ws-bom-robot-app 0.0.97__py3-none-any.whl → 0.0.98__py3-none-any.whl

ws_bom_robot_app/llm/agent_lcel.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Literal
+from typing import Any, Optional
 from langchain.agents import AgentExecutor, create_tool_calling_agent
 from langchain_core.prompts import ChatPromptTemplate, MessagesPlaceholder
 from langchain_core.runnables import RunnableLambda
@@ -12,10 +12,8 @@ from ws_bom_robot_app.llm.defaut_prompt import default_prompt, tool_prompt
 
 class AgentLcel:
 
-    def __init__(self, llm: LlmInterface, sys_message: str, sys_context: AgentContext, tools: list, ouput_model: str | dict = None,  rules: LlmRules = None):
+    def __init__(self, llm: LlmInterface, sys_message: str, sys_context: AgentContext, tools: list, rules: LlmRules = None):
         self.sys_message = chevron.render(template=sys_message,data=sys_context)
-        self.ouput_model = ouput_model
-        self.output_parser =  None
         self.__llm = llm
         self.__tools = tools
         self.rules = rules
@@ -29,10 +27,6 @@ class AgentLcel:
         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
-        if isinstance(self.ouput_model, dict):
-          output_parser = self.__llm.get_parser(type="json", model=self.ouput_model)
-          system += "\n\nFormat instructions:\n{format_instructions}".strip()
-
         prompt = ChatPromptTemplate(
             messages=[
                 SystemMessage(content=system), #from ("system",system) to avoid improper f-string substitutions
@@ -41,13 +35,6 @@ class AgentLcel:
             ],
             template_format=None,
             )
-        if output_parser:
-          prompt.partial(
-              format_instructions=output_parser.get_format_instructions()
-            )
-          self.output_parser = output_parser
-        else:
-          self.output_parser = self.__llm.get_parser(type="text")
         return prompt
 
     def __create_agent(self) -> AgentExecutor:
@@ -58,6 +45,6 @@ class AgentLcel:
           }
           | RunnableLambda(self.__create_prompt)
           | self.__llm_with_tools
-          | self.__llm.get_parser("text", None if not self.output_parser else "json", self.ouput_model)
+          | self.__llm.get_parser()
       )
       return AgentExecutor(agent=agent,tools=self.__tools,verbose=False)

ws_bom_robot_app/llm/main.py

@@ -127,7 +127,6 @@ async def __stream(rq: StreamRequest, ctx: Request, queue: Queue, formatted: boo
       sys_message=rq.system_message,
       sys_context=rq.system_context,
       tools=get_structured_tools(__llm, tools=rq.app_tools, callbacks=[callbacks], queue=queue),
-      ouput_model=rq.jsonOutputModel,
       rules=rq.rules
   )
   try:

ws_bom_robot_app/llm/models/api.py

@@ -150,8 +150,6 @@ class LlmApp(BaseModel):
   app_tools: Optional[List[LlmAppTool]] = Field([], validation_alias=AliasChoices("appTools","app_tools"))
   vector_type: Optional[str] = "faiss"
   vector_db: Optional[str] = Field(None, validation_alias=AliasChoices("vectorDb","vector_db"))
-  output_model: Optional[str] = Field(None, validation_alias=AliasChoices("outputModel","output_model"))
-  jsonOutputModel: Optional[dict] = Field(None, validation_alias=AliasChoices("jsonOutputModel","json_output_model"))
   rules: Optional[LlmRules] = None
   fine_tuned_model: Optional[str] = Field(None, validation_alias=AliasChoices("fineTunedModel","fine_tuned_model"))
   lang_chain_tracing: Optional[bool] = Field(False, validation_alias=AliasChoices("langChainTracing","lang_chain_tracing"))

ws_bom_robot_app/llm/providers/llm_manager.py

@@ -1,4 +1,4 @@
-from typing import Optional, Literal
+from typing import Optional
 from urllib.parse import urlparse
 from langchain_core.embeddings import Embeddings
 from langchain_core.language_models import BaseChatModel
@@ -34,14 +34,9 @@ class LlmInterface:
         from langchain.agents.format_scratchpad.openai_tools import format_to_openai_tool_messages
         return format_to_openai_tool_messages(intermediate_steps=intermadiate_steps)
 
-    def get_parser(self, type: Literal["text", "json"] = "text", model: Optional[dict] = None):
+    def get_parser(self):
         from langchain.agents.output_parsers.openai_tools import OpenAIToolsAgentOutputParser
-        from langchain_core.output_parsers import JsonOutputParser
-        from pydantic import create_model
-        if type == "json":
-          return JsonOutputParser(pydantic_object=create_model('json_schema', **{k: (type(v), ...) for k, v in model.items()}))
         return OpenAIToolsAgentOutputParser()
