fmt

dojoengine · Mar 5, 2025 · fc1f1cb · fc1f1cb
1 parent 917e50d
commit fc1f1cb
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 41 deletions.
diff --git a/crates/torii/mcp/src/lib.rs b/crates/torii/mcp/src/lib.rs
@@ -1,3 +1,3 @@
-pub mod types;
+pub mod resources;
 pub mod tools;
-pub mod resources;
+pub mod types;
diff --git a/crates/torii/mcp/src/resources/mod.rs b/crates/torii/mcp/src/resources/mod.rs
@@ -5,4 +5,4 @@ pub struct Resource {
 
 pub fn get_resources() -> Vec<Resource> {
     vec![] // Add resources as needed
-} 
+}
diff --git a/crates/torii/mcp/src/tools/mod.rs b/crates/torii/mcp/src/tools/mod.rs
@@ -11,8 +11,5 @@ pub struct Tool {
 }
 
 pub fn get_tools() -> Vec<Tool> {
-    vec![
-        query::get_tool(),
-        schema::get_tool(),
-    ]
-} 
+    vec![query::get_tool(), schema::get_tool()]
+}
diff --git a/crates/torii/mcp/src/tools/query.rs b/crates/torii/mcp/src/tools/query.rs
@@ -2,12 +2,10 @@ use std::sync::Arc;
 
 use serde_json::{json, Value};
 use sqlx::SqlitePool;
-
-use crate::types::{JsonRpcRequest, JsonRpcResponse, JsonRpcError};
 use torii_sqlite::utils::map_row_to_json;
-use crate::types::JSONRPC_VERSION;
 
 use super::Tool;
+use crate::types::{JsonRpcError, JsonRpcRequest, JsonRpcResponse, JSONRPC_VERSION};
 
 pub fn get_tool() -> Tool {
     Tool {
@@ -73,4 +71,4 @@ pub async fn handle(pool: Arc<SqlitePool>, request: JsonRpcRequest) -> JsonRpcRe
             }),
         }
     }
-} 
+}
diff --git a/crates/torii/mcp/src/tools/schema.rs b/crates/torii/mcp/src/tools/schema.rs
@@ -1,12 +1,10 @@
 use std::sync::Arc;
 
 use serde_json::{json, Value};
-use sqlx::SqlitePool;
-use sqlx::Row;
-use crate::types::{JsonRpcRequest, JsonRpcResponse, JsonRpcError};
-use crate::types::JSONRPC_VERSION;
+use sqlx::{Row, SqlitePool};
 
 use super::Tool;
+use crate::types::{JsonRpcError, JsonRpcRequest, JsonRpcResponse, JSONRPC_VERSION};
 
 pub fn get_tool() -> Tool {
     Tool {
@@ -113,4 +111,4 @@ pub async fn handle(pool: Arc<SqlitePool>, request: JsonRpcRequest) -> JsonRpcRe
             }),
         },
     }
-} 
+}
diff --git a/crates/torii/mcp/src/types/mod.rs b/crates/torii/mcp/src/types/mod.rs
@@ -106,4 +106,4 @@ impl JsonRpcResponse {
     pub fn parse_error(id: Value, details: &str) -> Self {
         Self::error(id, -32700, "Parse error", Some(json!({ "details": details })))
     }
-} 
+}
diff --git a/crates/torii/server/src/handlers/mcp.rs b/crates/torii/server/src/handlers/mcp.rs
@@ -7,14 +7,14 @@ use serde_json::{json, Value};
 use sqlx::SqlitePool;
 use tokio::sync::{broadcast, RwLock};
 use tokio_tungstenite::tungstenite::Message;
-use torii_mcp::{tools::{self, Tool}, resources::{self, Resource}};
-use tracing::warn;
-use uuid::Uuid;
-
+use torii_mcp::resources::{self, Resource};
+use torii_mcp::tools::{self, Tool};
 use torii_mcp::types::{
-    JsonRpcMessage, JsonRpcRequest, JsonRpcResponse, SseSession,
-    JSONRPC_VERSION, MCP_VERSION, SSE_CHANNEL_CAPACITY,
+    JsonRpcMessage, JsonRpcRequest, JsonRpcResponse, SseSession, JSONRPC_VERSION, MCP_VERSION,
+    SSE_CHANNEL_CAPACITY,
 };
+use tracing::warn;
+use uuid::Uuid;
 
 use super::Handler;
 
@@ -213,20 +213,16 @@ impl McpHandler {
 
     async fn handle_message_request(&self, req: Request<Body>) -> Response<Body> {
         // Extract session ID from query parameters
-        let session_id = req
-            .uri()
-            .query()
-            .and_then(|q| {
-                q.split('&')
-                    .find_map(|p| {
-                        let parts: Vec<&str> = p.split('=').collect();
-                        if parts.len() == 2 && parts[0] == "sessionId" {
-                            Some(parts[1].to_string())
-                        } else {
-                            None
-                        }
-                    })
-            });
+        let session_id = req.uri().query().and_then(|q| {
+            q.split('&').find_map(|p| {
+                let parts: Vec<&str> = p.split('=').collect();
+                if parts.len() == 2 && parts[0] == "sessionId" {
+                    Some(parts[1].to_string())
+                } else {
+                    None
+                }
+            })
+        });
 
         if session_id.is_none() {
             return Response::builder()
@@ -343,4 +339,4 @@ impl Handler for McpHandler {
                 .unwrap(),
         }
     }
-} 
+}
diff --git a/crates/torii/sqlite/src/utils.rs b/crates/torii/sqlite/src/utils.rs
@@ -4,18 +4,18 @@ use std::str::FromStr;
 use std::time::Duration;
 
 use anyhow::Result;
-use base64::Engine;
 use base64::engine::general_purpose::STANDARD;
+use base64::Engine;
 use chrono::{DateTime, Utc};
 use futures_util::TryStreamExt;
 use ipfs_api_backend_hyper::{IpfsApi, IpfsClient, TryFromUri};
 use once_cell::sync::Lazy;
 use reqwest::Client;
+use sqlx::{Column, Row, TypeInfo};
 use starknet::core::types::U256;
 use starknet_crypto::Felt;
 use tokio_util::bytes::Bytes;
 use tracing::debug;
-use sqlx::{Column, Row, TypeInfo};
 
 use crate::constants::{
     IPFS_CLIENT_PASSWORD, IPFS_CLIENT_URL, IPFS_CLIENT_USERNAME, REQ_MAX_RETRIES,
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ pub struct Resource { @@
     pub fn get_resources() -> Vec<Resource> {
         vec![] // Add resources as needed
-    }
+    }