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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ai-parrot
-Version: 0.5.12
+Version: 0.5.14
 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.12.dist-info → ai_parrot-0.5.14.dist-info}/RECORD

@@ -1,12 +1,12 @@
 parrot/__init__.py,sha256=eTkAkHeJ5BBDG2fxrXA4M37ODBJoS1DQYpeBAWL2xeI,387
 parrot/conf.py,sha256=BBbArVYjcGGaNKw3_h1dOw_pl1qcYNuT6Sj6dINwJd8,5404
 parrot/exceptions.cpython-311-x86_64-linux-gnu.so,sha256=1tKBneucxl6ShNqI8KS4-pa9G-YQw9kXCnqUB-n2tbc,361184
-parrot/manager.py,sha256=E1OdoNnZh1qCqVgZzcp8rdRnE1-xRwyQ6d1nFcOmg3U,6527
+parrot/manager.py,sha256=JNE6vY1H2PvpVeKzLv18uXTY9u5rb-JvmKSx-aIH1y4,6618
 parrot/models.py,sha256=MT88rYdITenwTuyCfeqHqaNf49rieAKz43R2TibN7G8,14314
 parrot/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-parrot/version.py,sha256=ocgzUZHJ4MXLtVKHnONHZUfuD_VQd8N3xw73-gr6wLA,378
+parrot/version.py,sha256=hhUcCDigRFpD1xGNG4vekpgZxvQKfpPpOIlOCACvoZ0,378
 parrot/bots/__init__.py,sha256=qD-WOn8n34VUCp7Mq6Mq1lZV8h_cKAeXQxn27UtBDP4,153
-parrot/bots/abstract.py,sha256=EO7eq-CbR2xaBZoqRhYUcXYt66RwKXhSnxXhoCmYUXk,36088
+parrot/bots/abstract.py,sha256=YH2XAHMlPCcc1q2V6RvZWkpAreHCqoDNnXATRPg8-5Y,36219
 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=qn5Ml4KK0d8RqZhkXGCLYDKYOicIbgLDjqAeysWv3ls,4951
+parrot/bots/retrievals/multi.py,sha256=92exQXAU5B2gk0uA9dAJnZMwFldPcarcQzLo-iEZy6o,4990
 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.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,,
+ai_parrot-0.5.14.dist-info/LICENSE,sha256=vRKOoa7onTsLNvSzJtGtMaNhWWh8B3YAT733Tlu6M4o,1070
+ai_parrot-0.5.14.dist-info/METADATA,sha256=kIekwFxKW7hsvo_yzplt0uy0j2qk0OJWCauU8b9_k0w,9716
+ai_parrot-0.5.14.dist-info/WHEEL,sha256=lNWVJ6q28SO2kTKDIyc1kQ-4wE2w5snxBQXSv06oiUw,113
+ai_parrot-0.5.14.dist-info/top_level.txt,sha256=VCLpdIu_5wkShgIQjK85jFzL9HEVVjAqlQa_gupLekI,17
+ai_parrot-0.5.14.dist-info/RECORD,,

parrot/bots/abstract.py

@@ -486,7 +486,9 @@ class AbstractBot(DBInterface, ABC):
             raise ValueError(
                 f"Invalid Vector Store Config: {self._vector_store}"
             )
-        self.logger.info(f"Configured Vector Stores: {self.stores}")
+        self.logger.info(
+            f"Configured Vector Stores: {self.stores}"
+        )
         if self.stores:
             self.store = self.stores[0]
         print('=================================')
@@ -538,11 +540,12 @@ class AbstractBot(DBInterface, ABC):
                 f"Error clearing chat history: {e}"
             )
 
-    def get_response(self, response: dict):
+    def get_response(self, response: dict, query: str = None):
         if 'error' in response:
             return response  # return this error directly
         try:
             response = ChatResponse(**response)
+            response.query = query
             response.response = self.as_markdown(
                 response,
                 return_sources=self.return_sources
@@ -695,15 +698,15 @@ class AbstractBot(DBInterface, ABC):
         )
         # re-configure LLM:
         new_llm = kwargs.pop('llm', None)
-        llm_config = kwargs.pop(
-            'llm_config',
-            {
-                "temperature": 0.2,
-                "top_k": 30,
-                "Top_p": 0.6
-            }
-        )
         if new_llm:
+            llm_config = kwargs.pop(
+                'llm_config',
+                {
+                    "temperature": 0.2,
+                    "top_k": 30,
+                    "Top_p": 0.6
+                }
+            )
             self.configure_llm(llm=new_llm, config=llm_config)
         # Combine into a ChatPromptTemplate
         prompt = PromptTemplate(
@@ -763,11 +766,11 @@ class AbstractBot(DBInterface, ABC):
                 "query": question,
                 "error": str(e)
             }
-        return self.get_response(response)
+        return self.get_response(response, question)
 
     def as_markdown(self, response: ChatResponse, return_sources: bool = False) -> str:
         markdown_output = f"**Question**: {response.question}  \n"
-        markdown_output += f"**Answer**: {response.answer}  \n"
+        markdown_output += f"**Answer**: \n {response.answer}  \n"
         if return_sources is True and response.source_documents:
             source_documents = response.source_documents
             current_sources = []
@@ -1009,7 +1012,7 @@ class AbstractBot(DBInterface, ABC):
                 response = await chain.ainvoke(
                     {"question": question}
                 )
-                return self.get_response(response)
+                return self.get_response(response, question)
             except asyncio.CancelledError:
                 # Handle task cancellation
                 print("Conversation task was cancelled.")

parrot/bots/retrievals/multi.py

@@ -13,11 +13,10 @@ class MultiVectorStoreRetriever(BaseRetriever):
 
     # 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)")
-
+    search_kwargs: Optional[Dict[str, Any]] = Field(default_factory=dict, description="Dict to pass to each store's retrieve method (like 'k' for top_k)")
+    chain_type: Optional[str] = Field(default="stuff", description="Chain type for the retriever")
+    search_type: Optional[str] = Field(default="similarity", description="Search type (similarity, mmr)")
+    metric_type: Optional[str] = Field(default="COSINE", description="Similarity metric (COSINE, EUCLIDEAN, DOT_PRODUCT)")
     class Config:
         """Configuration for this pydantic object."""
         arbitrary_types_allowed = True

parrot/manager.py

@@ -61,7 +61,9 @@ class BotManager:
                     f"Failed to load chatbots from DB: {e}"
                 )
                 return
+            print('HERE >>>>>> ', len(bots))
             for bot in bots:
+                print('CREATING BOT > ', bot)
                 if bot.bot_type == 'chatbot':
                     self.logger.notice(
                         f"Loading chatbot '{bot.name}'..."

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.12"
+__version__ = "0.5.14"
 __author__ = "Jesus Lara"
 __author_email__ = "jesuslarag@gmail.com"
 __license__ = "MIT"