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

projectdavid/clients/vector_store_manager.py

@@ -7,10 +7,8 @@ details from the higher‑level SDK.
 
 from __future__ import annotations
 
-import inspect
 import time
 import uuid
-from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 from dotenv import load_dotenv
@@ -57,12 +55,14 @@ class VectorStoreManager(BaseVectorStore):
         vectors_config: Optional[Dict[str, qdrant.VectorParams]] = None,
     ) -> dict:
         """
-        Create or recreate a Qdrant collection.  By default creates a single-vector
-        collection with `vector_size`.  To define multi-vector schema, pass
-        `vectors_config` mapping field names to VectorParams.
+        Create or recreate a Qdrant collection.
+
+        • If *vectors_config* is provided → use it verbatim (multi-vector schema).
+        • Otherwise create a classic single-vector collection *without* naming the
+          vector field – so upserts can omit ``vector_name``.
         """
         try:
-            # existence check
+            # ── pre-existence check ────────────────────────────────────────────
             if any(
                 col.name == collection_name
                 for col in self.client.get_collections().collections
@@ -73,27 +73,32 @@ class VectorStoreManager(BaseVectorStore):
             if dist not in qdrant.Distance.__members__:
                 raise ValueError(f"Invalid distance metric '{distance}'")
 
-            # choose schema
-            if vectors_config:
-                config = vectors_config
-            else:
-                config = {
-                    "_default": qdrant.VectorParams(
-                        size=vector_size, distance=qdrant.Distance[dist]
-                    )
-                }
+            # ── choose schema ──────────────────────────────────────────────────
+            if vectors_config:  # caller supplied full mapping
+                config = vectors_config  # e.g. {"text_vec": ..., "img_vec": ...}
+            else:  # default = single unnamed vector
+                config = qdrant.VectorParams(
+                    size=vector_size,
+                    distance=qdrant.Distance[dist],
+                )
 
-            # recreate with full schema
+            # ── (re)create collection ─────────────────────────────────────────
             self.client.recreate_collection(
                 collection_name=collection_name,
                 vectors_config=config,
             )
-            # record metadata for each field
+
+            # ── bookkeeping ───────────────────────────────────────────────────
+            if isinstance(config, dict):
+                fields = list(config.keys())
+            else:  # unnamed field
+                fields = [None]
+
             self.active_stores[collection_name] = {
                 "created_at": int(time.time()),
                 "vector_size": vector_size,
                 "distance": dist,
-                "fields": list(config.keys()),
+                "fields": fields,
             }
             log.info("Created Qdrant collection %s", collection_name)
             return {"collection_name": collection_name, "status": "created"}
@@ -139,13 +144,17 @@ class VectorStoreManager(BaseVectorStore):
         metadata: List[dict],
         vector_name: Optional[str] = None,
     ) -> Dict[str, Any]:
-        """Upsert vectors + payloads into *store_name*.
+        """
+        Upsert vectors + payloads into *store_name*.
+
+        If *vector_name* is omitted the manager:
 
-        If *vector_name* is omitted, the manager auto‑detects the sole vector
-        field. If multiple fields exist it raises a clear error.
+        • auto-detects the single vector field for classic (unnamed) collections
+        • auto-detects the sole key for named-vector collections with exactly one field
+        • raises if multiple named fields exist.
         """
 
-        # ---- validate input ------------------------------------------------
+        # ─── input validation ───────────────────────────────────────────────
         if not vectors:
             raise ValueError("Empty vectors list")
         expected = len(vectors[0])
@@ -153,22 +162,33 @@ class VectorStoreManager(BaseVectorStore):
             if len(vec) != expected or not all(isinstance(v, float) for v in vec):
                 raise ValueError(f"Vector {i} malformed: expected {expected} floats")
 
-        # ---- auto‑detect vector field --------------------------------------
+        # ─── auto-detect vector field ───────────────────────────────────────
         if vector_name is None:
             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=%r for store=%s", vector_name, store_name
-                )
+
+            if isinstance(v_cfg, dict):  # modern named-vector schema
+                vector_fields = list(v_cfg.keys())
+                if len(vector_fields) == 1:  # exactly one → safe default
+                    vector_name = vector_fields[0]
+                    log.debug(
+                        "Auto-detected vector_name=%r for store=%s",
+                        vector_name,
+                        store_name,
+                    )
+                else:  # >1 named fields → ambiguous
+                    raise ValueError(
+                        f"Multiple vector fields {vector_fields}; please specify vector_name"
+                    )
             else:
-                raise ValueError(
-                    f"Multiple vector fields {vector_fields}; please specify vector_name"
+                # legacy single-vector schema → leave vector_name as None
+                log.debug(
+                    "Collection %s uses legacy single-vector schema; "
+                    "upserting without vector_name",
+                    store_name,
                 )
 
-        # ---- build points ---------------------------------------------------
+        # ─── build points payload ───────────────────────────────────────────
         points = [
             qdrant.PointStruct(
                 id=self._generate_vector_id(),
@@ -178,7 +198,9 @@ class VectorStoreManager(BaseVectorStore):
             for txt, vec, meta in zip(texts, vectors, metadata)
         ]
 
-        # ---- upsert with backward‑compat for old clients --------------------
+        # ─── upsert with backward-compat for old qdrant-client builds ───────
+        import inspect  # keep local to avoid top-level dependency if absent elsewhere
+
         upsert_sig = inspect.signature(self.client.upsert)
         supports_vector_name = "vector_name" in upsert_sig.parameters
 
@@ -187,14 +209,14 @@ class VectorStoreManager(BaseVectorStore):
             "points": points,
             "wait": True,
         }
-        if supports_vector_name:
+        if supports_vector_name and vector_name is not None:
             upsert_kwargs["vector_name"] = vector_name
 
         try:
             self.client.upsert(**upsert_kwargs)
             return {"status": "success", "points_inserted": len(points)}
         except Exception as exc:  # noqa: BLE001
-            log.error("Add‑to‑store failed: %s", exc, exc_info=True)
+            log.error("Add-to-store failed: %s", exc, exc_info=True)
             raise VectorStoreError(f"Insertion failed: {exc}") from exc
 
     # ------------------------------------------------------------------ #

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: projectdavid
-Version: 1.33.20
+Version: 1.33.22
 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.20.dist-info → projectdavid-1.33.22.dist-info}/RECORD

@@ -20,7 +20,7 @@ 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=4uedMZ7foNr7s4Lsq5-FSN5kl4lR-Y8-nUlkoO2ff8M,14119
+projectdavid/clients/vector_store_manager.py,sha256=A-L1rhURKwiRs0EDd1HOuIShOtaC9Hb1yHB4He456Zc,15943
 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
@@ -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.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,,
+projectdavid-1.33.22.dist-info/licenses/LICENSE,sha256=_8yjiEGttpS284BkfhXxfERqTRZW_tUaHiBB0GTJTMg,4563
+projectdavid-1.33.22.dist-info/METADATA,sha256=Q4TM1PmVUXpccxOLaRrKnx2qwZw48w7nt-XUOlUiJaE,11555
+projectdavid-1.33.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+projectdavid-1.33.22.dist-info/top_level.txt,sha256=kil8GU4s7qYRfNnzGnFHhZnSNRSxgNG-J4HLgQMmMtw,13
+projectdavid-1.33.22.dist-info/RECORD,,