Skip to content

Commit

Permalink
Merge branch 'v1.0' into kalvin/mcp-gdrive
Browse files Browse the repository at this point in the history
  • Loading branch information
kalvinnchau authored Jan 16, 2025
2 parents 83c8b85 + 3061478 commit 3299eaf
Show file tree
Hide file tree
Showing 8 changed files with 614 additions and 83 deletions.
8 changes: 5 additions & 3 deletions crates/goose-cli/src/commands/mcp.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use anyhow::Result;
use goose_mcp::NonDeveloperRouter;
use goose_mcp::{Developer2Router, DeveloperRouter, GoogleDriveRouter, JetBrainsRouter};
use goose_mcp::{
Developer2Router, DeveloperRouter, GoogleDriveRouter, JetBrainsRouter, MemoryRouter, NonDeveloperRouter,
};
use mcp_server::router::RouterService;
use mcp_server::{BoundedService, ByteTransport, Server};
use tokio::io::{stdin, stdout};
Expand All @@ -19,7 +20,8 @@ pub async fn run_server(name: &str) -> Result<()> {
"google_drive" => {
let router = GoogleDriveRouter::new().await;
Some(Box::new(RouterService(router)))
}
},
"memory" => Some(Box::new(RouterService(MemoryRouter::new()))),
_ => None,
};

Expand Down
6 changes: 3 additions & 3 deletions crates/goose-mcp/examples/mcp.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// An example script to run an MCP server
use anyhow::Result;
use goose_mcp::DeveloperRouter;
use goose_mcp::{DeveloperRouter, MemoryRouter};
use mcp_server::router::RouterService;
use mcp_server::{ByteTransport, Server};
use tokio::io::{stdin, stdout};
Expand All @@ -10,7 +10,7 @@ use tracing_subscriber::{self, EnvFilter};
#[tokio::main]
async fn main() -> Result<()> {
// Set up file appender for logging
let file_appender = RollingFileAppender::new(Rotation::DAILY, "logs", "mcp-server.log");
let file_appender = RollingFileAppender::new(Rotation::DAILY, "logs", "goose-mcp-example.log");

// Initialize the tracing subscriber with file and stdout logging
tracing_subscriber::fmt()
Expand All @@ -25,7 +25,7 @@ async fn main() -> Result<()> {
tracing::info!("Starting MCP server");

// Create an instance of our counter router
let router = RouterService(DeveloperRouter::new());
let router = RouterService(MemoryRouter::new());

// Create and run the server
let server = Server::new(router);
Expand Down
2 changes: 2 additions & 0 deletions crates/goose-mcp/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ mod developer;
mod developer2;
mod google_drive;
mod jetbrains;
mod memory;
mod nondeveloper;

pub use developer::DeveloperRouter;
pub use developer2::Developer2Router;
pub use google_drive::GoogleDriveRouter;
pub use jetbrains::JetBrainsRouter;
pub use memory::MemoryRouter;
pub use nondeveloper::NonDeveloperRouter;
Loading

0 comments on commit 3299eaf

Please sign in to comment.