Skip to content

armgit / E2B

Public Imported from GitHub
0

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

commit

Vasek Mlejnsky25f75b840d65
diff --git a/api-service/codegen/agent/base.py b/api-service/codegen/agent/base.py
index 6d684385a..668a53b91 100644
--- a/api-service/codegen/agent/base.py
+++ b/api-service/codegen/agent/base.py
@@ -60,10 +60,10 @@ def parse_action_string(action_string: str):
pass
# === SINGLE-LINE CASE
+ # <action tool="name">content</action><action tool="name">content</action>
#
if len(lines) == 1:
# We assume that the XML is in valid format, just on a single line.
- # Possible format: <action tool="name">content</action><action tool="name">content</action>
line = lines[0]
parts = line.split("</action>")
# We have an array that looks like this:
@@ -71,9 +71,7 @@ def parse_action_string(action_string: str):
# We will use regex to match content after the `<action tool="name">` part.
for idx, part in enumerate(parts):
if part:
- match = re.search(
- r"<action tool=\"(.*)\">(.*)$", part
- )
+ match = re.search(r"<action tool=\"(.*)\">(.*)$", part)
if not match:
return []
@@ -126,6 +124,12 @@ def parse_action_string(action_string: str):
return actions
+def separate_thought_and_action(llm_input: str) -> Tuple[str, str]:
+ thought, *actions = llm_input.split("```")
+ action_str = "\n".join(actions).strip()
+ return thought, action_str
+
+
class CodegenAgent(ChatAgent):
# def _construct_scratchpad(
# self, intermediate_steps: List[Tuple[AgentAction, str]]
@@ -159,18 +163,10 @@ class CodegenAgent(ChatAgent):
if FINAL_ANSWER_ACTION in text:
return "Final Answer", text.split(FINAL_ANSWER_ACTION)[-1].strip()
try:
- print("+++ _extract_tool_and_input TEXT")
- print(text)
- print("--- _extract_tool_and_input TEXT")
- _, action_string, _ = text.split("```")
- print("+++ _extract_tool_and_input action_string")
- print(action_string)
- print("--- _extract_tool_and_input action_string")
+ _, action_string = separate_thought_and_action(text)
# A list of XML elements that represents actions.
actions = parse_action_string(action_string)
- print("ACTIONS")
- print(actions)
# We handle the case when the LLM starts specifying multiple actions in a single response.
# Return a special `ACTIONS_QUEUE` identifier and the raw action string.
diff --git a/api-service/codegen/callbacks/logs.py b/api-service/codegen/callbacks/logs.py
index 1a854a636..9c96c3545 100644
--- a/api-service/codegen/callbacks/logs.py
+++ b/api-service/codegen/callbacks/logs.py
@@ -1,13 +1,11 @@
-from typing import Dict, Any, List, Union, Optional
+from typing import Dict, Any, List, Union
import datetime
-import uuid
-from codegen.agent.base import parse_action_string
-
from pydantic import PrivateAttr
from langchain.callbacks.base import BaseCallbackHandler
from langchain.schema import AgentAction, AgentFinish, LLMResult
+from codegen.agent.base import parse_action_string
from database import Database
diff --git a/api-service/codegen/codegen.py b/api-service/codegen/codegen.py
index 0cd81fa0c..0f2500fca 100644
--- a/api-service/codegen/codegen.py
+++ b/api-service/codegen/codegen.py
@@ -185,6 +185,7 @@ class Codegen(BaseModel):
inst_idx += 1
instructions = instructions + "\n" + f"{inst_idx}. {inst}"
+ instructions += "\nThought: Here is the plan of how I will go about solving this based on the instructions I got:\n1."
print("Instructions:\n", instructions)
print("Running executor...")
diff --git a/api-service/test/test_action_parsing.py b/api-service/test/test_action_parsing.py
index 9370c6356..6e44c5f62 100644
--- a/api-service/test/test_action_parsing.py
+++ b/api-service/test/test_action_parsing.py
@@ -172,9 +172,13 @@ def test_parsing_llm_action_output():
"""Test LLM action parsing."""
output = llm_outputs[len(llm_outputs) - 1]
- parts = output["llm_output"].split("```")
- for part in parts:
- print(part)
- print("======")
+ thought, *actions = output["llm_output"].split("```")
+ print(thought)
+ print("??????")
+ for action in actions:
+ a = action.strip()
+ if a:
+ print(a)
+ print("======")
assert 1 == 1