ws-bom-robot-app 0.0.59__py3-none-any.whl → 0.0.61__py3-none-any.whl

ws_bom_robot_app/llm/agent_handler.py

@@ -60,7 +60,7 @@ class AgentHandler(AsyncCallbackHandler):
         tags: Optional[List[str]] = None,
         **kwargs: Any,
     ) -> None:
-        if token:
+        if token and "llm_chain" not in tags:
             token = _parse_token(self.llm,token)
             if token:
               self.stream_buffer += token  # append new data to pending buffer

ws_bom_robot_app/llm/models/api.py

@@ -29,6 +29,7 @@ class LlmAppToolChainSettings(BaseModel):
   provider: Optional[str] = "openai"
   model: Optional[str] = None
   temperature: Optional[float] = 0
+  outputStructure: Optional[dict] = None
 
 class LlmAppToolDbSettings(BaseModel):
   connection_string: Optional[str] = Field(None, validation_alias=AliasChoices("connectionString","connection_string"))

ws_bom_robot_app/llm/nebuly_handler.py

@@ -29,11 +29,9 @@ class NebulyHandler(AsyncCallbackHandler):
             input_tokens=0,
             output_tokens=0,
         )
-        self.retrieval_trace = NebulyRetrievalTrace(
-            source=None,
-            input="",
-            outputs=[],
-        )
+        self.__response_with_rag: str = "false" # Flag to check if the AI used some retrieval tools
+        self.__retrieval_query: str = ""
+        self.retrieval_traces: list[NebulyRetrievalTrace] = []
 
     async def on_chat_model_start(self, serialized, messages, *, run_id, parent_run_id = None, tags = None, metadata = None, **kwargs):
         # Initialize the interaction with the input message
@@ -57,13 +55,22 @@ class NebulyHandler(AsyncCallbackHandler):
         self.llm_trace.output_tokens = usage_metadata.get("output_tokens", 0)
 
     async def on_retriever_start(self, serialized, query, *, run_id, parent_run_id = None, tags = None, metadata = None, **kwargs):
-        if metadata.get("source"):
-          self.retrieval_trace.input = query
-          self.retrieval_trace.source = metadata.get("source", "retriever")
+        self.__retrieval_query = query
+
 
     async def on_retriever_end(self, documents, *, run_id, parent_run_id = None, tags = None, **kwargs):
         # pass the document source because of the large amount of data in the document content
-        self.retrieval_trace.outputs.extend([ doc.metadata.get("source", "content unavailable") for doc in documents])
+        for doc in documents:
+          self.retrieval_traces.append(
+            NebulyRetrievalTrace(
+              source=doc.metadata.get("source", "content unavailable"),
+              input=self.__retrieval_query,
+              outputs=[doc.metadata.get("source", "content unavailable")]
+            )
+          )
+
+    async def on_tool_start(self, serialized, input_str, *, run_id, parent_run_id = None, tags = None, metadata = None, inputs = None, **kwargs):
+        self.__response_with_rag = "true"  # Set the flag to true when the retriever starts
 
     async def on_agent_finish(self, finish, *, run_id, parent_run_id = None, tags = None, **kwargs):
         # Interaction
@@ -126,14 +133,16 @@ class NebulyHandler(AsyncCallbackHandler):
 
     def __prepare_payload(self):
         self.interaction.time_end = datetime.now().astimezone().isoformat()
+        self.interaction.tags["response_with_rag"] = self.__response_with_rag
         payload = {
             "interaction": self.interaction.__dict__,
             "traces": [
               self.llm_trace.__dict__,
             ]
         }
-        if self.retrieval_trace.source:
-            payload["traces"].append(self.retrieval_trace.__dict__)
+        for trace in self.retrieval_traces:
+          if trace.source:
+              payload["traces"].append(trace.__dict__)
         return payload
 
     def __parse_multimodal_input(self, input: list[dict]) -> str:

ws_bom_robot_app/llm/tools/models/main.py

@@ -11,3 +11,7 @@ class LlmChainInput(BaseModel):
   input: str = Field(description="Input to the LLM chain")
 class SearchOnlineInput(BaseModel):
   query: str = Field(description="The search query string")
+class EmailSenderInput(BaseModel):
+  email_subject: str = Field(description="The subject of the email to send")
+  body: str = Field(description="The body of the email to send")
+  to_email: str = Field(description="The recipient email address")

ws_bom_robot_app/llm/tools/tool_manager.py

@@ -4,8 +4,11 @@ from ws_bom_robot_app.llm.models.api import LlmAppTool
 from ws_bom_robot_app.llm.providers.llm_manager import LlmInterface
 from ws_bom_robot_app.llm.vector_store.db.manager import VectorDbManager
 from ws_bom_robot_app.llm.tools.utils import getRandomWaitingMessage, translate_text
