altcodepro-polydb-python 2.3.26__tar.gz → 2.3.27__tar.gz

{altcodepro_polydb_python-2.3.26/src/altcodepro_polydb_python.egg-info → altcodepro_polydb_python-2.3.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: altcodepro-polydb-python
-Version: 2.3.26
+Version: 2.3.27
 Summary: Production-ready multi-cloud database abstraction layer with connection pooling, retry logic, and thread safety
 Author: AltCodePro
 Project-URL: Homepage, https://github.com/altcodepro/polydb-python

{altcodepro_polydb_python-2.3.26 → altcodepro_polydb_python-2.3.27}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "altcodepro-polydb-python"
-version = "2.3.26"
+version = "2.3.27"
 description = "Production-ready multi-cloud database abstraction layer with connection pooling, retry logic, and thread safety"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.11"

{altcodepro_polydb_python-2.3.26 → altcodepro_polydb_python-2.3.27/src/altcodepro_polydb_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: altcodepro-polydb-python
-Version: 2.3.26
+Version: 2.3.27
 Summary: Production-ready multi-cloud database abstraction layer with connection pooling, retry logic, and thread safety
 Author: AltCodePro
 Project-URL: Homepage, https://github.com/altcodepro/polydb-python

{altcodepro_polydb_python-2.3.26 → altcodepro_polydb_python-2.3.27}/src/altcodepro_polydb_python.egg-info/SOURCES.txt

@@ -79,6 +79,7 @@ tests/test_atomic_decrement.py
 tests/test_aws.py
 tests/test_azure.py
 tests/test_azure_table_empty_filter.py
+tests/test_azure_table_unpack_entity.py
 tests/test_blockchain.py
 tests/test_cloud_factory.py
 tests/test_gcp.py

{altcodepro_polydb_python-2.3.26 → altcodepro_polydb_python-2.3.27}/src/polydb/adapters/AzureTableStorageAdapter.py

@@ -255,7 +255,7 @@ class AzureTableStorageAdapter(NoSQLKVAdapter):
 
         return entity
 
-    def _unpack_entity(self, entity: JsonDict) -> JsonDict:
+    def _unpack_entity(self, model: type, entity: JsonDict) -> JsonDict:
         if not entity:
             return {}
 
@@ -263,6 +263,9 @@ class AzureTableStorageAdapter(NoSQLKVAdapter):
         raw.pop("etag", None)
         raw.pop("ETag", None)
         raw.pop("Timestamp", None)
+        # Internal: which model a row belongs to, used only to isolate models
+        # sharing a table. Never part of the public record shape.
+        raw.pop(_MODEL_FIELD, None)
 
         keymap_str = raw.pop("__keymap__", None)
         keymap: Dict[str, str] = {}
@@ -272,26 +275,30 @@ class AzureTableStorageAdapter(NoSQLKVAdapter):
             except Exception:
                 keymap = {}
 
-        out: JsonDict = {}
-
-        pk = raw.get("PartitionKey")
-        rk = raw.get("RowKey")
-        if pk is not None:
-            out["PartitionKey"] = pk
-        if rk is not None:
-            out["RowKey"] = rk
+        pk = raw.pop("PartitionKey", None)
+        rk = raw.pop("RowKey", None)
 
+        out: JsonDict = {}
         for k, v in raw.items():
-            if k in ("PartitionKey", "RowKey"):
-                continue
-
-            if k.startswith("_") or k in (_MODEL_FIELD,):
+            if k.startswith("_"):
                 out[k] = v
                 continue
 
             orig_key = keymap.get(k, k)
             out[orig_key] = self._decode_value(v)
 
+        # PartitionKey/RowKey are Azure Table Storage's own physical column
+        # names — never return them as-is. Map each back to the domain field
+        # it was derived from (model's declared partition_key/sort_key, same
+        # resolution _get_pk_rk used to write them), so the same field name
+        # round-trips on read as it did on write. Guarded so we never clobber
+        # a real property that already carries the value (the common case —
+        # pk/rk fields are usually also stored as regular properties).
+        pk_field, rk_field = self._pk_rk_field_names(model)
+        if pk is not None and pk_field not in out:
+            out[pk_field] = pk
+        if rk is not None and rk_field not in out:
+            out[rk_field] = rk
         if "id" not in out and rk is not None:
             out["id"] = rk
 
@@ -491,7 +498,7 @@ class AzureTableStorageAdapter(NoSQLKVAdapter):
 
             table_client.upsert_entity(reference_entity)
 
-            restored = self._unpack_entity(entity)
+            restored = self._unpack_entity(model, entity)
             restored["id"] = safe_rk
 
             return restored
@@ -517,7 +524,7 @@ class AzureTableStorageAdapter(NoSQLKVAdapter):
 
             restored_entity = self._restore_overflow_properties(entity_dict)
 
-            out = self._unpack_entity(restored_entity)
+            out = self._unpack_entity(model, restored_entity)
             if "id" not in out:
                 out["id"] = safe_rk
 
@@ -589,7 +596,7 @@ class AzureTableStorageAdapter(NoSQLKVAdapter):
 
                 restored_entity = self._restore_overflow_properties(ent_dict)
 
-                out = self._unpack_entity(restored_entity)
+                out = self._unpack_entity(model, restored_entity)
 
                 if "id" not in out and "RowKey" in ent_dict:
                     out["id"] = ent_dict["RowKey"]
@@ -705,7 +712,7 @@ class AzureTableStorageAdapter(NoSQLKVAdapter):
                 for ent in page:
                     ent_dict = dict(ent)
                     restored = self._restore_overflow_properties(ent_dict)
-                    out = self._unpack_entity(restored)
+                    out = self._unpack_entity(model, restored)
                     if "id" not in out and "RowKey" in ent_dict:
                         out["id"] = ent_dict["RowKey"]
                     items.append(out)

{altcodepro_polydb_python-2.3.26 → altcodepro_polydb_python-2.3.27}/src/polydb/base/NoSQLKVAdapter.py

@@ -34,6 +34,22 @@ class NoSQLKVAdapter:
         self._lock = threading.Lock()
         self.max_size = 1024 * 1024  # 1MB
 
+    def _pk_rk_field_names(self, model: type) -> Tuple[str, str]:
+        """
+        The domain field names PK/RK were derived from — the mirror image of
+        _get_pk_rk's field resolution. Adapters use this to translate a
+        physical PartitionKey/RowKey (or pk/sk, whatever the backend calls
+        them) back into the model's own field name before returning a record,
+        instead of leaking storage-internal column names to callers. Falls
+        back to the same defaults _get_pk_rk uses (tenant_id / id) when a
+        model declares no explicit mapping, so unmapped models still round-
+        trip cleanly on upsert without erroring.
+        """
+        meta = getattr(model, "__polydb__", {})
+        pk_field = meta.get("pk_field") or meta.get("partition_key", "tenant_id")
+        rk_field = meta.get("rk_field") or meta.get("sort_key", "id")
+        return pk_field, rk_field
+
     def _get_pk_rk(self, model: type, data: JsonDict) -> Tuple[str, str]:
         """Extract PK/RK from model metadata"""
         meta = getattr(model, "__polydb__", {})

{altcodepro_polydb_python-2.3.26 → altcodepro_polydb_python-2.3.27}/src/polydb/databaseFactory.py

@@ -543,14 +543,32 @@ class DatabaseFactory:
             if self._is_sql(meta, engine_override):
                 result = adapters.sql.update(meta.table, entity_id, data)
             else:
+                # A scalar entity_id is usually the record's "id" property,
+                # not its physical PartitionKey/RowKey — those come from the
+                # model's declared pk_field/rk_field (x-metadata partition_key
+                # /sort_key), which for most schema models is a different
+                # field entirely (e.g. Artifact: pk=project_slug, rk=
+                # template_key). Recover both from the patch payload, or —
+                # more reliably — from the record loaded just above as
+                # `before`, so a plain id-addressed update() still lands on
+                # the entity's real physical key instead of a mismatched
+                # default partition / the id used as a row key it never had.
                 pkey = data.get("PartitionKey") or data.get("partition_key") or data.get("pk")
-                en_id = entity_id
+                if not pkey and meta.pk_field:
+                    pkey = data.get(meta.pk_field)
                 if not pkey and before:
                     pkey = (
                         before.get("PartitionKey")
                         or before.get("partition_key")
                         or before.get("pk")
+                        or (before.get(meta.pk_field) if meta.pk_field else None)
+                    )
+                rkey = None
+                if meta.rk_field and meta.rk_field != "id":
+                    rkey = data.get(meta.rk_field) or (
+                        before.get(meta.rk_field) if before else None
                     )
+                en_id = entity_id
                 if pkey:
                     if isinstance(en_id, dict):
                         en_pk = (
@@ -560,8 +578,16 @@ class DatabaseFactory:
                         )
                         if not en_pk:
                             en_id["partition_key"] = pkey
+                        en_rk = (
+                            en_id.get("RowKey")
+                            or en_id.get("row_key")
+                            or en_id.get("rk")
+                            or en_id.get("id")
+                        )
+                        if not en_rk and rkey:
+                            en_id["row_key"] = rkey
                     elif isinstance(en_id, str):
-                        en_id = {"partition_key": pkey, "id": entity_id}
+                        en_id = {"partition_key": pkey, "row_key": rkey or entity_id}
 
                 cls = (
                     model
@@ -702,7 +728,23 @@ class DatabaseFactory:
                     if isinstance(model, type)
                     else type(name, (), {"__polydb__": meta.__dict__})
                 )
-                result = adapters.nosql.delete(cls, entity_id, etag=etag)
+                # Same physical-key recovery as update() (see there for why a
+                # scalar entity_id alone isn't enough once a model's pk_field
+                # /rk_field differ from "id").
+                en_id = entity_id
+                if not isinstance(en_id, dict) and before:
+                    pkey = (
+                        before.get("PartitionKey")
+                        or before.get("partition_key")
+                        or before.get("pk")
+                        or (before.get(meta.pk_field) if meta.pk_field else None)
+                    )
+                    if pkey:
+                        rkey = None
+                        if meta.rk_field and meta.rk_field != "id":
+                            rkey = before.get(meta.rk_field)
+                        en_id = {"partition_key": pkey, "row_key": rkey or entity_id}
+                result = adapters.nosql.delete(cls, en_id, etag=etag)
             success = True
             if self._enable_cache and self._cache:
                 try:

altcodepro_polydb_python-2.3.27/tests/test_azure_table_unpack_entity.py

@@ -0,0 +1,76 @@
+"""Unit tests for AzureTableStorageAdapter._unpack_entity (no Azurite needed).
+
+Contract: PartitionKey/RowKey/__polydb_model__ are Azure Table Storage
+internals and must never leak into a returned record. Each gets mapped back
+to the domain field it was derived from (the model's declared
+partition_key/sort_key — the same fields _get_pk_rk used to write them), and
+only fills in that field if it isn't already present from a regular stored
+property. Models with no explicit mapping still round-trip cleanly via the
+same defaults _get_pk_rk uses (tenant_id / id) instead of erroring.
+"""
+
+import pytest
+
+pytest.importorskip("azure.data.tables")  # adapter needs the SDK to import
+
+from polydb.adapters.AzureTableStorageAdapter import AzureTableStorageAdapter  # noqa: E402
+
+
+class _ArtifactComment:
+    __name__ = "ArtifactComment"
+    __polydb__ = {"partition_key": "artifact_id", "sort_key": "created_at"}
+
+
+class _Unmapped:
+    __name__ = "Unmapped"
+    # no __polydb__ at all
+
+
+def _adapter():
+    return object.__new__(AzureTableStorageAdapter)  # bypass live-connection __init__
+
+
+def test_mapped_model_remaps_pk_rk_and_strips_internals():
+    entity = {
+        "PartitionKey": "artifact-123",
+        "RowKey": "2026-07-13T21_04_53",
+        "__polydb_model__": "ArtifactComment",
+        "artifact_id": "artifact-123",
+        "created_at": "2026-07-13T21:04:53",
+        "body": "hello",
+    }
+    out = _adapter()._unpack_entity(_ArtifactComment, entity)
+    assert "PartitionKey" not in out
+    assert "RowKey" not in out
+    assert "__polydb_model__" not in out
+    assert out["artifact_id"] == "artifact-123"
+    assert out["created_at"] == "2026-07-13T21:04:53"  # real property wins over RowKey
+    assert out["body"] == "hello"
+
+
+def test_unmapped_model_falls_back_without_erroring():
+    entity = {
+        "PartitionKey": "t1",
+        "RowKey": "row1",
+        "__polydb_model__": "Unmapped",
+        "email": "user@x.com",
+    }
+    out = _adapter()._unpack_entity(_Unmapped, entity)
+    assert "PartitionKey" not in out
+    assert "RowKey" not in out
+    assert "__polydb_model__" not in out
+    assert out["tenant_id"] == "t1"
+    assert out["id"] == "row1"
+    assert out["email"] == "user@x.com"
+
+
+def test_pk_rk_fill_in_only_when_field_missing():
+    entity = {
+        "PartitionKey": "artifact-999",
+        "RowKey": "row-1",
+        "__polydb_model__": "ArtifactComment",
+        "body": "no explicit artifact_id property",
+    }
+    out = _adapter()._unpack_entity(_ArtifactComment, entity)
+    assert out["artifact_id"] == "artifact-999"
+    assert out["created_at"] == "row-1"