crewplus 0.2.37__tar.gz → 0.2.39__tar.gz

{crewplus-0.2.37 → crewplus-0.2.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crewplus
-Version: 0.2.37
+Version: 0.2.39
 Summary: Base services for CrewPlus AI applications
 Author-Email: Tim Liu <tim@opsmateai.com>
 License: MIT
@@ -15,6 +15,7 @@ Requires-Dist: google-genai>=1.21.1
 Requires-Dist: langchain-milvus<0.3.0,>=0.2.1
 Requires-Dist: langfuse<4.0.0,>=3.1.3
 Requires-Dist: langchain-mcp-adapters>=0.1.4
+Requires-Dist: protobuf<6.0,>=5.27
 Description-Content-Type: text/markdown
 
 # CrewPlus

{crewplus-0.2.37 → crewplus-0.2.39}/crewplus/services/gemini_chat_model.py

@@ -678,10 +678,13 @@ class GeminiChatModel(BaseChatModel):
             "thoughts_tokens": thoughts_tokens,
             "total_tokens": total_tokens,
         }
-        if input_details:
-            final_metadata["input_token_details"] = input_details
-        if output_details:
-            final_metadata["output_token_details"] = output_details
+
+        ## COMMENTED BEGIN: This is not working as expected.
+        # if input_details:
+        #     final_metadata["input_token_details"] = input_details
+        # if output_details:
+        #     final_metadata["output_token_details"] = output_details
+        ## COMMENTED END
             
         return final_metadata
 

{crewplus-0.2.37 → crewplus-0.2.39}/crewplus/vectorstores/milvus/schema_milvus.py

@@ -195,26 +195,16 @@ class SchemaMilvus(Milvus):
         doc.metadata = existing_metadata
         return doc
 
-    def update_documents_metadata(self, expr: str, metadata: str,action:Action=Action.UPSERT) -> List[Document]:
-        """
-        Updates the metadata of documents in the Milvus vector store based on the provided expression.
-
-        Args:
-            expr: Expression to filter the target documents.
-            metadata: New metadata to update the documents with.
-
-        Returns:
-            List of updated documents.
-        """
+    def _prepare_documents_for_update(self, expr: str, metadata: str, action: Action = Action.UPSERT) -> tuple[List[Document], List]:
         try:
             metadata_dict = json.loads(metadata)
         except json.JSONDecodeError:
             raise ValueError("Invalid JSON string for metadata")
-        
+
         # Retrieve documents that match the filter expression.
         fields = self.get_fields()
         documents = self.search_by_metadata(expr, fields=fields, limit=5000)
-        
+
         updated_documents = []
         for doc in documents:
             # Preserve the original primary key and text values.
@@ -232,7 +222,7 @@ class SchemaMilvus(Milvus):
                 update_dict = {}
                 for key, value in metadata_dict.items():
                     if key in existing_metadata:
-                        if isinstance(value, dict) and isinstance(existing_metadata[key], dict):
+                        if isinstance(value, dict) and isinstance(existing_metadata.get(key), dict):
                             merged = existing_metadata[key].copy()
                             for sub_key, sub_value in value.items():
                                 if sub_key in merged:
@@ -247,7 +237,7 @@ class SchemaMilvus(Milvus):
                     if key in ['pk', 'text']:
                         continue
 
-                    if isinstance(value, dict) and key in existing_metadata and isinstance(existing_metadata[key], dict):
+                    if isinstance(value, dict) and key in existing_metadata and isinstance(existing_metadata.get(key), dict):
                         existing_metadata[key] = {}
                         existing_metadata[key] = value
                     else:
@@ -262,16 +252,59 @@ class SchemaMilvus(Milvus):
 
             updated_documents.append(doc)
 
+        if not updated_documents:
+            return [], []
+
         # Extract the primary keys for the upsert operation.
         updated_ids = [doc.metadata[self.primary_field] for doc in updated_documents]
-        
+
         # Remove primary key and text from metadata before upserting,
         # as they are handled separately by the vector store.
         for doc in updated_documents:
             doc.metadata.pop(self.primary_field, None)
             doc.metadata.pop(self.text_field, None)
-        
+
+        return updated_documents, updated_ids
+
+    def update_documents_metadata(self, expr: str, metadata: str, action: Action = Action.UPSERT) -> List[Document]:
+        """
+        Updates the metadata of documents in the Milvus vector store based on the provided expression.
+
+        Args:
+            expr: Expression to filter the target documents.
+            metadata: New metadata to update the documents with.
+
+        Returns:
+            List of updated documents.
+        """
+        documents_to_upsert, updated_ids = self._prepare_documents_for_update(expr, metadata, action)
+
+        if not documents_to_upsert:
+            return []
+
         # Perform the upsert operation to update the documents in the collection.
-        self.upsert(ids=updated_ids, documents=updated_documents)
-        
-        return updated_documents
+        self.upsert(ids=updated_ids, documents=documents_to_upsert)
+
+        return documents_to_upsert
+
+    async def aupdate_documents_metadata(self, expr: str, metadata: str, action: Action = Action.UPSERT) -> List[Document]:
+        """
+        Asynchronously updates the metadata of documents in the Milvus vector store.
+
+        Args:
+            expr: Expression to filter the target documents.
+            metadata: New metadata to update the documents with.
+            action: The action to perform on the document metadata.
+
+        Returns:
+            List of updated documents.
+        """
+        documents_to_upsert, updated_ids = self._prepare_documents_for_update(expr, metadata, action)
+
+        if not documents_to_upsert:
+            return []
+
+        # Perform the asynchronous upsert operation.
+        await self.aupsert(ids=updated_ids, documents=documents_to_upsert)
+
+        return documents_to_upsert

{crewplus-0.2.37 → crewplus-0.2.39}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "crewplus"
-version = "0.2.37"
+version = "0.2.39"
 description = "Base services for CrewPlus AI applications"
 authors = [
     { name = "Tim Liu", email = "tim@opsmateai.com" },
@@ -20,6 +20,7 @@ dependencies = [
     "langchain-milvus (>=0.2.1,<0.3.0)",
     "langfuse (>=3.1.3,<4.0.0)",
     "langchain-mcp-adapters>=0.1.4",
+    "protobuf (>=5.27,<6.0)",
 ]
 
 [project.license]