-from ws_bom_robot_app.llm.tools.models.main import NoopInput,DocumentRetrieverInput,ImageGeneratorInput,LlmChainInput,SearchOnlineInput
+from ws_bom_robot_app.llm.tools.models.main import NoopInput,DocumentRetrieverInput,ImageGeneratorInput,LlmChainInput,SearchOnlineInput,EmailSenderInput
 from pydantic import BaseModel, ConfigDict
+import smtplib
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
 
 class ToolConfig(BaseModel):
     function: Callable
@@ -123,7 +126,8 @@ class ToolManager:
     async def llm_chain(self, input: str):
         if self.app_tool.type == "llmChain":
           from langchain_core.prompts import ChatPromptTemplate
-          from langchain_core.output_parsers import StrOutputParser
+          from langchain_core.output_parsers import StrOutputParser, JsonOutputParser
+          from pydantic import create_model
           system_message = self.app_tool.llm_chain_settings.prompt
           context = []
           if self.app_tool.data_source == "knowledgebase":
@@ -131,14 +135,33 @@ class ToolManager:
           if len(context) > 0:
             for doc in context:
               system_message += f"\n\nContext:\n{doc.metadata.get("source", "")}: {doc.page_content}"
-          prompt = ChatPromptTemplate.from_messages(
-              [ ("system", system_message),
-                ("user", "{input}")],
-          )
+          # Determine output parser and format based on output type
+          output_type = self.app_tool.llm_chain_settings.outputStructure.get("outputType")
+          is_json_output = output_type == "json"
+
+          if is_json_output:
+            output_format = self.app_tool.llm_chain_settings.outputStructure.get("outputFormat", {})
+            json_schema = create_model('json_schema', **{k: (type(v), ...) for k, v in output_format.items()})
+            output_parser = JsonOutputParser(pydantic_object=json_schema)
+            system_message += "\n\nFormat instructions:\n{format_instructions}".strip()
+          else:
+            output_parser = StrOutputParser()
+          # Create prompt template with or without format instructions
+          base_messages = [
+            ("system", system_message),
+            ("user", "{input}")
+          ]
+          if is_json_output:
+            prompt = ChatPromptTemplate.from_messages(base_messages).partial(
+              format_instructions=output_parser.get_format_instructions()
+            )
+          else:
+            prompt = ChatPromptTemplate.from_messages(base_messages)
           model = self.app_tool.llm_chain_settings.model
           self.llm.config.model = model
           llm = self.llm.get_llm()
-          chain = prompt | llm | StrOutputParser()
+          llm.tags = ["llm_chain"]
+          chain = prompt | llm | output_parser
           result = await chain.ainvoke({"input": input})
           return result
 
@@ -171,6 +194,81 @@ class ToolManager:
                 final_results.append({"url": url, "content": "Page not found"})
         return final_results
 
+    async def search_online_google(self, query: str):
+      from langchain_google_community import GoogleSearchAPIWrapper
+      from ws_bom_robot_app.llm.tools.utils import fetch_page, extract_content_with_trafilatura
+      import aiohttp, asyncio
+      secrets = {}
+      for d in self.app_tool.secrets:
+        secrets[d.get("secretId")] = d.get("secretValue")
+      search_type = secrets.get("searchType")
+      if search_type:
+          search_kwargs = {"searchType" : search_type}
+      search = GoogleSearchAPIWrapper(
+          google_api_key=secrets.get("GOOGLE_API_KEY"),
+          google_cse_id=secrets.get("GOOGLE_CSE_ID"),
+      )
+      if search_type:
+          raw_results = search.results(query=query,
+                     num_results=secrets.get("num_results", 5),
+                     search_params=search_kwargs)
+          return raw_results
+      raw_results = search.results(
+          query=query,
+          num_results=secrets.get("num_results", 5)
+      )
+      urls = [r["link"] for r in raw_results]
+      async with aiohttp.ClientSession() as session:
+          tasks = [fetch_page(session, url) for url in urls]
+          responses = await asyncio.gather(*tasks)
+      final_results = []
+      for item in responses:
+          url = item["url"]
+          html = item["html"]
+          if html:
+              content = await extract_content_with_trafilatura(html)
+              if content:
+                  final_results.append({"url": url, "content": content, "type": "web"})
+              else:
+                  final_results.append({"url": url, "content": "No content found", "type": "web"})
+          else:
+              final_results.append({"url": url, "content": "Page not found", "type": "web"})
+      return final_results
+
+
+    async def send_email(self, email_subject: str, body: str, to_email:str):
+        secrets = self.app_tool.secrets
+        secrets = {item["secretId"]: item["secretValue"] for item in secrets}
+        # Email configuration
+        smtp_server = secrets.get("smtp_server")
+        smtp_port = secrets.get("smtp_port")
+        smtp_user = secrets.get("smtp_user")
+        smtp_password = secrets.get("smtp_password")
+        from_email = secrets.get("from_email")
+        if not to_email or to_email == "":
+          return "No recipient email provided"
+        if not email_subject or email_subject == "":
+          return "No email object provided"
+        # Create the email content
+        msg = MIMEMultipart()
+        msg['From'] = from_email
+        msg['To'] = to_email
+        msg['Subject'] = email_subject
+
+        # Create the email body
+        msg.attach(MIMEText(body, 'plain'))
+
+        # Send the email
+        try:
+          with smtplib.SMTP(smtp_server, smtp_port) as server:
+            # Use authentication and SSL only if password is provided
+            if smtp_password:
+              server.starttls()
+              server.login(smtp_user, smtp_password)
+            server.send_message(msg)
+        except Exception as e:
+          return f"Failed to send email: {str(e)}"
+        return "Email sent successfully"
 
     #endregion
 
