metaobjects 0.15.12__tar.gz → 0.16.0__tar.gz

{metaobjects-0.15.12 → metaobjects-0.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metaobjects
-Version: 0.15.12
+Version: 0.16.0
 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.15.12 → metaobjects-0.16.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "metaobjects"
-version = "0.15.12"
+version = "0.16.0"
 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.15.12 → metaobjects-0.16.0}/src/metaobjects/codegen/KNOWN_GAPS.md

@@ -32,6 +32,14 @@ The generated router takes `dto: dict[str, Any]` for `POST` / `PATCH` /
 `PUT` request bodies and returns `Any` for responses. The repository
 `Protocol` likewise uses `Any` for the row type.
 
+**FR-036 update:** the router now DOES import the generated Pydantic models
+(`from .<Entity> import <Entity>, <Entity>Patch`) and constructs them to enforce
+field constraints over HTTP — POST validates `<Entity>(**dto)`, PATCH validates
+the all-optional `<Entity>Patch(**dto)` (present values only) → `400 {"error":"validation"}`.
+The repository seam still receives the original `dict` (preserving the FR-035
+present-key tristate + wire values), so the strong-typing simplification below
+remains for the repo/response types; only the validation import was added.
+
 This keeps the router module decoupled from sibling generated files
 (the entity-model generator emits one `@dataclass`/Pydantic model per
 entity in a separate file — wiring router→entity-model would require

{metaobjects-0.15.12 → metaobjects-0.16.0}/src/metaobjects/codegen/generators/entity_model.py

@@ -5,7 +5,14 @@ import re
 
 from metaobjects.meta.core.field.meta_field import MetaField
 from metaobjects.meta.core.object.meta_object import MetaObject
+from metaobjects.meta.core.object.object_constants import OBJECT_SUBTYPE_ENTITY
 from metaobjects.meta.core.field import field_constants as fc
+from metaobjects.meta.core.identity.identity_constants import (
+    GENERATION_INCREMENT,
+    GENERATION_UUID,
+    IDENTITY_ATTR_FIELDS,
+    IDENTITY_ATTR_GENERATION,
+)
 from metaobjects.meta.core.validator import validator_constants as vc
 from metaobjects.shared.base_types import TYPE_VALIDATOR
 from metaobjects.shared.separators import PACKAGE_SEP
@@ -98,7 +105,10 @@ def _validator_constraints(field: MetaField) -> dict[str, object]:
     max_len = _first_attr(field, vc.VALIDATOR_SUBTYPE_LENGTH, vc.VALIDATOR_ATTR_MAX)
     field_max = field.attrs().get(fc.FIELD_ATTR_MAX_LENGTH)
     if _is_int(field_max):
-        max_len = field_max
+        # FR-036 A3 — strictest-wins: when BOTH a validator.length @max and a field
+        # @maxLength cap a string, the smaller bound governs (never the field attr
+        # unconditionally, which could loosen a tighter validator).
+        max_len = field_max if max_len is None else min(max_len, field_max)
     if min_len is not None:
         kwargs["min_length"] = min_len
     if max_len is not None:
@@ -127,7 +137,11 @@ def _validator_constraints(field: MetaField) -> dict[str, object]:
         # located via the resolving field.children() in _validators().
         pattern = v.attr(vc.VALIDATOR_ATTR_PATTERN)
         if isinstance(pattern, str):
-            kwargs["pattern"] = pattern
+            # FR-036 Pin 2 — a validator.regex is a FULL match. Pydantic v2 `pattern=`
+            # is search/partial (un-anchored), so wrap the authored expression in an
+            # anchored non-capturing group so alternation still spans the whole value
+            # (a redundant anchor on an already-anchored pattern matches identically).
+            kwargs["pattern"] = f"^(?:{pattern})$"
             break
 
     # ADR-0036/0037 Wave 3 — @stringFormat: hostname -> a codegen-owned canonical
@@ -137,60 +151,87 @@ def _validator_constraints(field: MetaField) -> dict[str, object]:
     if field.attrs().get(fc.FIELD_ATTR_STRING_FORMAT) == fc.STRING_FORMAT_HOSTNAME:
         kwargs["pattern"] = _HOSTNAME_REGEX
 
+    # FR-036 Pin 1 — a @required non-array string is non-empty: reject null / "" but
+    # ACCEPT whitespace-only. Emit an implicit min_length of 1, keeping the stricter
+    # floor if a validator.length @min already set one.
+    if (
+        field.sub_type == fc.FIELD_SUBTYPE_STRING
+        and not field_is_array(field)
+        and field.attrs().get(fc.FIELD_ATTR_REQUIRED) is True
+    ):
+        existing_min = kwargs.get("min_length")
+        kwargs["min_length"] = max(1, existing_min) if isinstance(existing_min, int) else 1
+
     return kwargs
 
 
-def _field_line(field: MetaField, imports: set[str], config: GenConfig) -> tuple[str, bool]:
-    """Return (source line, uses_field). Collects required imports into *imports*."""
-    # FR-019: a field resolving to a package-level shared enum is typed by the materialized
-    # standalone class (imported from the shared `enums` module) or — when @provided — an
-    # external module from per-port config; inline enums keep their `Literal[...]` (py_type_for).
+# Constraint kwargs are emitted in this fixed order so generated output is deterministic.
+_CONSTRAINT_ORDER = ("pattern", "ge", "le", "min_length", "max_length")
+
+
+def _constraint_parts(constraints: dict[str, object]) -> list[str]:
+    """The ``Field(...)`` constraint kwargs rendered in the stable, deterministic order."""
+    return [f"{k}={constraints[k]!r}" for k in _CONSTRAINT_ORDER if k in constraints]
+
+
+def _type_expr_for_field(
+    field: MetaField, imports: set[str], config: GenConfig
+) -> tuple[str, str | None]:
+    """The Python annotation text for *field* (arrays wrapped in ``list[...]``) plus the
+    shared-enum class name when the field resolves to one (used to render an enum
+    default). Collects any required imports into *imports*. Shared by the create-model
+    and patch-model emitters so both carry byte-identical typing.
+
+    FR-019: a field resolving to a package-level shared enum is typed by the materialized
+    standalone class (imported from the shared ``enums`` module) or — when @provided — an
+    external module; inline enums keep their ``Literal[...]`` (py_type_for)."""
     shared = (
         fr019.shared_enum_for_field(field)
         if field.sub_type == fc.FIELD_SUBTYPE_ENUM
         else None
     )
+    enum_type_name: str | None = None
     if shared is not None:
         type_name, import_line = fr019.enum_type_and_import(shared, config)
         imports.add(import_line)
+        enum_type_name = type_name
         type_expr = f"list[{type_name}]" if field_is_array(field) else type_name
     else:
         pt = py_type_for(field)
         imports.update(pt.imports)
         type_expr = pt.expr
-    # ADR-0036/0037 Wave 3 — @stringFormat: email narrows a plain string to a
-    # validated email. Bind Pydantic's idiomatic EmailStr (the Python analogue of
-    # Zod .email()); hostname stays a plain str with a codegen-owned canonical
-    # pattern= (handled in _validator_constraints). The field stays a string.
+    # ADR-0036/0037 Wave 3 — @stringFormat: email narrows a plain string to a validated
+    # email (Pydantic EmailStr, the Python analogue of Zod .email()); hostname stays a
+    # plain str with a codegen-owned canonical pattern= (in _validator_constraints).
     if (
         field.sub_type == fc.FIELD_SUBTYPE_STRING
         and field.attrs().get(fc.FIELD_ATTR_STRING_FORMAT) == fc.STRING_FORMAT_EMAIL
     ):
-        base_expr = "EmailStr"
         imports.add("from pydantic import EmailStr")
-        type_expr = f"list[{base_expr}]" if field_is_array(field) else base_expr
+        type_expr = "list[EmailStr]" if field_is_array(field) else "EmailStr"
     if field.sub_type in (fc.FIELD_SUBTYPE_OBJECT, fc.FIELD_SUBTYPE_MAP):
-        # A field.object (-> VO) and a field.map with @objectRef (-> dict[str, VO])
-        # both reference a value-object by name; import it so the annotation
-        # py_type_for emitted resolves.
+        # A field.object (-> VO) and a field.map with @objectRef (-> dict[str, VO]) both
+        # reference a value-object by name; import it so the emitted annotation resolves.
+        # @objectRef is FQN-expanded at load; the generated VOs live flat in one package,
+        # so import by the bare class name.
         ref = field.attrs().get(fc.FIELD_ATTR_OBJECT_REF)
         if ref:
-            # @objectRef is FQN-expanded at load time; the generated VOs live
-            # flat in one package, so import by the bare class name.
             ref_name = str(ref).split("::")[-1]
             imports.add(f"from .{ref_name} import {ref_name}")
+    return type_expr, enum_type_name
+
+
+def _field_line(field: MetaField, imports: set[str], config: GenConfig) -> tuple[str, bool]:
+    """Return (source line, uses_field). Collects required imports into *imports*."""
+    type_expr, enum_type_name = _type_expr_for_field(field, imports, config)
     required = field.attrs().get(fc.FIELD_ATTR_REQUIRED) is True
     default_raw = field.attrs().get(fc.FIELD_ATTR_DEFAULT)
     # A server-side expression default (now(), gen_random_uuid(), CURRENT_TIMESTAMP)
     # is filled by the DB — the Python model carries no default for it (the field keeps
     # its required/optional shape). Only literal defaults become Pydantic defaults.
     has_default = default_raw is not None and not _is_sql_expr_default(default_raw)
-    enum_type_name = type_name if shared is not None else None
 
-    constraints = _validator_constraints(field)
-    # Emit kwargs in a stable order so generated output is deterministic.
-    _order = ["pattern", "ge", "le", "min_length", "max_length"]
-    parts = [f"{k}={constraints[k]!r}" for k in _order if k in constraints]
+    parts = _constraint_parts(_validator_constraints(field))
     uses_field = bool(parts)
 
     # @default — render an enum member (Type.MEMBER, UPPER_CASE) or a Python literal.
@@ -226,6 +267,106 @@ def _field_line(field: MetaField, imports: set[str], config: GenConfig) -> tuple
     return f"    {py_name}: {annotation}{assignment}", uses_field
 
 
+def _primary_identity_field_names(entity: MetaObject) -> list[str]:
+    """The field names in the entity's primary identity (``identity.primary @fields``),
+    normalized to a list. Empty when there is no primary identity. Mirrors the TS
+    ``primaryIdentityFieldNames``."""
+    primary = entity.primary_identity()
+    if primary is None:
+        return []
+    # ADR-0039: resolving (identity attr) — an identity.primary may be inherited via extends.
+    fields = primary.get_meta_attr(IDENTITY_ATTR_FIELDS)
+    if isinstance(fields, (list, tuple)):
+        return [str(f) for f in fields]
+    if isinstance(fields, str) and fields:
+        return [s.strip() for s in fields.split(",") if s.strip()]
+    return []
+
+
+def _auto_gen_pk_field_names(entity: MetaObject) -> set[str]:
+    """Primary-key field names that the SERVER generates (``identity.primary
+    @generation: increment|uuid``) — excluded from the create-validation shape because
+    the caller never supplies them. An ``assigned`` (or ungenerated) PK is NOT excluded
+    (the caller provides it). Mirrors the TS ``autoGenPkFieldNames``."""
+    primary = entity.primary_identity()
+    if primary is None:
+        return set()
+    # ADR-0039: resolving (identity attr).
+    generation = primary.get_meta_attr(IDENTITY_ATTR_GENERATION)
+    if generation not in (GENERATION_INCREMENT, GENERATION_UUID):
+        return set()
+    return set(_primary_identity_field_names(entity))
+
+
+def _create_field_line(
+    field: MetaField, imports: set[str], config: GenConfig
+) -> tuple[str, bool]:
+    """A CREATE-model field line (FR-036): keyed by the WIRE name (``field.name``) and
+    carrying the same per-field constraints as the read model. A ``@required`` field
+    that is SERVER-FILLED — it has ANY ``@default`` (a literal OR a SQL expression such
+    as ``now()`` / ``gen_random_uuid()`` / ``CURRENT_TIMESTAMP``) or an ``@autoSet`` — is
+    emitted OPTIONAL, because the DB / trigger provides it and a POST that omits it must
+    not 400 (mirrors the TS InsertSchema ``fieldWillBeOptional``). A literal ``@default``
+    is preserved as the Python default; a SQL-expression default / ``@autoSet`` carries
+    no Python default (the server fills it). Returns (source line, uses_field)."""
+    type_expr, enum_type_name = _type_expr_for_field(field, imports, config)
+    required = field.attrs().get(fc.FIELD_ATTR_REQUIRED) is True
+    default_raw = field.attrs().get(fc.FIELD_ATTR_DEFAULT)
+    literal_default = default_raw is not None and not _is_sql_expr_default(default_raw)
+    auto_set = field.attrs().get(fc.FIELD_ATTR_AUTO_SET)
+    is_auto_set = auto_set in (fc.AUTO_SET_ON_CREATE, fc.AUTO_SET_ON_UPDATE)
+    # A field is required in the CREATE shape only when @required AND not server-filled:
+    # 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
+
+    parts = _constraint_parts(_validator_constraints(field))
+    uses_field = bool(parts)
+
+    py_name = field.name  # FR-036 #3 — validation models key by the WIRE name (field.name)
+
+    if literal_default:
+        # Preserve the literal @default (enum member or Python literal) exactly as the
+        # read model does — the caller may omit the field and the model fills the default.
+        if enum_type_name is not None and not field_is_array(field):
+            default_expr = f"{enum_type_name}.{str(default_raw).upper()}"
+        else:
+            default_expr = repr(default_raw)
+        annotation = type_expr
+        assignment = (
+            f" = Field(default={default_expr}, {', '.join(parts)})"
+            if uses_field
+            else f" = {default_expr}"
+        )
+    elif create_required:
+        annotation = type_expr
+        assignment = f" = Field({', '.join(parts)})" if uses_field else ""
+    else:
+        annotation = f"{type_expr} | None"
+        assignment = (
+            f" = Field(default=None, {', '.join(parts)})" if uses_field else " = None"
+        )
+
+    return f"    {py_name}: {annotation}{assignment}", uses_field
+
+
+def _patch_field_line(
+    field: MetaField, imports: set[str], config: GenConfig
+) -> tuple[str, bool]:
+    """A PATCH-model field line: the field is made Optional (default ``None``) yet
+    carries the SAME per-field constraints as the create model, so a present, non-null
+    value is validated with the create rules (FR-036) while an absent field is left
+    untouched. A ``@default`` is never emitted (a patch does not default a column).
+    Returns (source line, uses_field)."""
+    type_expr, _enum = _type_expr_for_field(field, imports, config)
+    parts = _constraint_parts(_validator_constraints(field))
+    py_name = field.name  # FR-036 #3 — validation models key by the WIRE name (field.name)
+    if parts:
+        return f"    {py_name}: {type_expr} | None = Field(default=None, {', '.join(parts)})", True
+    return f"    {py_name}: {type_expr} | None = None", False
+
+
 def _effective_fqn(entity: MetaObject) -> str:
     """`package::name` via the canonical :meth:`MetaData.resolution_key` — own
     package, else the file-default package (captured at parse), else the nearest
@@ -295,6 +436,76 @@ class EntityModelGenerator:
                 lines.append(f"    {d.relation_name}: list[{element}] = []")
         return lines, uses_field
 
+    def _emit_create_lines(
+        self,
+        entity: MetaObject,
+        imports: set[str],
+        config: GenConfig | None = None,
+    ) -> tuple[list[str], bool]:
+        """The ``<Name>Create`` body — the CREATE-validation shape the generated router
+        validates a POST body against (FR-036). Restates every EFFECTIVE field (own +
+        inherited via ``extends``) EXCEPT the ones the server owns: an auto-generated PK
+        (``identity.primary @generation``; FR-036 #2) and any ``@readOnly`` field
+        (FR-013) are omitted, and a ``@required`` server-filled field (``@default`` /
+        ``@autoSet``; FR-036 #1) is made optional. Keyed by the wire name; a TPH
+        subtype's discriminator is pinned to its ``Literal`` value (the route injects it
+        from the URL, so it stays optional with a default). M:N navigations are omitted
+        (a create body targets columns, not relations). Returns ``(lines, uses_field)``.
+        Override to 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)
+        binding = tph_subtype_binding(entity)
+        disc_field = binding[0] if binding is not None else None
+        uses_field = False
+        lines: list[str] = []
+        # RESOLVING (fields()): the flat Create model subclasses BaseModel (not the entity
+        # base), so it restates inherited fields too — unlike the read model's own_fields
+        # subclass-emit.
+        for f in entity.fields():
+            if disc_field is not None and f.name == disc_field:
+                continue  # pinned below (prepended), never as a normal field line
+            if f.name in auto_gen_pk:
+                continue  # FR-036 #2 — a server-generated PK is never in the create body
+            if f.attrs().get(fc.FIELD_ATTR_READ_ONLY) is True:
+                continue  # FR-013 — a read-only column is DB/owner-written, not create input
+            line, used = _create_field_line(f, imports, cfg)
+            uses_field = uses_field or used
+            lines.append(line)
+        # FR-017 TPH: pin the inherited discriminator to this subtype's value (with a
+        # default so the URL-injected create body may omit it) — mirrors the read model.
+        if binding is not None:
+            disc_name, disc_value = binding
+            lines = [f'    {disc_name}: Literal["{disc_value}"] = "{disc_value}"', *lines]
+            imports.add("from typing import Literal")
+        return lines, uses_field
+
+    def _emit_patch_lines(
+        self,
+        entity: MetaObject,
+        imports: set[str],
+        config: GenConfig | None = None,
+    ) -> tuple[list[str], bool]:
+        """The ``<Name>Patch`` body: every EFFECTIVE field (own + inherited via
+        ``extends``) made Optional while retaining its create-model constraints, so the
+        generated PATCH handler can validate present, non-null values without
+        bean-validating absent ones (FR-036). The primary-key field(s) are excluded
+        (route-authoritative; FR-036 #4) and M:N navigations are omitted (a patch
+        targets columns, not relations). Returns ``(lines, uses_field)``. Override to
+        add/transform patch-model lines."""
+        cfg = config if config is not None else GenConfig(out_dir="")
+        pk_fields = set(_primary_identity_field_names(entity))
+        uses_field = False
+        lines: list[str] = []
+        # RESOLVING (fields()): the flat Patch model is self-contained (subclasses
+        # BaseModel, not the entity base), so it restates inherited fields too.
+        for f in entity.fields():
+            if f.name in pk_fields:
+                continue  # FR-036 #4 — the PK is route-authoritative, never patched
+            line, used = _patch_field_line(f, imports, cfg)
+            uses_field = uses_field or used
+            lines.append(line)
+        return lines, uses_field
+
     def render_entity_model(
         self,
         entity: MetaObject,
@@ -333,11 +544,29 @@ class EntityModelGenerator:
             imports.add("from typing import Literal")
         body = lines if lines else ["    pass"]
 
-        # Import only the pydantic names actually referenced.
+        # FR-036 — an object.entity also emits two flat validation models the generated
+        # router binds: a ``<Name>Create`` (POST-body shape: auto-gen PK / @readOnly
+        # omitted, @default/@autoSet optional, other @required required) and an
+        # all-optional ``<Name>Patch`` (PATCH-body shape: PK excluded). Both key by the
+        # WIRE name and carry the field constraints, so present values are validated with
+        # the create rules. Value objects / projections are never routed, so they emit
+        # neither (only the read model). See findings #1–#4.
+        emit_validation_models = entity.sub_type == OBJECT_SUBTYPE_ENTITY
+        create_lines: list[str] = []
+        create_uses_field = False
+        patch_lines: list[str] = []
+        patch_uses_field = False
+        if emit_validation_models:
+            create_lines, create_uses_field = self._emit_create_lines(entity, imports, config)
+            patch_lines, patch_uses_field = self._emit_patch_lines(entity, imports, config)
+
+        # Import only the pydantic names actually referenced. The main model imports
+        # BaseModel only when it has no super, but the flat Create/Patch models always
+        # subclass BaseModel, so their presence forces the import regardless.
         pyd_names: list[str] = []
-        if entity.super_data is None:
+        if entity.super_data is None or emit_validation_models:
             pyd_names.append("BaseModel")
-        if uses_field:
+        if uses_field or create_uses_field or patch_uses_field:
             pyd_names.append("Field")
 
         parts: list[str] = [
@@ -350,7 +579,22 @@ class EntityModelGenerator:
             parts += [*extra_imports, ""]
         if pyd_names:
             parts += [f"from pydantic import {', '.join(pyd_names)}", ""]
-        parts += ["", self._emit_class_header(entity, base_class), *body, ""]
+        parts += ["", self._emit_class_header(entity, base_class), *body]
+        if emit_validation_models:
+            parts += [
+                "",
+                "",
+                f"class {entity.name}Create(BaseModel):",
+                '    """GENERATED — CREATE input: auto-gen PK / @readOnly omitted; '
+                '@default/@autoSet optional; present values validated (FR-036)."""',
+                *create_lines,
+                "",
+                "",
+                f"class {entity.name}Patch(BaseModel):",
+                '    """GENERATED — PATCH input: all fields optional (PK excluded); present values validated (FR-036)."""',
+                *patch_lines,
+            ]
+        parts += [""]
         return "\n".join(parts)
 
     def _render_shared_enums_module(self, entities: list[MetaObject]) -> EmittedFile | None:

{metaobjects-0.15.12 → metaobjects-0.16.0}/src/metaobjects/codegen/generators/m2m_codegen.py

@@ -110,7 +110,7 @@ def _field_named(entity: MetaObject, field_name: str) -> MetaField | None:
     return None
 
 
-def _pk_field_name(entity: MetaObject) -> str:
+def pk_field_name(entity: MetaObject) -> str:
     """The single PK field name (``identity.primary @fields``), default ``id``."""
     for c in entity.children():
         if c.type == TYPE_IDENTITY and c.sub_type == IDENTITY_SUBTYPE_PRIMARY:
@@ -184,8 +184,8 @@ def resolve_m2m_descriptors(
                 source_column=_column_of(source_fk, fields.source_field),
                 target_column=_column_of(target_fk, fields.target_field),
                 target_pk_column=_column_of(
-                    _field_named(target, _pk_field_name(target)),
-                    _pk_field_name(target),
+                    _field_named(target, pk_field_name(target)),
+                    pk_field_name(target),
                 ),
                 symmetric=rel.symmetric(),
             )