Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Fix python missing fields access; Fix model selection; Increase OpenAI model timeout

Tomas Valentae7e8d916c902
diff --git a/api-service/codegen/agent/base.py b/api-service/codegen/agent/base.py
index fa4e65aab..c683db281 100644
--- a/api-service/codegen/agent/base.py
+++ b/api-service/codegen/agent/base.py
@@ -55,24 +55,24 @@ class CodegenAgentExecutor(AgentExecutor):
# Otherwise we lookup the tool
if tool_name in name_to_tool_map:
tool = name_to_tool_map[tool_name]
- return_direct = tool.return_direct
+ # return_direct = tool.return_direct
color = color_mapping[tool_name]
- llm_prefix = "" if return_direct else self.agent.llm_prefix
+ # llm_prefix = "" if return_direct else self.agent.llm_prefix
# We then call the tool on the tool input to get an observation
observation = await tool.arun(
tool_input,
verbose=self.verbose,
color=color,
- llm_prefix=llm_prefix,
- observation_prefix=self.agent.observation_prefix,
+ # llm_prefix=llm_prefix,
+ # observation_prefix=self.agent.observation_prefix,
)
else:
observation = await InvalidTool().arun( # type: ignore
tool_name,
verbose=self.verbose,
color=None,
- llm_prefix="",
- observation_prefix=self.agent.observation_prefix,
+ # llm_prefix="",
+ # observation_prefix=self.agent.observation_prefix,
)
return observation
diff --git a/api-service/codegen/codegen.py b/api-service/codegen/codegen.py
index 8836cf8ed..105ad9c22 100644
--- a/api-service/codegen/codegen.py
+++ b/api-service/codegen/codegen.py
@@ -6,7 +6,7 @@ from typing import (
ClassVar,
)
-from langchain.agents import AgentExecutor
+from langchain.agents import AgentExecutor, Agent
from langchain.schema import BaseLanguageModel
from pydantic import BaseModel, PrivateAttr
from langchain.callbacks.base import (
@@ -52,7 +52,7 @@ from codegen.prompt import (
class Codegen(BaseModel):
input_variables: ClassVar[List[str]] = ["input", "agent_scratchpad", "method"]
- _agent: CodegenAgent = PrivateAttr()
+ _agent: Agent = PrivateAttr()
_agent_executor: AgentExecutor = PrivateAttr()
_tools: List[BaseTool] = PrivateAttr()
_llm: BaseLanguageModel = PrivateAttr()
@@ -65,7 +65,7 @@ class Codegen(BaseModel):
callback_manager: BaseCallbackManager,
tools: List[BaseTool],
llm: BaseLanguageModel,
- agent: CodegenAgent,
+ agent: Agent,
**kwargs: Any,
) -> None:
super().__init__(**kwargs)
@@ -105,6 +105,7 @@ class Codegen(BaseModel):
# Create the LLM
llm = get_model(model_config, callback_manager)
+ print("LLM >>>>>>>>>>>>>>>>>>>", bool(llm))
# Create CodegenAgent
agent = CodegenAgent.from_llm_and_tools(
llm=llm,
diff --git a/api-service/models/base.py b/api-service/models/base.py
index a24b4bfe4..82efd1642 100644
--- a/api-service/models/base.py
+++ b/api-service/models/base.py
@@ -13,7 +13,8 @@ class ModelProvider(Enum):
class ModelConfig(TypedDict):
- provider: ModelProvider
+ # Provider is string and not ModelProvider because we deserialize it form request's JSON body
+ provider: str
args: Dict[str, Any]
@@ -22,16 +23,20 @@ def get_model(
callback_manager: BaseCallbackManager,
) -> BaseLanguageModel:
match config["provider"]:
- case ModelProvider.OpenAI:
+ case ModelProvider.OpenAI.value:
+ print("pack")
return ChatOpenAI(
**config["args"],
+ request_timeout=3600,
verbose=True,
streaming=True,
callback_manager=callback_manager,
)
- case ModelProvider.Replicate:
+ case ModelProvider.Replicate.value:
return Replicate(
**config["args"],
verbose=True,
callback_manager=callback_manager,
)
+ case _:
+ raise ValueError(f"Provider {config['provider']} no found.")