@@ -180,6 +278,8 @@ class ToolManager:
         "image_generator": ToolConfig(function=image_generator, model=ImageGeneratorInput),
         "llm_chain": ToolConfig(function=llm_chain, model=LlmChainInput),
         "search_online": ToolConfig(function=search_online, model=SearchOnlineInput),
+        "search_online_google": ToolConfig(function=search_online_google, model=SearchOnlineInput),
+        "send_email": ToolConfig(function=send_email, model=EmailSenderInput),
     }
 
     #instance methods

{ws_bom_robot_app-0.0.59.dist-info → ws_bom_robot_app-0.0.61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ws_bom_robot_app
-Version: 0.0.59
+Version: 0.0.61
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa
@@ -50,6 +50,7 @@ Requires-Dist: unstructured-ingest[slack]
 Requires-Dist: html5lib==1.1
 Requires-Dist: markdownify==0.14.1
 Requires-Dist: duckduckgo-search==8.0.4
+Requires-Dist: langchain_google_community==2.0.7
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{ws_bom_robot_app-0.0.59.dist-info → ws_bom_robot_app-0.0.61.dist-info}/RECORD

@@ -8,17 +8,17 @@ ws_bom_robot_app/util.py,sha256=b49ItlZgh2Wzw-6K8k5Wa44eVgjQ0JmWQwJnEaQBVGw,3502
 ws_bom_robot_app/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/llm/agent_context.py,sha256=uatHJ8wcRly6h0S762BgfzDMpmcwCHwNzwo37aWjeE0,1305
 ws_bom_robot_app/llm/agent_description.py,sha256=5IP0qFSJvaE3zjGS7f0W1DuiegP0RHXRMBoDC5pCofA,4779
-ws_bom_robot_app/llm/agent_handler.py,sha256=4HYP8wbdtJhRi3bk6PvJ3cRDZyLYWt3Ow5tnHpkEg1o,7738
+ws_bom_robot_app/llm/agent_handler.py,sha256=PzdDpBnfUdqxKuMpHcVYgVf0hxIFOJwdxT9YIyFGdYY,7766
 ws_bom_robot_app/llm/agent_lcel.py,sha256=8d10b43BXqE4rfXE5uh8YGT67o1bw0q0l7QXFT6wPKA,2320
 ws_bom_robot_app/llm/api.py,sha256=1nzQ7g2n_DlX6Ixo5ecS10UvyyKJ42qZQ6aD8-EI7BE,4709
 ws_bom_robot_app/llm/defaut_prompt.py,sha256=D9dn8yPveu0bVwGM1wQWLYftmBs5O76o0R_caLLll8w,1121
 ws_bom_robot_app/llm/main.py,sha256=UK33yI_0zDCdM5zKe9h7c_qzM41PIANvRFCxjGlAzlI,5140
-ws_bom_robot_app/llm/nebuly_handler.py,sha256=1HaBeBNzEhyTsgz9v-15Tt7oAc6UBGtqB_DBujpFIcw,7534
+ws_bom_robot_app/llm/nebuly_handler.py,sha256=w895twhPgtRUH_jZz1pbX4W2leq8A3O_9gUwp_ridoY,8033
 ws_bom_robot_app/llm/settings.py,sha256=DCLaGZwxlw0xE46LpfUgin_FHD8_XJIthCgI6r2UDlM,121
 ws_bom_robot_app/llm/feedbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/llm/feedbacks/feedback_manager.py,sha256=bnP0FEJTyrzT0YzqCVE73EC07Eu_4FLxVu3Cy-5Si0o,3211
 ws_bom_robot_app/llm/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ws_bom_robot_app/llm/models/api.py,sha256=266f5jc1ikfX9HnK5Ms4NxXowNRfxFEH8GPlQcDvN5Y,10709
+ws_bom_robot_app/llm/models/api.py,sha256=DPhL_207RRN4qwPlKxbLrARnsYVAkdMYYUV7MkbN7Rk,10751
 ws_bom_robot_app/llm/models/base.py,sha256=1TqxuTK3rjJEALn7lvgoen_1ba3R2brAgGx6EDTtDZo,152
 ws_bom_robot_app/llm/models/feedback.py,sha256=pYNQGxNOBgeAAfdJLI95l7ePLBI5tVdsgnyjp5oMOQU,1722
 ws_bom_robot_app/llm/models/kb.py,sha256=oVSw6_dmNxikAHrPqcfxDXz9M0ezLIYuxpgvzfs_Now,9514
@@ -26,10 +26,10 @@ ws_bom_robot_app/llm/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 ws_bom_robot_app/llm/providers/llm_manager.py,sha256=zIkxgTLYQCcup2Ixf4eWap4mNinuJH2YmkjLjZGDyJM,8371
 ws_bom_robot_app/llm/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/llm/tools/tool_builder.py,sha256=p_Q32_-OSydcxzj69PgPIuiny816zYv5dVsCHSY0ELc,1188
-ws_bom_robot_app/llm/tools/tool_manager.py,sha256=adWvaSIur5Ez2gGsuTFqNprZZlQP6ZZj5WknzJjtQ0c,8355
+ws_bom_robot_app/llm/tools/tool_manager.py,sha256=I5HPQov-9ELSiNDhxMsm9-zOqZ77J_E5c6IDOXX_CFk,12935
 ws_bom_robot_app/llm/tools/utils.py,sha256=Ba7ScFZPVJ3ke8KLO8ik1wyR2f_zC99Bikqx0OGnKoI,1924
 ws_bom_robot_app/llm/tools/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ws_bom_robot_app/llm/tools/models/main.py,sha256=pBQNWPd1OZgZ2xkOnUOawNbujQ5oJXLdyuAex1afLWc,579
+ws_bom_robot_app/llm/tools/models/main.py,sha256=1hICqHs-KS2heenkH7b2eH0N2GrPaaNGBrn64cl_A40,827
 ws_bom_robot_app/llm/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/llm/utils/agent.py,sha256=ISF9faaD5tBi-8sbgQpgfqWT1JIVcgv_lRhyaNAkI2Q,1445
 ws_bom_robot_app/llm/utils/chunker.py,sha256=N7570xBYlObneg-fsvDhPAJ-Pv8C8OaYZOBK6q7LmMI,607
@@ -65,7 +65,7 @@ ws_bom_robot_app/llm/vector_store/loader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 ws_bom_robot_app/llm/vector_store/loader/base.py,sha256=L_ugekNuAq0N9O-24wtlHSNHkqSeD-KsJrfGt_FX9Oc,5340
 ws_bom_robot_app/llm/vector_store/loader/docling.py,sha256=yP0zgXLeFAlByaYuj-6cYariuknckrFds0dxdRcnVz8,3456
 ws_bom_robot_app/llm/vector_store/loader/json_loader.py,sha256=LDppW0ZATo4_1hh-KlsAM3TLawBvwBxva_a7k5Oz1sc,858
-ws_bom_robot_app-0.0.59.dist-info/METADATA,sha256=hTSpZWSUDrn0IY9jsYvUCGocnzK9kbrEiRINEwiDVe0,8406
-ws_bom_robot_app-0.0.59.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ws_bom_robot_app-0.0.59.dist-info/top_level.txt,sha256=Yl0akyHVbynsBX_N7wx3H3ZTkcMLjYyLJs5zBMDAKcM,17
-ws_bom_robot_app-0.0.59.dist-info/RECORD,,
+ws_bom_robot_app-0.0.61.dist-info/METADATA,sha256=9Ph9kKWlaMASpyHCpha4k40H2clLDe2KbmUSq2D1uLw,8456
+ws_bom_robot_app-0.0.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ws_bom_robot_app-0.0.61.dist-info/top_level.txt,sha256=Yl0akyHVbynsBX_N7wx3H3ZTkcMLjYyLJs5zBMDAKcM,17
+ws_bom_robot_app-0.0.61.dist-info/RECORD,,