Feature/adk phase1 sdk usability

Cargo.toml

@@ -9,10 +9,12 @@ axum = "0.7"
 chrono = { version = "0.4", default-features = false, features = ["std", "clock", "serde"] }
 futures-util = "0.3"
 reqwest = { version = "0.12", default-features = false, features = ["json", "stream", "rustls-tls"] }
+rusqlite = { version = "0.32", features = ["bundled"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tokio = { version = "1", features = ["macros", "rt-multi-thread", "sync"] }
 tokio-stream = "0.1"
+toml = "0.8"
 tower = { version = "0.5", features = ["util"] }
 tower-http = { version = "0.6", features = ["cors"] }
 ureq = { version = "2", default-features = false, features = ["tls"] }

examples/openai_compatible_demo.rs

@@ -60,7 +60,9 @@ fn main() -> Result<()> {
         description: "A tool-using assistant.".to_string(),
         system_prompt: "Use tools when useful, then answer the user.".to_string(),
         model: Box::new(model),
+        generate_content_config: None,
         tools: vec![Box::new(GetTimeTool)],
+        toolsets: Vec::new(),
         sub_agents: Vec::new(),
         max_steps: 4,
         include_contents: IncludeContents::Default,

src/agent/agent.rs

@@ -1,3 +1,5 @@
+use std::{collections::HashSet, sync::Arc};
+
 use crate::{Result, event::Event};
 
 use super::{AsyncEventStream, EventStream, InvocationContext, event_stream_from_result};
@@ -7,7 +9,7 @@ pub trait Agent: Send + Sync {
 
     fn description(&self) -> &str;
 
-    fn sub_agents(&self) -> &[Box<dyn Agent>] {
+    fn sub_agents(&self) -> &[Arc<dyn Agent>] {
         &[]
     }
 
@@ -36,3 +38,55 @@ pub fn find_agent<'a>(agent: &'a dyn Agent, name: &str) -> Option<&'a dyn Agent>
 
     None
 }
+
+pub trait IntoAgentArc {
+    fn into_agent_arc(self) -> Arc<dyn Agent>;
+}
+
+impl IntoAgentArc for Arc<dyn Agent> {
+    fn into_agent_arc(self) -> Arc<dyn Agent> {
+        self
+    }
+}
+
+impl<T> IntoAgentArc for Arc<T>
+where
+    T: Agent + 'static,
+{
+    fn into_agent_arc(self) -> Arc<dyn Agent> {
+        self
+    }
+}
+
+impl IntoAgentArc for Box<dyn Agent> {
+    fn into_agent_arc(self) -> Arc<dyn Agent> {
+        Arc::from(self)
+    }
+}
+
+impl<T> IntoAgentArc for Box<T>
+where
+    T: Agent + 'static,
+{
+    fn into_agent_arc(self) -> Arc<dyn Agent> {
+        Arc::new(*self)
+    }
+}
+
+pub fn validate_agent_names(agent: &dyn Agent) -> Result<()> {
+    let mut seen = HashSet::new();
+    validate_agent_names_inner(agent, &mut seen)
+}
+
+fn validate_agent_names_inner(agent: &dyn Agent, seen: &mut HashSet<String>) -> Result<()> {
+    let name = agent.name().to_string();
+    if !seen.insert(name.clone()) {
+        return Err(crate::Error::msg(format!("duplicate agent name: {name}")));
+    }
+
+    for sub_agent in agent.sub_agents() {
+        validate_agent_names_inner(sub_agent.as_ref(), seen)?;
+    }
+
+    Ok(())
+}

src/agent/custom_agent.rs

@@ -1,12 +1,14 @@
+use std::sync::Arc;
+
 use crate::{Result, event::Event};
 
-use super::{Agent, InvocationContext};
+use super::{Agent, IntoAgentArc, InvocationContext};
 
 pub struct CustomAgent {
     name: String,
     description: String,
     handler: Box<dyn Fn(InvocationContext) -> Result<Vec<Event>> + Send + Sync>,
-    sub_agents: Vec<Box<dyn Agent>>,
+    sub_agents: Vec<Arc<dyn Agent>>,
 }
 
 impl CustomAgent {
@@ -23,12 +25,12 @@ impl CustomAgent {
         }
     }
 
-    pub fn with_sub_agent(mut self, sub_agent: Box<dyn Agent>) -> Self {
-        self.sub_agents.push(sub_agent);
+    pub fn with_sub_agent(mut self, sub_agent: impl IntoAgentArc) -> Self {
+        self.sub_agents.push(sub_agent.into_agent_arc());
         self
     }
 
-    pub fn with_sub_agents(mut self, sub_agents: Vec<Box<dyn Agent>>) -> Self {
+    pub fn with_sub_agents(mut self, sub_agents: Vec<Arc<dyn Agent>>) -> Self {
         self.sub_agents = sub_agents;
         self
     }
@@ -43,7 +45,7 @@ impl Agent for CustomAgent {
         &self.description
     }
 
-    fn sub_agents(&self) -> &[Box<dyn Agent>] {
+    fn sub_agents(&self) -> &[Arc<dyn Agent>] {
         &self.sub_agents
     }