projectdavid 1.33.18__py3-none-any.whl → 1.33.20__py3-none-any.whl

projectdavid/clients/vector_store_manager.py

@@ -7,6 +7,7 @@ details from the higher‑level SDK.
 
 from __future__ import annotations
 
+import inspect
 import time
 import uuid
 from pathlib import Path
@@ -129,48 +130,45 @@ class VectorStoreManager(BaseVectorStore):
             log.error("Store info failed: %s", e)
             raise VectorStoreError(f"Info retrieval failed: {e}") from e
 
-    # ------------------------------------------------------------------ #
-    # ingestion helpers
-    # ------------------------------------------------------------------ #
     def add_to_store(
         self,
+        *,
         store_name: str,
         texts: List[str],
         vectors: List[List[float]],
         metadata: List[dict],
-        *,
         vector_name: Optional[str] = None,
-    ):
+    ) -> Dict[str, Any]:
+        """Upsert vectors + payloads into *store_name*.
+
+        If *vector_name* is omitted, the manager auto‑detects the sole vector
+        field. If multiple fields exist it raises a clear error.
+        """
+
+        # ---- validate input ------------------------------------------------
         if not vectors:
             raise ValueError("Empty vectors list")
         expected = len(vectors[0])
         for i, vec in enumerate(vectors):
             if len(vec) != expected or not all(isinstance(v, float) for v in vec):
-                raise ValueError(f"Vector {i} malformed")
+                raise ValueError(f"Vector {i} malformed: expected {expected} floats")
 
-        # AUTO-DETECT VECTOR FIELD IF NONE GIVEN
+        # ---- auto‑detect vector field --------------------------------------
         if vector_name is None:
-            collection_info = self.client.get_collection(collection_name=store_name)
-            vectors_config = collection_info.config.params.vectors
-
-            # Qdrant 1.x vs 2.x compatibility
-            if isinstance(vectors_config, dict):
-                vector_fields = list(vectors_config.keys())
-            else:
-                vector_fields = [vectors_config]
-
+            coll_info = self.client.get_collection(collection_name=store_name)
+            v_cfg = coll_info.config.params.vectors
+            vector_fields = list(v_cfg.keys()) if isinstance(v_cfg, dict) else [v_cfg]
             if len(vector_fields) == 1:
                 vector_name = vector_fields[0]
                 log.debug(
-                    "Auto-detected vector_name='%s' for store=%s",
-                    vector_name,
-                    store_name,
+                    "Auto‑detected vector_name=%r for store=%s", vector_name, store_name
                 )
             else:
                 raise ValueError(
-                    f"Multiple vector fields exist: {vector_fields}; please specify vector_name"
+                    f"Multiple vector fields {vector_fields}; please specify vector_name"
                 )
 
+        # ---- build points ---------------------------------------------------
         points = [
             qdrant.PointStruct(
                 id=self._generate_vector_id(),
@@ -180,17 +178,24 @@ class VectorStoreManager(BaseVectorStore):
             for txt, vec, meta in zip(texts, vectors, metadata)
         ]
 
+        # ---- upsert with backward‑compat for old clients --------------------
+        upsert_sig = inspect.signature(self.client.upsert)
+        supports_vector_name = "vector_name" in upsert_sig.parameters
+
+        upsert_kwargs: Dict[str, Any] = {
+            "collection_name": store_name,
+            "points": points,
+            "wait": True,
+        }
+        if supports_vector_name:
+            upsert_kwargs["vector_name"] = vector_name
+
         try:
-            self.client.upsert(
-                collection_name=store_name,
-                points=points,
-                wait=True,
-                vector_name=vector_name,
-            )
+            self.client.upsert(**upsert_kwargs)
             return {"status": "success", "points_inserted": len(points)}
-        except Exception as e:
-            log.error("Add‑to‑store failed: %s", e)
-            raise VectorStoreError(f"Insertion failed: {e}") from e
+        except Exception as exc:  # noqa: BLE001
+            log.error("Add‑to‑store failed: %s", exc, exc_info=True)
+            raise VectorStoreError(f"Insertion failed: {exc}") from exc
 
     # ------------------------------------------------------------------ #
     # search / query

projectdavid/clients/vectors.py

@@ -245,32 +245,31 @@ class VectorStoreClient:
     ) -> ValidationInterface.VectorStoreFileRead:
         processed = await self.file_processor.process_file(p)
         texts, vectors = processed["chunks"], processed["vectors"]
-        line_data = processed.get("line_data") or []  # ← NEW
-
-        base_md = meta or {}
-        base_md.update({"source": str(p), "file_name": p.name})
+        line_data = processed.get("line_data") or []
 
+        base_md = (meta or {}) | {"source": str(p), "file_name": p.name}
         file_record_id = f"vsf_{uuid.uuid4()}"
 
-        # Build per‑chunk payload, now including page/lines if present
         chunk_md = []
-        for i in range(len(texts)):
-            payload = {
-                **base_md,
-                "chunk_index": i,
-                "file_id": file_record_id,
-            }
-            if i < len(line_data):  # ← NEW
-                payload.update(line_data[i])  # {'page': …, 'lines': …}
+        for i, txt in enumerate(texts):
+            payload = {**base_md, "chunk_index": i, "file_id": file_record_id}
+            if i < len(line_data):
+                payload.update(line_data[i])  # {'page':…, 'lines':…}
             chunk_md.append(payload)
 
