Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Improve params and func naming

Tomas Valenta3d210b3d2a9b
diff --git a/api-service/codegen/agent/base.py b/api-service/codegen/agent/base.py
index 1195fde0e..50a5f0e39 100644
--- a/api-service/codegen/agent/base.py
+++ b/api-service/codegen/agent/base.py
@@ -7,7 +7,7 @@ from langchain.agents.chat.base import ChatAgent
from langchain.schema import AgentAction, AgentFinish
from langchain.tools.base import BaseTool
-from codegen.agent.parsing import parse_text, ToolLog
+from codegen.agent.parsing import parse_thoughts_and_actions, ToolLog
FINAL_ANSWER_ACTION = "Final Answer:"
ACTIONS_QUEUE = "action_queue"
@@ -109,7 +109,7 @@ class CodegenAgentExecutor(AgentExecutor):
# Go through each action and run it.
# Collect outputs from each action.
- for action in (cast(ToolLog, action) for action in parse_text(output.tool_input) if action["type"] == "tool"):
+ for action in (cast(ToolLog, action) for action in parse_thoughts_and_actions(output.tool_input) if action["type"] == "tool"):
observation = await self._arun_tool(
tool_name=action["tool_name"],
tool_input=action["tool_input"],
diff --git a/api-service/codegen/agent/parsing.py b/api-service/codegen/agent/parsing.py
index 08d73c025..9a9069b91 100644
--- a/api-service/codegen/agent/parsing.py
+++ b/api-service/codegen/agent/parsing.py
@@ -14,8 +14,8 @@ escape_table = str.maketrans({
'"': """,
})
-def xml_escape(txt: str):
- return txt.translate(escape_table)
+def xml_escape(text: str):
+ return text.translate(escape_table)
class Log(TypedDict):
@@ -32,8 +32,8 @@ class ToolLog(Log):
tool_output: NotRequired[str]
finish_at: NotRequired[str]
-def merge_logs(t: TypedDict, o: TypedDict):
- t.update(o)
+def merge_logs(log: TypedDict, other: TypedDict):
+ log.update(other)
action_tag_open = "<action(\\s+tool=\".+?\")?\\s*\\/?>?"
@@ -42,7 +42,7 @@ action_tag_close = "</\\s*action\\s*>?"
action_tag_split_pattern = re.compile(f"({action_tag_open}.*?{action_tag_close})|(.+)")
action_tag_check_pattern = re.compile(f"{action_tag_open}|{action_tag_close}")
-def parse_text(text: str):
+def parse_thoughts_and_actions(text: str):
escaped = "".join(
# If the text part is not action tag escape it.
part if action_tag_check_pattern.match(part) else xml_escape(part)
diff --git a/api-service/codegen/callbacks/log_parser.py b/api-service/codegen/callbacks/log_parser.py
index 87b746983..a9371c78e 100644
--- a/api-service/codegen/callbacks/log_parser.py
+++ b/api-service/codegen/callbacks/log_parser.py
@@ -3,7 +3,7 @@ import uuid
from typing import List, TypedDict
-from codegen.agent.parsing import ThoughtLog, ToolLog, merge_logs, parse_text
+from codegen.agent.parsing import ThoughtLog, ToolLog, merge_logs, parse_thoughts_and_actions
class ToolOutput(TypedDict):
finish_at: str
@@ -78,7 +78,7 @@ class LogStreamParser:
# If you ingested token or tool output this will save the change so you can call self.get_logs and get the new logs.
self._logs_buffer = [
log for log
- in parse_text(self._token_buffer)
+ in parse_thoughts_and_actions(self._token_buffer)
if log["type"] == "thought"
or log["type"] == "tool" and log.get("tool_name") in self._tool_names
]
diff --git a/api-service/test/test_simple_format_action_parsing.py b/api-service/test/test_simple_format_action_parsing.py
index 51f8a34f4..1111b5622 100644
--- a/api-service/test/test_simple_format_action_parsing.py
+++ b/api-service/test/test_simple_format_action_parsing.py
@@ -4,7 +4,7 @@
from typing import Dict, List, NamedTuple, Any
from codegen.agent.base import (
- parse_text,
+ parse_thoughts_and_actions,
separate_thought_and_action,
parse_action_string,
)
@@ -90,7 +90,7 @@ def test_parsing_llm_simple_format_action_output():
# _, action_string = separate_thought_and_action(output["llm_output"])
# parsed_actions = parse_action_string(output["llm_output"])
- thought, parsed_actions = parse_text(output["llm_output"])
+ thought, parsed_actions = parse_thoughts_and_actions(output["llm_output"])
# print("Thought", thought)