ws-bom-robot-app 0.0.63__tar.gz → 0.0.65__tar.gz

{ws_bom_robot_app-0.0.63/ws_bom_robot_app.egg-info → ws_bom_robot_app-0.0.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ws_bom_robot_app
-Version: 0.0.63
+Version: 0.0.65
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa
@@ -22,6 +22,7 @@ Requires-Dist: langchain-community==0.3.26
 Requires-Dist: langchain-core==0.3.67
 Requires-Dist: langchain-openai==0.3.27
 Requires-Dist: langchain-anthropic==0.3.6
+Requires-Dist: langchain-ibm==0.3.14
 Requires-Dist: langchain-google-genai==2.0.7
 Requires-Dist: langchain-google-vertexai==2.0.27
 Requires-Dist: langchain-groq==0.3.5

{ws_bom_robot_app-0.0.63 → ws_bom_robot_app-0.0.65}/requirements.txt

@@ -13,6 +13,7 @@ langchain-community==0.3.26
 langchain-core==0.3.67
 langchain-openai==0.3.27
 langchain-anthropic==0.3.6 #issue get_models() from 0.3.7
+langchain-ibm==0.3.14
 langchain-google-genai==2.0.7 #waiting for new release: https://github.com/langchain-ai/langchain-google/issues/711
 langchain-google-vertexai==2.0.27
 langchain-groq==0.3.5

{ws_bom_robot_app-0.0.63 → ws_bom_robot_app-0.0.65}/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.63",
+    version="0.0.65",
     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.63 → ws_bom_robot_app-0.0.65}/ws_bom_robot_app/config.py

@@ -27,6 +27,7 @@ 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
     NEBULY_API_URL: str =''
     GOOGLE_APPLICATION_CREDENTIALS: str = '' # path to google credentials iam file, e.d. ./.secrets/google-credentials.json
     model_config = ConfigDict(
@@ -44,6 +45,7 @@ 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_APIKEY"] = self.WATSONX_APIKEY
         os.environ["NEBULY_API_URL"] = self.NEBULY_API_URL
 
     class RuntimeOptions(BaseModel):

{ws_bom_robot_app-0.0.63 → ws_bom_robot_app-0.0.65}/ws_bom_robot_app/llm/main.py

@@ -99,11 +99,15 @@ async def __stream(rq: StreamRequest, ctx: Request, queue: Queue,formatted: bool
       rules=rq.rules
   )
   if rq.secrets.get("nebulyApiKey","") != "":
+    user_id = None
+    if rq.system_context.user.id:
+      user_id = rq.system_context.user.id
     nebuly_callback = NebulyHandler(
         llm_model=__llm.config.model,
         threadId=rq.thread_id,
         url=config.NEBULY_API_URL,
         api_key=rq.secrets.get("nebulyApiKey", None),
+        user_id=user_id,
       )
     callbacks.append(nebuly_callback)
 

{ws_bom_robot_app-0.0.63 → ws_bom_robot_app-0.0.65}/ws_bom_robot_app/llm/nebuly_handler.py

@@ -5,10 +5,9 @@ from langchain_core.callbacks.base import AsyncCallbackHandler
 import ws_bom_robot_app.llm.settings as settings
 from langchain_core.messages import BaseMessage, HumanMessage, AIMessage
 from langchain_core.outputs import ChatGenerationChunk, GenerationChunk
-from uuid import UUID
 
 class NebulyHandler(AsyncCallbackHandler):
-    def __init__(self, llm_model: str | None, threadId: str = None, url: str = None, api_key: str = None):
+    def __init__(self, llm_model: str | None, threadId: str = None, url: str = None, api_key: str = None, user_id: str | None = None):
         super().__init__()
         self.__started: bool = False
         self.__url: str = url
@@ -19,7 +18,7 @@ class NebulyHandler(AsyncCallbackHandler):
             output="",
             time_start="",
             time_end="",
-            end_user=threadId,
+            end_user= user_id if user_id and user_id != "" else threadId,
             tags={"model": llm_model},
         )
         self.llm_trace = NebulyLLMTrace(

{ws_bom_robot_app-0.0.63 → ws_bom_robot_app-0.0.65}/ws_bom_robot_app/llm/providers/llm_manager.py

@@ -37,6 +37,31 @@ class LlmInterface:
         from langchain.agents.output_parsers.openai_tools import OpenAIToolsAgentOutputParser
         return OpenAIToolsAgentOutputParser()
 
+class Anthropic(LlmInterface):
+    def get_llm(self):
+        from langchain_anthropic import ChatAnthropic
+        return ChatAnthropic(
+            api_key=self.config.api_key or os.getenv("ANTHROPIC_API_KEY"),
+            model=self.config.model,
+            temperature=self.config.temperature,
+            streaming=True,
+            stream_usage=True
+        )
+
+    """
+    def get_embeddings(self):
+        from langchain_voyageai import VoyageAIEmbeddings
+        return VoyageAIEmbeddings(
+            api_key=self.config.embedding_api_key, #voyage api key
+            model="voyage-3")
+    """
+
+    def get_models(self):
+        import anthropic
+        client = anthropic.Client(api_key=self.config.api_key or os.getenv("ANTHROPIC_API_KEY"))
+        response = client.models.list()
+        return response.data
+
 class OpenAI(LlmInterface):
     def __init__(self, config: LlmConfig):
         super().__init__(config)
@@ -133,31 +158,6 @@ class Gvertex(LlmInterface):
               {"id":"gemini-1.5-pro-002"}
             ]
 
