chore: improve gen_schema_for

Author: zensh

agents/anda_assistant/Cargo.toml

@@ -3,7 +3,7 @@ name = "anda_assistant"
 description = "Anda -- an AI Assistant powered by the Knowledge Interaction Protocol (KIP)."
 repository = "https://github.com/ldclabs/anda/tree/main/agents/anda_assistant"
 publish = true
-version = "0.4.6"
+version = "0.4.7"
 edition.workspace = true
 keywords.workspace = true
 categories.workspace = true

anda_core/Cargo.toml

@@ -3,7 +3,7 @@ name = "anda_core"
 description = "Core types and traits for Anda -- an AI agent framework built with Rust, powered by ICP and TEEs."
 repository = "https://github.com/ldclabs/anda/tree/main/anda_core"
 publish = true
-version.workspace = true
+version = "0.9.9"
 edition.workspace = true
 keywords.workspace = true
 categories.workspace = true

anda_core/src/json.rs

@@ -19,6 +19,9 @@ pub fn gen_schema_for<T: JsonSchema>() -> serde_json::Value {
     let mut schema = root_schema_for::<T>();
     schema.remove("title");
     schema.remove("description");
+    if schema.get("required").is_none() {
+        schema.insert("required".to_string(), serde_json::json!([]));
+    }
     schema.to_value()
 }
 

anda_core/src/model.rs

@@ -94,6 +94,10 @@ pub struct AgentOutput {
     /// The conversation ID.
     #[serde(skip_serializing_if = "Option::is_none")]
     pub conversation: Option<u64>,
+
+    /// The model used by the agent.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub model: Option<String>,
 }
 
 /// Represents a message send to LLM for completion.

anda_core/src/model/completion.rs

@@ -13,6 +13,9 @@ pub trait CompletionFeatures: Sized {
         req: CompletionRequest,
         resources: Vec<Resource>,
     ) -> impl Future<Output = Result<AgentOutput, BoxError>> + Send;
+
+    /// Returns the name of the model.
+    fn model_name(&self) -> String;
 }
 
 /// Represents a general completion request that can be sent to a completion model provider.

anda_engine/Cargo.toml

@@ -3,7 +3,7 @@ name = "anda_engine"
 description = "Agents engine for Anda -- an AI agent framework built with Rust, powered by ICP and TEEs."
 repository = "https://github.com/ldclabs/anda/tree/main/anda_engine"
 publish = true
-version = "0.9.11"
+version = "0.9.12"
 edition.workspace = true
 keywords.workspace = true
 categories.workspace = true

anda_engine/src/context/agent.rs

