sqlmodel-ext 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

sqlmodel_ext/__init__.py

@@ -20,10 +20,10 @@ Quick start::
     user = await user.save(session)
     users = await User.get(session, fetch_mode="all")
 """
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 
 # Base
-from sqlmodel_ext.base import SQLModelBase
+from sqlmodel_ext.base import SQLModelBase, ExtraIgnoreModelBase
 
 # Exceptions
 from sqlmodel_ext._exceptions import RecordNotFoundError
@@ -39,8 +39,12 @@ from sqlmodel_ext.pagination import (
 # Mixins
 from sqlmodel_ext.mixins import (
     # Table
+    SESSION_FOR_UPDATE_KEY,
     TableBaseMixin,
     UUIDTableBaseMixin,
+    rel,
+    cond,
+    safe_reset,
     # Polymorphic
     PolymorphicBaseMixin,
     AutoPolymorphicIdentityMixin,
@@ -53,6 +57,9 @@ from sqlmodel_ext.mixins import (
     # Relation Preload
     RelationPreloadMixin,
     requires_relations,
+    requires_for_update,
+    # Cached Table
+    CachedTableBaseMixin,
     # Info Response DTOs
     IntIdInfoMixin,
     UUIDIdInfoMixin,
@@ -67,6 +74,7 @@ from sqlmodel_ext.field_types import (
     DirectoryPathType,
     FilePathType,
     # String constraints
+    Str16,
     Str24,
     Str32,
     Str36,
@@ -76,21 +84,33 @@ from sqlmodel_ext.field_types import (
     Str128,
     Str255,
     Str256,
+    Str500,
+    Str512,
+    Str2048,
     Text1K,
     Text1024,
     Text2K,
     Text2500,
     Text3K,
+    Text5K,
     Text10K,
+    Text32K,
     Text60K,
     Text64K,
     Text100K,
+    Text1M,
     # Numeric constraints
+    INT32_MAX,
+    INT64_MAX,
+    JS_MAX_SAFE_INTEGER,
     Port,
     Percentage,
     PositiveInt,
     NonNegativeInt,
+    PositiveBigInt,
+    NonNegativeBigInt,
     PositiveFloat,
+    NonNegativeFloat,
     # Custom types
     IPAddress,
     Url,
@@ -101,3 +121,12 @@ from sqlmodel_ext.field_types import (
     validate_not_private_host,
     ModuleNameMixin,
 )
+
+# Relation Load Checker (static analysis)
+from sqlmodel_ext.relation_load_checker import (
+    RelationLoadChecker,
+    RelationLoadWarning,
+    RelationLoadCheckMiddleware,
+    run_model_checks,
+    mark_app_check_completed,
+)

sqlmodel_ext/_compat.py

@@ -65,7 +65,25 @@ if sys.version_info >= (3, 14):
                 non_none_args = [a for a in args if a is not type(None)]
                 if non_none_args:
                     first_arg = non_none_args[0]
+                    # Check for Annotated SA type metadata first (e.g. Array[T] | None).
+                    # Array[T] desugars to Annotated[list[T], _ArrayTypeHandler(T)];
+                    # wrapping with | None produces Union[Annotated[...], None],
+                    # so the SA type must be extracted from the inner Annotated.
+                    first_arg_type_name = type(first_arg).__name__
+                    if first_arg_type_name in ('AnnotatedAlias', '_AnnotatedAlias'):
+                        inner_args = get_args(first_arg)
+                        for md in inner_args[1:]:
+                            if hasattr(md, '__get_pydantic_core_schema__'):
+                                try:
+                                    schema = md.__get_pydantic_core_schema__(None, None)
+                                    if isinstance(schema, dict) and 'metadata' in schema:
+                                        sa_type = schema['metadata'].get('sa_type')
+                                        if sa_type is not None:
+                                            return sa_type
+                                except (TypeError, AttributeError, KeyError):
+                                    pass
                     first_origin = get_origin(first_arg)
+                    # Plain list/dict/tuple/set (no Annotated SA type) -> JSONB
                     if first_origin in (list, dict, tuple, set):
                         return JSONB
 

sqlmodel_ext/_sa_type.py

@@ -97,7 +97,8 @@ def _resolve_annotations(attrs: dict[str, Any]) -> tuple[
 
     try:
         temp_cls = type('AnnotationProxy', (object,), dict(attrs))
-        temp_cls.__module__ = module_name
+        if isinstance(module_name, str):
+            temp_cls.__module__ = module_name
         extras_kw = {'include_extras': True} if sys.version_info >= (3, 10) else {}
         evaluated = get_type_hints(
             temp_cls,
@@ -132,6 +133,6 @@ def _evaluate_annotation_from_string(
         return current_type
 
     try:
-        return eval(expr, globalns, localns)
+        return eval(expr, dict(globalns), dict(localns))
     except (NameError, SyntaxError, AttributeError, TypeError):
         return current_type

sqlmodel_ext/_utils.py

@@ -1,5 +1,5 @@
 """Internal utility functions."""
-from datetime import datetime
+from datetime import datetime, timezone
 
-now = lambda: datetime.now()
-now_date = lambda: datetime.now().date()
+now = lambda: datetime.now(timezone.utc)
+now_date = lambda: datetime.now(timezone.utc).date()