opensource/Agent-S
3
0
Fork 0
mirror of https://github.com/simular-ai/Agent-S.git synced 2026-08-28 17:45:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

lint

Browse Source
This commit is contained in:
alckasoc
2025-08-01 08:59:36 -07:00
parent 009b7f2111
commit 39d9635974
6 changed files with 67 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui_agents/s2/core/engine.py
+6 -4
View File
@@ -469,15 +469,17 @@ class LMMEngineParasail(LMMEngine):
"A Parasail API key needs to be provided in either the api_key parameter or as an environment variable named PARASAIL_API_KEY"
)
if not self.llm_client:
self.llm_client = OpenAI(base_url="https://api.parasail.io/v1", api_key=api_key)
self.llm_client = OpenAI(
base_url="https://api.parasail.io/v1", api_key=api_key
)
return (
self.llm_client.chat.completions.create(
model=self.model,
messages=messages,
max_tokens=max_new_tokens if max_new_tokens else 4096,
temperature=temperature,
**kwargs
**kwargs,
)
.choices[0].
message.content
.choices[0]
.message.content
)
gui_agents/s2/core/mllm.py
+1 -1
View File
@@ -128,7 +128,7 @@ class LMMAgent:
LMMEngineHuggingFace,
LMMEngineGemini,
LMMEngineOpenRouter,
LMMEngineParasail
LMMEngineParasail,
),
):
# infer role from previous message
gui_agents/s2_5/agents/agent_s.py
+2 -10
View File
@@ -66,9 +66,7 @@ class AgentS2_5(UIAgent):
enable_reflection: Creates a reflection agent to assist the worker agent
"""
super().__init__(
engine_params, grounding_agent, platform
)
super().__init__(engine_params, grounding_agent, platform)
self.max_trajectory_length = max_trajectory_length
self.enable_reflection = enable_reflection
self.reset()
@@ -90,12 +88,6 @@ class AgentS2_5(UIAgent):
)
# concatenate the three info dictionaries
info = {
**{
k: v
for d in [executor_info or {}]
for k, v in d.items()
}
}
info = {**{k: v for d in [executor_info or {}] for k, v in d.items()}}
return info, actions
gui_agents/s2_5/core/engine.py
+54 -14
View File
@@ -18,7 +18,14 @@ class LMMEngine:
class LMMEngineOpenAI(LMMEngine):
def __init__(
self, base_url=None, api_key=None, model=None, rate_limit=-1, temperature=None, organization=None, **kwargs
self,
base_url=None,
api_key=None,
model=None,
rate_limit=-1,
temperature=None,
organization=None,
**kwargs,
):
assert model is not None, "model must be provided"
self.model = model
@@ -27,7 +34,7 @@ class LMMEngineOpenAI(LMMEngine):
self.organization = organization
self.request_interval = 0 if rate_limit == -1 else 60.0 / rate_limit
self.llm_client = None
self.temperature = temperature # Can force temperature to be the same (in the case of o3 requiring temperature to be 1)
self.temperature = temperature # Can force temperature to be the same (in the case of o3 requiring temperature to be 1)
@backoff.on_exception(
backoff.expo, (APIConnectionError, APIError, RateLimitError), max_time=60
@@ -43,13 +50,17 @@ class LMMEngineOpenAI(LMMEngine):
if not self.base_url:
self.llm_client = OpenAI(api_key=api_key, organization=organization)
else:
self.llm_client = OpenAI(base_url=self.base_url, api_key=api_key, organization=organization)
self.llm_client = OpenAI(
base_url=self.base_url, api_key=api_key, organization=organization
)
return (
self.llm_client.chat.completions.create(
model=self.model,
messages=messages,
max_completion_tokens=max_new_tokens if max_new_tokens else 4096,
temperature=temperature if self.temperature is None else self.temperature,
temperature=(
temperature if self.temperature is None else self.temperature
),
**kwargs,
)
.choices[0]
@@ -59,7 +70,13 @@ class LMMEngineOpenAI(LMMEngine):
class LMMEngineAnthropic(LMMEngine):
def __init__(
self, base_url=None, api_key=None, model=None, thinking=False, temperature=None, **kwargs
self,
base_url=None,
api_key=None,
model=None,
thinking=False,
temperature=None,
**kwargs,
):
assert model is not None, "model must be provided"
self.model = model
@@ -133,7 +150,13 @@ class LMMEngineAnthropic(LMMEngine):
class LMMEngineGemini(LMMEngine):
def __init__(
self, base_url=None, api_key=None, model=None, rate_limit=-1, temperature=None, **kwargs
self,
base_url=None,
api_key=None,
model=None,
rate_limit=-1,
temperature=None,
**kwargs,
):
assert model is not None, "model must be provided"
self.model = model
@@ -176,7 +199,13 @@ class LMMEngineGemini(LMMEngine):
class LMMEngineOpenRouter(LMMEngine):
def __init__(
self, base_url=None, api_key=None, model=None, rate_limit=-1, temperature=None, **kwargs
self,
base_url=None,
api_key=None,
model=None,
rate_limit=-1,
temperature=None,
**kwargs,
):
assert model is not None, "model must be provided"
self.model = model
@@ -280,7 +309,13 @@ class LMMEngineAzureOpenAI(LMMEngine):
class LMMEnginevLLM(LMMEngine):
def __init__(
self, base_url=None, api_key=None, model=None, rate_limit=-1, temperature=None, **kwargs
self,
base_url=None,
api_key=None,
model=None,
rate_limit=-1,
temperature=None,
**kwargs,
):
assert model is not None, "model must be provided"
self.model = model
@@ -300,7 +335,7 @@ class LMMEnginevLLM(LMMEngine):
top_p=0.8,
repetition_penalty=1.05,
max_new_tokens=512,
**kwargs
**kwargs,
):
api_key = self.api_key or os.getenv("vLLM_API_KEY")
if api_key is None:
@@ -364,7 +399,9 @@ class LMMEngineHuggingFace(LMMEngine):
class LMMEngineParasail(LMMEngine):
def __init__(self, base_url=None, api_key=None, model=None, rate_limit=-1, **kwargs):
def __init__(
self, base_url=None, api_key=None, model=None, rate_limit=-1, **kwargs
):
assert model is not None, "Parasail model id must be provided"
self.base_url = base_url
self.model = model
@@ -387,15 +424,18 @@ class LMMEngineParasail(LMMEngine):
"Parasail endpoint must be provided as base_url parameter or as an environment variable named PARASAIL_ENDPOINT_URL"
)
if not self.llm_client:
self.llm_client = OpenAI(base_url=base_url if base_url else "https://api.parasail.io/v1", api_key=api_key)
self.llm_client = OpenAI(
base_url=base_url if base_url else "https://api.parasail.io/v1",
api_key=api_key,
)
return (
self.llm_client.chat.completions.create(
model=self.model,
messages=messages,
max_tokens=max_new_tokens if max_new_tokens else 4096,
temperature=temperature,
**kwargs
**kwargs,
)
.choices[0].
message.content
.choices[0]
.message.content
)
gui_agents/s2_5/core/mllm.py
+1 -1
View File
@@ -128,7 +128,7 @@ class LMMAgent:
LMMEngineHuggingFace,
LMMEngineGemini,
LMMEngineOpenRouter,
LMMEngineParasail
LMMEngineParasail,
),
):
# infer role from previous message
gui_agents/s2_5/utils/common_utils.py
+3 -4
View File
@@ -3,9 +3,8 @@ import time
from typing import Tuple
def call_llm_safe(
agent, temperature: float = 0.0, use_thinking: bool = False
) -> str:
def call_llm_safe(agent, temperature: float = 0.0, use_thinking: bool = False) -> str:
# Retry if fails
max_retries = 3 # Set the maximum number of retries
attempt = 0
@@ -104,4 +103,4 @@ def extract_first_agent_function(code_string):
matches = re.findall(pattern, code_string)
# Return the first match if found, otherwise return None
return matches[0] if matches else None
return matches[0] if matches else None