aljaz/goose
1
0
Fork 0
mirror of https://github.com/aljazceru/goose.git synced 2025-12-19 07:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from aljazceru/codex/parse-extensions-and-update-initialization

Browse Source 
Initialize extensions via agent
This commit is contained in:
Aljaz
2025-05-28 19:28:18 +02:00
committed by GitHub
parent c2064469e2 40fb476071
commit f69a2f353c
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
crates/goose-api/src/main.rs
View File

@@ -2,6 +2,7 @@ use warp::{Filter, Rejection};
use warp::http::HeaderValue; use warp::http::HeaderValue;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::sync::LazyLock; use std::sync::LazyLock;
use goose::config::{Config, ExtensionEntry};
use goose::agents::{ use goose::agents::{
extension::Envs, extension::Envs,
Agent, Agent,
@@ -11,7 +12,7 @@ use goose::agents::{
use mcp_core::tool::Tool; use mcp_core::tool::Tool;
use std::collections::HashMap; use std::collections::HashMap;
use uuid::Uuid; use uuid::Uuid;
use goose::config::Config;
use goose::providers::{create, providers}; use goose::providers::{create, providers};
use goose::model::ModelConfig; use goose::model::ModelConfig;
use goose::message::Message; use goose::message::Message;
@@ -510,17 +511,20 @@ async fn initialize_provider_config() -> Result<(), anyhow::Error> {
Ok(()) Ok(())
} }
/// Initialize extensions from the configuration. /// Initialize extensions from the configuration.
fn initialize_extensions(config: &config::Config) -> Result<(), anyhow::Error> { async fn initialize_extensions(config: &config::Config) -> Result<(), anyhow::Error> {
if let Ok(ext_table) = config.get_table("extensions") { if let Ok(ext_table) = config.get_table("extensions") {
for (name, ext_config) in ext_table { for (name, ext_config) in ext_table {
let json_value: serde_json::Value = ext_config.clone().try_deserialize() // Deserialize into ExtensionEntry to get enabled flag and config
let entry: ExtensionEntry = ext_config.clone().try_deserialize()
.map_err(|e| anyhow::anyhow!("Failed to deserialize extension config for {}: {}", name, e))?; .map_err(|e| anyhow::anyhow!("Failed to deserialize extension config for {}: {}", name, e))?;
// Only process the extension if it is enabled.
let enabled = json_value.get("enabled").and_then(|v| v.as_bool()).unwrap_or(false); if entry.enabled {
if enabled { let extension_config: ExtensionConfig = entry.config;
// Note: The ExtensionManager does not provide a method to register extensions. // Acquire the global agent lock and try to add the extension
// Here, we log that the extension is enabled. Adjust this code if a registration API becomes available. let mut agent = AGENT.lock().await;
info!("Extension {} is enabled and would be registered", name); if let Err(e) = agent.add_extension(extension_config).await {
error!("Failed to add extension {}: {}", name, e);
}
} else { } else {
info!("Skipping disabled extension: {}", name); info!("Skipping disabled extension: {}", name);
} }
@@ -569,7 +573,7 @@ async fn main() -> Result<(), anyhow::Error> {
} }
// Initialize extensions from configuration // Initialize extensions from configuration
if let Err(e) = initialize_extensions(&api_config) { if let Err(e) = initialize_extensions(&api_config).await {
error!("Failed to initialize extensions: {}", e); error!("Failed to initialize extensions: {}", e);
} }