Add Moderation trait to OpenRouter

crates/goose/src/providers/anthropic.rs

@@ -286,7 +286,7 @@ impl Provider for AnthropicProvider {
 
 #[async_trait]
 impl Moderation for AnthropicProvider {
-    async fn moderate_content(&self, content: &str) -> Result<ModerationResult> {
+    async fn moderate_content(&self, _content: &str) -> Result<ModerationResult> {
         Ok(ModerationResult::new(false, None, None))
     }
 }
@@ -346,7 +346,7 @@ mod tests {
         let messages = vec![Message::user().with_text("Hello?")];
 
         let (message, usage) = provider
-            .complete("You are a helpful assistant.", &messages, &[])
+            .complete_internal("You are a helpful assistant.", &messages, &[])
             .await?;
 
         if let MessageContent::Text(text) = &message.content[0] {
@@ -405,7 +405,7 @@ mod tests {
         );
 
         let (message, usage) = provider
-            .complete("You are a helpful assistant.", &messages, &[tool])
+            .complete_internal("You are a helpful assistant.", &messages, &[tool])
             .await?;
 
         if let MessageContent::ToolRequest(tool_request) = &message.content[0] {

crates/goose/src/providers/base.rs

@@ -9,7 +9,6 @@ use tokio::sync::RwLock;
 
 use super::configs::ModelConfig;
 use crate::message::{Message, MessageContent};
-use mcp_core::content::TextContent;
 use mcp_core::role::Role;
 use mcp_core::tool::Tool;
 
@@ -241,6 +240,7 @@ pub trait Provider: Send + Sync + Moderation {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use mcp_core::content::TextContent;
     use serde_json::json;
     use std::time::Duration;
     use tokio::time::sleep;

crates/goose/src/providers/databricks.rs

@@ -161,7 +161,7 @@ impl Provider for DatabricksProvider {
 
 #[async_trait]
 impl Moderation for DatabricksProvider {
-    async fn moderate_content(&self, content: &str) -> Result<ModerationResult> {
+    async fn moderate_content(&self, _content: &str) -> Result<ModerationResult> {
         Ok(ModerationResult::new(false, None, None))
     }
 }

crates/goose/src/providers/google.rs

@@ -359,7 +359,7 @@ impl Provider for GoogleProvider {
 
 #[async_trait]
 impl Moderation for GoogleProvider {
-    async fn moderate_content(&self, content: &str) -> Result<ModerationResult> {
+    async fn moderate_content(&self, _content: &str) -> Result<ModerationResult> {
         Ok(ModerationResult::new(false, None, None))
     }
 }
@@ -659,7 +659,7 @@ mod tests {
 
         // Call the complete method
         let (message, usage) = provider
-            .complete("You are a helpful assistant.", &messages, &[])
+            .complete_internal("You are a helpful assistant.", &messages, &[])
             .await?;
 
         // Assert the response
@@ -690,7 +690,7 @@ mod tests {
 
         // Call the complete method
         let (message, usage) = provider
-            .complete(
+            .complete_internal(
                 "You are a helpful assistant.",
                 &messages,
                 &[create_test_tool()],

crates/goose/src/providers/groq.rs

@@ -94,7 +94,7 @@ impl Provider for GroqProvider {
 
 #[async_trait]
 impl Moderation for GroqProvider {
-    async fn moderate_content(&self, content: &str) -> Result<ModerationResult> {
+    async fn moderate_content(&self, _content: &str) -> Result<ModerationResult> {
         Ok(ModerationResult::new(false, None, None))
     }
 }

crates/goose/src/providers/mock.rs

@@ -69,7 +69,7 @@ impl Provider for MockProvider {
 
 #[async_trait]
 impl Moderation for MockProvider {
-    async fn moderate_content(&self, content: &str) -> Result<ModerationResult> {
+    async fn moderate_content(&self, _content: &str) -> Result<ModerationResult> {
         Ok(ModerationResult::new(false, None, None))
     }
 }

crates/goose/src/providers/ollama.rs

@@ -85,7 +85,7 @@ impl Provider for OllamaProvider {
 
 #[async_trait]
 impl Moderation for OllamaProvider {
-    async fn moderate_content(&self, content: &str) -> Result<ModerationResult> {
+    async fn moderate_content(&self, _content: &str) -> Result<ModerationResult> {
         Ok(ModerationResult::new(false, None, None))
     }
 }

crates/goose/src/providers/openai.rs

@@ -134,7 +134,9 @@ impl Moderation for OpenAiProvider {
             .send()
             .await?;
 
-        let response_json: serde_json::Value = response.json().await?;
+        let response_json = handle_response(serde_json::to_value(&request)?, response)
+            .await?
+            .unwrap();
 
         let flagged = response_json["results"][0]["flagged"]
             .as_bool()

crates/goose/src/providers/openrouter.rs

@@ -5,6 +5,7 @@ use serde_json::Value;
 use std::time::Duration;
 
 use super::base::ProviderUsage;
+use super::base::{Moderation, ModerationResult};
 use super::base::{Provider, Usage};
 use super::configs::OpenAiProviderConfig;
 use super::configs::{ModelConfig, ProviderModelConfig};
@@ -73,7 +74,7 @@ impl Provider for OpenRouterProvider {
             cost
         )
     )]
-    async fn complete(
+    async fn complete_internal(
         &self,
         system: &str,
         messages: &[Message],
@@ -112,6 +113,13 @@ impl Provider for OpenRouterProvider {
     }
 }
 
+#[async_trait]
+impl Moderation for OpenRouterProvider {
+    async fn moderate_content(&self, _content: &str) -> Result<ModerationResult> {
+        Ok(ModerationResult::new(false, None, None))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;