ws-bom-robot-app 0.0.70__tar.gz → 0.0.72__tar.gz

{ws_bom_robot_app-0.0.70/ws_bom_robot_app.egg-info → ws_bom_robot_app-0.0.72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ws_bom_robot_app
-Version: 0.0.70
+Version: 0.0.72
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa
@@ -32,6 +32,7 @@ Requires-Dist: chromadb==1.0.13
 Requires-Dist: langchain_chroma==0.2.4
 Requires-Dist: fastembed==0.7.1
 Requires-Dist: langchain-qdrant==0.2.0
+Requires-Dist: qdrant-client==1.15.0
 Requires-Dist: lark==1.2.2
 Requires-Dist: unstructured==0.16.21
 Requires-Dist: unstructured[image]

{ws_bom_robot_app-0.0.70 → ws_bom_robot_app-0.0.72}/requirements.txt

@@ -25,6 +25,7 @@ chromadb==1.0.13
 langchain_chroma==0.2.4
 fastembed==0.7.1 #qdrant sparse embedding
 langchain-qdrant==0.2.0
+qdrant-client==1.15.0
 lark==1.2.2 #self-query retriever
 
 #loaders

{ws_bom_robot_app-0.0.70 → ws_bom_robot_app-0.0.72}/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.70",
+    version="0.0.72",
     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.70 → ws_bom_robot_app-0.0.72}/ws_bom_robot_app/llm/agent_lcel.py

@@ -23,14 +23,19 @@ class AgentLcel:
         self.executor = self.__create_agent()
 
     async def __create_prompt(self, input: dict) -> ChatPromptTemplate:
+        from langchain_core.messages import SystemMessage
         message : LlmMessage = input[self.memory_key][-1]
         rules_prompt = await get_rules(self.embeddings, self.rules, message.content) if self.rules else ""
         system = default_prompt + (tool_prompt(render_text_description(self.__tools)) if len(self.__tools)>0 else "") + self.sys_message + rules_prompt
