test: align v2 parser baselines before v1 output removal (#3032)

* test: align v2 parser baselines before v1 output removal

* test: restore v1 baseline coverage

Author: koxudaxi

src/datamodel_code_generator/config.py

@@ -39,7 +39,7 @@
     PythonVersion,
     PythonVersionMin,
 )
-from datamodel_code_generator.model import pydantic as pydantic_model
+from datamodel_code_generator.model import pydantic_v2
 from datamodel_code_generator.model.base import (  # noqa: TC001 - used by Pydantic at runtime
     DataModel,
     DataModelFieldBase,
@@ -205,10 +205,10 @@ class ParserConfig(BaseModel):
 
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
 
-    data_model_type: type[DataModel] = pydantic_model.BaseModel
-    data_model_root_type: type[DataModel] = pydantic_model.CustomRootType
-    data_type_manager_type: type[DataTypeManager] = pydantic_model.DataTypeManager
-    data_model_field_type: type[DataModelFieldBase] = pydantic_model.DataModelField
+    data_model_type: type[DataModel] = pydantic_v2.BaseModel
+    data_model_root_type: type[DataModel] = pydantic_v2.RootModel
+    data_type_manager_type: type[DataTypeManager] = pydantic_v2.DataTypeManager
+    data_model_field_type: type[DataModelFieldBase] = pydantic_v2.DataModelField
     base_class: str | None = None
     base_class_map: dict[str, str | list[str]] | None = None
     additional_imports: list[str] | None = None

src/datamodel_code_generator/parser/base.py

@@ -64,7 +64,6 @@
 )
 from datamodel_code_generator.model import dataclass as dataclass_model
 from datamodel_code_generator.model import msgspec as msgspec_model
