altcodepro-polydb-python 2.5.3__py3-none-any.whl → 2.5.6__py3-none-any.whl

polydb/adapters/DynamoDBAdapter.py

@@ -23,10 +23,12 @@ class DynamoDBAdapter(NoSQLKVAdapter):
     Production-grade DynamoDB adapter with optional S3 overflow.
 
     Goals (matches your adapter test style)
-    - stored row keeps "id" == pk
-    - query({"id": ...}) works
+    - stored row keeps "id" == rk (the row key -- see NoSQLKVAdapter._get_pk_rk,
+      which derives rk from data.get(rk_field, ...) with rk_field defaulting
+      to "id"); put() returns the full stored record, not just {"id": ...}
+    - query({"id": ...}) works (matches the record's own "id"/rk, not PK)
     - patch() merges (handled by NoSQLKVAdapter.patch)
-    - delete() returns {"id": <pk>} and raises sqlite3.DatabaseError on missing
+    - delete() returns {"id": <rk>} and raises sqlite3.DatabaseError on missing
     - query_page() uses DynamoDB LastEvaluatedKey token (stable)
     - LocalStack support (endpoint_url) + auto create table/bucket in test/dev
     """
@@ -273,16 +275,24 @@ class DynamoDBAdapter(NoSQLKVAdapter):
             payload["PK"] = pk
             payload["SK"] = rk
 
-            # Ensure "id" field exists for tests/querying
-            payload.setdefault("id", pk)
+            # "id" is the row key (NoSQLKVAdapter._get_pk_rk derives `rk` from
+            # data.get(rk_field, ...) with rk_field defaulting to "id"), so it
+            # is already present in `payload` via dict(data) above whenever the
+            # caller supplied one. Only fall back to `rk` -- never `pk`, which
+            # would silently collide every row in the same partition onto the
+            # same "id" and break id-addressed lookups (query/get/patch/delete
+            # by {"id": ...}), the same corruption previously present here and
+            # in VercelKVAdapter.
+            payload.setdefault("id", rk)
             payload.setdefault("_pk", pk)
             payload.setdefault("_rk", rk)
 
             ref = self._maybe_overflow_to_s3(model, pk, rk, payload)
             table.put_item(Item=ref if ref is not None else payload)
 
-            # ✅ match pattern: put returns {"id": pk}
-            return {"id": pk}
+            # Return the full stored record, not just {"id": pk} -- callers
+            # (e.g. DatabaseFactory.create()) use this as the created row.
+            return payload
 
         except Exception as e:
             raise NoSQLError(f"DynamoDB put failed: {e}")
@@ -297,7 +307,7 @@ class DynamoDBAdapter(NoSQLKVAdapter):
             if not item:
                 return None
 
-            item.setdefault("id", pk)
+            item.setdefault("id", rk)
             return self._resolve_overflow(item)
 
         except Exception as e:
@@ -318,8 +328,11 @@ class DynamoDBAdapter(NoSQLKVAdapter):
             table = self._get_table(model)
             filters = filters or {}
 
-            # Treat 'id' as PK by convention (since we store PK=pk=id in NoSQLKVAdapter by default)
-            pk_value = filters.get("PK") or filters.get("partition_key") or filters.get("id")
+            # "id" is the row key by convention (see _put_raw), not the
+            # partition key -- only route to Query when the caller names the
+            # actual PK explicitly. A bare {"id": ...} filter falls through to
+            # Scan below with "id" applied as a normal attribute filter.
+            pk_value = filters.get("PK") or filters.get("partition_key")
 
             if pk_value is not None:
                 key_cond = Key("PK").eq(str(pk_value))
@@ -330,7 +343,7 @@ class DynamoDBAdapter(NoSQLKVAdapter):
 
                 # Other filters as FilterExpression
                 other = {
-                    k: v for k, v in filters.items() if k not in ("PK", "SK", "partition_key", "id")
+                    k: v for k, v in filters.items() if k not in ("PK", "SK", "partition_key")
                 }
                 if other:
                     expr = None
@@ -361,7 +374,7 @@ class DynamoDBAdapter(NoSQLKVAdapter):
 
             out: List[JsonDict] = []
             for it in items:
-                it.setdefault("id", it.get("_pk") or it.get("PK"))
+                it.setdefault("id", it.get("_rk") or it.get("SK"))
                 out.append(self._resolve_overflow(it))
             return out
 
@@ -392,7 +405,7 @@ class DynamoDBAdapter(NoSQLKVAdapter):
                         pass
 
             table.delete_item(Key={"PK": pk, "SK": rk})
-            return {"id": pk}
+            return {"id": rk}
 
         except DatabaseError:
             raise
@@ -427,7 +440,9 @@ class DynamoDBAdapter(NoSQLKVAdapter):
 
             start_key = self._decode_token(continuation_token) if continuation_token else None
 
-            pk_value = query.get("PK") or query.get("partition_key") or query.get("id")
+            # "id" is the row key by convention, not the partition key --
+            # see _query_raw.
+            pk_value = query.get("PK") or query.get("partition_key")
 
             items: List[JsonDict] = []
             last_key = start_key
@@ -448,7 +463,7 @@ class DynamoDBAdapter(NoSQLKVAdapter):
                     kwargs["ExclusiveStartKey"] = last_key
 
                 other_filters = {
-                    k: v for k, v in query.items() if k not in ("PK", "SK", "partition_key", "id")
+                    k: v for k, v in query.items() if k not in ("PK", "SK", "partition_key")
                 }
 
                 if other_filters:
@@ -501,7 +516,7 @@ class DynamoDBAdapter(NoSQLKVAdapter):
             out: List[JsonDict] = []
 
             for it in items:
-                it.setdefault("id", it.get("_pk") or it.get("PK"))
+                it.setdefault("id", it.get("_rk") or it.get("SK"))
                 out.append(self._resolve_overflow(it))
 
             next_tok = self._encode_token(last_key) if last_key else None

polydb/adapters/FirestoreAdapter.py

@@ -25,12 +25,21 @@ class FirestoreAdapter(NoSQLKVAdapter):
     Production-grade Firestore adapter with optional GCS overflow.
 
     Goals (matches your tests)
-    - Document id == pk (so querying {"id": ...} works)
+    - stored row keeps "id" == rk (the row key -- see NoSQLKVAdapter._get_pk_rk,
+      which derives rk from data.get(rk_field, ...) with rk_field defaulting
+      to "id"), so querying {"id": ...} matches the record's own id
     - patch() merges (preserves existing fields)
-    - delete() returns {"id": <pk>} and raises DatabaseError on missing
+    - delete() returns {"id": <rk>} and raises DatabaseError on missing
     - query_page() returns (rows, token) with stable pagination
     - Emulator support via FIRESTORE_EMULATOR_HOST
 
+    NOTE: the Firestore *document id* is still `pk` alone (see _doc_id) --
+    this adapter does not compose pk+rk into the physical document key the
+    way VercelKVAdapter/DynamoDBAdapter do. That is a pre-existing, separate
+    design constraint (two rows sharing the same pk collide onto one
+    document) left as-is here since fixing it is a bigger structural change
+    this pass didn't verify against a live Firestore/emulator.
+
     NOTE: google-cloud-firestore / google-cloud-storage are imported lazily
     inside the methods that use them, so installing them is only required when
     this adapter is actually used.
@@ -118,7 +127,7 @@ class FirestoreAdapter(NoSQLKVAdapter):
         return self._client.collection(self._collection_name(model))
 
     def _doc_id(self, pk: str) -> str:
-        # IMPORTANT for tests: doc_id == pk == row["id"]
+        # Document id is the partition key alone (not composed with rk).
         return str(pk)
 
     def _blob_key(self, model: type, pk: str, rk: str, checksum: str) -> str:
@@ -148,7 +157,7 @@ class FirestoreAdapter(NoSQLKVAdapter):
         blob.upload_from_string(data_bytes)
 
         ref: JsonDict = {
-            "id": pk,
+            "id": rk,
             "_pk": pk,
             "_rk": rk,
             "_overflow": True,
@@ -203,9 +212,15 @@ class FirestoreAdapter(NoSQLKVAdapter):
             collection = self._get_collection(model)
             doc_id = self._doc_id(pk)
 
-            # Ensure required identifiers exist for tests and convenience
+            # "id" is the row key (see NoSQLKVAdapter._get_pk_rk, which derives
+            # rk from data.get(rk_field, ...) with rk_field defaulting to "id").
+            # It is already present in `payload` via dict(data) above whenever
+            # the caller supplied one -- only fall back to `rk`, never `pk`,
+            # which would silently collapse every row's "id" to its partition
+            # key and break id-addressed lookups (the same corruption
+            # previously present here and in VercelKVAdapter/DynamoDBAdapter).
             payload: JsonDict = dict(data or {})
-            payload["id"] = pk
+            payload.setdefault("id", rk)
             payload["_pk"] = pk
             payload["_rk"] = rk
 
@@ -215,7 +230,8 @@ class FirestoreAdapter(NoSQLKVAdapter):
             else:
                 collection.document(doc_id).set(payload)
 
-            return {"id": pk}
+            # Return the full stored record, not just {"id": pk}.
+            return overflow_ref if overflow_ref is not None else payload
 
         except Exception as e:
             raise NoSQLError(f"Firestore put failed: {e}")
@@ -231,7 +247,7 @@ class FirestoreAdapter(NoSQLKVAdapter):
                 return None
 
             doc_data = snap.to_dict() or {}
-            doc_data.setdefault("id", pk)
+            doc_data.setdefault("id", rk)
 
             return self._resolve_overflow(doc_data)
 
@@ -275,8 +291,9 @@ class FirestoreAdapter(NoSQLKVAdapter):
             out: List[JsonDict] = []
             for d in docs:
                 row = d.to_dict() or {}
-                # Ensure id present for tests
-                row.setdefault("id", row.get("_pk") or d.id)
+                # Fall back to the row key, not the partition key, when "id"
+                # is absent from the stored document (legacy/incomplete data).
+                row.setdefault("id", row.get("_rk") or d.id)
                 out.append(self._resolve_overflow(row))
             return out
 
@@ -288,7 +305,7 @@ class FirestoreAdapter(NoSQLKVAdapter):
         """
         Test expectations:
         - deleting nonexistent raises sqlite3.DatabaseError
-        - delete returns {"id": pk}
+        - delete returns {"id": rk}
         - deletes overflow blob if present
         """
         try:
@@ -311,7 +328,7 @@ class FirestoreAdapter(NoSQLKVAdapter):
                         pass
 
             collection.document(doc_id).delete()
-            return {"id": pk}
+            return {"id": rk}
 
         except DatabaseError:
             raise
@@ -355,7 +372,7 @@ class FirestoreAdapter(NoSQLKVAdapter):
             rows: List[JsonDict] = []
             for d in docs:
                 row = d.to_dict() or {}
-                row.setdefault("id", row.get("_pk") or d.id)
+                row.setdefault("id", row.get("_rk") or d.id)
                 rows.append(self._resolve_overflow(row))
 
             next_token = None

polydb/adapters/GCPPubSubAdapter.py

@@ -237,3 +237,49 @@ class GCPPubSubAdapter(QueueAdapter):
 
         except Exception as e:
             raise QueueError(f"Pub/Sub ack failed: {e}")
+
+    # ---------------------------------------------------------
+    # extend -- real GCP Pub/Sub ModifyAckDeadline. delay()/cancel() are
+    # NOT overridden: a published Pub/Sub message is deliverable
+    # immediately (no "don't make this visible until N seconds from
+    # now" primitive exists), so the base class's NotImplementedError
+    # is the honest answer for both.
+    # ---------------------------------------------------------
+
+    # Pub/Sub's own real, documented maximum ack deadline. Google's API
+    # rejects anything above this with an invalid-argument error, so
+    # enforce it here rather than leaving callers to hit an opaque
+    # remote error.
+    MAX_ACK_DEADLINE_SECONDS = 600
+
+    @retry(max_attempts=3, delay=1.0, exceptions=(QueueError,))
+    def extend(
+        self, ack_id: str, queue_name: str = "default", *, visibility_timeout: int = 30
+    ) -> bool:
+        """Real Pub/Sub ModifyAckDeadline -- ack_id is the same ack_id
+        receive() returned for this message."""
+        if not ack_id:
+            raise QueueError("ack_id is required for Pub/Sub extend")
+        if visibility_timeout > self.MAX_ACK_DEADLINE_SECONDS:
+            raise QueueError(
+                f"Pub/Sub ack deadline cannot exceed {self.MAX_ACK_DEADLINE_SECONDS}s "
+                f"(GCP's own real maximum), got {visibility_timeout}"
+            )
+        try:
+            if not self._subscriber:
+                raise ConnectionError("Pub/Sub subscriber not initialized")
+
+            _, subscription = self._resolve_names(queue_name)
+            sub_path = self._subscription_path(subscription)
+
+            self._subscriber.modify_ack_deadline(
+                request={
+                    "subscription": sub_path,
+                    "ack_ids": [ack_id],
+                    "ack_deadline_seconds": visibility_timeout,
+                }
+            )
+            return True
+
+        except Exception as e:
+            raise QueueError(f"Pub/Sub extend failed: {e}")

polydb/adapters/GCPSecretManagerAdapter.py

@@ -0,0 +1,79 @@
+# src/polydb/adapters/GCPSecretManagerAdapter.py
+import os
+from typing import Optional
+
+from ..base.SecretsAdapter import SecretsAdapter
+from ..errors import ConnectionError
+from ..retry import retry
+
+
+class GCPSecretManagerAdapter(SecretsAdapter):
+    def __init__(self, project_id: str = ""):
+        super().__init__()
+
+        self.project_id = project_id or os.getenv("GOOGLE_CLOUD_PROJECT")
+        if not self.project_id:
+            raise ConnectionError("GOOGLE_CLOUD_PROJECT is not configured")
+
+        self._client = None
+        self._initialize_client()
+
+    def _initialize_client(self) -> None:
+        from google.cloud import secretmanager
+
+        self._client = secretmanager.SecretManagerServiceClient()
+
+    def _secret_path(self, key: str) -> str:
+        return f"projects/{self.project_id}/secrets/{key}"
+
+    @retry(max_attempts=3, delay=1.0, exceptions=(Exception,))
+    def get_secret(self, key: str) -> Optional[str]:
+        from google.api_core.exceptions import NotFound
+
+        try:
+            resp = self._client.access_secret_version(
+                name=f"{self._secret_path(key)}/versions/latest"
+            )
+        except NotFound:
+            return None
+        return resp.payload.data.decode("utf-8")
+
+    @retry(max_attempts=3, delay=1.0, exceptions=(Exception,))
+    def set_secret(self, key: str, value: str) -> None:
+        from google.api_core.exceptions import AlreadyExists
+
+        try:
+            self._client.create_secret(
+                request={
+                    "parent": f"projects/{self.project_id}",
+                    "secret_id": key,
+                    "secret": {"replication": {"automatic": {}}},
+                }
+            )
+        except AlreadyExists:
+            pass
+        self._client.add_secret_version(
+            request={
+                "parent": self._secret_path(key),
+                "payload": {"data": value.encode("utf-8")},
+            }
+        )
+
+    @retry(max_attempts=3, delay=1.0, exceptions=(Exception,))
+    def delete_secret(self, key: str) -> bool:
+        from google.api_core.exceptions import NotFound
+
+        try:
+            self._client.delete_secret(request={"name": self._secret_path(key)})
+            return True
+        except NotFound:
+            return False
+
+    @retry(max_attempts=3, delay=1.0, exceptions=(Exception,))
+    def list_secrets(self, prefix: str = "") -> list[str]:
+        secrets = self._client.list_secrets(request={"parent": f"projects/{self.project_id}"})
+        return [
+            s.name.rsplit("/", 1)[-1]
+            for s in secrets
+            if s.name.rsplit("/", 1)[-1].startswith(prefix)
+        ]