fix forward reference resolution and other issues

Author: Pwuts

src/prisma/generator/templates/_typing_imports.py.jinja

@@ -40,5 +40,6 @@ from builtins import float as _float
 {% if recursive_types %}
 from typing_extensions import LiteralString
 {% else %}
-LiteralString = str
+from typing import TypeAlias
+LiteralString: TypeAlias = str
 {% endif %}

src/prisma/generator/templates/types/__init__.py.jinja

@@ -9,9 +9,14 @@ from typing import TYPE_CHECKING, Any
 {% if recursive_types %}
 from typing_extensions import LiteralString  # noqa: F401
 {% else %}
-LiteralString = str
+from typing import TypeAlias
+
+LiteralString: TypeAlias = str
 {% endif %}
 
+# List of submodules for validator forward reference resolution
+_SUBMODULES = ['atomic', 'filters', 'list_filters'{% for model in dmmf.datamodel.models %}, '{{ model.name | lower }}'{% endfor %}]
+
 if TYPE_CHECKING:
     # Direct re-exports for type checking
     from .atomic import *  # noqa: F401, F403
@@ -21,16 +26,22 @@ if TYPE_CHECKING:
     from .{{ model.name | lower }} import *  # noqa: F401, F403
     {% endfor %}
 else:
+    import importlib
+
     # Lazy attribute access at runtime
     def __getattr__(name: str) -> Any:
         """Allow attribute access to types defined in submodules."""
         # Try each submodule
-        import importlib
-        for module_name in ['atomic', 'filters', 'list_filters'{% for model in dmmf.datamodel.models %}, '{{ model.name | lower }}'{% endfor %}]:
-            try:
-                module = importlib.import_module(f'.{module_name}', __package__)
-                if hasattr(module, name):
-                    return getattr(module, name)
-            except (ImportError, AttributeError):
-                continue
+        for module_name in _SUBMODULES:
+            module = importlib.import_module(f'.{module_name}', __package__)
+            if hasattr(module, name):
+                return getattr(module, name)
         raise AttributeError(f"module 'prisma.types' has no attribute {name!r}")
+
+    def __dict__():
+        return {
+            name
+            for module_name in _SUBMODULES
+            for name in dir(importlib.import_module(f'.{module_name}', __package__))
+            if not name.startswith('_')
+        }

src/prisma/generator/templates/types/_model.py.jinja

@@ -14,28 +14,6 @@ from .list_filters import *
 
 # --- Types for model: {{ model.name }} --- #
 
-{% set other_models = all_models | selectattr('name', 'ne', model.name) | list %}
-{% if other_models %}
-# Cross-import related model types for type checker resolution
-if TYPE_CHECKING:
-{% for other_model in other_models %}
-    from .{{ other_model.name | lower }} import (
-        {{ other_model.name }}WhereInput,
-        {{ other_model.name }}WhereUniqueInput,
-        {{ other_model.name }}OrderByInput,
-        {{ other_model.name }}ScalarFieldKeys,
-        {{ other_model.name }}RelationFilter,
-        {{ other_model.name }}ListRelationFilter,
-        {{ other_model.name }}CreateWithoutRelationsInput,
-        {{ other_model.name }}CreateNestedWithoutRelationsInput,
-        {{ other_model.name }}CreateManyNestedWithoutRelationsInput,
-        {{ other_model.name }}UpdateOneWithoutRelationsInput,
-        {{ other_model.name }}UpdateManyWithoutRelationsInput,
-        {{ other_model.name }}ConnectOrCreateWithoutRelationsInput,
-    )
-{% endfor %}
-{% endif %}
-
 
 {% set depth = generator.config.recursive_type_depth %}
 
@@ -432,3 +410,24 @@ class {{ model.name }}NumberAggregateInput(TypedDict, total=False):
 {% else -%}
     {{ model.name }}RelationalFieldKeys = _NoneType
 {% endif %}
+
+{% set other_models = all_models | selectattr('name', 'ne', model.name) | list %}
+{% if other_models %}
+# Cross-import related model types for resolution of forward references
+{% for other_model in other_models %}
+from .{{ other_model.name | lower }} import (
+    {{ other_model.name }}WhereInput,
+    {{ other_model.name }}WhereUniqueInput,
+    {{ other_model.name }}OrderByInput,
+    {{ other_model.name }}ScalarFieldKeys,
+    {{ other_model.name }}RelationFilter,
+    {{ other_model.name }}ListRelationFilter,
+    {{ other_model.name }}CreateWithoutRelationsInput,
+    {{ other_model.name }}CreateNestedWithoutRelationsInput,
+    {{ other_model.name }}CreateManyNestedWithoutRelationsInput,
+    {{ other_model.name }}UpdateOneWithoutRelationsInput,
+    {{ other_model.name }}UpdateManyWithoutRelationsInput,
+    {{ other_model.name }}ConnectOrCreateWithoutRelationsInput,
+)
+{% endfor %}
+{% endif %}

src/prisma/validator.py

@@ -1,4 +1,5 @@
 import sys
+import warnings
 from types import ModuleType
 from typing import Any, Type, TypeVar, cast, is_typeddict
 from functools import lru_cache
@@ -8,6 +9,16 @@
 from ._types import Protocol, runtime_checkable
 from ._compat import PYDANTIC_V2, Extra
 
+# Python 3.13+ raises a DeprecationWarning for ForwardRef._evaluate without type_params.
+# This is an issue in pydantic v1's typing module that we can't fix here.
+# Filter these warnings to avoid spurious failures.
+if sys.version_info >= (3, 13):
+    warnings.filterwarnings(
+        'ignore',
+        message=r"Failing to pass a value to the 'type_params' parameter",
+        category=DeprecationWarning,
+    )
+
 __all__ = ('validate',)
 
 TD = TypeVar('TD')