-        return ChatPromptTemplate([
-                ("system", system),
+        prompt = ChatPromptTemplate(
+            messages=[
+                SystemMessage(content=system), #from ("system",system) to avoid improper f-string substitutions
                 MessagesPlaceholder(variable_name=self.memory_key),
                 MessagesPlaceholder(variable_name="agent_scratchpad"),
-            ])
+            ],
+            template_format=None,
+            )
+        return prompt
 
     def __create_agent(self) -> AgentExecutor:
       agent: Any = (

{ws_bom_robot_app-0.0.70 → ws_bom_robot_app-0.0.72}/ws_bom_robot_app/llm/models/api.py

@@ -154,7 +154,7 @@ class LlmApp(BaseModel):
     for tool in self.app_tools or []:
       tool.vector_db = os.path.join(_vector_db_folder, os.path.splitext(os.path.basename(tool.vector_db))[0]) if tool.vector_db else None
   def api_key(self):
-    return self.secrets.get("openAIApiKey", self.secrets.get("apiKey", ""))
+    return self.secrets.get("apiKey", "")
   def get_llm(self) -> LlmInterface:
     return LlmManager._list[self.provider](LlmConfig(
       api_key=self.api_key(),

{ws_bom_robot_app-0.0.70 → ws_bom_robot_app-0.0.72}/ws_bom_robot_app/llm/utils/cms.py

@@ -50,35 +50,40 @@ async def get_apps() -> list[CmsApp]:
           for cms_app in cms_apps:
              if __attr(cms_app,"isActive",default=True) == True:
                 _cms_app_dict = DictObject.from_dict(cms_app)
-                _app: CmsApp = CmsApp(
-                  id=_cms_app_dict.id,
-                  name=_cms_app_dict.name,
-                  mode=_cms_app_dict.mode,
-                  prompt_samples=[__attr(sample,'sampleInputText') or f"{sample.__dict__}" for sample in _cms_app_dict.contents.sampleInputTexts],
-                  credentials=CmsAppCredential(app_key=_cms_app_dict.settings.credentials.appKey,api_key=_cms_app_dict.settings.credentials.apiKey),
-                  rq=StreamRequest(
-                    #thread_id=str(uuid.uuid1()),
-                    messages=[],
-                    secrets={
-                      "apiKey": __attr(_cms_app_dict.settings,'llmConfig','secrets','openAIApiKey', default=''),
-                      "langChainApiKey": __attr(_cms_app_dict.settings,'llmConfig','secrets','langChainApiKey', default=''),
-                      "nebulyApiKey": __attr(_cms_app_dict.settings,'llmConfig','secrets','nebulyApiKey', default=''),
-                      },
-                    system_message=__attr(_cms_app_dict.settings,'llmConfig','prompt','prompt','systemMessage') if __attr(_cms_app_dict.settings,'llmConfig','prompt','prompt','systemMessage') else __attr(_cms_app_dict.settings,'llmConfig','prompt','systemMessage'),
-                    provider= __attr(_cms_app_dict.settings,'llmConfig','provider') or 'openai',
-                    model= __attr(_cms_app_dict.settings,'llmConfig','model') or 'gpt-4o',
-                    temperature=_cms_app_dict.settings.llmConfig.temperature or 0,
-                    app_tools=[LlmAppTool(**tool) for tool in cms_app.get('settings').get('appTools',[])],
-                    rules=LlmRules(
-                      vector_type=__attr(_cms_app_dict.settings,'rules','vectorDbType', default='faiss'),
-                      vector_db=__attr(_cms_app_dict.settings,'rules','vectorDbFile','filename'),
-                      threshold=__attr(_cms_app_dict.settings,'rules','threshold', default=0.7)
-                      ) if __attr(_cms_app_dict.settings,'rules','vectorDbFile','filename') else None,
-                    #fine_tuned_model=__attr(_cms_app_dict.settings,'llmConfig','fineTunedModel'),
-                    lang_chain_tracing= __attr(_cms_app_dict.settings,'llmConfig','langChainTracing', default=False),
-                    lang_chain_project= __attr(_cms_app_dict.settings,'llmConfig','langChainProject', default='')
-                  )
-                )
+                try:
+                  _app: CmsApp = CmsApp(
+                    id=_cms_app_dict.id,
+                    name=_cms_app_dict.name,
+                    mode=_cms_app_dict.mode,
+                    prompt_samples=[__attr(sample,'sampleInputText') or f"{sample.__dict__}" for sample in _cms_app_dict.contents.sampleInputTexts],
+                    credentials=CmsAppCredential(app_key=_cms_app_dict.settings.credentials.appKey,api_key=_cms_app_dict.settings.credentials.apiKey),
+                    rq=StreamRequest(
+                      #thread_id=str(uuid.uuid1()),
+                      messages=[],
+                      secrets={
+                        "apiKey": __attr(_cms_app_dict.settings,'llmConfig','secrets','apiKey', default=''),
+                        "langChainApiKey": __attr(_cms_app_dict.settings,'llmConfig','secrets','langChainApiKey', default=''),
+                        "nebulyApiKey": __attr(_cms_app_dict.settings,'llmConfig','secrets','nebulyApiKey', default=''),
+                        },
+                      system_message=__attr(_cms_app_dict.settings,'llmConfig','prompt','prompt','systemMessage') if __attr(_cms_app_dict.settings,'llmConfig','prompt','prompt','systemMessage') else __attr(_cms_app_dict.settings,'llmConfig','prompt','systemMessage'),
+                      provider= __attr(_cms_app_dict.settings,'llmConfig','provider') or 'openai',
+                      model= __attr(_cms_app_dict.settings,'llmConfig','model') or 'gpt-4o',
+                      temperature=_cms_app_dict.settings.llmConfig.temperature or 0,
+                      app_tools=[LlmAppTool(**tool) for tool in cms_app.get('settings').get('appTools',[])],
+                      rules=LlmRules(
+                        vector_type=__attr(_cms_app_dict.settings,'rules','vectorDbType', default='faiss'),
+                        vector_db=__attr(_cms_app_dict.settings,'rules','vectorDbFile','filename'),
+                        threshold=__attr(_cms_app_dict.settings,'rules','threshold', default=0.7)
+                        ) if __attr(_cms_app_dict.settings,'rules','vectorDbFile','filename') else None,
+                      #fine_tuned_model=__attr(_cms_app_dict.settings,'llmConfig','fineTunedModel'),
+                      lang_chain_tracing= __attr(_cms_app_dict.settings,'llmConfig','langChainTracing', default=False),
+                      lang_chain_project= __attr(_cms_app_dict.settings,'llmConfig','langChainProject', default='')
+                    ))
+                except Exception as e:
+                  import traceback
+                  ex = traceback.format_exc()
+                  logging.error(f"Error creating CmsApp {_cms_app_dict.name} from dict: {e}\n{ex}")
+                  continue
                 if _app.rq.app_tools:
                   for tool in _app.rq.app_tools:
                     _knowledgeBase = tool.knowledgeBase

{ws_bom_robot_app-0.0.70 → ws_bom_robot_app-0.0.72/ws_bom_robot_app.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ws_bom_robot_app
-Version: 0.0.70
+Version: 0.0.72
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa
@@ -32,6 +32,7 @@ Requires-Dist: chromadb==1.0.13
 Requires-Dist: langchain_chroma==0.2.4
 Requires-Dist: fastembed==0.7.1
 Requires-Dist: langchain-qdrant==0.2.0
+Requires-Dist: qdrant-client==1.15.0
 Requires-Dist: lark==1.2.2
 Requires-Dist: unstructured==0.16.21
 Requires-Dist: unstructured[image]

{ws_bom_robot_app-0.0.70 → ws_bom_robot_app-0.0.72}/ws_bom_robot_app.egg-info/requires.txt

@@ -20,6 +20,7 @@ chromadb==1.0.13
 langchain_chroma==0.2.4
 fastembed==0.7.1
 langchain-qdrant==0.2.0
+qdrant-client==1.15.0
 lark==1.2.2
 unstructured==0.16.21
 unstructured[image]