-class Anthropic(LlmInterface):
-    def get_llm(self):
-        from langchain_anthropic import ChatAnthropic
-        return ChatAnthropic(
-            api_key=self.config.api_key or os.getenv("ANTHROPIC_API_KEY"),
-            model=self.config.model,
-            temperature=self.config.temperature,
-            streaming=True,
-            stream_usage=True
-        )
-
-    """
-    def get_embeddings(self):
-        from langchain_voyageai import VoyageAIEmbeddings
-        return VoyageAIEmbeddings(
-            api_key=self.config.embedding_api_key, #voyage api key
-            model="voyage-3")
-    """
-
-    def get_models(self):
-        import anthropic
-        client = anthropic.Client(api_key=self.config.api_key or os.getenv("ANTHROPIC_API_KEY"))
-        response = client.models.list()
-        return response.data
-
 class Groq(LlmInterface):
     def get_llm(self):
         from langchain_groq import ChatGroq
@@ -179,10 +179,63 @@ class Groq(LlmInterface):
         response = requests.get(url, headers=headers)
         return response.json().get("data", [])
 
+class IBM(LlmInterface):
+    def __init__(self, config: LlmConfig):
+        super().__init__(config)
+        self.__apy_key = self.config.api_key or os.getenv("WATSONX_APIKEY")
+        self.__base_url = self.config.api_url or "https://us-south.ml.cloud.ibm.com"
+    def get_llm(self):
+        from langchain_ibm import ChatWatsonx
+        return ChatWatsonx(
+            model_id=self.config.model,
+            url=self.__base_url,
+            apikey=self.__apy_key
+        )
+    def get_models(self):
+        import requests
+        from datetime import date
+        try:
+          # https://cloud.ibm.com/apidocs/watsonx-ai#list-foundation-model-specs
+          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}",
+              "Content-Type": "application/json"
+          }
+          response = requests.get(url, headers=headers)
+          models = response.json().get("resources", [])
+          return [{
+                "id": model['model_id'],
+                "provider": model['provider'],
+                "tasks": model['task_ids'],
+                "limits": model.get('model_limits', {}),
+              } for model in models if model['provider'].lower() in ['ibm','meta','mistral ai']]
+        except Exception as e:
+          print(f"Error fetching models from IBM WatsonX: {e}")
+          # https://www.ibm.com/products/watsonx-ai/foundation-models
+          return [
+            {"id":"granite-3-3-8b-instruct"},
+            {"id":"granite-vision-3-2-2b"},
+            {"id":"granite-13b-instruct"},
+            {"id":"llama-4-scout-17b-16e-instruct"},
+            {"id":"llama-3-3-70b-instruct"},
+            {"id":"mistral-medium-2505"},
+            {"id":"mistral-small-3-1-24b-instruct-2503"},
+            {"id":"mistral-large-2"}
+          ]
+
+    def get_embeddings(self):
+        from langchain_ibm import WatsonxEmbeddings
+        return WatsonxEmbeddings(
+            model_id="ibm/granite-embedding-107m-multilingual", #https://www.ibm.com/products/watsonx-ai/foundation-models
+            url=self.__base_url,
+            apikey=self.__apy_key
+        )
+
 class Ollama(LlmInterface):
     def __init__(self, config: LlmConfig):
         super().__init__(config)
