matrx-orm 3.1.227__tar.gz → 3.1.228__tar.gz

{matrx_orm-3.1.227 → matrx_orm-3.1.228}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: matrx-orm
-Version: 3.1.227
+Version: 3.1.228
 Summary: Async-first PostgreSQL ORM with bidirectional migrations, schema introspection, many-to-many relationships, and built-in state caching
 Project-URL: Homepage, https://github.com/AI-Matrix-Engine/aidream-current
 Project-URL: Repository, https://github.com/AI-Matrix-Engine/aidream-current

{matrx_orm-3.1.227 → matrx_orm-3.1.228}/matrx_orm/schema_builder/common.py

@@ -141,66 +141,9 @@ DEBUG_CONFIG = {
     "verbose": False,
 }
 
-# Names a generated model class can NEVER take, because the models file imports
-# or defines them at module scope — a model class shadowing one of these either
-# breaks the module (e.g. a class named `Model` is special-cased by ModelMeta as
-# the abstract base and never gets its table wired) or silently rebinds a field
-# type. A table whose PascalCase lands on one of these is renamed deterministically
-# by safe_model_class_name() to <Schema><Pascal> (e.g. ai.model -> AiModel). This
-# is the ONLY place a name still carries a schema, and only for a true collision.
-RESERVED_MODEL_NAMES: frozenset[str] = frozenset(
-    {
-        "Model",
-        "BaseManager",
-        "BaseDTO",
-        "ModelView",
-        "model_registry",
-        "Enum",
-        "dataclass",
-        "ClassVar",
-        "Field",
-        "CharField",
-        "TextField",
-        "IntegerField",
-        "BigIntegerField",
-        "SmallIntegerField",
-        "BooleanField",
-        "FloatField",
-        "DecimalField",
-        "DateTimeField",
-        "DateField",
-        "TimeField",
-        "UUIDField",
-        "JSONField",
-        "JSONBField",
-        "EnumField",
-        "ForeignKey",
-        "ObjectField",
-        "BinaryField",
-        "IPAddressField",
-        "RangeField",
-        "VectorField",
-        "TextArrayField",
-        "IntegerArrayField",
-        "UUIDArrayField",
-        "FloatArrayField",
-    }
-)
-
-
-def safe_model_class_name(table_name: str, schema: str | None, to_pascal_case) -> str:
-    """PascalCase class name for *table_name*, schema-prefixed ONLY if the bare
-    PascalCase collides with a framework-reserved symbol (see RESERVED_MODEL_NAMES).
-
-    e.g. ``ai.model`` -> ``AiModel`` (a class literally named ``Model`` is
-    unusable), while every non-reserved table keeps its clean, prefix-free name.
-    The same (table, schema) always yields the same name, so a FK target and the
-    target's own class agree.
-    """
-    base = to_pascal_case(table_name)
-    if base in RESERVED_MODEL_NAMES:
-        return f"{to_pascal_case(schema or 'public')}{base}"
-    return base
+# RESERVED_MODEL_NAMES / safe_model_class_name live in package_wiring.py (stdlib-only, so the
+# package-wiring drift gate can name view classes without importing matrx_orm); re-exported here.
+from matrx_orm.schema_builder.package_wiring import RESERVED_MODEL_NAMES, safe_model_class_name  # noqa: E402,F401
 
 
 def resolve_fk_related_model_name(

{matrx_orm-3.1.227 → matrx_orm-3.1.228}/matrx_orm/schema_builder/package_wiring.py

@@ -179,6 +179,79 @@ def _lookup(inventory: dict[tuple[str, str], TableInfo], table: str) -> TableInf
     return info
 
 
+# Names a generated model class can NEVER take, because the models file imports
+# or defines them at module scope — a model class shadowing one of these either
+# breaks the module (e.g. a class named `Model` is special-cased by ModelMeta as
+# the abstract base and never gets its table wired) or silently rebinds a field
+# type. A table whose PascalCase lands on one of these is renamed deterministically
+# by safe_model_class_name() to <Schema><Pascal> (e.g. ai.model -> AiModel). This
+# is the ONLY place a name still carries a schema, and only for a true collision.
+RESERVED_MODEL_NAMES: frozenset[str] = frozenset(
+    {
+        "Model",
+        "BaseManager",
+        "BaseDTO",
+        "ModelView",
+        "model_registry",
+        "Enum",
+        "dataclass",
+        "ClassVar",
+        "Field",
+        "CharField",
+        "TextField",
+        "IntegerField",
+        "BigIntegerField",
+        "SmallIntegerField",
+        "BooleanField",
+        "FloatField",
+        "DecimalField",
+        "DateTimeField",
+        "DateField",
+        "TimeField",
+        "UUIDField",
+        "JSONField",
+        "JSONBField",
+        "EnumField",
+        "ForeignKey",
+        "ObjectField",
+        "BinaryField",
+        "IPAddressField",
+        "RangeField",
+        "VectorField",
+        "TextArrayField",
+        "IntegerArrayField",
+        "UUIDArrayField",
+        "FloatArrayField",
+    }
+)
+
+
+def safe_model_class_name(table_name: str, schema: str | None, to_pascal_case) -> str:
+    """PascalCase class name for *table_name*, schema-prefixed ONLY if the bare
+    PascalCase collides with a framework-reserved symbol (see RESERVED_MODEL_NAMES).
+
+    e.g. ``ai.model`` -> ``AiModel`` (a class literally named ``Model`` is
+    unusable), while every non-reserved table keeps its clean, prefix-free name.
+    The same (table, schema) always yields the same name, so a FK target and the
+    target's own class agree.
+    """
+    base = to_pascal_case(table_name)
+    if base in RESERVED_MODEL_NAMES:
+        return f"{to_pascal_case(schema or 'public')}{base}"
+    return base
+
+
+def _pascal_case(s: str) -> str:
+    """Stdlib twin of ``DataTransformer.to_pascal_case`` (matrx_utils): snake-normalize, then title each part.
+
+    Kept stdlib-only so the wiring gate needs neither matrx_orm nor matrx_utils's runtime deps; a drift
+    from the generator's naming fails the gate loudly (the class is checked against the models file).
+    """
+    s = re.sub(r"(?<!^)(?=[A-Z])", "_", s)
+    s = re.sub(r"[^a-zA-Z0-9]+", "_", s).lower()
+    return "".join(x.title() for x in s.split("_"))
+
+
 def _lookup_view(
     inventory: dict[tuple[str, str], TableInfo], view: str, python_root: str | Path | None
 ) -> TableInfo:
@@ -190,9 +263,7 @@ def _lookup_view(
         raise PackageWiringError(
             f"package_wiring: view '{view}' — schema '{schema}' has no generated models module"
         )
-    from matrx_orm.schema_builder.common import dt_utils, safe_model_class_name
-
-    pascal = safe_model_class_name(snake, schema, dt_utils.to_pascal_case)
+    pascal = safe_model_class_name(snake, schema, _pascal_case)
     if python_root is not None:
         models_file = Path(python_root) / (sibling.models_module.replace(".", "/") + ".py")
         tree = ast.parse(models_file.read_text(), filename=str(models_file))

{matrx_orm-3.1.227 → matrx_orm-3.1.228}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matrx-orm"
-version = "3.1.227"
+version = "3.1.228"
 description = "Async-first PostgreSQL ORM with bidirectional migrations, schema introspection, many-to-many relationships, and built-in state caching"
 readme = "README.md"
 license = { text = "MIT" }