ws-bom-robot-app 0.0.35__py3-none-any.whl → 0.0.37__py3-none-any.whl

ws_bom_robot_app/config.py

@@ -20,12 +20,12 @@ class Settings(BaseSettings):
     robot_cms_auth: str = ''
     robot_cms_db_folder: str = 'llmVectorDb'
     robot_cms_kb_folder: str ='llmKbFile'
-    robot_debugger_llm_provider: str = 'openai'
-    robot_debugger_llm_model: str = 'gpt-4o'
-    robot_debugger_llm_key: str = ''
-    robot_debugger_embedding_key: str = ''
-    OPENAI_API_KEY: str = '' # used for dall-e api
-    GOOGLE_APPLICATION_CREDENTIALS: str = './.secrets/google.json' # path to google credentials iam file
+    ANTHROPIC_API_KEY: str = ''
+    OPENAI_API_KEY: str = '' # used also for saas dall-e api
+    OLLAMA_API_URL: str = 'http://localhost:11434'
+    GROQ_API_KEY: str = ''
+    GOOGLE_API_KEY: str = ''
+    GOOGLE_APPLICATION_CREDENTIALS: str = '' # path to google credentials iam file, e.d. ./.secrets/google-credentials.json
     model_config = ConfigDict(
         env_file='./.env',
         extra='ignore',
@@ -34,6 +34,10 @@ class Settings(BaseSettings):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         os.environ["OPENAI_API_KEY"] = self.OPENAI_API_KEY
+        os.environ["OLLAMA_API_URL"] = self.OLLAMA_API_URL
+        os.environ["ANTHROPIC_API_KEY"] = self.ANTHROPIC_API_KEY
+        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
 
     class RuntimeOptions(BaseModel):

ws_bom_robot_app/llm/main.py

@@ -1,22 +1,20 @@
-from typing import  AsyncGenerator
-
+from asyncio import Queue
+import asyncio, json, logging, os, traceback
 from fastapi import Request
-from ws_bom_robot_app.llm.agent_lcel import AgentLcel
-from ws_bom_robot_app.llm.agent_handler import AgentHandler, RawAgentHandler
+from langchain.callbacks.tracers import LangChainTracer
+from langchain_core.callbacks.base import AsyncCallbackHandler
+from langchain_core.messages import AIMessage, HumanMessage
+from langsmith import Client as LangSmithClient
+from nebuly.providers.langchain import LangChainTrackingHandler
+from typing import AsyncGenerator, List
+from ws_bom_robot_app.config import config
 from ws_bom_robot_app.llm.agent_description import AgentDescriptor
-from langchain_core.messages import HumanMessage, AIMessage
-from ws_bom_robot_app.llm.providers.llm_manager import LlmConfig, LlmInterface, LlmManager
-from ws_bom_robot_app.llm.tools.tool_builder import get_structured_tools
+from ws_bom_robot_app.llm.agent_handler import AgentHandler, RawAgentHandler
+from ws_bom_robot_app.llm.agent_lcel import AgentLcel
 from ws_bom_robot_app.llm.models.api import InvokeRequest, StreamRequest
+from ws_bom_robot_app.llm.providers.llm_manager import LlmInterface
+from ws_bom_robot_app.llm.tools.tool_builder import get_structured_tools
 import ws_bom_robot_app.llm.settings as settings
-from nebuly.providers.langchain import LangChainTrackingHandler
-from langchain_core.callbacks.base import AsyncCallbackHandler
-import warnings, asyncio, os, io, sys, json,  logging, traceback
-from typing import List
-from asyncio import Queue
-from langchain.callbacks.tracers import LangChainTracer
-from langsmith import Client as LangSmithClient
-from starlette.datastructures import Headers
 
 async def invoke(rq: InvokeRequest) -> str:
   await rq.initialize()
@@ -91,6 +89,9 @@ async def __stream(rq: StreamRequest, ctx: Request, queue: Queue,formatted: bool
   except Exception as e:
     _error = f"Agent invoke ex: {e}"
     logging.warning(_error)
+    if config.runtime_options().debug:
+      _error += f" | {traceback.format_exc()}"
+      await queue.put(_error)
     await queue.put(None)
 
   # Signal the end of streaming

ws_bom_robot_app/llm/providers/llm_manager.py

@@ -1,15 +1,18 @@
-from typing import Any, Optional
+import json
+from typing import Optional
 from langchain_core.embeddings import Embeddings
 from langchain_core.language_models import BaseChatModel
 from pydantic import BaseModel, ConfigDict, Field
+import os
 
 class LlmConfig(BaseModel):
+    api_url: Optional[str] = None
     api_key: str
     embedding_api_key: Optional[str] = None
     model: Optional[str] = None
-    temperature: Optional[float] = Field(0.7, ge=0.0, le=2.0)
+    temperature: Optional[float] = Field(0.7, ge=0.0, le=1.0)
 
-# Define an abstract LLM interface
+# abstract LLM interface with default implementations
 class LlmInterface:
     def __init__(self, config: LlmConfig):
         self.config = config
@@ -19,7 +22,9 @@ class LlmInterface:
 
     def get_embeddings(self) -> Embeddings:
         from langchain_openai import OpenAIEmbeddings
-        return OpenAIEmbeddings(model="text-embedding-3-small")
+        return OpenAIEmbeddings(
+            api_key=self.config.embedding_api_key or os.getenv("OPENAI_API_KEY"),
+            model="text-embedding-3-small")
 
     def get_models(self) -> list:
         raise NotImplementedError
@@ -33,6 +38,10 @@ class LlmInterface:
         return OpenAIToolsAgentOutputParser()
 
 class OpenAI(LlmInterface):
+    def __init__(self, config: LlmConfig):
+        super().__init__(config)
+        self.config.embedding_api_key = self.config.api_key
+
     def get_llm(self):
         from langchain_openai import ChatOpenAI
         chat = ChatOpenAI(api_key=self.config.api_key, model=self.config.model)
@@ -41,15 +50,9 @@ class OpenAI(LlmInterface):
             chat.streaming = True
         return chat
 
-    def get_embeddings(self):
-        from langchain_openai import OpenAIEmbeddings
-        return OpenAIEmbeddings(
-            api_key=self.config.api_key,
-            model="text-embedding-3-small")
-
     def get_models(self):
         import openai
-        openai.api_key = self.config.api_key
+        openai.api_key = self.config.api_key or os.getenv("OPENAI_API_KEY")
         response = openai.models.list()
         return response.data
 
@@ -65,12 +68,6 @@ class DeepSeek(LlmInterface):
             streaming=True,
         )
 
-    def get_embeddings(self):
-        from langchain_openai import OpenAIEmbeddings
-        return OpenAIEmbeddings(
-            api_key=self.config.embedding_api_key,
-            model="text-embedding-3-small")
-
     def get_models(self):
         return [
               {"id":"deepseek-chat"},
@@ -96,7 +93,7 @@ class Google(LlmInterface):
 
   def get_models(self):
     import google.generativeai as genai
-    genai.configure(api_key=self.config.api_key)
+    genai.configure(api_key=self.config.api_key or os.getenv("GOOGLE_API_KEY"))
     response = genai.list_models()
     return [{
       "id": model.name,
@@ -111,17 +108,20 @@ class Gvertex(LlmInterface):
         from langchain_google_vertexai  import ChatVertexAI
         return ChatVertexAI(
             model=self.config.model,
-            temperature=self.config.temperature,
+            temperature=self.config.temperature
         )
     def get_embeddings(self):
         from langchain_google_vertexai import VertexAIEmbeddings
         return VertexAIEmbeddings(model_name="text-embedding-004")
     def get_models(self):
-        from google.cloud import aiplatform
-        aiplatform.init()
-        models = aiplatform.Model.list()
+        #from google.cloud import aiplatform
+        #aiplatform.init()
+        #models = aiplatform.Model.list()
+        # removed due issue: https://github.com/langchain-ai/langchain-google/issues/733
+        # Message type "google.cloud.aiplatform.v1beta1.GenerateContentResponse" has no field named "createTime" at "GenerateContentResponse".  Available Fields(except extensions): "['candidates', 'modelVersion', 'promptFeedback', 'usageMetadata']"
+
         #see https://cloud.google.com/vertex-ai/generative-ai/docs/learn/locations#united-states for available models
-        return models or [
+        return [
               {"id":"gemini-2.0-flash-001"},
               {"id":"gemini-1.5-pro-001"},
               {"id":"gemini-1.5-pro-002"}
@@ -138,29 +138,73 @@ class Anthropic(LlmInterface):
             stream_usage=False
         )
 
+    """
     def get_embeddings(self):
-        #from langchain_voyageai import VoyageAIEmbeddings
-        #return VoyageAIEmbeddings(
-        #    api_key=self.config.embedding_api_key, #voyage api key
-        #    model="voyage-3")
-        from langchain_openai import OpenAIEmbeddings
-        return OpenAIEmbeddings(
-            api_key=self.config.embedding_api_key,
-            model="text-embedding-3-small")
+        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)
+        client = anthropic.Client(api_key=self.config.api_key or os.getenv("ANTHROPIC_API_KEY"))
         response = client.models.list()
         return response.data
 
-    def get_formatter(self,intermadiate_steps):
-        from langchain.agents.format_scratchpad.tools import format_to_tool_messages
-        return format_to_tool_messages(intermediate_steps=intermadiate_steps)
+class Groq(LlmInterface):
+    def get_llm(self):
+        from langchain_groq import ChatGroq
+        return ChatGroq(
+            api_key=self.config.api_key,
+            model=self.config.model,
+            #max_tokens=8192,
+            temperature=self.config.temperature,
+            streaming=True,
+        )
 
-    def get_parser(self):
-        from langchain.agents.output_parsers.tools import ToolsAgentOutputParser
-        return ToolsAgentOutputParser()
+    def get_models(self):
+        import requests
+        url = "https://api.groq.com/openai/v1/models"
+        headers = {
+            "Authorization": f"Bearer {self.config.api_key or os.getenv('GROQ_API_KEY')}",
+            "Content-Type": "application/json"
+        }
+        response = requests.get(url, headers=headers)
+        return response.json().get("data", [])
+
+class Ollama(LlmInterface):
+    def __init__(self, config: LlmConfig):
+        super().__init__(config)
+        self.__base_url = self.config.api_url or os.getenv("OLLAMA_API_URL")
+    def get_llm(self):
+        from langchain_ollama.chat_models import ChatOllama
+        return ChatOllama(
+            model=self.config.model,
+            base_url=self.__base_url,
+            temperature=self.config.temperature,
+            streaming=True,
+        )
+    def get_embeddings(self):
+        from langchain_ollama.embeddings import OllamaEmbeddings
+        return OllamaEmbeddings(
+            base_url=self.__base_url,
+            model="nomic-embed-text" #mxbai-embed-large
+        )
+    def get_models(self):
+        import requests
+        url = f"{self.__base_url}/api/tags"
+        headers = {
+            "Content-Type": "application/json"
+        }
+        response = requests.get(url, headers=headers)
+        models = response.json().get("models", [])
+        return [{
+              "id": model['model'],
+              "modified_at": model['modified_at'],
+              "size": model['size'],
+              "details": model['details']
+            } for model in models]
 
 class LlmManager:
 
@@ -170,5 +214,7 @@ class LlmManager:
         "deepseek": DeepSeek,
         "google": Google,
         "gvertex": Gvertex,
+        "groq": Groq,
         "openai": OpenAI,
+        "ollama": Ollama
     }

{ws_bom_robot_app-0.0.35.dist-info → ws_bom_robot_app-0.0.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ws_bom_robot_app
-Version: 0.0.35
+Version: 0.0.37
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa
@@ -23,6 +23,8 @@ Requires-Dist: langchain-openai==0.3.5
 Requires-Dist: langchain-anthropic==0.3.6
 Requires-Dist: langchain-google-genai==2.0.7
 Requires-Dist: langchain-google-vertexai==2.0.13
+Requires-Dist: langchain-groq==0.2.4
+Requires-Dist: langchain-ollama==0.2.3
 Requires-Dist: faiss-cpu==1.9.0
 Requires-Dist: chromadb==0.6.3
 Requires-Dist: langchain_chroma==0.2.1

{ws_bom_robot_app-0.0.35.dist-info → ws_bom_robot_app-0.0.37.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=zjqr_tx8tkxZ94YXrZ-xQFZiM5es3mcQlZG1VEnj0ac,3635
+ws_bom_robot_app/config.py,sha256=6Rz6-KGYMloekkLL9DUsyPAbdtN5iSTiPzRCuhymJFI,3872
 ws_bom_robot_app/cron_manager.py,sha256=0Yt5AMTPGlXZ_M5ck0SKMX8wvzoPsseEezg_s0Q3HKY,9224
 ws_bom_robot_app/main.py,sha256=zO3B-v-v9ESASvw8IaQj9Y9hNvNmOxohFmA0R82EybQ,6518
 ws_bom_robot_app/task_manager.py,sha256=Zedzs2R3O-wNSQOqs4jorgFwPRi-ji_0TN4mGfk-VvE,15958
@@ -11,14 +11,14 @@ ws_bom_robot_app/llm/agent_handler.py,sha256=4zdpSf5iVLxMZ90c_vUl_k-O9SF6u_h7GOB
 ws_bom_robot_app/llm/agent_lcel.py,sha256=BUfGVUcw6s_YAu5aPMkqqjsStYNHUXKh31t_Ybx11-A,2395
 ws_bom_robot_app/llm/api.py,sha256=UaD1oJyAOe7ASoXxPNJcth3kDuWcjk1xqUNEjuPWbR4,3759
 ws_bom_robot_app/llm/defaut_prompt.py,sha256=LlCd_nSMkMmHESfiiiQYfnJyB6Pp-LSs4CEKdYW4vFk,1106
-ws_bom_robot_app/llm/main.py,sha256=Qw4SbZtstXo31bWFLRQmm_t8BEKlqvgXmtYbxM2F6_Y,4138
+ws_bom_robot_app/llm/main.py,sha256=fVXyS9TOu22ZC7M8o2mRCya9vTmMFf5jRgs9V0K_4cw,4189
 ws_bom_robot_app/llm/settings.py,sha256=EkFGCppORenStH9W4e6_dYvQ-5p6xiEMpmUHBqNqG9M,117
 ws_bom_robot_app/llm/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/llm/models/api.py,sha256=mLbPG7jHh1EjgQG-xpBhEgiTIHpK35HZ51obgqQSfq4,8890
 ws_bom_robot_app/llm/models/base.py,sha256=1TqxuTK3rjJEALn7lvgoen_1ba3R2brAgGx6EDTtDZo,152
 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=ONPeIkMracB3R4UScjgb1s5GZm29kAWOIzT0T8cjvvo,6179
+ws_bom_robot_app/llm/providers/llm_manager.py,sha256=GUi5aHQX_4A4pRgv-XEBH42wGPBYW2HUeQeiU_j044E,7924
 ws_bom_robot_app/llm/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/llm/tools/tool_builder.py,sha256=OaA0jReNUpjfe7c8TVLM86acQ4w0cQaR3NE22hGKJb0,1165
 ws_bom_robot_app/llm/tools/tool_manager.py,sha256=RZcJVPyWT9D3HUxSO1d5kSfTQtJB2CG5hocuFa01AzY,5816
@@ -54,7 +54,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.35.dist-info/METADATA,sha256=gwxWX98wtRsmod8DpysLX38QBX_Rl0MHdyCnclliUTs,8270
-ws_bom_robot_app-0.0.35.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ws_bom_robot_app-0.0.35.dist-info/top_level.txt,sha256=Yl0akyHVbynsBX_N7wx3H3ZTkcMLjYyLJs5zBMDAKcM,17
-ws_bom_robot_app-0.0.35.dist-info/RECORD,,
+ws_bom_robot_app-0.0.37.dist-info/METADATA,sha256=UHDhg12pT_4h3GtmCUUzI6zj-Hjso0ATpLRHIC5iOJ4,8348
+ws_bom_robot_app-0.0.37.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ws_bom_robot_app-0.0.37.dist-info/top_level.txt,sha256=Yl0akyHVbynsBX_N7wx3H3ZTkcMLjYyLJs5zBMDAKcM,17
+ws_bom_robot_app-0.0.37.dist-info/RECORD,,