ws-bom-robot-app 0.0.36__py3-none-any.whl → 0.0.38__py3-none-any.whl

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/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.dist-info → ws_bom_robot_app-0.0.38.dist-info}/METADATA

@@ -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.dist-info → ws_bom_robot_app-0.0.38.dist-info}/RECORD

@@ -11,7 +11,7 @@ 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
@@ -38,7 +38,7 @@ ws_bom_robot_app/llm/vector_store/generator.py,sha256=9_xdtCKJhmt1OP0GXDjvFERXMP
 ws_bom_robot_app/llm/vector_store/integration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/llm/vector_store/integration/azure.py,sha256=R37TaPQP-HJJJiaKE9rmMc9kpeXeRvdebbTY_982om0,3392
 ws_bom_robot_app/llm/vector_store/integration/base.py,sha256=8r6XO_XM8PcDXhsKst6q_Xw-P48rCiEtowmkBEDVd08,1957
-ws_bom_robot_app/llm/vector_store/integration/confluence.py,sha256=4fiRHB3J-SHZZxNGHwVkCrT-xSPbc91z4WrDE9fy6xU,2505
+ws_bom_robot_app/llm/vector_store/integration/confluence.py,sha256=YCljHIzAt15LI-iAAROimqndVl9y3for72e2D5ByZ74,2725
 ws_bom_robot_app/llm/vector_store/integration/dropbox.py,sha256=yhGvHTN0TEpUfhdvvV7RX5MxBwTUyddAX95Fgqp3mCg,2629
 ws_bom_robot_app/llm/vector_store/integration/gcs.py,sha256=fFDVDUR6eNB7FVTzDSEpMHFEWMgG16GLnpSf_mqGDdE,3184
 ws_bom_robot_app/llm/vector_store/integration/github.py,sha256=18PO30AZcgTn6PHhid3MwImVAdmKBNkr0kmAPgOetGw,2663
@@ -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.36.dist-info/METADATA,sha256=ROer_6Ot24hgee3HuoWzfzQPRzr1JX1XZArffWzZAW0,8348
-ws_bom_robot_app-0.0.36.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ws_bom_robot_app-0.0.36.dist-info/top_level.txt,sha256=Yl0akyHVbynsBX_N7wx3H3ZTkcMLjYyLJs5zBMDAKcM,17
-ws_bom_robot_app-0.0.36.dist-info/RECORD,,
+ws_bom_robot_app-0.0.38.dist-info/METADATA,sha256=_J5jN1CY2FZIQqwVJDFE963HaRVzUznJ163_zCX0ybk,8348
+ws_bom_robot_app-0.0.38.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ws_bom_robot_app-0.0.38.dist-info/top_level.txt,sha256=Yl0akyHVbynsBX_N7wx3H3ZTkcMLjYyLJs5zBMDAKcM,17
+ws_bom_robot_app-0.0.38.dist-info/RECORD,,