Skip to content

pass disable give control and user agent params #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions agent-manager/proto/agent_manager_grpc.proto
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ message RunAgentRequest {
optional uint64 max_steps = 16;
optional uint64 thinking_token_budget = 17;
optional string start_url = 18;
optional bool disable_give_control = 19;
optional string user_agent = 20;
}

message ActionResult {
Expand Down
32 changes: 16 additions & 16 deletions agent-manager/src/agent_manager_grpc_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions agent-manager/src/agent_manager_grpc_pb2.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ OPENAI: ModelProvider
GEMINI: ModelProvider

class RunAgentRequest(_message.Message):
__slots__ = ("prompt", "session_id", "is_chat_request", "request_api_key", "cdp_url", "parent_span_context", "model_provider", "model", "enable_thinking", "return_screenshots", "return_agent_state", "return_storage_state", "storage_state", "agent_state", "timeout", "max_steps", "thinking_token_budget", "start_url")
__slots__ = ("prompt", "session_id", "is_chat_request", "request_api_key", "cdp_url", "parent_span_context", "model_provider", "model", "enable_thinking", "return_screenshots", "return_agent_state", "return_storage_state", "storage_state", "agent_state", "timeout", "max_steps", "thinking_token_budget", "start_url", "disable_give_control", "user_agent")
PROMPT_FIELD_NUMBER: _ClassVar[int]
SESSION_ID_FIELD_NUMBER: _ClassVar[int]
IS_CHAT_REQUEST_FIELD_NUMBER: _ClassVar[int]
Expand All @@ -36,6 +36,8 @@ class RunAgentRequest(_message.Message):
MAX_STEPS_FIELD_NUMBER: _ClassVar[int]
THINKING_TOKEN_BUDGET_FIELD_NUMBER: _ClassVar[int]
START_URL_FIELD_NUMBER: _ClassVar[int]
DISABLE_GIVE_CONTROL_FIELD_NUMBER: _ClassVar[int]
USER_AGENT_FIELD_NUMBER: _ClassVar[int]
prompt: str
session_id: str
is_chat_request: bool
Expand All @@ -54,7 +56,9 @@ class RunAgentRequest(_message.Message):
max_steps: int
thinking_token_budget: int
start_url: str
def __init__(self, prompt: _Optional[str] = ..., session_id: _Optional[str] = ..., is_chat_request: bool = ..., request_api_key: _Optional[str] = ..., cdp_url: _Optional[str] = ..., parent_span_context: _Optional[str] = ..., model_provider: _Optional[_Union[ModelProvider, str]] = ..., model: _Optional[str] = ..., enable_thinking: bool = ..., return_screenshots: bool = ..., return_agent_state: bool = ..., return_storage_state: bool = ..., storage_state: _Optional[str] = ..., agent_state: _Optional[str] = ..., timeout: _Optional[int] = ..., max_steps: _Optional[int] = ..., thinking_token_budget: _Optional[int] = ..., start_url: _Optional[str] = ...) -> None: ...
disable_give_control: bool
user_agent: str
def __init__(self, prompt: _Optional[str] = ..., session_id: _Optional[str] = ..., is_chat_request: bool = ..., request_api_key: _Optional[str] = ..., cdp_url: _Optional[str] = ..., parent_span_context: _Optional[str] = ..., model_provider: _Optional[_Union[ModelProvider, str]] = ..., model: _Optional[str] = ..., enable_thinking: bool = ..., return_screenshots: bool = ..., return_agent_state: bool = ..., return_storage_state: bool = ..., storage_state: _Optional[str] = ..., agent_state: _Optional[str] = ..., timeout: _Optional[int] = ..., max_steps: _Optional[int] = ..., thinking_token_budget: _Optional[int] = ..., start_url: _Optional[str] = ..., disable_give_control: bool = ..., user_agent: _Optional[str] = ...) -> None: ...

class ActionResult(_message.Message):
__slots__ = ("is_done", "content", "error", "give_control")
Expand Down
2 changes: 2 additions & 0 deletions app-server/proto/agent_manager_grpc.proto
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ message RunAgentRequest {
optional uint64 max_steps = 16;
optional uint64 thinking_token_budget = 17;
optional string start_url = 18;
optional bool disable_give_control = 19;
optional string user_agent = 20;
}

message ActionResult {
Expand Down
4 changes: 4 additions & 0 deletions app-server/src/agent_manager/agent_manager_grpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ pub struct RunAgentRequest {
pub thinking_token_budget: ::core::option::Option<u64>,
#[prost(string, optional, tag = "18")]
pub start_url: ::core::option::Option<::prost::alloc::string::String>,
#[prost(bool, optional, tag = "19")]
pub disable_give_control: ::core::option::Option<bool>,
#[prost(string, optional, tag = "20")]
pub user_agent: ::core::option::Option<::prost::alloc::string::String>,
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct ActionResult {
Expand Down
10 changes: 7 additions & 3 deletions app-server/src/agent_manager/agent_manager_impl.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
use crate::agent_manager::types::ErrorChunkContent;

use super::AgentManagerTrait;
use super::agent_manager_grpc::{
agent_manager_service_client::AgentManagerServiceClient, RunAgentRequest,
RunAgentRequest, agent_manager_service_client::AgentManagerServiceClient,
};
use super::types::{AgentOutput, RunAgentResponseStreamChunk};
use super::AgentManagerTrait;
use anyhow::Result;
use async_trait::async_trait;
use chrono::Utc;
use std::pin::Pin;
use std::sync::Arc;
use tonic::{transport::Channel, Request};
use tonic::{Request, transport::Channel};
use uuid::Uuid;

#[derive(Clone)]
Expand Down Expand Up @@ -56,6 +56,8 @@ impl AgentManagerTrait for AgentManagerImpl {
max_steps: params.max_steps,
thinking_token_budget: params.thinking_token_budget,
start_url: params.start_url,
disable_give_control: Some(params.disable_give_control),
user_agent: params.user_agent,
});

let response = client.run_agent(request).await?;
Expand Down Expand Up @@ -85,6 +87,8 @@ impl AgentManagerTrait for AgentManagerImpl {
max_steps: params.max_steps,
thinking_token_budget: params.thinking_token_budget,
start_url: params.start_url,
disable_give_control: Some(params.disable_give_control),
user_agent: params.user_agent,
});

match client.run_agent_stream(request).await {
Expand Down
6 changes: 3 additions & 3 deletions app-server/src/agent_manager/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ pub struct RunAgentParams {
pub max_steps: Option<u64>,
pub thinking_token_budget: Option<u64>,
pub start_url: Option<String>,
pub disable_give_control: bool,
pub user_agent: Option<String>,
}

#[async_trait]
#[enum_delegate::register]
pub trait AgentManagerTrait {
type RunAgentStreamStream: futures_util::stream::Stream<
Item = Result<RunAgentResponseStreamChunk>,
>;
type RunAgentStreamStream: futures_util::stream::Stream<Item = Result<RunAgentResponseStreamChunk>>;

async fn run_agent(&self, params: RunAgentParams) -> Result<AgentOutput>;

Expand Down
8 changes: 6 additions & 2 deletions app-server/src/agent_manager/worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use futures_util::StreamExt;
use uuid::Uuid;

use super::{
AgentManager, AgentManagerTrait,
channel::AgentManagerWorkers,
storage_state,
types::{ModelProvider, RunAgentResponseStreamChunk},
AgentManager, AgentManagerTrait,
};
use crate::db::{self, agent_messages::MessageType, DB};
use crate::db::{self, DB, agent_messages::MessageType};

pub struct RunAgentWorkerOptions {
pub model_provider: Option<ModelProvider>,
Expand All @@ -22,9 +22,11 @@ pub struct RunAgentWorkerOptions {
pub max_steps: Option<u64>,
pub thinking_token_budget: Option<u64>,
pub start_url: Option<String>,
pub user_agent: Option<String>,
pub return_agent_state: bool,
pub return_storage_state: bool,
pub return_screenshots: bool,
pub disable_give_control: bool,
}

pub async fn run_agent_worker(
Expand Down Expand Up @@ -84,6 +86,8 @@ pub async fn run_agent_worker(
return_agent_state: options.return_agent_state,
return_screenshots: options.return_screenshots,
return_storage_state: options.return_storage_state,
disable_give_control: options.disable_give_control,
user_agent: options.user_agent,
})
.await;

Expand Down
18 changes: 13 additions & 5 deletions app-server/src/api/v1/agent.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
use std::sync::Arc;

use actix_web::{post, web, HttpResponse};
use actix_web::{HttpResponse, post, web};
use futures_util::StreamExt;
use serde::Deserialize;
use uuid::Uuid;

use crate::agent_manager::RunAgentParams;
use crate::agent_manager::channel::AgentManagerWorkers;
use crate::agent_manager::types::RunAgentResponseStreamChunk;
use crate::agent_manager::worker::{run_agent_worker, RunAgentWorkerOptions};
use crate::agent_manager::RunAgentParams;
use crate::agent_manager::{types::ModelProvider, AgentManager, AgentManagerTrait};
use crate::agent_manager::worker::{RunAgentWorkerOptions, run_agent_worker};
use crate::agent_manager::{AgentManager, AgentManagerTrait, types::ModelProvider};
use crate::cache::Cache;
use crate::db::project_api_keys::ProjectApiKey;
use crate::db::{self, DB};
use crate::features::{is_feature_enabled, Feature};
use crate::features::{Feature, is_feature_enabled};
use crate::routes::types::ResponseResult;
use crate::traces::limits::get_workspace_limit_exceeded_by_project_id;

Expand All @@ -34,6 +34,8 @@ struct RunAgentRequest {
#[serde(default)]
return_screenshots: bool,
#[serde(default)]
disable_give_control: bool,
#[serde(default)]
return_agent_state: bool,
#[serde(default)]
return_storage_state: bool,
Expand All @@ -51,6 +53,8 @@ struct RunAgentRequest {
thinking_token_budget: Option<u64>,
#[serde(default)]
start_url: Option<String>,
#[serde(default)]
user_agent: Option<String>,
}

fn default_true() -> bool {
Expand Down Expand Up @@ -127,6 +131,8 @@ pub async fn run_agent_manager(
return_screenshots: request.return_screenshots,
return_agent_state: request.return_agent_state,
return_storage_state: request.return_storage_state,
disable_give_control: request.disable_give_control,
user_agent: request.user_agent,
};
let pool = db.pool.clone();
let worker_states_clone = worker_states.clone();
Expand Down Expand Up @@ -210,6 +216,8 @@ pub async fn run_agent_manager(
max_steps: request.max_steps,
thinking_token_budget: request.thinking_token_budget,
start_url: request.start_url,
disable_give_control: request.disable_give_control,
user_agent: request.user_agent,
return_agent_state: request.return_agent_state,
return_storage_state: request.return_storage_state,
return_screenshots: request.return_screenshots,
Expand Down
Loading