ws-bom-robot-app 0.0.31__tar.gz → 0.0.33__tar.gz

{ws_bom_robot_app-0.0.31/ws_bom_robot_app.egg-info → ws_bom_robot_app-0.0.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ws_bom_robot_app
-Version: 0.0.31
+Version: 0.0.33
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa

{ws_bom_robot_app-0.0.31 → ws_bom_robot_app-0.0.33}/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.31",
+    version="0.0.33",
     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.31 → ws_bom_robot_app-0.0.33}/ws_bom_robot_app/llm/main.py

@@ -42,7 +42,7 @@ async def __stream(rq: StreamRequest,queue: Queue,formatted: bool = True) -> Non
           settings.chat_history.append(HumanMessage(content=message.content))
       elif message.role == "assistant":
           message_content = ""
-          if '{\"type\":\"string\"' in message.content:
+          if '{\"type\":\"text\"' in message.content:
             try:
               json_msg = json.loads('[' + message.content[:-1] + ']')
               for msg in json_msg:
@@ -75,13 +75,13 @@ async def __stream(rq: StreamRequest,queue: Queue,formatted: bool = True) -> Non
         )
     callbacks.append(nebuly_callback)
 
-  with warnings.catch_warnings():
-    warnings.simplefilter("ignore", UserWarning)
+  #with warnings.catch_warnings():
+  #  warnings.simplefilter("ignore", UserWarning)
 
-    await processor.executor.ainvoke(
-        {"input": rq.messages[-1], "chat_history": settings.chat_history},
-        {"callbacks": callbacks},
-    )
+  await processor.executor.ainvoke(
+      {"input": rq.messages[-1], "chat_history": settings.chat_history},
+      {"callbacks": callbacks},
+  )
 
   # Signal the end of streaming
   await queue.put(None)

{ws_bom_robot_app-0.0.31 → ws_bom_robot_app-0.0.33}/ws_bom_robot_app/llm/models/api.py

@@ -8,7 +8,7 @@ from ws_bom_robot_app.config import Settings, config
 
 class LlmMessage(BaseModel):
   role: str
-  content: str
+  content: Union[str, list]
 
 class LlmSearchSettings(BaseModel):
   search_type: Optional[str] = Field('default', validation_alias=AliasChoices("searchType","search_type"))

{ws_bom_robot_app-0.0.31 → ws_bom_robot_app-0.0.33}/ws_bom_robot_app/llm/vector_store/integration/jira.py

@@ -7,6 +7,8 @@ from langchain_core.documents import Document
 from ws_bom_robot_app.llm.vector_store.loader.base import Loader
 from pydantic import BaseModel, Field, AliasChoices
 from typing import Optional, Union
+import requests
+import unstructured_ingest.connector.jira
 
 class JiraParams(BaseModel):
   """
@@ -26,13 +28,18 @@ class JiraParams(BaseModel):
   projects: list[str]
   boards: Optional[list[str]] | None = None
   issues: Optional[list[str]] | None = None
+  fieldsMappingUrl: Optional[str] | None = None
+
 class Jira(IntegrationStrategy):
+  DEFAULT_C_SEP = " " * 5
+  DEFAULT_R_SEP = "\n"
   def __init__(self, knowledgebase_path: str, data: dict[str, Union[str,int,list]]):
     super().__init__(knowledgebase_path, data)
     self.__data = JiraParams.model_validate(self.data)
   def working_subdirectory(self) -> str:
     return 'jira'
   def run(self) -> None:
+    unstructured_ingest.connector.jira._get_dropdown_fields_for_issue = self._get_dropdown_fields_for_issue
     access_config = JiraAccessConfig(
       api_token=self.__data.access_token
     )
@@ -56,3 +63,52 @@ class Jira(IntegrationStrategy):
       await asyncio.to_thread(self.run)
       await asyncio.sleep(1)
       return await Loader(self.working_directory).load()
+
+  def _remap_custom_fields(self, field_list):
+    auth = (self.__data.user_email, self.__data.access_token)
+    response = requests.get(self.__data.fieldsMappingUrl, auth=auth)
+
+    if response.status_code == 200:
+      mapper: dict = response.json()
+    remapped_field_list = {}
+    for field_key, field_value in field_list.items():
+        new_key = None
+        for map_item in mapper:
+            if field_key == map_item["id"]:
+                # Usa il nome mappato come nuova chiave
+                new_key = map_item["name"]
+                break
+
+        if new_key is None:
+            new_key = field_key
+
+        remapped_field_list[new_key] = field_value
+
+    return remapped_field_list
+
+  def _get_dropdown_fields_for_issue(self, issue, c_sep=DEFAULT_C_SEP, r_sep=DEFAULT_R_SEP):
+      all_fields = {}
+      for key, value in issue.items():
+          if value is not None:
+              if isinstance(value, list) and (len(value) > 0):
+                  all_fields[key] = value
+              else:
+                  all_fields[key] = value
+      mapped_fields = self._remap_custom_fields(all_fields)
+      return f"""
+      IssueType:{issue["issuetype"]["name"]}
+      {r_sep}
+      Status:{issue["status"]["name"]}
+      {r_sep}
+      Priority:{issue["priority"]}
+      {r_sep}
+      AssigneeID_Name:{issue["assignee"]["accountId"]}{c_sep}{issue["assignee"]["displayName"]}
+      {r_sep}
+      ReporterAdr_Name:{issue["reporter"]["emailAddress"]}{c_sep}{issue["reporter"]["displayName"]}
+      {r_sep}
+      Labels:{c_sep.join(issue["labels"])}
+      {r_sep}
+      Components:{c_sep.join([component["name"] for component in issue["components"]])}
+      {r_sep}
+      {(r_sep + c_sep ).join([f"{key}:{value}{r_sep}" for key, value in mapped_fields.items()])}
+      """

{ws_bom_robot_app-0.0.31 → ws_bom_robot_app-0.0.33/ws_bom_robot_app.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ws_bom_robot_app
-Version: 0.0.31
+Version: 0.0.33
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa