ws-bom-robot-app 0.0.13__tar.gz → 0.0.15__tar.gz

{ws_bom_robot_app-0.0.13 → ws_bom_robot_app-0.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ws_bom_robot_app
-Version: 0.0.13
+Version: 0.0.15
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa

{ws_bom_robot_app-0.0.13 → ws_bom_robot_app-0.0.15}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="ws_bom_robot_app",
-    version="0.0.13",
+    version="0.0.15",
     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.13 → ws_bom_robot_app-0.0.15}/ws_bom_robot_app/config.py

@@ -13,7 +13,7 @@ class Settings(BaseSettings):
     robot_data_db_folder_out: str = 'out'
     robot_data_db_folder_store: str = 'store'
     robot_data_db_retention_days: float = 60
-    robot_task_max_concurrent: int = os.cpu_count() or 1
+    robot_task_max_total_parallelism: int = 2 * (os.cpu_count() or 1)
     robot_task_retention_days: float = 1
     robot_cms_host: str = ''
     robot_cms_auth: str = ''

{ws_bom_robot_app-0.0.13 → ws_bom_robot_app-0.0.15}/ws_bom_robot_app/llm/agent_lcel.py

@@ -53,11 +53,9 @@ class AgentLcel:
     def __create_agent(self):
       agent: Any = (
           {
-              "input": lambda x: x["input"],
-              "agent_scratchpad": lambda x: format_to_openai_tool_messages(
-                  x["intermediate_steps"]
-              ),
-              "chat_history": lambda x: x["chat_history"],
+            "input": lambda x: x["input"],
+            "agent_scratchpad": lambda x: format_to_openai_tool_messages(x["intermediate_steps"]),
+            "chat_history": lambda x: x["chat_history"],
           }
           | RunnableLambda(self.__create_prompt)
           | self.__llm_with_tools

{ws_bom_robot_app-0.0.13 → ws_bom_robot_app-0.0.15}/ws_bom_robot_app/llm/main.py

@@ -24,7 +24,12 @@ async def invoke(rq: InvokeRequest) -> str:
 
 async def __stream(rq: StreamRequest,formatted: bool = True) -> None:
   await rq.initialize()
-  callbacks: List[AsyncCallbackHandler] = [AgentHandler(rq.thread_id) if formatted else RawAgentHandler()]
+  if formatted:
+    agent_handler = AgentHandler(rq.thread_id)
+  else:
+    agent_handler = RawAgentHandler()
+  os.environ["AGENT_HANDLER_FORMATTED"] = str(formatted)
+  callbacks: List[AsyncCallbackHandler] = [agent_handler]
   settings.init()
 
   #CREATION OF CHAT HISTORY FOR AGENT

{ws_bom_robot_app-0.0.13 → ws_bom_robot_app-0.0.15}/ws_bom_robot_app/llm/tools/tool_manager.py

@@ -1,4 +1,4 @@
-from typing import  Optional, Type
+from typing import  Optional, Type, Callable
 from ws_bom_robot_app.llm.models.api import LlmAppTool
 from ws_bom_robot_app.llm.utils.faiss_helper import FaissHelper
 from ws_bom_robot_app.llm.tools.utils import getRandomWaitingMessage, translate_text
@@ -7,13 +7,26 @@ from pydantic import BaseModel, ConfigDict
 from langchain_community.utilities.dalle_image_generator import DallEAPIWrapper
 
 class ToolConfig(BaseModel):
-    function: callable
+    function: Callable
     model: Optional[Type[BaseModel]] = None
     model_config = ConfigDict(
         arbitrary_types_allowed=True
     )
 
 class ToolManager:
+    """
+    ToolManager is responsible for managing various tools used in the application.
+
+    Attributes:
+        app_tool (LlmAppTool): The application tool configuration.
+        api_key (str): The API key for accessing external services.
+        callbacks (list): A list of callback functions to be executed.
+
+    Methods:
+        document_retriever(query: str): Asynchronously retrieves documents based on the query.
+        image_generator(query: str, language: str = "it"): Asynchronously generates an image based on the query.
+        get_coroutine(): Retrieves the coroutine function based on the tool configuration.
+    """
 
     def __init__(
         self,

{ws_bom_robot_app-0.0.13 → ws_bom_robot_app-0.0.15}/ws_bom_robot_app/llm/tools/utils.py

@@ -1,20 +1,23 @@
-import random
+import random, os
 from langchain_openai import ChatOpenAI
 from langchain_core.prompts import PromptTemplate
 from ws_bom_robot_app.llm.utils.print import printString
 
+def __print_output(data: str) -> None:
+  printString(data) if os.environ.get("AGENT_HANDLER_FORMATTED") == str(True) else print(f"{data} ")
+
 def getRandomWaitingMessage(waiting_messages: str, traduction: bool = True) -> str:
   if not waiting_messages: return ""
   messages = [msg.strip() for msg in waiting_messages.split(";") if msg.strip()]
   if not messages: return ""
   chosen_message = random.choice(messages) + "\n"
   if not traduction:
-      printString(chosen_message)
+      __print_output(chosen_message)
   return chosen_message
 
 async def translate_text(api_key, language, text: str, callbacks: list) -> str:
   if language == "it":
-      printString(text)
+      __print_output(text)
       return
   llm = ChatOpenAI(api_key=api_key, model="gpt-3.5-turbo-0125", streaming=True)
   sys_message = """Il tuo compito è di tradurre il testo_da_tradure nella seguente lingua: \n\n lingua: {language}\n\n testo_da_tradure: {testo_da_tradure} \n\nTraduci il testo_da_tradure nella lingua {language} senza aggiungere altro:"""

{ws_bom_robot_app-0.0.13 → ws_bom_robot_app-0.0.15}/ws_bom_robot_app/llm/utils/agent_utils.py

@@ -5,7 +5,7 @@ from ws_bom_robot_app.llm.utils.faiss_helper import FaissHelper
 
 async def get_rules(rules: LlmRules, api_key:str, input: str) -> str:
   with HiddenPrints():
-    if any([input=="",rules is None,rules.vector_db == "",not os.path.exists(rules.vector_db)]):
+    if any([input=="",rules is None,rules and rules.vector_db == "",rules and not os.path.exists(rules.vector_db)]):
       return ""
     rules_prompt = ""
     rules_doc = await FaissHelper.invoke(rules.vector_db,api_key,input,search_type="similarity_score_threshold", search_kwargs={"score_threshold": rules.threshold}) #type: ignore

{ws_bom_robot_app-0.0.13 → ws_bom_robot_app-0.0.15}/ws_bom_robot_app/main.py

@@ -38,14 +38,45 @@ async def openapi(authenticate: bool = Depends(authenticate)):
 @app.get("/api/health",tags=["diag"])
 def health():
     return {"status": "ok"}
-
+def __get_size(bytes, suffix="B"):
+    """
+    Scale bytes to its proper format
+    e.g:
+        1253656 => '1.20MB'
+        1253656678 => '1.17GB'
+    """
+    factor = 1024
+    for unit in ["", "K", "M", "G", "T", "P"]:
+        if bytes < factor:
+            return f"{bytes:.2f}{unit}{suffix}"
+        bytes /= factor
+def __get_disk_info():
+    import psutil
+    partitions = psutil.disk_partitions()
+    _disks:list = []
+    for partition in partitions:
+        device = partition.device
+        mountpoint = partition.mountpoint
+        fstype = partition.fstype
+        try:
+            usage = psutil.disk_usage(mountpoint)
+        except PermissionError:
+            continue
+        total = __get_size(usage.total)
+        used = __get_size(usage.used)
+        free = __get_size(usage.free)
+        percent = f"{usage.percent}%"
+        _disks.append({"device": device, "mountpoint": mountpoint, "fstype": fstype, "total": total, "used": used, "free": free, "percent": percent})
+    return _disks
 @app.get("/api/diag",tags=["diag"])
 def diag(authenticate: bool = Depends(authenticate)):
-    import pkg_resources
+    import pkg_resources, psutil
     from ws_bom_robot_app.llm.vector_store.loader.base import Loader as wsll
     from ws_bom_robot_app.llm.vector_store.integration.manager import IntegrationManager as wsim
     from ws_bom_robot_app.llm.tools.tool_manager import ToolManager as wstm
     from ws_bom_robot_app.llm.agent_description import AgentDescriptor as wsad
+    svmem = psutil.virtual_memory()
+    swap = psutil.swap_memory()
     return {
         "status":"ok",
         "uptime": {'from':_uptime,'elapsed':str(datetime.datetime.now()-_uptime)},
@@ -56,9 +87,27 @@ def diag(authenticate: bool = Depends(authenticate)):
                 "version": platform.version(),
                 "type": platform.machine(),
                 "processor": platform.processor(),
-                "cpu": os.cpu_count(),
                 "architecture": platform.architecture()
             },
+            "cpu": {
+                "physical_core": psutil.cpu_count(logical=False),
+                "total_core": psutil.cpu_count(logical=True),
+                "load": f"{psutil.cpu_percent(interval=1)}%"
+            },
+            "memory": {
+                "total": f"{__get_size(svmem.total)}",
+                "available": f"{__get_size(svmem.available)}",
+                "used": f"{__get_size(svmem.used)}",
+                "free": f"{__get_size(svmem.free)}",
+                "percent": f"{svmem.percent}%"
+            },
+            "swap": {
+                "total": f"{__get_size(swap.total)}",
+                "used": f"{__get_size(swap.used)}",
+                "free": f"{__get_size(swap.free)}",
+                "percent": f"{swap.percent}%"
+            },
+            "disk": __get_disk_info(),
             "sys": {
                 "version": sys.version,
                 "platform": sys.platform,

{ws_bom_robot_app-0.0.13 → ws_bom_robot_app-0.0.15}/ws_bom_robot_app/task_manager.py

@@ -133,7 +133,7 @@ class TaskStatistics(BaseModel):
 
 #region interface
 class TaskManagerStrategy(ABC):
-    def __init__(self, max_concurrent_tasks: int = floor(2 * config.robot_task_max_concurrent / config.runtime_options().number_of_workers)):
+    def __init__(self, max_concurrent_tasks: int = max(1,floor(config.robot_task_max_total_parallelism / config.runtime_options().number_of_workers))):
         self.max_concurrent_tasks = max_concurrent_tasks
         self.semaphore = asyncio.Semaphore(self.max_concurrent_tasks)
         self.running_tasks = dict[str, TaskEntry]()

{ws_bom_robot_app-0.0.13 → ws_bom_robot_app-0.0.15}/ws_bom_robot_app.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ws_bom_robot_app
-Version: 0.0.13
+Version: 0.0.15
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa