PyPI - ws-bom-robot-app - Versions diffs - 0.0.97__tar.gz → 0.0.98__tar.gz - Mend

@@ -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)

@@ -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

@@ -4,7 +4,7 @@ _requirements = [line.split('#')[0].strip() for line in open("requirements.txt")
 setup(
     name="ws_bom_robot_app",
-    version="0.0.97",
+    version="0.0.98",
     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",

@@ -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:

@@ -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"))

@@ -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__tar.gz → 0.0.98__tar.gz

ws-bom-robot-app 0.0.97tar.gz → 0.0.98tar.gz