ws-bom-robot-app 0.0.67__py3-none-any.whl → 0.0.68__py3-none-any.whl

ws_bom_robot_app/config.py

@@ -54,7 +54,7 @@ class Settings(BaseSettings):
 
     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.
 
@@ -72,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/llm/main.py

@@ -85,7 +85,7 @@ async def __stream(rq: StreamRequest, ctx: Request, queue: Queue,formatted: bool
     client = LangSmithClient(
       api_key= rq.secrets.get("langChainApiKey", "")
     )
-    trace = LangChainTracer(project_name=rq.lang_chain_project,client=client,tags=[str(ctx.base_url)])
+    trace = LangChainTracer(project_name=rq.lang_chain_project,client=client,tags=[str(ctx.base_url) if ctx else ''])
     callbacks.append(trace)
 
   __llm: LlmInterface =rq.get_llm()

ws_bom_robot_app/llm/providers/llm_manager.py

@@ -183,9 +183,9 @@ class IBM(LlmInterface):
         from ibm_watsonx_ai import APIClient,Credentials
         super().__init__(config)
         self.__base_url = self.config.api_url or os.getenv("WATSONX_URL") or "https://us-south.ml.cloud.ibm.com"
-        self.__apy_key = self.config.api_key or os.getenv("WATSONX_APIKEY")
+        self.__api_key = self.config.api_key or os.getenv("WATSONX_APIKEY")
         self.__client = APIClient(
-            credentials=Credentials(url=self.__base_url,api_key=self.__apy_key),
+            credentials=Credentials(url=self.__base_url,api_key=self.__api_key),
             project_id=os.getenv("WATSONX_PROJECTID") or "default"
         )
     def get_llm(self):
@@ -202,7 +202,7 @@ class IBM(LlmInterface):
           today = date.today().strftime("%Y-%m-%d")
           url = f"{self.__base_url}/ml/v1/foundation_model_specs?version={today}&filters=task_generation,task_summarization:and"
           headers = {
-              "Authorization": f"Bearer {self.__apy_key}",
+              "Authorization": f"Bearer {self.__api_key}",
               "Content-Type": "application/json"
           }
           response = requests.get(url, headers=headers)

ws_bom_robot_app/llm/tools/tool_builder.py

@@ -18,7 +18,7 @@ async def __process_proxy_tool(proxy_tool: LlmAppTool) -> LlmAppTool | None:
         if not app:
             raise ValueError(f"App with id {app_id} not found.")
         tool_id = secrets.get("toolId")
-        tool = next((t for t in app.app_tools if t.id == tool_id), None)
+        tool = next((t for t in app.rq.app_tools if app.rq.app_tools and t.id == tool_id), None)
         if not tool:
             raise ValueError(f"Tool with function_id {tool_id} not found in app {app.name}.")
         #override derived tool with proxy tool props

ws_bom_robot_app/llm/tools/tool_manager.py

@@ -166,6 +166,7 @@ class ToolManager:
           return result
 
     async def proxy_app_chat(self, query: str) -> str | None:
+        from ws_bom_robot_app.llm.models.api import LlmMessage
         secrets = self.app_tool.secrets_to_dict()
         app_id = secrets.get("appId")
         if not app_id:
@@ -173,26 +174,38 @@ class ToolManager:
         app: CmsApp = await get_app_by_id(app_id)
         if not app:
             raise ValueError(f"App with id {app_id} not found.")
-        url = f"{config.robot_cms_host}/api/llm/message?locale=en&raw=true"
-        auth = config.robot_cms_auth
-        headers = {"Authorization": auth} if auth else {}
-        async with aiohttp.ClientSession() as session:
-            data = {
-              "appKey": app.credentials.app_key,
-              "apiKey": app.credentials.api_key,
-              "messages": [
-                {
-                  "role": "user",
-                  "content": query
-                }
-              ]
-            }
-            async with session.post(url, json=data, headers=headers) as response:
-                if response.status == 200:
-                  return await response.text()
-                else:
-                  raise ValueError(f"Error fetching chat response: {response.status}")
-        return None
+        # message
+        app.rq.messages.append(LlmMessage(role="user", content=query))
+        # tracing
+        if str(secrets.get("disable_tracing", False)).lower() in ['1','true','yes']:
+          app.rq.lang_chain_tracing = False
+          app.rq.lang_chain_project = ''
+          app.rq.secrets['nebulyApiKey'] = ''
+        # http: for debugging purposes
+        if str(secrets.get("use_http", False)).lower() in ['1','true','yes']:
+          import base64
+          url = f"http://localhost:{config.runtime_options().tcp_port}/api/llm/stream/raw"
+          auth = f"Basic {base64.b64encode((config.robot_user + ':' + config.robot_password).encode('utf-8')).decode('utf-8')}"
+          headers = {"Authorization": auth} if auth else {}
+          async with aiohttp.ClientSession() as session:
+              _data = app.rq.model_dump(mode='json',by_alias=True,exclude_unset=True,exclude_none=True, exclude_defaults=True)
+              async with session.post(url, json=_data, headers=headers) as response:
+                  if response.status == 200:
+                    return await response.text()
+                  else:
+                    raise ValueError(f"Error fetching chat response: {response.status}")
+          return None
+        else:  # default
+          try:
+            from ws_bom_robot_app.llm.main import stream
+            chunks = []
+            async for chunk in stream(rq=app.rq, ctx=None, formatted=False):
+                chunks.append(chunk)
+            rs = ''.join(chunks) if chunks else None
+            return rs
+          except Exception as e:
+            print(f"[!] Error in proxy_app_chat: {e}")
+            return None
 
     async def proxy_app_tool(self) -> None:
         return None

ws_bom_robot_app/llm/utils/cms.py

@@ -1,8 +1,8 @@
 import logging, aiohttp
-from typing import List, Optional
-
+from typing import Any, List, Optional
 from pydantic import AliasChoices, BaseModel, ConfigDict, Field
-from ws_bom_robot_app.llm.models.api import LlmAppTool
+from ws_bom_robot_app.llm.models.api import LlmAppTool, LlmRules, StreamRequest
+from ws_bom_robot_app.llm.models.kb import LlmKbEndpoint, LlmKbIntegration
 from ws_bom_robot_app.util import cache_with_ttl
 
 class CmsAppCredential(BaseModel):
@@ -12,13 +12,16 @@ class CmsAppCredential(BaseModel):
 class CmsApp(BaseModel):
   id: str = Field(..., description="Unique identifier for the app")
   name: str = Field(..., description="Name of the app")
+  mode: str
+  prompt_samples: Optional[List[str]]
   credentials: CmsAppCredential = None
-  app_tools: Optional[List[LlmAppTool]] = Field([], validation_alias=AliasChoices("appTools","app_tools"))
+  rq: StreamRequest
+  kb: Optional[Any] = None
   model_config = ConfigDict(extra='ignore')
 
 @cache_with_ttl(600)  # Cache for 10 minutes
 async def get_apps() -> list[CmsApp]:
-  import json, os
+  import json
   from ws_bom_robot_app.config import config
   class DictObject(object):
       def __init__(self, dict_):
@@ -36,7 +39,7 @@ async def get_apps() -> list[CmsApp]:
       return obj
   host = config.robot_cms_host
   if host:
-    url = f"{host}/api/llmApp?depth=1&pagination=false"
+    url = f"{host}/api/llmApp?depth=1&pagination=false&locale=it"
     auth = config.robot_cms_auth
     headers = {"Authorization": auth} if auth else {}
     async with aiohttp.ClientSession() as session:
@@ -50,12 +53,40 @@ async def get_apps() -> list[CmsApp]:
                 _app: CmsApp = CmsApp(
                   id=_cms_app_dict.id,
                   name=_cms_app_dict.name,
+                  mode=_cms_app_dict.mode,
+                  prompt_samples=[__attr(sample,'sampleInputText') or f"{sample.__dict__}" for sample in _cms_app_dict.contents.sampleInputTexts],
                   credentials=CmsAppCredential(app_key=_cms_app_dict.settings.credentials.appKey,api_key=_cms_app_dict.settings.credentials.apiKey),
-                  app_tools=[LlmAppTool(**tool) for tool in cms_app.get('settings').get('appTools',[])]
+                  rq=StreamRequest(
+                    #thread_id=str(uuid.uuid1()),
+                    messages=[],
+                    secrets={
+                      "apiKey": __attr(_cms_app_dict.settings,'llmConfig','secrets','openAIApiKey', default=''),
+                      "langChainApiKey": __attr(_cms_app_dict.settings,'llmConfig','secrets','langChainApiKey', default=''),
+                      "nebulyApiKey": __attr(_cms_app_dict.settings,'llmConfig','secrets','nebulyApiKey', default=''),
+                      },
+                    system_message=__attr(_cms_app_dict.settings,'llmConfig','prompt','prompt','systemMessage') if __attr(_cms_app_dict.settings,'llmConfig','prompt','prompt','systemMessage') else __attr(_cms_app_dict.settings,'llmConfig','prompt','systemMessage'),
+                    provider= __attr(_cms_app_dict.settings,'llmConfig','provider') or 'openai',
+                    model= __attr(_cms_app_dict.settings,'llmConfig','model') or 'gpt-4o',
+                    temperature=_cms_app_dict.settings.llmConfig.temperature or 0,
+                    app_tools=[LlmAppTool(**tool) for tool in cms_app.get('settings').get('appTools',[])],
+                    rules=LlmRules(
+                      vector_type=__attr(_cms_app_dict.settings,'rules','vectorDbType', default='faiss'),
+                      vector_db=__attr(_cms_app_dict.settings,'rules','vectorDbFile','filename'),
+                      threshold=__attr(_cms_app_dict.settings,'rules','threshold', default=0.7)
+                      ) if __attr(_cms_app_dict.settings,'rules','vectorDbFile','filename') else None,
+                    #fine_tuned_model=__attr(_cms_app_dict.settings,'llmConfig','fineTunedModel'),
+                    lang_chain_tracing= __attr(_cms_app_dict.settings,'llmConfig','langChainTracing', default=False),
+                    lang_chain_project= __attr(_cms_app_dict.settings,'llmConfig','langChainProject', default='')
+                  )
                 )
-                if _app.app_tools:
-                  for tool in _app.app_tools:
+                if _app.rq.app_tools:
+                  for tool in _app.rq.app_tools:
                     _knowledgeBase = tool.knowledgeBase
+                    tool.integrations = [LlmKbIntegration(**item) for item in _knowledgeBase.get('integrations')] if _knowledgeBase.get('integrations') else []
+                    try:
+                      tool.endpoints = [LlmKbEndpoint(**item) for item in _knowledgeBase.get('externalEndpoints')] if _knowledgeBase.get('externalEndpoints') else []
+                    except Exception as e:
+                      logging.error(f"Error parsing endpoints for app {_cms_app_dict.name} tool {tool.name}: {e}")
                     tool.vector_db = _knowledgeBase.get('vectorDbFile').get('filename') if _knowledgeBase.get('vectorDbFile') else None
                     tool.vector_type = _knowledgeBase.get('vectorDbType') if _knowledgeBase.get('vectorDbType') else 'faiss'
                     del tool.knowledgeBase
@@ -67,6 +98,7 @@ async def get_apps() -> list[CmsApp]:
     logging.error("robot_cms_host environment variable is not set.")
   return []
 
+
 async def get_app_by_id(app_id: str) -> CmsApp | None:
     apps = await get_apps()
     app = next((a for a in apps if a.id == app_id), None)

{ws_bom_robot_app-0.0.67.dist-info → ws_bom_robot_app-0.0.68.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ws_bom_robot_app
-Version: 0.0.67
+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.67.dist-info → ws_bom_robot_app-0.0.68.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ws_bom_robot_app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/auth.py,sha256=84nIbmJsMrNs0sxIQGEHbjsjc2P6ZrZZGSn8dkiL6is,895
-ws_bom_robot_app/config.py,sha256=F-7jQ80rXESHUP-agwJhYpEUR3EJJb3rcr46-xrCGww,4417
+ws_bom_robot_app/config.py,sha256=QvoWds1DkBHqd3jAxDQtcmQSN8B6SrpBGERDXhTlswk,4490
 ws_bom_robot_app/cron_manager.py,sha256=pFHV7SZtp6GRmmLD9K1Mb1TE9Ev9n5mIiFScrc7tpCo,9221
 ws_bom_robot_app/main.py,sha256=1vx0k2fEcE53IC5zcE2EUCwQPcUHM4pvuKSun_E0a9I,6501
 ws_bom_robot_app/task_manager.py,sha256=Q3Il2TtkP0FoG9zHEBu48pZGXzimTtvWQsoH6wdvQs0,16077
@@ -12,7 +12,7 @@ ws_bom_robot_app/llm/agent_handler.py,sha256=BQ-f--Z5QCJDp-7tzSG_CKrANUCqG65S09p
 ws_bom_robot_app/llm/agent_lcel.py,sha256=GGZcGBKsSBbZQ-_MPI3NUMvT7lTerYgwKs3o74stwSU,2252
 ws_bom_robot_app/llm/api.py,sha256=2bF-UFczY9LuBqPxKObM0TOWYbZgVztX1RiIz5MSorU,5042
 ws_bom_robot_app/llm/defaut_prompt.py,sha256=LlCd_nSMkMmHESfiiiQYfnJyB6Pp-LSs4CEKdYW4vFk,1106
-ws_bom_robot_app/llm/main.py,sha256=fss9hSkL317fH2F6g6AhufXt_nS5_dz7muPYkdSRCjk,5220
+ws_bom_robot_app/llm/main.py,sha256=vzUfaLCRk2SYujD00hnrTiHEVLYgZcbSw6LUea43siU,5235
 ws_bom_robot_app/llm/nebuly_handler.py,sha256=d4TI5XbvIYJLCxHcCUa6QUxsgwKW_4ItCYe4ocn7IJo,7900
 ws_bom_robot_app/llm/settings.py,sha256=EkFGCppORenStH9W4e6_dYvQ-5p6xiEMpmUHBqNqG9M,117
 ws_bom_robot_app/llm/feedbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,17 +23,17 @@ ws_bom_robot_app/llm/models/base.py,sha256=1TqxuTK3rjJEALn7lvgoen_1ba3R2brAgGx6E
 ws_bom_robot_app/llm/models/feedback.py,sha256=zh1jLqPRLzNlxInkCMoiJbfSu0-tiOEYHM7FhC46PkM,1692
 ws_bom_robot_app/llm/models/kb.py,sha256=oVSw6_dmNxikAHrPqcfxDXz9M0ezLIYuxpgvzfs_Now,9514
 ws_bom_robot_app/llm/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ws_bom_robot_app/llm/providers/llm_manager.py,sha256=Nr5SMJkQI2FX5VNlql8zhHU9BBfQVCO5PKzt1iF6aKk,11422
+ws_bom_robot_app/llm/providers/llm_manager.py,sha256=DZKb8pKEbR2uECyzsqr_L825zpAIanuljJgsk17aqUw,11422
 ws_bom_robot_app/llm/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ws_bom_robot_app/llm/tools/tool_builder.py,sha256=p5CeLCuAilhtEAbPaiAWKGtuIWl8vfilZjYJ9Kw1dLg,3200
-ws_bom_robot_app/llm/tools/tool_manager.py,sha256=Z7yJSIn86BvGtWCkpT48pbu59qLpNe6XtpnoFI-jQU8,14073
+ws_bom_robot_app/llm/tools/tool_builder.py,sha256=QTRG1c-EnH4APP10IyfZxEkqK9KitUsutXUvDRKeAhU,3224
+ws_bom_robot_app/llm/tools/tool_manager.py,sha256=1IgRXxdB7DU3gbIlfT_aMUWZyWuanFTAFwu3VaYKxfE,14990
 ws_bom_robot_app/llm/tools/utils.py,sha256=tdmOAk8l4HVzw67z3brA9yX-1WLu91paU-WmXHyz4Bg,1883
 ws_bom_robot_app/llm/tools/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=_CY5Dji3UeAIi2iuU7ttz4fml1q8aCFgVWOv970x8Fw,1411
 ws_bom_robot_app/llm/utils/chunker.py,sha256=N7570xBYlObneg-fsvDhPAJ-Pv8C8OaYZOBK6q7LmMI,607
-ws_bom_robot_app/llm/utils/cms.py,sha256=Cg5jVi0Peg3PNKOkWIx3SIISv8vf2zn0FP9JJumyeJE,3384
+ws_bom_robot_app/llm/utils/cms.py,sha256=Q3VMYXU4Ls-0qjsCe1YBt8I5vcU03XrE6NylVVVUf3A,6051
 ws_bom_robot_app/llm/utils/download.py,sha256=iAUxH_NiCpTPtGzhC4hBtxotd2HPFt2MBhttslIxqiI,3194
 ws_bom_robot_app/llm/utils/kb.py,sha256=jja45WCbNI7SGEgqDS99nErlwB5eY8Ga7BMnhdMHZ90,1279
 ws_bom_robot_app/llm/utils/print.py,sha256=IsPYEWRJqu-dqlJA3F9OnnIS4rOq_EYX1Ljp3BvDnww,774
@@ -66,7 +66,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=qo9ejRZyKv_k6jnGgXnu1W5uqsMMtgqK_uvPpZQ0p74,833
-ws_bom_robot_app-0.0.67.dist-info/METADATA,sha256=w7nmGhnnW3UDsAzLbEyCW63vuDNNgDqQ3klAE5buO40,8497
-ws_bom_robot_app-0.0.67.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ws_bom_robot_app-0.0.67.dist-info/top_level.txt,sha256=Yl0akyHVbynsBX_N7wx3H3ZTkcMLjYyLJs5zBMDAKcM,17
-ws_bom_robot_app-0.0.67.dist-info/RECORD,,
+ws_bom_robot_app-0.0.68.dist-info/METADATA,sha256=VA_28oqsMRhYDKMTBmH8-kaHSJtTwIE1JxCa1XsJfMc,8497
+ws_bom_robot_app-0.0.68.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ws_bom_robot_app-0.0.68.dist-info/top_level.txt,sha256=Yl0akyHVbynsBX_N7wx3H3ZTkcMLjYyLJs5zBMDAKcM,17
+ws_bom_robot_app-0.0.68.dist-info/RECORD,,