ws-bom-robot-app 0.0.36__tar.gz → 0.0.38__tar.gz

{ws_bom_robot_app-0.0.36/ws_bom_robot_app.egg-info → ws_bom_robot_app-0.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ws_bom_robot_app
-Version: 0.0.36
+Version: 0.0.38
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa
@@ -31,9 +31,9 @@ Requires-Dist: langchain_chroma==0.2.1
 Requires-Dist: fastembed==0.5.1
 Requires-Dist: langchain-qdrant==0.2.0
 Requires-Dist: lark==1.2.2
-Requires-Dist: unstructured==0.16.17
+Requires-Dist: unstructured==0.16.21
 Requires-Dist: unstructured[image]
-Requires-Dist: unstructured-ingest==0.4.6
+Requires-Dist: unstructured-ingest==0.5.4
 Requires-Dist: unstructured-ingest[azure]
 Requires-Dist: unstructured-ingest[confluence]
 Requires-Dist: unstructured-ingest[dropbox]

{ws_bom_robot_app-0.0.36 → ws_bom_robot_app-0.0.38}/requirements.txt

@@ -27,9 +27,9 @@ lark==1.2.2 #self-query retriever
 
 
 #loaders
-unstructured==0.16.17
+unstructured==0.16.21
 unstructured[image]
-unstructured-ingest==0.4.6
+unstructured-ingest==0.5.4
 unstructured-ingest[azure]
 unstructured-ingest[confluence]
 unstructured-ingest[dropbox]

{ws_bom_robot_app-0.0.36 → ws_bom_robot_app-0.0.38}/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.36",
+    version="0.0.38",
     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.36 → ws_bom_robot_app-0.0.38}/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-0.0.36 → ws_bom_robot_app-0.0.38}/ws_bom_robot_app/llm/vector_store/integration/confluence.py

@@ -3,7 +3,7 @@ from ws_bom_robot_app.llm.vector_store.integration.base import IntegrationStrate
 from unstructured_ingest.v2.processes.connectors.confluence import ConfluenceIndexerConfig, ConfluenceDownloaderConfig, ConfluenceConnectionConfig, ConfluenceAccessConfig
 from langchain_core.documents import Document
 from ws_bom_robot_app.llm.vector_store.loader.base import Loader
-from typing import Union
+from typing import Optional, Union
 from pydantic import BaseModel, Field, AliasChoices
 
 class ConfluenceParams(BaseModel):
@@ -12,14 +12,16 @@ class ConfluenceParams(BaseModel):
 
   Attributes:
     url (str): The URL of the Confluence instance, e.g., 'https://example.atlassian.net'.
-    access_token (str): The access token for authenticating with Confluence, e.g., 'AT....'
-    user_email (str): The email address of the Confluence user
+    username (str): The email address or username of the Confluence user
+    password: Confluence password or Cloud API token, if filled, set the access_token to None and vice versa.
+    access_token (str): The personal access token for authenticating with Confluence, e.g., 'AT....'
     spaces (list[str]): A list of Confluence spaces to interact with, e.g., ['SPACE1', 'SPACE2'].
     extension (list[str], optional): A list of file extensions to filter by. Defaults to None, e.g., ['.pdf', '.docx'].
   """
   url: str
-  access_token: str = Field(validation_alias=AliasChoices("accessToken","access_token"))
-  user_email: str = Field(validation_alias=AliasChoices("userEmail","user_email"))
+  username: str = Field(validation_alias=AliasChoices("userName","userEmail","username"))
+  password: Optional[str] = None
+  access_token: Optional[str] = Field(None, validation_alias=AliasChoices("accessToken","access_token"))
   spaces: list[str] = []
   extension: list[str] = Field(default=None)
 class Confluence(IntegrationStrategy):
@@ -37,9 +39,9 @@ class Confluence(IntegrationStrategy):
       download_dir=self.working_directory
     )
     connection_config = ConfluenceConnectionConfig(
-      access_config=ConfluenceAccessConfig(api_token=self.__data.access_token),
+      access_config=ConfluenceAccessConfig(password=self.__data.password, token=self.__data.access_token),
       url=self.__data.url,
-      user_email=self.__data.user_email
+      username=self.__data.username
     )
     self.__unstructured_ingest.pipeline(
       indexer_config,

{ws_bom_robot_app-0.0.36 → ws_bom_robot_app-0.0.38/ws_bom_robot_app.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ws_bom_robot_app
-Version: 0.0.36
+Version: 0.0.38
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa
@@ -31,9 +31,9 @@ Requires-Dist: langchain_chroma==0.2.1
 Requires-Dist: fastembed==0.5.1
 Requires-Dist: langchain-qdrant==0.2.0
 Requires-Dist: lark==1.2.2
-Requires-Dist: unstructured==0.16.17
+Requires-Dist: unstructured==0.16.21
 Requires-Dist: unstructured[image]
-Requires-Dist: unstructured-ingest==0.4.6
+Requires-Dist: unstructured-ingest==0.5.4
 Requires-Dist: unstructured-ingest[azure]
 Requires-Dist: unstructured-ingest[confluence]
 Requires-Dist: unstructured-ingest[dropbox]

{ws_bom_robot_app-0.0.36 → ws_bom_robot_app-0.0.38}/ws_bom_robot_app.egg-info/requires.txt

@@ -19,9 +19,9 @@ langchain_chroma==0.2.1
 fastembed==0.5.1
 langchain-qdrant==0.2.0
 lark==1.2.2
-unstructured==0.16.17
+unstructured==0.16.21
 unstructured[image]
-unstructured-ingest==0.4.6
+unstructured-ingest==0.5.4
 unstructured-ingest[azure]
 unstructured-ingest[confluence]
 unstructured-ingest[dropbox]