Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Improve scratchpad; Fix undef error; Cleanup
Tomas Valenta7b7368bb6f2c
diff --git a/api-service/agent/base.py b/api-service/agent/base.pyindex b3c98aff8..c31329ecc 100644--- a/api-service/agent/base.py+++ b/api-service/agent/base.py@@ -13,6 +13,7 @@ from langchain.chains.llm import LLMChainfrom langchain.schema import BaseMessagefrom langchain.tools import BaseToolfrom langchain.prompts.chat import (+ AIMessagePromptTemplate,BaseMessagePromptTemplate,ChatPromptTemplate,HumanMessagePromptTemplate,@@ -37,6 +38,7 @@ class AgentRun:self.should_pause = Falseself.canceled = Falseself.rewriting_steps = False+ self.llm_generation = Noneself.can_resume = asyncio.Event()@staticmethod@@ -88,13 +90,15 @@ class AgentRun:human_template = "\n\n".join([AgentRun._get_prompt_part(model_config.prompt, "user", "prefix"),- "{agent_scratchpad}",+ # "{agent_scratchpad}",])messages: List[BaseMessage | BaseMessagePromptTemplate] = [SystemMessagePromptTemplate.from_template(system_template),HumanMessagePromptTemplate.from_template(human_template),+ # TODO: Check if the results are better when we add scratchpad as AI message+ AIMessagePromptTemplate.from_template("{agent_scratchpad}"),]return ChatPromptTemplate(input_variables=["agent_scratchpad"],@@ -171,9 +175,16 @@ class AgentRun:self._output_parser = OutputStreamParser(tool_names=self.tool_names)# This function is used to inject information from previous steps to the current prompt+ # TODO: Improve the scratchpad handling and prompts for templatesdef get_agent_scratchpad():steps = self._output_parser.get_steps()- if len(steps) == 0:++ print("stps >><<", steps)+ if (+ len(steps) == 0+ or len(steps) == 1+ and not self._output_parser._token_buffer+ ):return ""agent_scratchpad = ""@@ -195,22 +206,19 @@ class AgentRun:if tool_outputs:agent_scratchpad += f"\nObservation: {tool_outputs}\nThought:"- return (- f"This was your previous work "- f"(but I haven't seen any of it! I only see what "- f"you return as final answer):\n{agent_scratchpad}"- )+ return f"This is your previous work (you can continue where you left off):\n{agent_scratchpad}"print("Generating...", flush=True)while True:try:await self._check_interrupt()# Query the LLM in background+ scratchpad = get_agent_scratchpad()self.llm_generation = asyncio.create_task(llm_chain.agenerate([{- "agent_scratchpad": get_agent_scratchpad(),+ "agent_scratchpad": scratchpad,"stop": "Observation:",}]@@ -319,6 +327,8 @@ class AgentRun:self.rewriting_steps = Trueif self.llm_generation:self.llm_generation.cancel()+ # TODO: Communicate the rewriting in model prompt - inform about what was rewritten.+ # TODO: Handle token that is generated after a rewrite - if the current step seems "finished" the model still outputs string (usually something like . or :).self._output_parser = OutputStreamParser(tool_names=self.tool_names,steps=steps[:-1],diff --git a/api-service/agent/output/output_stream_parser.py b/api-service/agent/output/output_stream_parser.pyindex 43ab30685..af88939e2 100644--- a/api-service/agent/output/output_stream_parser.py+++ b/api-service/agent/output/output_stream_parser.py@@ -87,7 +87,7 @@ class OutputStreamParser:# They are flushed to self._logs after outputs for all tools in self._logs.buffer are ingested.self._logs_buffer: List[ToolLog | ThoughtLog] = buffered_step["logs"]self._logs_meta_buffer: List[LogMeta] = [- LogMeta(created_at=log.get[str]("created_at", ""), id=log.get("id", ""))+ LogMeta(created_at=log.get("created_at", ""), id=log.get("id", ""))for log in self._logs_buffer]