metaobjects 0.22.0__tar.gz → 0.22.1__tar.gz

{metaobjects-0.22.0 → metaobjects-0.22.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: metaobjects
-Version: 0.22.0
+Version: 0.22.1
 Summary: Cross-language metadata standard: declare typed entities once, generate idiomatic drift-checked code across languages — Python port.
 Project-URL: Homepage, https://metaobjects.dev
 Project-URL: Repository, https://github.com/metaobjectsdev/metaobjects

{metaobjects-0.22.0 → metaobjects-0.22.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "metaobjects"
-version = "0.22.0"
+version = "0.22.1"
 description = "Cross-language metadata standard: declare typed entities once, generate idiomatic drift-checked code across languages — Python port."
 readme = "README.md"
 requires-python = ">=3.11"

{metaobjects-0.22.0 → metaobjects-0.22.1}/src/metaobjects/codegen/generators/entity_model.py

@@ -372,8 +372,25 @@ def _auto_gen_pk_field_names(entity: MetaObject) -> set[str]:
     return set(_primary_identity_field_names(entity))
 
 
+def _assigned_pk_field_names(entity: MetaObject) -> set[str]:
+    """Primary-key field names the CALLER must supply on create: an ASSIGNED primary key
+    — a natural key or an externally-issued id, i.e. an ``identity.primary`` carrying no
+    ``@generation`` (or an explicit ``assigned``).
+
+    These are create-REQUIRED regardless of ``@required``: nothing else can produce the
+    value, so a create body omitting one can only fail at the database. Excludes the
+    ``increment|uuid`` keys, which ``_auto_gen_pk_field_names`` already drops from the
+    create shape entirely. A PK carrying a ``@default`` stays optional (the column has
+    that default) — handled at the call site, which knows the field.
+
+    Mirrors the TS ``assignedPkFieldNames``; gated cross-port by the
+    ``assigned-pk-missing`` case in ``fixtures/validation-conformance``."""
+    auto_gen = _auto_gen_pk_field_names(entity)
+    return {n for n in _primary_identity_field_names(entity) if n not in auto_gen}
+
+
 def _create_field_line(
-    field: MetaField, imports: set[str], config: GenConfig
+    field: MetaField, imports: set[str], config: GenConfig, *, force_required: bool = False
 ) -> tuple[str, bool]:
     """A CREATE-model field line (FR-036): keyed by the WIRE name (``field.name``) and
     carrying the WIRE-TIER per-field constraints (#224 — includes FR-036 Pin 1
@@ -397,7 +414,9 @@ def _create_field_line(
     # ANY @default (literal or SQL-expr) or @autoSet means the DB fills it, so the wire
     # body may omit it (the FR-036 #1 regression fix).
     server_filled = default_raw is not None or is_auto_set
-    create_required = required and not server_filled
+    # An assigned PK is create-REQUIRED whatever @required says (see
+    # _assigned_pk_field_names) — unless it is server-filled by a @default.
+    create_required = (required or force_required) and not server_filled
 
     parts = _constraint_parts(_validator_constraints(field, wire=True))
     uses_field = bool(parts)
@@ -534,6 +553,7 @@ class EntityModelGenerator:
         add/transform create-model lines."""
         cfg = config if config is not None else GenConfig(out_dir="")
         auto_gen_pk = _auto_gen_pk_field_names(entity)
+        assigned_pk = _assigned_pk_field_names(entity)
         binding = tph_subtype_binding(entity)
         disc_field = binding[0] if binding is not None else None
         uses_field = False
@@ -550,7 +570,9 @@ class EntityModelGenerator:
                 continue  # FR-013 — a read-only column is DB/owner-written, not create input
             if f.is_derived():
                 continue  # FR-024 §7 (#214) — a derived (origin.*) field is view-computed, not create input
-            line, used = _create_field_line(f, imports, cfg)
+            line, used = _create_field_line(
+                f, imports, cfg, force_required=f.name in assigned_pk
+            )
             uses_field = uses_field or used
             lines.append(line)
         # FR-017 TPH: pin the inherited discriminator to this subtype's value (with a

{metaobjects-0.22.0 → metaobjects-0.22.1}/tests/codegen/test_validation_conformance.py

@@ -38,23 +38,29 @@ def _corpus_dir() -> Path:
     return repo_root / "fixtures" / "validation-conformance"
 
 
-def _load_account_entity() -> MetaObject:
+DEFAULT_ENTITY = "Account"
+
+
+def _load_entity(name: str) -> MetaObject:
     meta = (_corpus_dir() / "meta.json").read_text()
     result = MetaDataLoader.from_string(meta)
     assert not result.errors, [str(e) for e in result.errors]
     for child in result.root.children():
-        if child.type == TYPE_OBJECT and getattr(child, "name", None) == "Account":
+        if child.type == TYPE_OBJECT and getattr(child, "name", None) == name:
             assert isinstance(child, MetaObject)
             return child
-    raise AssertionError("Account entity not found in corpus meta.json")
+    raise AssertionError(f"{name} entity not found in corpus meta.json")
+
 
+def _build_generated_model(entity_name: str = DEFAULT_ENTITY) -> type[BaseModel]:
+    """Generate the ``<Entity>Create`` Pydantic wire-validation model source and exec it
+    into a module namespace. #224 — the CREATE model (the generated input-validation
+    artifact), not the plain read model: FR-036 Pin 1 lives on the wire tier only.
 
-def _build_generated_model() -> type[BaseModel]:
-    """Generate the Account Pydantic wire-validation model source and exec it into a
-    module namespace. #224 — ``AccountCreate`` (the generated input-validation
-    artifact), not the plain ``Account`` read model: FR-036 Pin 1 lives on the wire
-    tier only."""
-    source = render_entity_model(_load_account_entity())
+    A case may name a different corpus entity (``Ledger`` — an ASSIGNED primary key,
+    a shape ``Account``'s ``@generation``-backed key cannot express).
+    """
+    source = render_entity_model(_load_entity(entity_name))
     # Import the generated source as a REAL module rather than exec'ing it into a
     # bare dict: under ``from __future__ import annotations`` Pydantic resolves
     # type annotations lazily via the class's module globals, so a non-builtin
@@ -63,14 +69,15 @@ def _build_generated_model() -> type[BaseModel]:
     # exec namespace has no ``__name__`` (forward refs fall back to builtins and
     # fail — #234); a proper module import mirrors the TS runner's temp-module.
     tmp_dir = tempfile.mkdtemp()
-    mod_path = Path(tmp_dir) / "generated_account.py"
+    mod_name = f"generated_{entity_name.lower()}"
+    mod_path = Path(tmp_dir) / f"{mod_name}.py"
     mod_path.write_text(source)
-    spec = importlib.util.spec_from_file_location("generated_account", mod_path)
+    spec = importlib.util.spec_from_file_location(mod_name, mod_path)
     assert spec and spec.loader
     module = importlib.util.module_from_spec(spec)
-    sys.modules["generated_account"] = module
+    sys.modules[mod_name] = module
     spec.loader.exec_module(module)
-    model = module.AccountCreate
+    model = getattr(module, f"{entity_name}Create")
     assert isinstance(model, type) and issubclass(model, BaseModel)
     return model
 
@@ -81,7 +88,7 @@ def _load_cases() -> list[dict]:
 
 @pytest.mark.parametrize("case", _load_cases(), ids=lambda c: c["name"])
 def test_validation_conformance(case: dict) -> None:
-    model = _build_generated_model()
+    model = _build_generated_model(case.get("entity", DEFAULT_ENTITY))
     try:
         model(**case["payload"])
         valid = True

{metaobjects-0.22.0 → metaobjects-0.22.1}/uv.lock

@@ -250,7 +250,7 @@ wheels = [
 
 [[package]]
 name = "metaobjects"
-version = "0.22.0"
+version = "0.22.1"
 source = { editable = "." }
 dependencies = [
     { name = "pyyaml" },