ai-parrot 0.5.11__cp311-cp311-manylinux_2_28_x86_64.whl → 0.5.12__cp311-cp311-manylinux_2_28_x86_64.whl

{ai_parrot-0.5.11.dist-info → ai_parrot-0.5.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ai-parrot
-Version: 0.5.11
+Version: 0.5.12
 Summary: Live Chatbots based on Langchain chatbots and Agents     Integrated into Navigator Framework or used into any aiohttp applications.
 Home-page: https://github.com/phenobarbital/ai-parrot
 Author: Jesus Lara

{ai_parrot-0.5.11.dist-info → ai_parrot-0.5.12.dist-info}/RECORD

@@ -4,9 +4,9 @@ parrot/exceptions.cpython-311-x86_64-linux-gnu.so,sha256=1tKBneucxl6ShNqI8KS4-pa
 parrot/manager.py,sha256=E1OdoNnZh1qCqVgZzcp8rdRnE1-xRwyQ6d1nFcOmg3U,6527
 parrot/models.py,sha256=MT88rYdITenwTuyCfeqHqaNf49rieAKz43R2TibN7G8,14314
 parrot/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-parrot/version.py,sha256=C4CZL3SltVkkn8Nf0SUBHRIqD7QqcJGmj5peRWKjzsM,378
+parrot/version.py,sha256=ocgzUZHJ4MXLtVKHnONHZUfuD_VQd8N3xw73-gr6wLA,378
 parrot/bots/__init__.py,sha256=qD-WOn8n34VUCp7Mq6Mq1lZV8h_cKAeXQxn27UtBDP4,153
-parrot/bots/abstract.py,sha256=8Oq47Cjt5-TAAdeyS3-JQd9FwPOumT2U6IIFMFXp02k,35886
+parrot/bots/abstract.py,sha256=EO7eq-CbR2xaBZoqRhYUcXYt66RwKXhSnxXhoCmYUXk,36088
 parrot/bots/agent.py,sha256=2v_5hQ3XCvCPpwTne7t-NDUpX3na1LIwXfufT-cK9LU,13432
 parrot/bots/base.py,sha256=Wl2BXRzxdGsWdHltAi0jalIPPAiM0TkVIHkRc1HQ99I,13422
 parrot/bots/basic.py,sha256=dg2kT_ynMEtZ3cMTcSovmDwrOo7BhBwL1o-Nn_7I85A,235
@@ -24,7 +24,7 @@ parrot/bots/prompts/__init__.py,sha256=rm_rAX7ZIxDIpSVOjHVuHRLMI9wS3avsu5fUfwAsd
 parrot/bots/prompts/agents.py,sha256=nXmzmRG15jiTDnjhmZ8ljSYCB1xU4RwsayZThFSj0Zg,4310
 parrot/bots/retrievals/__init__.py,sha256=AgI0mTB27tZ0Oyr7RU63G-ZO1VyX-uCJ6lwxgP4baag,45
 parrot/bots/retrievals/constitutional.py,sha256=x7kFR0KpmkR0Wz6bXNOeU3Hesn_EXc6eOSd4TdXxb8o,600
-parrot/bots/retrievals/multi.py,sha256=gVsGIM6ynqDFdqryrEyQg6yYXIN3uGwAGby9fvacl_w,3667
+parrot/bots/retrievals/multi.py,sha256=qn5Ml4KK0d8RqZhkXGCLYDKYOicIbgLDjqAeysWv3ls,4951
 parrot/bots/retrievals/retrieval.py,sha256=wvMM53k76njV5b6t6CCKiYVk2o81JCHzCNmlHBKYFMg,20622
 parrot/chatbots/__init__.py,sha256=ypskCnME0xUv6psBEGCEyXCrD0J0ULHSllpVmSxqb4A,200
 parrot/chatbots/abstract.py,sha256=CmDn3k4r9uKImOZRN4L9zxLbCdC-1MPUAorDlfZT-kA,26421
@@ -144,8 +144,8 @@ resources/users/handlers.py,sha256=BGzqBvPY_OaIF_nONWX4b_B5OyyBrdGuSihIsdlFwjk,2
 resources/users/models.py,sha256=glk7Emv7QCi6i32xRFDrGc8UwK23_LPg0XUOJoHnwRU,6799
 settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 settings/settings.py,sha256=9ueEvyLNurUX-AaIeRPV8GKX1c4YjDLbksUAeqEq6Ck,1854
-ai_parrot-0.5.11.dist-info/LICENSE,sha256=vRKOoa7onTsLNvSzJtGtMaNhWWh8B3YAT733Tlu6M4o,1070
-ai_parrot-0.5.11.dist-info/METADATA,sha256=3cT8zN64WE4sXyaO5CwVAe5WkLs7-UHsrojIY7jy3bU,9716
-ai_parrot-0.5.11.dist-info/WHEEL,sha256=lNWVJ6q28SO2kTKDIyc1kQ-4wE2w5snxBQXSv06oiUw,113
-ai_parrot-0.5.11.dist-info/top_level.txt,sha256=VCLpdIu_5wkShgIQjK85jFzL9HEVVjAqlQa_gupLekI,17
-ai_parrot-0.5.11.dist-info/RECORD,,
+ai_parrot-0.5.12.dist-info/LICENSE,sha256=vRKOoa7onTsLNvSzJtGtMaNhWWh8B3YAT733Tlu6M4o,1070
+ai_parrot-0.5.12.dist-info/METADATA,sha256=uTQuV_HZPiAA3HFYtKvrU-SKB8C0J9UYkxiTVeqUySY,9716
+ai_parrot-0.5.12.dist-info/WHEEL,sha256=lNWVJ6q28SO2kTKDIyc1kQ-4wE2w5snxBQXSv06oiUw,113
+ai_parrot-0.5.12.dist-info/top_level.txt,sha256=VCLpdIu_5wkShgIQjK85jFzL9HEVVjAqlQa_gupLekI,17
+ai_parrot-0.5.12.dist-info/RECORD,,

parrot/bots/abstract.py

@@ -477,6 +477,7 @@ class AbstractBot(DBInterface, ABC):
                 except ImportError:
                     continue
         elif isinstance(self._vector_store, dict):
+            print('< ENTERING HERE > ', )
             # Is a single vector store instance:
             store_cls = self._get_database_store(self._vector_store)
             store_cls.use_database = self._use_vector
@@ -488,6 +489,10 @@ class AbstractBot(DBInterface, ABC):
         self.logger.info(f"Configured Vector Stores: {self.stores}")
         if self.stores:
             self.store = self.stores[0]
+        print('=================================')
+        print('END STORES >> ', self.stores, self.store)
+        print('=================================')
+
 
     def get_memory(
         self,

parrot/bots/retrievals/multi.py

@@ -1,8 +1,9 @@
 from typing import List, Dict, Any, Optional
+from collections.abc import Callable
 from langchain_core.retrievers import BaseRetriever
 from langchain_core.callbacks import CallbackManagerForRetrieverRun
 from langchain_core.documents import Document
-
+from pydantic import Field
 
 class MultiVectorStoreRetriever(BaseRetriever):
     """
@@ -10,11 +11,16 @@ class MultiVectorStoreRetriever(BaseRetriever):
     and merges the results into a single list.
     """
 
-    stores: List[Any]
-    search_kwargs: Dict[str, Any]
-    chain_type: str
-    search_type: str
-    metric_type: str
+    # Define class attributes with default values
+    stores: List[Any] = Field(description="List of vector stores that provide an as_retriever() method")
+    search_kwargs: Dict[str, Any] = Field(default_factory=dict, description="Dict to pass to each store's retrieve method (like 'k' for top_k)")
+    chain_type: str = Field(default="stuff", description="Chain type for the retriever")
+    search_type: str = Field(default="similarity", description="Search type (similarity, mmr)")
+    metric_type: str = Field(default="COSINE", description="Similarity metric (COSINE, EUCLIDEAN, DOT_PRODUCT)")
+
+    class Config:
+        """Configuration for this pydantic object."""
+        arbitrary_types_allowed = True
 
     def __init__(
         self,
@@ -23,6 +29,7 @@ class MultiVectorStoreRetriever(BaseRetriever):
         chain_type: str = 'stuff',
         search_type: str = 'similarity',
         search_kwargs: Optional[Dict[str, Any]] = None,
+        **kwargs
     ):
         """
         Initialize the MultiVectorStoreRetriever.
@@ -34,12 +41,18 @@ class MultiVectorStoreRetriever(BaseRetriever):
             search_type: Search type (similarity, mmr)
             search_kwargs: Dict to pass to each store's retrieve method (like 'k' for top_k)
         """
-        super().__init__()
-        self.stores = stores
-        self.search_kwargs = search_kwargs or {}
-        self.chain_type = chain_type
-        self.search_type = search_type
-        self.metric_type = metric_type
+        # Initialize with default values
+        search_kwargs = search_kwargs or {}
+
+        # Call super().__init__ with all properties
+        super().__init__(
+            stores=stores,
+            search_kwargs=search_kwargs,
+            chain_type=chain_type,
+            search_type=search_type,
+            metric_type=metric_type,
+            **kwargs
+        )
 
     def _get_relevant_documents(
         self, query: str, *, run_manager: CallbackManagerForRetrieverRun
@@ -57,18 +70,22 @@ class MultiVectorStoreRetriever(BaseRetriever):
         """
         all_results = []
         for store in self.stores:
-            retriever = store.as_retriever(
-                search_type=self.search_type,
-                search_kwargs=self.search_kwargs,
-                chain_type=self.chain_type
-            )
-            # Pass the run_manager to the sub-retrievers if they support it
-            if hasattr(retriever, "_get_relevant_documents"):
-                callback_manager = run_manager.get_child()
-                docs = retriever._get_relevant_documents(query, run_manager=callback_manager)
-            else:
-                docs = retriever.get_relevant_documents(query)
-            all_results.extend(docs)
+            try:
+                retriever = store.as_retriever(
+                    search_type=self.search_type,
+                    search_kwargs=self.search_kwargs,
+                )
+                # Pass the run_manager to the sub-retrievers if they support it
+                if hasattr(retriever, "_get_relevant_documents"):
+                    callback_manager = run_manager.get_child()
+                    docs = retriever._get_relevant_documents(query, run_manager=callback_manager)
+                else:
+                    docs = retriever.get_relevant_documents(query)
+                all_results.extend(docs)
+            except Exception as e:
+                # Log the error but continue with other stores
+                run_manager.on_retriever_error(f"Error retrieving from store: {str(e)}")
+                continue
         return all_results
 
     async def _aget_relevant_documents(
@@ -87,16 +104,20 @@ class MultiVectorStoreRetriever(BaseRetriever):
         """
         all_results = []
         for store in self.stores:
-            retriever = store.as_retriever(
-                search_type=self.search_type,
-                search_kwargs=self.search_kwargs,
-                chain_type=self.chain_type
-            )
-            # Pass the run_manager to the sub-retrievers if they support it
-            if hasattr(retriever, "_aget_relevant_documents"):
-                callback_manager = run_manager.get_child()
-                docs = await retriever._aget_relevant_documents(query, run_manager=callback_manager)
-            else:
-                docs = await retriever.aget_relevant_documents(query)
-            all_results.extend(docs)
+            try:
+                retriever = store.as_retriever(
+                    search_type=self.search_type,
+                    search_kwargs=self.search_kwargs,
+                )
+                # Pass the run_manager to the sub-retrievers if they support it
+                if hasattr(retriever, "_aget_relevant_documents"):
+                    callback_manager = run_manager.get_child()
+                    docs = await retriever._aget_relevant_documents(query, run_manager=callback_manager)
+                else:
+                    docs = await retriever.aget_relevant_documents(query)
+                all_results.extend(docs)
+            except Exception as e:
+                # Log the error but continue with other stores
+                run_manager.on_retriever_error(f"Error retrieving from store: {str(e)}")
+                continue
         return all_results

parrot/version.py

@@ -3,7 +3,7 @@
 __title__ = "ai-parrot"
 __description__ = "Live Chatbots based on Langchain chatbots and Agents \
     Integrated into Navigator Framework or used into any aiohttp applications."
-__version__ = "0.5.11"
+__version__ = "0.5.12"
 __author__ = "Jesus Lara"
 __author_email__ = "jesuslarag@gmail.com"
 __license__ = "MIT"