+        # 🔑 1. look up the backend store to get its *collection* name
+        store = self.retrieve_vector_store_sync(vector_store_id)
+        collection_name = store.collection_name
+
+        # 🔑 2. upsert via VectorStoreManager (auto-detects vector field)
         self.vector_manager.add_to_store(
-            store_name=vector_store_id,
+            store_name=collection_name,
             texts=texts,
             vectors=vectors,
             metadata=chunk_md,
         )
 
+        # 3. register the file with the API
         resp = await self._request(
             "POST",
             f"/v1/vector-stores/{vector_store_id}/files",
@@ -318,10 +317,10 @@ class VectorStoreClient:
             vector_field=vector_field,
         )
 
-    async def _delete_vs_async(
-        self, vector_store_id: str, permanent: bool
-    ) -> Dict[str, Any]:
-        qres = self.vector_manager.delete_store(vector_store_id)
+    async def _delete_vs_async(self, vector_store_id: str, permanent: bool):
+        # collection deletion must use the *collection* name
+        store = self.retrieve_vector_store_sync(vector_store_id)
+        qres = self.vector_manager.delete_store(store.collection_name)
         await self._request(
             "DELETE",
             f"/v1/vector-stores/{vector_store_id}",
@@ -334,10 +333,11 @@ class VectorStoreClient:
             "qdrant_result": qres,
         }
 
-    async def _delete_file_async(
-        self, vector_store_id: str, file_path: str
-    ) -> Dict[str, Any]:
-        fres = self.vector_manager.delete_file_from_store(vector_store_id, file_path)
+    async def _delete_file_async(self, vector_store_id: str, file_path: str):
+        store = self.retrieve_vector_store_sync(vector_store_id)
+        fres = self.vector_manager.delete_file_from_store(
+            store.collection_name, file_path
+        )
         await self._request(
             "DELETE",
             f"/v1/vector-stores/{vector_store_id}/files",

{projectdavid-1.33.18.dist-info → projectdavid-1.33.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: projectdavid
-Version: 1.33.18
+Version: 1.33.20
 Summary: Python SDK for interacting with the Entities Assistant API.
 Author-email: Francis Neequaye Armah <francis.neequaye@projectdavid.co.uk>
 License: PolyForm Noncommercial License 1.0.0

{projectdavid-1.33.18.dist-info → projectdavid-1.33.20.dist-info}/RECORD

@@ -20,8 +20,8 @@ projectdavid/clients/synchronous_inference_wrapper.py,sha256=qh94rtNlLqgIxiA_ZbQ
 projectdavid/clients/threads_client.py,sha256=ekzU5w14zftmtmFkiec3NC90Of-_KVSUY1qH9cmfSFg,6771
 projectdavid/clients/tools_client.py,sha256=GkCVOmwpAoPqVt6aYmH0G1HIFha3iEwR9IIf9teR0j8,11487
 projectdavid/clients/users_client.py,sha256=eCuUb9qvyH1GUFhZu6TRL9zdoK-qzHSs8-Vmrk_0mmg,13729
-projectdavid/clients/vector_store_manager.py,sha256=_mbN7s_WMb64CMYzXmlDva3F-n8lMiKgwGRNWsnS-tU,13682
-projectdavid/clients/vectors.py,sha256=ubkB4rzcfDSYHFwOpa99Y4nHSJan_0jKnzyCYFJ15ck,31665
+projectdavid/clients/vector_store_manager.py,sha256=4uedMZ7foNr7s4Lsq5-FSN5kl4lR-Y8-nUlkoO2ff8M,14119
+projectdavid/clients/vectors.py,sha256=TcY-kMsFFbjZV3hIJ4qlRBZvaxtTbIAVzGS0GdQJNuI,31956
 projectdavid/clients/vision-file_processor.py,sha256=19ft9IUeY5x9_22vC4JqndiFlpDYyUn6z1ygv-EV2NE,16852
 projectdavid/clients/vision_vectors.py,sha256=cysPVbUzW3byB82MTqG2X1Iz5ZAe82WTS1JfQcoqVhE,40229
 projectdavid/constants/platform.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -37,8 +37,8 @@ projectdavid/utils/monitor_launcher.py,sha256=3YAgJdeuaUvq3JGvpA4ymqFsAnk29nH5q9
 projectdavid/utils/peek_gate.py,sha256=5whMRnDOQjATRpThWDJkvY9ScXuJ7Sd_-9rvGgXeTAQ,2532
 projectdavid/utils/run_monitor.py,sha256=F_WkqIP-qnWH-4llIbileWWLfRj2Q1Cg-ni23SR1rec,3786
 projectdavid/utils/vector_search_formatter.py,sha256=YTe3HPGec26qGY7uxY8_GS8lc4QaN6aNXMzkl29nZpI,1735
-projectdavid-1.33.18.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
-projectdavid-1.33.18.dist-info/METADATA,sha256=5Xhz_r8ereveoS9tTG5IJlkdeq8Y_JrrCtIW6fZHzUA,11555
-projectdavid-1.33.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-projectdavid-1.33.18.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
-projectdavid-1.33.18.dist-info/RECORD,,
+projectdavid-1.33.20.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
+projectdavid-1.33.20.dist-info/METADATA,sha256=pV7oSTxkZfCgK-GcJ1u2HZLvWr16vZssNGpQAmeJ1oY,11555
+projectdavid-1.33.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+projectdavid-1.33.20.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
+projectdavid-1.33.20.dist-info/RECORD,,