matrx-orm 3.1.72__tar.gz → 3.1.73__tar.gz

{matrx_orm-3.1.72 → matrx_orm-3.1.73}/.gitignore

@@ -218,7 +218,7 @@ frontend/
 # Armani
 .history*
 .history/
-local_data/
+/local_data/
 local_reports_data/
 webscraper/quick_scrapes/temp/
 automation_matrix/ai_apis/fireworks/_dev/*

{matrx_orm-3.1.72 → matrx_orm-3.1.73}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: matrx-orm
-Version: 3.1.72
+Version: 3.1.73
 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.73/matrx_orm/schema_builder/FEATURE.md

@@ -0,0 +1,12 @@
+# Schema Builder
+
+The schema builder generates importable models and manager wrappers from live database metadata.
+
+## Manager method names
+
+- A generated manager must never contain duplicate method names; later definitions silently replace earlier behavior in Python.
+- When a table's singular and plural tokens are identical (for example, `entity_grants`), item methods keep the table token and collection methods use the `all_` prefix: `load_entity_grants(...)` and `load_all_entity_grants(...)`.
+- Relation collection wrappers follow the same rule, such as `get_all_entity_grants_with_iam_organizations()`.
+- Generated code must pass Ruff without unused imports or redefined methods.
+
+Guard: `packages/matrx-orm/tests/schema/test_base_generation.py`.

{matrx_orm-3.1.72 → matrx_orm-3.1.73}/matrx_orm/schema_builder/helpers/base_generators.py

@@ -78,8 +78,6 @@ from dataclasses import dataclass
 from typing import Any
 
 from matrx_orm import BaseManager, BaseDTO, ModelView, build_output_schema
-from matrx_utils import vcprint
-
 from {models_module_path} import {model_pascal}
 
 
@@ -271,8 +269,6 @@ from dataclasses import dataclass
 from typing import Any
 
 from matrx_orm import BaseManager, BaseDTO, ModelView
-from matrx_utils import vcprint
-
 from {models_module_path} import {model_pascal}
 
 
@@ -640,11 +636,16 @@ def generate_manager_class(
     view_prefetch: list[str] | None = None,
 ) -> str:
     """Combine all parts into the full class with fine-grained configuration and singleton manager."""
+    collection_name = (
+        f"all_{model_name_plural}"
+        if model_name_plural == model_name
+        else model_name_plural
+    )
     base = generate_base_manager_class(
         models_module_path,
         model_pascal,
         model_name,
-        model_name_plural,
+        collection_name,
         model_name_snake,
         relations=relations or [],
         view_prefetch=view_prefetch,
@@ -653,39 +654,39 @@ def generate_manager_class(
 
     # Core relation methods
     if relations and include_core_relations:
-        parts.append(generate_core_relation_methods(model_name, model_name_plural, relations))
+        parts.append(generate_core_relation_methods(model_name, collection_name, relations))
 
     # Active relation methods
     if relations and include_active_relations:
-        parts.append(generate_active_relation_methods(model_name, model_name_plural, relations))
+        parts.append(generate_active_relation_methods(model_name, collection_name, relations))
 
     # M2M relation methods
     if m2m_relations:
-        parts.append(generate_m2m_relation_methods(model_name, model_name_plural, m2m_relations))
+        parts.append(generate_m2m_relation_methods(model_name, collection_name, m2m_relations))
 
     # Filter field methods
     if filter_fields and include_filter_fields:
-        parts.append(generate_filter_field_methods(model_name, model_name_plural, filter_fields))
+        parts.append(generate_filter_field_methods(model_name, collection_name, filter_fields))
 
     # Active methods
     if include_active_methods:
         print("Generating active methods")
-        parts.append(generate_active_methods(model_name, model_name_plural))
+        parts.append(generate_active_methods(model_name, collection_name))
 
     # Or-not methods
     if include_or_not_methods:
-        parts.append(generate_or_not_methods(model_name, model_name_plural))
+        parts.append(generate_or_not_methods(model_name, collection_name))
 
     # To-dict methods
     if include_to_dict_methods:
-        parts.append(generate_to_dict_methods(model_name, model_name_plural))
+        parts.append(generate_to_dict_methods(model_name, collection_name))
 
     # To-dict relation methods
     if relations and include_to_dict_relations:
-        parts.append(generate_to_dict_relation_methods(model_name, model_name_plural, relations))
+        parts.append(generate_to_dict_relation_methods(model_name, collection_name, relations))
 
     # Always included utility methods
-    parts.append(generate_utility_methods(model_name, model_name_plural))
+    parts.append(generate_utility_methods(model_name, collection_name))
 
     # Add singleton manager with extra linebreaks
     parts.append("\n\n" + generate_singleton_manager(model_pascal, model_name))

{matrx_orm-3.1.72 → matrx_orm-3.1.73}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matrx-orm"
-version = "3.1.72"
+version = "3.1.73"
 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" }

{matrx_orm-3.1.72 → matrx_orm-3.1.73}/tests/schema/test_base_generation.py

@@ -1,3 +1,5 @@
+import ast
+
 from matrx_orm.schema_builder.helpers import save_manager_class
 
 
@@ -39,3 +41,34 @@ def test_generate_manager_class(tmp_path) -> None:
     assert "class AiModelManager(AiModelBase):" in model_class_str
     assert file_path == str(tmp_path / "ai_model_base.py")
     assert (tmp_path / "ai_model_base.py").read_text() == model_class_str
+
+
+def test_generate_manager_class_avoids_singular_plural_collisions(tmp_path) -> None:
+    model_class_str, _ = save_manager_class(
+        models_module_path="db.models.platform",
+        model_pascal="EntityGrants",
+        model_name="entity_grants",
+        model_name_plural="entity_grants",
+        model_name_snake="entity_grants",
+        relations=["iam.organizations"],
+        filter_fields=[],
+        include_or_not_methods=False,
+        include_to_dict_methods=False,
+        output_root=tmp_path,
+    )
+
+    tree = ast.parse(model_class_str)
+    manager = next(
+        node
+        for node in tree.body
+        if isinstance(node, ast.ClassDef) and node.name == "EntityGrantsBase"
+    )
+    method_names = [
+        node.name for node in manager.body if isinstance(node, ast.AsyncFunctionDef)
+    ]
+
+    assert len(method_names) == len(set(method_names))
+    assert "load_entity_grants" in method_names
+    assert "load_all_entity_grants" in method_names
+    assert "get_all_entity_grants_with_iam_organizations" in method_names
+    assert "from matrx_utils import vcprint" not in model_class_str