Remove Python 3.9 dead code from msgspec and update action

Author: koxudaxi

.github/workflows/config-types.yaml

@@ -20,12 +20,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: astral-sh/setup-uv@v5
+      - uses: ./
         with:
-          enable-cache: true
+          profile: generate-config-dict
 
-      - run: uv python install 3.14
-
-      - run: uv tool install --python 3.14 tox --with tox-uv
+      - uses: ./
+        with:
+          profile: parser-config-dicts
 
-      - run: tox -e config-types -- --check
+      - uses: ./
+        with:
+          profile: parse-config-dict

action.yml

@@ -7,16 +7,20 @@ branding:
 inputs:
   input:
     description: 'Input schema file or directory'
-    required: true
+    required: false
+    default: ''
   output:
     description: 'Output file or directory'
-    required: true
+    required: false
+    default: ''
   input-file-type:
     description: 'Input file type (openapi, jsonschema, json, yaml, csv, graphql)'
-    required: true
+    required: false
+    default: ''
   output-model-type:
     description: 'Output model type (pydantic_v2.BaseModel, pydantic.BaseModel, dataclasses.dataclass, typing.TypedDict, msgspec.Struct)'
-    required: true
+    required: false
+    default: ''
   check:
     description: 'Validate that existing output is up to date (no generation)'
     required: false
@@ -70,12 +74,23 @@ runs:
       shell: bash
 
     - run: |
-        ARGS=(
-          --input "${{ inputs.input }}"
-          --output "${{ inputs.output }}"
-          --input-file-type "${{ inputs.input-file-type }}"
-          --output-model-type "${{ inputs.output-model-type }}"
-        )
+        ARGS=()
+
+        if [ -n "${{ inputs.input }}" ]; then
+          ARGS+=(--input "${{ inputs.input }}")
+        fi
+
+        if [ -n "${{ inputs.output }}" ]; then
+          ARGS+=(--output "${{ inputs.output }}")
+        fi
+
+        if [ -n "${{ inputs.input-file-type }}" ]; then
+          ARGS+=(--input-file-type "${{ inputs.input-file-type }}")
+        fi
+
+        if [ -n "${{ inputs.output-model-type }}" ]; then
+          ARGS+=(--output-model-type "${{ inputs.output-model-type }}")
+        fi
 
         if [ "${{ inputs.check }}" = "true" ]; then
           ARGS+=(--check)

src/datamodel_code_generator/model/msgspec.py

@@ -16,7 +16,6 @@
     IMPORT_DATETIME,
     IMPORT_TIME,
     IMPORT_TIMEDELTA,
-    IMPORT_UNION,
     Import,
 )
 from datamodel_code_generator.model import DataModel, DataModelFieldBase
@@ -37,10 +36,7 @@
 from datamodel_code_generator.model.types import standard_primitive_type_map_factory, type_map_factory
 from datamodel_code_generator.types import (
     NONE,
-    OPTIONAL_PREFIX,
-    UNION_DELIMITER,
     UNION_OPERATOR_DELIMITER,
-    UNION_PREFIX,
     DataType,
     StrictTypes,
     Types,
@@ -96,8 +92,6 @@ def new_imports(self: DataModelFieldBaseT) -> tuple[Import, ...]:
             extra_imports.append(IMPORT_MSGSPEC_META)
         if not self.required and not self.nullable:
             extra_imports.append(IMPORT_MSGSPEC_UNSETTYPE)
-            if not self.data_type.use_union_operator:  # pragma: no cover
-                extra_imports.append(IMPORT_UNION)
             if self.default is None or self.default is UNDEFINED:
                 extra_imports.append(IMPORT_MSGSPEC_UNSET)
         return chain_as_tuple(original_imports.fget(self), extra_imports)  # pyright: ignore[reportOptionalCall]
@@ -218,32 +212,18 @@ class Constraints(_Constraints):
 
 
 @lru_cache
-def get_neither_required_nor_nullable_type(type_: str, use_union_operator: bool) -> str:  # noqa: FBT001
+def get_neither_required_nor_nullable_type(type_: str, use_union_operator: bool) -> str:  # noqa: ARG001, FBT001
     """Get type hint for fields that are neither required nor nullable, using UnsetType."""
-    type_ = _remove_none_from_union(type_, use_union_operator=use_union_operator)
-    if type_.startswith(OPTIONAL_PREFIX):  # pragma: no cover
-        type_ = type_[len(OPTIONAL_PREFIX) : -1]
-
+    type_ = _remove_none_from_union(type_, use_union_operator=True)
     if not type_ or type_ == NONE:
         return UNSET_TYPE
-    if use_union_operator:
-        return UNION_OPERATOR_DELIMITER.join((type_, UNSET_TYPE))
-    if type_.startswith(UNION_PREFIX):  # pragma: no cover
-        return f"{type_[:-1]}{UNION_DELIMITER}{UNSET_TYPE}]"
-    return f"{UNION_PREFIX}{type_}{UNION_DELIMITER}{UNSET_TYPE}]"  # pragma: no cover
+    return UNION_OPERATOR_DELIMITER.join((type_, UNSET_TYPE))
 
 
 @lru_cache
-def _add_unset_type(type_: str, use_union_operator: bool) -> str:  # noqa: FBT001
+def _add_unset_type(type_: str, use_union_operator: bool) -> str:  # noqa: ARG001, FBT001
     """Add UnsetType to a type hint without removing None."""
-    if use_union_operator:
-        return f"{type_}{UNION_OPERATOR_DELIMITER}{UNSET_TYPE}"
-    if type_.startswith(UNION_PREFIX):  # pragma: no cover
-        return f"{type_[:-1]}{UNION_DELIMITER}{UNSET_TYPE}]"
-    if type_.startswith(OPTIONAL_PREFIX):  # pragma: no cover
-        inner_type = type_[len(OPTIONAL_PREFIX) : -1]
-        return f"{UNION_PREFIX}{inner_type}{UNION_DELIMITER}{NONE}{UNION_DELIMITER}{UNSET_TYPE}]"
-    return f"{UNION_PREFIX}{type_}{UNION_DELIMITER}{UNSET_TYPE}]"  # pragma: no cover
+    return f"{type_}{UNION_OPERATOR_DELIMITER}{UNSET_TYPE}"
 
 
 @import_extender