-        self.__base_url = self.config.api_url or os.getenv("OLLAMA_API_URL")
+        self.__base_url = self.config.api_url or os.getenv("OLLAMA_API_URL") or "http://localhost:11434"
     def get_llm(self):
         from langchain_ollama.chat_models import ChatOllama
         return ChatOllama(
@@ -221,6 +274,7 @@ class LlmManager:
         "google": Google,
         "gvertex": Gvertex,
         "groq": Groq,
+        "ibm": IBM,
         "openai": OpenAI,
         "ollama": Ollama
     }

{ws_bom_robot_app-0.0.63 → ws_bom_robot_app-0.0.65}/ws_bom_robot_app/main.py

@@ -70,7 +70,7 @@ def __get_disk_info():
     return _disks
 @app.get("/api/diag",tags=["diag"])
 def diag(authenticate: bool = Depends(authenticate)):
-    import pkg_resources, psutil
+    import importlib,psutil
     from ws_bom_robot_app.llm.providers.llm_manager import LlmManager as wsllm
     from ws_bom_robot_app.llm.vector_store.db.manager import VectorDbManager as wsdb
     from ws_bom_robot_app.llm.vector_store.loader.base import Loader as wsldr
@@ -81,7 +81,7 @@ def diag(authenticate: bool = Depends(authenticate)):
     svmem = psutil.virtual_memory()
     swap = psutil.swap_memory()
     try:
-      ws_bom_robot_app_version = pkg_resources.get_distribution("ws_bom_robot_app").version
+      ws_bom_robot_app_version = importlib.metadata.version("ws_bom_robot_app")
     except:
       ws_bom_robot_app_version = "unknown"
     peer_process_ids = [c.pid for c in psutil.Process(os.getppid()).children()] if config.runtime_options().is_multi_process else None

{ws_bom_robot_app-0.0.63 → ws_bom_robot_app-0.0.65/ws_bom_robot_app.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ws_bom_robot_app
-Version: 0.0.63
+Version: 0.0.65
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa
@@ -22,6 +22,7 @@ Requires-Dist: langchain-community==0.3.26
 Requires-Dist: langchain-core==0.3.67
 Requires-Dist: langchain-openai==0.3.27
 Requires-Dist: langchain-anthropic==0.3.6
+Requires-Dist: langchain-ibm==0.3.14
 Requires-Dist: langchain-google-genai==2.0.7
 Requires-Dist: langchain-google-vertexai==2.0.27
 Requires-Dist: langchain-groq==0.3.5

{ws_bom_robot_app-0.0.63 → ws_bom_robot_app-0.0.65}/ws_bom_robot_app.egg-info/requires.txt

@@ -10,6 +10,7 @@ langchain-community==0.3.26
 langchain-core==0.3.67
 langchain-openai==0.3.27
 langchain-anthropic==0.3.6
+langchain-ibm==0.3.14
 langchain-google-genai==2.0.7
 langchain-google-vertexai==2.0.27
 langchain-groq==0.3.5