@@ -515,6 +515,10 @@ impl AgentContext for AgentCtx {
 }
 
 impl CompletionFeatures for AgentCtx {
+    fn model_name(&self) -> String {
+        self.model.model_name()
+    }
+
     /// Executes a completion request with automatic tool call handling.
     ///
     /// This method handles the completion request in a loop, automatically executing
@@ -991,33 +995,37 @@ impl CompletionRunner {
         self.step += 1;
 
         let mut output = self.model.completion(self.req.clone()).await?;
+        output.model = Some(self.model.model_name());
+
         self.usage.accumulate(&output.usage);
 
         // If the primary model returns a failed result (failed_reason exists),
         // and a fallback model is configured, switch to the fallback model and retry.
         // After switching, subsequent steps will keep using the fallback model.
         if output.failed_reason.is_some()
-            && let Some(fallback) = self.fallback_model.take() {
-                let primary_reason = output
-                    .failed_reason
-                    .clone()
-                    .unwrap_or_else(|| "unknown error".to_string());
-
-                self.model = fallback;
-                let mut output2 = self.model.completion(self.req.clone()).await?;
-                self.usage.accumulate(&output2.usage);
-
-                if let Some(fallback_reason) = output2.failed_reason.clone() {
-                    output2.failed_reason = Some(format!(
-                        "primary model failed: {}; fallback model failed: {}",
-                        primary_reason, fallback_reason
-                    ));
-                    return Ok(Some(self.final_output(output2)));
-                }
-
-                output = output2;
+            && let Some(fallback) = self.fallback_model.take()
+        {
+            let primary_reason = output
+                .failed_reason
+                .clone()
+                .unwrap_or_else(|| "unknown error".to_string());
+
+            self.model = fallback;
+            let mut output2 = self.model.completion(self.req.clone()).await?;
+            output2.model = Some(self.model.model_name());
+            self.usage.accumulate(&output2.usage);
+
+            if let Some(fallback_reason) = output2.failed_reason.clone() {
+                output2.failed_reason = Some(format!(
+                    "primary model failed: {}; fallback model failed: {}",
+                    primary_reason, fallback_reason
+                ));
+                return Ok(Some(self.final_output(output2)));
             }
 
+            output = output2;
+        }
+
         // 累计所有原始对话历史（包含初始的 req.raw_history 和 req.chat_history）
         self.req.raw_history.append(&mut output.raw_history);
         // 累计所有对话历史（不包含初始的 req.chat_history）
@@ -1220,6 +1228,10 @@ mod tests {
     struct AlwaysFailCompleter;
 
     impl CompletionFeaturesDyn for AlwaysFailCompleter {
+        fn model_name(&self) -> String {
+            "always_fail".to_string()
+        }
+
         fn completion(
             &self,
             _req: CompletionRequest,
@@ -1235,6 +1247,10 @@ mod tests {
     struct AlwaysOkCompleter;
 
     impl CompletionFeaturesDyn for AlwaysOkCompleter {
+        fn model_name(&self) -> String {
+            "always_ok".to_string()
+        }
+
         fn completion(
             &self,
             _req: CompletionRequest,

anda_engine/src/memory.rs

@@ -1125,4 +1125,11 @@ mod tests {
         let args1: MemoryToolArgs = serde_json::from_str(&rt).unwrap();
         assert_eq!(args, args1);
     }
+
+    #[test]
+    fn test_list_prev_conversations_schema() {
+        let schema = gen_schema_for::<ListConversationsArgs>();
+        println!("{}", serde_json::to_string_pretty(&schema).unwrap());
+        assert!(schema.get("required").is_some());
+    }
 }

anda_engine/src/model.rs

@@ -36,6 +36,8 @@ use crate::APP_USER_AGENT;
 pub trait CompletionFeaturesDyn: Send + Sync + 'static {
     /// Performs a completion request and returns a future with the agent's output
     fn completion(&self, req: CompletionRequest) -> BoxPinFut<Result<AgentOutput, BoxError>>;
+
+    fn model_name(&self) -> String;
 }
 
 /// Trait for dynamic embedding features that can be used across threads
@@ -55,6 +57,10 @@ pub trait EmbeddingFeaturesDyn: Send + Sync + 'static {
 pub struct NotImplemented;
 
 impl CompletionFeaturesDyn for NotImplemented {
+    fn model_name(&self) -> String {
+        "not_implemented".to_string()
+    }
+
     fn completion(&self, _req: CompletionRequest) -> BoxPinFut<Result<AgentOutput, BoxError>> {
         Box::pin(futures::future::ready(Err("not implemented".into())))
     }
@@ -79,6 +85,10 @@ impl EmbeddingFeaturesDyn for NotImplemented {
 pub struct MockImplemented;
 
 impl CompletionFeaturesDyn for MockImplemented {
+    fn model_name(&self) -> String {
+        "not_implemented".to_string()
+    }
+
     fn completion(&self, req: CompletionRequest) -> BoxPinFut<Result<AgentOutput, BoxError>> {
         Box::pin(futures::future::ready(Ok(AgentOutput {
             content: req.prompt.clone(),
@@ -177,6 +187,10 @@ impl Model {
         }
     }
 
+    pub fn model_name(&self) -> String {
+        self.completer.model_name()
+    }
+
     pub async fn completion(&self, req: CompletionRequest) -> Result<AgentOutput, BoxError> {
         self.completer.completion(req).await
     }

anda_engine/src/model/deepseek.rs

@@ -298,6 +298,10 @@ impl CompletionModel {
 }
 
 impl CompletionFeatures for CompletionModel {
+    fn model_name(&self) -> String {
+        self.model.clone()
+    }
+
     async fn completion(
         &self,
         req: CompletionRequest,
@@ -308,6 +312,10 @@ impl CompletionFeatures for CompletionModel {
 }
 
 impl CompletionFeaturesDyn for CompletionModel {
+    fn model_name(&self) -> String {
+        self.model.clone()
+    }
+
     fn completion(&self, mut req: CompletionRequest) -> BoxPinFut<Result<AgentOutput, BoxError>> {
         let model = self.model.clone();
         let client = self.client.clone();