ws-bom-robot-app 0.0.66__tar.gz → 0.0.68__tar.gz

{ws_bom_robot_app-0.0.66/ws_bom_robot_app.egg-info → ws_bom_robot_app-0.0.68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ws_bom_robot_app
-Version: 0.0.66
+Version: 0.0.68
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa
@@ -244,7 +244,7 @@ pytest --cov=ws_bom_robot_app --log-cli-level=info
 launch debugger
 
 ```pwsh
-streamlit run debugger.py --server.port 6011
+streamlit run debugger.py --server.port 8051
 ```
 
 dockerize base image

{ws_bom_robot_app-0.0.66 → ws_bom_robot_app-0.0.68}/README.md

@@ -179,7 +179,7 @@ pytest --cov=ws_bom_robot_app --log-cli-level=info
 launch debugger
 
 ```pwsh
-streamlit run debugger.py --server.port 6011
+streamlit run debugger.py --server.port 8051
 ```
 
 dockerize base image

{ws_bom_robot_app-0.0.66 → ws_bom_robot_app-0.0.68}/setup.py

@@ -4,7 +4,7 @@ _requirements = [line.split('#')[0].strip() for line in open("requirements.txt")
 
 setup(
     name="ws_bom_robot_app",
-    version="0.0.66",
+    version="0.0.68",
     description="A FastAPI application serving ws bom/robot/llm platform ai.",
     long_description=open("README.md", encoding='utf-8').read(),
     long_description_content_type="text/markdown",

{ws_bom_robot_app-0.0.66 → ws_bom_robot_app-0.0.68}/ws_bom_robot_app/config.py

@@ -27,7 +27,9 @@ class Settings(BaseSettings):
     OLLAMA_API_URL: str = 'http://localhost:11434'
     GROQ_API_KEY: str = ''
     GOOGLE_API_KEY: str = ''
-    WATSONX_APIKEY: str = '' # used for ibm watsonx
+    WATSONX_URL: str = ''
+    WATSONX_APIKEY: str = ''
+    WATSONX_PROJECTID: str = ''
     NEBULY_API_URL: str =''
     GOOGLE_APPLICATION_CREDENTIALS: str = '' # path to google credentials iam file, e.d. ./.secrets/google-credentials.json
     model_config = ConfigDict(
@@ -45,12 +47,14 @@ class Settings(BaseSettings):
         os.environ["GROQ_API_KEY"] = self.GROQ_API_KEY
         os.environ["GOOGLE_API_KEY"] = self.GOOGLE_API_KEY
         os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = self.GOOGLE_APPLICATION_CREDENTIALS
+        os.environ["WATSONX_URL"] = self.WATSONX_URL
         os.environ["WATSONX_APIKEY"] = self.WATSONX_APIKEY
+        os.environ["WATSONX_PROJECTID"] = self.WATSONX_PROJECTID
         os.environ["NEBULY_API_URL"] = self.NEBULY_API_URL
 
     class RuntimeOptions(BaseModel):
         @staticmethod
-        def _get_number_of_workers() -> int:
+        def _get_sys_arg(arg: str, default: int) -> int:
             """
             Returns the number of worker processes to use for the application.
 
@@ -68,18 +72,18 @@ class Settings(BaseSettings):
             """
             import sys
             try:
-                for i, arg in enumerate(sys.argv):
-                    if arg == "--workers" and i + 1 < len(sys.argv):
+                for i, argv in enumerate(sys.argv):
+                    if argv == f"--{arg}" and i + 1 < len(sys.argv):
                         return int(sys.argv[i + 1])
             except (ValueError, IndexError):
                 pass
-            return 1
+            return default
         debug: bool
+        tcp_port: int = _get_sys_arg("port", 6001)
         loader_show_progress: bool
         loader_silent_errors: bool
-        number_of_workers: int = _get_number_of_workers()
-        is_multi_process: bool = _get_number_of_workers() > 1
-
+        number_of_workers: int = _get_sys_arg("workers", 1)
+        is_multi_process: bool = _get_sys_arg("workers", 1) > 1
 
     def runtime_options(self) -> RuntimeOptions:
       """_summary_

{ws_bom_robot_app-0.0.66 → ws_bom_robot_app-0.0.68}/ws_bom_robot_app/llm/agent_description.py

@@ -1,123 +1,123 @@
-import json, requests, re
-from typing import Any
-from abc import ABC, abstractmethod
-from langchain_core.prompts import ChatPromptTemplate
-from langchain_core.messages import AIMessage
-from langchain_core.runnables import RunnableSerializable
-from langchain_core.runnables import RunnableLambda
-from bs4 import BeautifulSoup
-from ws_bom_robot_app.llm.models.api import LlmRules
-from ws_bom_robot_app.llm.providers.llm_manager import LlmInterface
-from ws_bom_robot_app.llm.utils.agent import get_rules
-
-# SafeDict helper class
-class SafeDict(dict):
-    def __missing__(self, key):
-        return ''
-
-# Strategy Interface
-class AgentDescriptorStrategy(ABC):
-    @abstractmethod
-    def enrich_prompt(self, prompt: str, input: dict) -> str:
-        pass
-
-    @abstractmethod
-    def rule_input(self, input: dict) -> str:
-        pass
-
-# Concrete Strategy for Default Agent
-class DefaultAgentDescriptor(AgentDescriptorStrategy):
-    def enrich_prompt(self, prompt: str, input: dict) -> str:
-        # Default enrichment logic (could be minimal or no-op)
-        return prompt.format_map(SafeDict(input))
-
-    def rule_input(self, input: dict) -> str:
-        return input.get('content', "")
-
-# Concrete Strategy for URL2Text Agent
-class URL2TextAgentDescriptor(AgentDescriptorStrategy):
-    def enrich_prompt(self, prompt: str, input: dict) -> str:
-        input["context"] = self._get_page_text(input)
-        return prompt.format_map(SafeDict(input))
-
-    def rule_input(self, input: dict) -> str:
-        return input.get('context', "")
-
-    def _get_page_text(self, input: dict) -> str:
-        url = input.get("content", "")
-        exclusions = input.get("exclude", {})
-        response = requests.get(url)
-        response.raise_for_status()
-        soup = BeautifulSoup(response.content, 'html5lib')
-        classes_to_exclude = exclusions.get("classes", [])
-        ids_to_exclude = exclusions.get("ids", [])
-        for class_name in classes_to_exclude:
-            for element in soup.find_all(class_=class_name):
-                element.extract()
-        for id_name in ids_to_exclude:
-            for element in soup.find_all(id=id_name):
-                element.extract()
-        for script in soup(["script", "noscript", "style", "head", "footer", "iframe"]):
-            script.extract()
-        return re.sub(' +', ' ', soup.get_text())
-
-
-class AgentDescriptor:
-    # Dictionary to hold all agent strategies
-    _list: dict[str,AgentDescriptorStrategy] = {
-        "default": DefaultAgentDescriptor(),
-        "url2text": URL2TextAgentDescriptor(),
-    }
-
-    # Functions to manage strategies
-    @staticmethod
-    def add_strategy(name: str, strategy: AgentDescriptorStrategy):
-        """_summary_
-            add a new strategy to the dictionary
-        Args:
-            name (str): name of the strategy, in lowercase
-            strategy (AgentDescriptorStrategy): class implementing the strategy
-        Examples:
-            AgentDescriptor.add_strategy("custom_agent_descriptor", CustomAgentDescriptor())
-        """
-        AgentDescriptor._list[name.lower()] = strategy
-
-    @staticmethod
-    def get_strategy(name: str) -> AgentDescriptorStrategy:
-        return AgentDescriptor._list.get(name.lower(), DefaultAgentDescriptor())
-
-    def __init__(self, llm: LlmInterface, prompt: str, mode: str, rules: LlmRules = None):
-        self.__prompt = prompt
-        self.__llm = llm
-        self.rules= rules
-        self.strategy = self.get_strategy(mode)  # Selects the strategy from the dictionary
-
-    async def __create_prompt(self, input_dict: dict):
-        input_data = json.loads(input_dict.get("input", {}))
-        system = self.strategy.enrich_prompt(self.__prompt, input_data)
-        if self.rules:
-            rule_input = self.strategy.rule_input(input_data)
-            rules_prompt = await get_rules(self.__llm.get_embeddings(), self.rules, rule_input)
-            system += rules_prompt
-        return ChatPromptTemplate.from_messages(
-            [
-                ("system", system),
-                ("user", input_data.get("content", ""))
-            ]
-        )
-
-    def __create_agent_descriptor(self, content) -> RunnableSerializable[Any, Any]:
-        content = json.loads(content)
-        agent = (
-            {
-                "input": lambda x: x["input"],
-            }
-            | RunnableLambda(self.__create_prompt)
-            | self.__llm.get_llm()
-        )
-        return agent
-
-    async def run_agent(self, content) -> Any:
-        agent_descriptor = self.__create_agent_descriptor(content)
-        response: AIMessage = await agent_descriptor.ainvoke({"input": content})
-        return response
+import json, requests, re
+from typing import Any
+from abc import ABC, abstractmethod
+from langchain_core.prompts import ChatPromptTemplate
+from langchain_core.messages import AIMessage
+from langchain_core.runnables import RunnableSerializable
+from langchain_core.runnables import RunnableLambda
+from bs4 import BeautifulSoup
+from ws_bom_robot_app.llm.models.api import LlmRules
+from ws_bom_robot_app.llm.providers.llm_manager import LlmInterface
+from ws_bom_robot_app.llm.utils.agent import get_rules
+
+# SafeDict helper class
+class SafeDict(dict):
+    def __missing__(self, key):
+        return ''
+
+# Strategy Interface
+class AgentDescriptorStrategy(ABC):
+    @abstractmethod
+    def enrich_prompt(self, prompt: str, input: dict) -> str:
+        pass
+
+    @abstractmethod
+    def rule_input(self, input: dict) -> str:
+        pass
+
+# Concrete Strategy for Default Agent
+class DefaultAgentDescriptor(AgentDescriptorStrategy):
+    def enrich_prompt(self, prompt: str, input: dict) -> str:
+        # Default enrichment logic (could be minimal or no-op)
+        return prompt.format_map(SafeDict(input))
+
+    def rule_input(self, input: dict) -> str:
+        return input.get('content', "")
+
+# Concrete Strategy for URL2Text Agent
+class URL2TextAgentDescriptor(AgentDescriptorStrategy):
+    def enrich_prompt(self, prompt: str, input: dict) -> str:
+        input["context"] = self._get_page_text(input)
+        return prompt.format_map(SafeDict(input))
+
+    def rule_input(self, input: dict) -> str:
+        return input.get('context', "")
+
+    def _get_page_text(self, input: dict) -> str:
+        url = input.get("content", "")
+        exclusions = input.get("exclude", {})
+        response = requests.get(url)
+        response.raise_for_status()
+        soup = BeautifulSoup(response.content, 'html5lib')
+        classes_to_exclude = exclusions.get("classes", [])
+        ids_to_exclude = exclusions.get("ids", [])
+        for class_name in classes_to_exclude:
+            for element in soup.find_all(class_=class_name):
+                element.extract()
+        for id_name in ids_to_exclude:
+            for element in soup.find_all(id=id_name):
+                element.extract()
+        for script in soup(["script", "noscript", "style", "head", "footer", "iframe"]):
+            script.extract()
+        return re.sub(' +', ' ', soup.get_text())
+
+
+class AgentDescriptor:
+    # Dictionary to hold all agent strategies
+    _list: dict[str,AgentDescriptorStrategy] = {
+        "default": DefaultAgentDescriptor(),
+        "url2text": URL2TextAgentDescriptor(),
+    }
+
+    # Functions to manage strategies
+    @staticmethod
+    def add_strategy(name: str, strategy: AgentDescriptorStrategy):
+        """_summary_
+            add a new strategy to the dictionary
+        Args:
+            name (str): name of the strategy, in lowercase
+            strategy (AgentDescriptorStrategy): class implementing the strategy
+        Examples:
+            AgentDescriptor.add_strategy("custom_agent_descriptor", CustomAgentDescriptor())
+        """
+        AgentDescriptor._list[name.lower()] = strategy
+
+    @staticmethod
+    def get_strategy(name: str) -> AgentDescriptorStrategy:
+        return AgentDescriptor._list.get(name.lower(), DefaultAgentDescriptor())
+
+    def __init__(self, llm: LlmInterface, prompt: str, mode: str, rules: LlmRules = None):
+        self.__prompt = prompt
+        self.__llm = llm
+        self.rules= rules
+        self.strategy = self.get_strategy(mode)  # Selects the strategy from the dictionary
+
+    async def __create_prompt(self, input_dict: dict):
+        input_data = json.loads(input_dict.get("input", {}))
+        system = self.strategy.enrich_prompt(self.__prompt, input_data)
+        if self.rules:
+            rule_input = self.strategy.rule_input(input_data)
+            rules_prompt = await get_rules(self.__llm.get_embeddings(), self.rules, rule_input)
+            system += rules_prompt
+        return ChatPromptTemplate.from_messages(
+            [
+                ("system", system),
+                ("user", input_data.get("content", ""))
+            ]
+        )
+
+    def __create_agent_descriptor(self, content) -> RunnableSerializable[Any, Any]:
+        content = json.loads(content)
+        agent = (
+            {
+                "input": lambda x: x["input"],
+            }
+            | RunnableLambda(self.__create_prompt)
+            | self.__llm.get_llm()
+        )
+        return agent
+
+    async def run_agent(self, content) -> Any:
+        agent_descriptor = self.__create_agent_descriptor(content)
+        response: AIMessage = await agent_descriptor.ainvoke({"input": content})
+        return response