graphddb-runtime 1.0.8__tar.gz → 1.0.9__tar.gz

{graphddb_runtime-1.0.8 → graphddb_runtime-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: graphddb-runtime
-Version: 1.0.8
+Version: 1.0.9
 Summary: Thin DynamoDB executor for GraphDDB-generated Python repositories (single-operation core, issue #44).
 License: MIT
 Requires-Python: >=3.9

{graphddb_runtime-1.0.8 → graphddb_runtime-1.0.9}/graphddb_runtime/behavior_exec.py

@@ -755,10 +755,14 @@ def collect_transaction_items(
 
         if component_name == "PutItem":
             plain = _group(ports, "item")
-            # A raw marker-row write (literalKey) carries its PK/SK verbatim; a
-            # modeled Put derives PK/SK/GSI from the manifest entity (C4 config).
-            if not ports.get("literalKey"):
-                expander._add_key_attributes(entity, plain)
+            # A modeled Put's PK/SK/GSI key attributes now ride as DECLARATIVE
+            # `key.*` ports (attribute → evaluated `concat`/`ref` template — the
+            # same symbolic derivation reads/updates use, issue #350), so fold
+            # them into the written item directly. NO runtime manifest key
+            # derivation. A raw marker-row write (literalKey) carries its PK/SK
+            # verbatim in `item` and emits no `key.*` group, so the fold is a
+            # no-op for it.
+            plain.update(_group(ports, "key"))
             serialized = {k: rt._serializer.serialize(v) for k, v in plain.items()}
             put: Dict[str, Any] = {"TableName": table, "Item": serialized}
             expander._apply_condition(cond_spec, put, cond_params, None)

{graphddb_runtime-1.0.8 → graphddb_runtime-1.0.9}/graphddb_runtime/runtime.py

@@ -1951,7 +1951,12 @@ class GraphDDBRuntime:
                     field: self._serializer.serialize(resolve_value_template(tmpl, params))
                     for field, tmpl in spec.get("item", {}).items()
                 }
-                self._add_key_attributes(spec["entity"], item, params)
+                # A put's PK/SK/GSI key attributes ride as DECLARATIVE key
+                # templates on `keyCondition` (the same symbolic derivation
+                # read/update/delete use, issue #350); resolve + fold — NO runtime
+                # manifest key derivation.
+                for attr, tmpl in spec.get("keyCondition", {}).items():
+                    item[attr] = self._serializer.serialize(resolve_template(tmpl, params))
                 requests.append({"PutRequest": {"Item": item}})
             else:  # DeleteItem
                 dynamo_key = {
@@ -2269,7 +2274,11 @@ class GraphDDBRuntime:
             field: self._serializer.serialize(resolve_value_template(tmpl, params))
             for field, tmpl in item_tmpl.items()
         }
-        self._add_key_attributes(spec["entity"], item, params)
+        # A put's PK/SK/GSI key attributes ride as DECLARATIVE key templates on
+        # `keyCondition` (the same symbolic derivation read/update/delete use,
+        # issue #350); resolve + fold — NO runtime manifest key derivation.
+        for attr, tmpl in spec.get("keyCondition", {}).items():
+            item[attr] = self._serializer.serialize(resolve_template(tmpl, params))
 
         request: Dict[str, Any] = {
             "TableName": self._physical_table(spec["tableName"]),
@@ -2549,35 +2558,6 @@ class GraphDDBRuntime:
                 values[alias] = self._serializer.serialize(resolved)
             request["ConditionExpression"] = condition["expression"]
 
-    def _add_key_attributes(
-        self, entity_name: str, item: Dict[str, Any], params: Mapping[str, Any]
-    ) -> None:
-        entity_meta = self._entities.get(entity_name, {})
-        plain = {
-            field: self._deserializer.deserialize(av) for field, av in item.items()
-        }
-        key = entity_meta.get("key")
-        if key:
-            # pkTemplate is self-contained (segment key model #51); no prefix.
-            pk = self._fill(key.get("pkTemplate") or "", plain)
-            item["PK"] = self._serializer.serialize(pk)
-            sk_tmpl = key.get("skTemplate")
-            if sk_tmpl is not None:
-                item["SK"] = self._serializer.serialize(self._fill(sk_tmpl, plain))
-
-        for gsi in entity_meta.get("gsis", []):
-            index = gsi["indexName"]
-            pk_tmpl = gsi.get("pkTemplate")
-            sk_tmpl = gsi.get("skTemplate")
-            if pk_tmpl is not None and self._fillable(pk_tmpl, plain):
-                item[f"{index}PK"] = self._serializer.serialize(
-                    self._fill(pk_tmpl, plain)
-                )
-            if sk_tmpl is not None and self._fillable(sk_tmpl, plain):
-                item[f"{index}SK"] = self._serializer.serialize(
-                    self._fill(sk_tmpl, plain)
-                )
-
     @staticmethod
     def _fillable(template: str, values: Mapping[str, Any]) -> bool:
         return all(

{graphddb_runtime-1.0.8 → graphddb_runtime-1.0.9}/graphddb_runtime/transactions.py

@@ -145,18 +145,6 @@ def _resolve_condition_tree(
     return out
 
 
-def _fill_key(template: str, item: Mapping[str, Any]) -> str:
-    def repl(match: "re.Match[str]") -> str:
-        name = match.group(0)[1:-1]
-        return str(item.get(name, ""))
-
-    return _PLACEHOLDER_RE.sub(repl, template)
-
-
-def _key_fillable(template: str, item: Mapping[str, Any]) -> bool:
-    return all(m.group(0)[1:-1] in item for m in _PLACEHOLDER_RE.finditer(template))
-
-
 # ── SCP guard evaluation seam (issue #266, Phase 3 S6) ────────────────────────
 #
 # The branch-for-branch port of the TS ``evaluateGuard`` seam
@@ -450,24 +438,6 @@ class TransactionExpander:
             raise KeyError(f"unknown entity '{name}' in manifest")
         return entity
 
-    def _add_key_attributes(self, entity_name: str, plain: Dict[str, Any]) -> None:
-        entity = self._entity(entity_name)
-        key = entity.get("key")
-        if key:
-            # pkTemplate is self-contained (segment key model #51); no prefix.
-            plain["PK"] = _fill_key(key.get("pkTemplate") or "", plain)
-            sk_tmpl = key.get("skTemplate")
-            if sk_tmpl is not None:
-                plain["SK"] = _fill_key(sk_tmpl, plain)
-        for gsi in entity.get("gsis", []):
-            index = gsi["indexName"]
-            pk_tmpl = gsi.get("pkTemplate")
-            sk_tmpl = gsi.get("skTemplate")
-            if pk_tmpl is not None and _key_fillable(pk_tmpl, plain):
-                plain[f"{index}PK"] = _fill_key(pk_tmpl, plain)
-            if sk_tmpl is not None and _key_fillable(sk_tmpl, plain):
-                plain[f"{index}SK"] = _fill_key(sk_tmpl, plain)
-
     def _apply_condition(
         self,
         condition: Optional[Mapping[str, Any]],

{graphddb_runtime-1.0.8 → graphddb_runtime-1.0.9}/graphddb_runtime.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: graphddb-runtime
-Version: 1.0.8
+Version: 1.0.9
 Summary: Thin DynamoDB executor for GraphDDB-generated Python repositories (single-operation core, issue #44).
 License: MIT
 Requires-Python: >=3.9

{graphddb_runtime-1.0.8 → graphddb_runtime-1.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "graphddb-runtime"
-version = "1.0.8"
+version = "1.0.9"
 description = "Thin DynamoDB executor for GraphDDB-generated Python repositories (single-operation core, issue #44)."
 readme = "README.md"
 requires-python = ">=3.9"