-from datamodel_code_generator.model import pydantic as pydantic_model
 from datamodel_code_generator.model import pydantic_v2 as pydantic_model_v2
 from datamodel_code_generator.model.base import (
     ALL_MODEL,
@@ -1112,7 +1111,7 @@ def field_name_model_type(self) -> ModelType:
         """
         if issubclass(
             self.data_model_type,
-            (pydantic_model.BaseModel, pydantic_model_v2.BaseModel),
+            (pydantic_model_v2.BaseModel,),
         ):
             return ModelType.PYDANTIC
         return ModelType.CLASS
@@ -1532,7 +1531,7 @@ def __apply_discriminator_type(  # noqa: PLR0912, PLR0914, PLR0915
                     type_names: list[str] = []
 
                     def check_paths(
-                        model: pydantic_model.BaseModel | pydantic_model_v2.BaseModel | Reference,
+                        model: pydantic_model_v2.BaseModel | Reference,
                         mapping: dict[str, str],
                         type_names: list[str] = type_names,
                     ) -> None:
@@ -1602,7 +1601,6 @@ def check_paths(
                             if not isinstance(  # pragma: no cover
                                 base_model,
                                 (
-                                    pydantic_model.BaseModel,
                                     pydantic_model_v2.BaseModel,
                                     dataclass_model.DataClass,
                                     msgspec_model.Struct,
@@ -1852,7 +1850,6 @@ def __create_shared_module_from_duplicates(  # noqa: PLR0912
         supports_inheritance = issubclass(
             self.data_model_type,
             (
-                pydantic_model.BaseModel,
                 pydantic_model_v2.BaseModel,
                 dataclass_model.DataClass,
             ),
@@ -1915,10 +1912,6 @@ def __reuse_model_tree_scope(
         self.__validate_shared_module_name(module_models)
         return self.__create_shared_module_from_duplicates(module_models, duplicates, require_update_action_models)
 
-    def _is_pydantic_v2_model(self) -> bool:
-        """Check if the output model type is Pydantic v2."""
-        return self.data_model_type.__module__.startswith("datamodel_code_generator.model.pydantic_v2")
-
     def __collapse_root_models(  # noqa: PLR0912, PLR0914, PLR0915
         self,
         models: list[DataModel],
@@ -2037,9 +2030,7 @@ def __collapse_root_models(  # noqa: PLR0912, PLR0914, PLR0915
                                 root_type_field.constraints, model_field.constraints
                             )
                         discriminator = root_type_field.extras.get("discriminator")
-                        if discriminator and isinstance(
-                            root_type_field, (pydantic_model.DataModelField, pydantic_model_v2.DataModelField)
-                        ):
+                        if discriminator and isinstance(root_type_field, pydantic_model_v2.DataModelField):
                             has_any_variant = any(
                                 dt.type == ANY
                                 or (not dt.reference and not dt.data_types and not dt.literals and not dt.type)
@@ -2051,8 +2042,7 @@ def __collapse_root_models(  # noqa: PLR0912, PLR0914, PLR0915
                                     if isinstance(discriminator, dict)
                                     else discriminator
                                 )
-                                if self._is_pydantic_v2_model():
-                                    copied_data_type.discriminator = prop_name
+                                copied_data_type.discriminator = prop_name
                         assert isinstance(data_type.parent, DataType)
                         data_type.parent.data_types.remove(data_type)
                         data_type.parent.data_types.append(copied_data_type)

tests/data/expected/main/class_decorators_pydantic_BaseModel.py

@@ -5,30 +5,31 @@
 from __future__ import annotations
 
 from datetime import date, datetime
-from typing import Literal, TypeAlias
+from typing import Literal
 
 from mymodule.myclass import MyCustomPythonClass
 from pydantic import BaseModel, Field
+from typing_extensions import TypeAliasType
 
-Boolean: TypeAlias = bool
+Boolean = TypeAliasType("Boolean", bool)
 """
 The `Boolean` scalar type represents `true` or `false`.
 """
 
 
-Date: TypeAlias = date
+Date = TypeAliasType("Date", date)
 
 
-DateTime: TypeAlias = datetime
+DateTime = TypeAliasType("DateTime", datetime)
 """
 DateTime (ISO8601, example: 2020-01-01T10:11:12+00:00)
 """
 
 
-MyCustomClass: TypeAlias = MyCustomPythonClass
+MyCustomClass = TypeAliasType("MyCustomClass", MyCustomPythonClass)
 
 
-String: TypeAlias = str
+String = TypeAliasType("String", str)
 """
 The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.
 """

tests/data/expected/main/graphql/additional_imports.py

@@ -4,17 +4,18 @@
 
 from __future__ import annotations
 
-from typing import Literal, TypeAlias
+from typing import Literal
 
 from pydantic import BaseModel, Field
+from typing_extensions import TypeAliasType
 
-Boolean: TypeAlias = bool
+Boolean = TypeAliasType("Boolean", bool)
 """
 The `Boolean` scalar type represents `true` or `false`.
 """
 
 
-String: TypeAlias = str
+String = TypeAliasType("String", str)
 """
 The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.
 """

tests/data/expected/main/graphql/annotated_use_default_kwarg.py

@@ -5,23 +5,24 @@
 from __future__ import annotations
 
 from enum import Enum
-from typing import Literal, TypeAlias
+from typing import Literal
 
 from pydantic import BaseModel, Field
+from typing_extensions import TypeAliasType
 
-Boolean: TypeAlias = bool
+Boolean = TypeAliasType("Boolean", bool)
 """
 The `Boolean` scalar type represents `true` or `false`.
 """
 
 
-Int: TypeAlias = int
+Int = TypeAliasType("Int", int)
 """
 The `Int` scalar type represents non-fractional signed whole numeric values. Int can represent values between -(2^31) and 2^31 - 1.
 """
 
 
-String: TypeAlias = str
+String = TypeAliasType("String", str)
 """
 The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.
 """

tests/data/expected/main/graphql/casing.py

@@ -5,26 +5,27 @@
 # a comment
 from __future__ import annotations
 
-from typing import Literal, TypeAlias
+from typing import Literal
 
 from pydantic import BaseModel, Field
+from typing_extensions import TypeAliasType
 
-Boolean: TypeAlias = bool
+Boolean = TypeAliasType("Boolean", bool)
 """
 The `Boolean` scalar type represents `true` or `false`.
 """
 
 
-ID: TypeAlias = str
+ID = TypeAliasType("ID", str)
 """
 The `ID` scalar type represents a unique identifier, often used to refetch an object or as key for a cache. The ID type appears in a JSON response as a String; however, it is not intended to be human-readable. When expected as an input type, any string (such as `"4"`) or integer (such as `4`) input value will be accepted as an ID.
 """
 
 
-Long: TypeAlias = str
+Long = TypeAliasType("Long", str)
 
 
-String: TypeAlias = str
+String = TypeAliasType("String", str)
 """
 The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.
 """

tests/data/expected/main/graphql/custom_formatters.py

@@ -4,26 +4,27 @@
 
 from __future__ import annotations
 
-from typing import Literal, TypeAlias
+from typing import Literal
 
 from pydantic import BaseModel, Field
+from typing_extensions import TypeAliasType
 
-Boolean: TypeAlias = bool
+Boolean = TypeAliasType("Boolean", bool)
 """
 The `Boolean` scalar type represents `true` or `false`.
 """
 
 
-ID: TypeAlias = str
+ID = TypeAliasType("ID", str)
 """
 The `ID` scalar type represents a unique identifier, often used to refetch an object or as key for a cache. The ID type appears in a JSON response as a String; however, it is not intended to be human-readable. When expected as an input type, any string (such as `"4"`) or integer (such as `4`) input value will be accepted as an ID.
 """
 
 
-Long: TypeAlias = int
+Long = TypeAliasType("Long", int)
 
 
-String: TypeAlias = str
+String = TypeAliasType("String", str)
 """
 The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.
 """

tests/data/expected/main/graphql/custom_scalar_types.py

@@ -4,23 +4,24 @@
 
 from __future__ import annotations
 
-from typing import Literal, TypeAlias
+from typing import Literal
 
 from pydantic import BaseModel, Field
+from typing_extensions import TypeAliasType
 
-Boolean: TypeAlias = bool
+Boolean = TypeAliasType("Boolean", bool)
 """
 The `Boolean` scalar type represents `true` or `false`.
 """
 
 
-ID: TypeAlias = str
+ID = TypeAliasType("ID", str)
 """
 The `ID` scalar type represents a unique identifier, often used to refetch an object or as key for a cache. The ID type appears in a JSON response as a String; however, it is not intended to be human-readable. When expected as an input type, any string (such as `"4"`) or integer (such as `4`) input value will be accepted as an ID.
 """
 
 
-String: TypeAlias = str
+String = TypeAliasType("String", str)
 """
 The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.
 """

tests/data/expected/main/graphql/default_values_required_use_default.py

@@ -4,17 +4,18 @@
 
 from __future__ import annotations
 
-from typing import Literal, TypeAlias
+from typing import Literal
 
 from pydantic import BaseModel, Field
+from typing_extensions import TypeAliasType
 
-Boolean: TypeAlias = bool
+Boolean = TypeAliasType("Boolean", bool)
 """
 The `Boolean` scalar type represents `true` or `false`.
 """
 
 
-String: TypeAlias = str
+String = TypeAliasType("String", str)
 """
 The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.
 """