-
     async def _format_multimodal_image_message(self, message: dict) -> dict:
         return {
             "type": "image_url",

{ws_bom_robot_app-0.0.97.dist-info → ws_bom_robot_app-0.0.98.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ws_bom_robot_app
-Version: 0.0.97
+Version: 0.0.98
 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.97.dist-info → ws_bom_robot_app-0.0.98.dist-info}/RECORD

@@ -10,21 +10,21 @@ ws_bom_robot_app/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 ws_bom_robot_app/llm/agent_context.py,sha256=uatHJ8wcRly6h0S762BgfzDMpmcwCHwNzwo37aWjeE0,1305
 ws_bom_robot_app/llm/agent_description.py,sha256=5IP0qFSJvaE3zjGS7f0W1DuiegP0RHXRMBoDC5pCofA,4779
 ws_bom_robot_app/llm/agent_handler.py,sha256=HAg3qmj-QY_k7P-GfAKna1tKdmZaTHrZbNWJc0eol3A,7858
-ws_bom_robot_app/llm/agent_lcel.py,sha256=vKgUN7Kt7HXhzSjC6WfRGWE_hvULf1BeGmBkM_z6tKk,3203
+ws_bom_robot_app/llm/agent_lcel.py,sha256=QRgGkdVXCwDXWjJj8R8qaYeLqUfpaYjtRnl3GrZCwVM,2530
 ws_bom_robot_app/llm/api.py,sha256=jMoiKiD5HNxGu6gTb5_qZ5UU8d2uJ7UVrdLseDStI6o,7634
 ws_bom_robot_app/llm/defaut_prompt.py,sha256=D9dn8yPveu0bVwGM1wQWLYftmBs5O76o0R_caLLll8w,1121
 ws_bom_robot_app/llm/evaluator.py,sha256=tUyPX1oGZEjSiO4JixwNlgv6BI9cUHSmcAsTCpBnIn4,13322
-ws_bom_robot_app/llm/main.py,sha256=q1bBhh3b6xgR6Z1YmfSOYkCJnhAjixjyAcq09LtxUds,5867
+ws_bom_robot_app/llm/main.py,sha256=GZ6Bkb3rNl4xf2ZXGkl9bhZrIRsvi40vUIRDJ-WwRAc,5828
 ws_bom_robot_app/llm/nebuly_handler.py,sha256=wFO2UG849kv5hmjM5EoOp0Jsloy-BtQjrRh4pVosnfU,8163
 ws_bom_robot_app/llm/feedbacks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/llm/feedbacks/feedback_manager.py,sha256=vNcZLG9IKhurAk7hjBqyFgQTjnh3Cd4GnxeYsX7ZdiA,2922
 ws_bom_robot_app/llm/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ws_bom_robot_app/llm/models/api.py,sha256=v2rKz4kuyA4IQr49LVxijE8fMzX19BzSR0pqaeOQnYo,12437
+ws_bom_robot_app/llm/models/api.py,sha256=bahqx9rdP6jM9Kk9VGkqT-bhASJeuAzO_5Ir6tBxDIU,12212
 ws_bom_robot_app/llm/models/base.py,sha256=1TqxuTK3rjJEALn7lvgoen_1ba3R2brAgGx6EDTtDZo,152
 ws_bom_robot_app/llm/models/feedback.py,sha256=pYNQGxNOBgeAAfdJLI95l7ePLBI5tVdsgnyjp5oMOQU,1722
 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=XVmuiL2jQAmYpENx-kDmvuDaWwO80TdcyKVFi9vB7kw,16945
+ws_bom_robot_app/llm/providers/llm_manager.py,sha256=oVeEmZUnR1ysV-BI_zpwQ-gpXqmhSzjKFQQAHtaFGSI,16596
 ws_bom_robot_app/llm/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/llm/tools/tool_builder.py,sha256=CtZwJ94aj0YGA3yVWkyCUxNE7WgU2zWjhl_tEfEskxw,3432
 ws_bom_robot_app/llm/tools/tool_manager.py,sha256=avoFERE0v9MFQ3pUBMug8eGYIXbIYl7NqkP1kjNee7s,15439
@@ -70,7 +70,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=GjUS2oaz0LHOSal5pipBkomZtrYUNcKPSd8bzhUU5Dc,6889
 ws_bom_robot_app/llm/vector_store/loader/docling.py,sha256=IOv1A0HSIWiHWQFzI4fdApfxrKgXOqwmC3mPXlKplqQ,4012
 ws_bom_robot_app/llm/vector_store/loader/json_loader.py,sha256=LDppW0ZATo4_1hh-KlsAM3TLawBvwBxva_a7k5Oz1sc,858
-ws_bom_robot_app-0.0.97.dist-info/METADATA,sha256=MNyfG6YQ70X3KYYW9fJC38EcTpP9YU5UTnYPjnwNMeQ,10116
-ws_bom_robot_app-0.0.97.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ws_bom_robot_app-0.0.97.dist-info/top_level.txt,sha256=Yl0akyHVbynsBX_N7wx3H3ZTkcMLjYyLJs5zBMDAKcM,17
-ws_bom_robot_app-0.0.97.dist-info/RECORD,,
+ws_bom_robot_app-0.0.98.dist-info/METADATA,sha256=-Bj9xROz40XE2XsA97v0Bl7hIjiZFKzin7c5pNITwgA,10116
+ws_bom_robot_app-0.0.98.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ws_bom_robot_app-0.0.98.dist-info/top_level.txt,sha256=Yl0akyHVbynsBX_N7wx3H3ZTkcMLjYyLJs5zBMDAKcM,17
+ws_bom_robot_app-0.0.98.dist-info/RECORD,,