Skip to content
Merged
16 changes: 8 additions & 8 deletions crates/goose-cli/src/commands/configure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use goose::agents::platform_tools::{
};
use goose::agents::Agent;
use goose::agents::{extension::Envs, ExtensionConfig};
use goose::config::custom_providers::CustomProviderConfig;
use goose::config::declarative_providers::{create_custom_provider, remove_custom_provider};
use goose::config::extensions::{
get_all_extension_names, get_all_extensions, get_enabled_extensions, get_extension_by_name,
name_to_key, remove_extension, set_extension, set_extension_enabled,
Expand Down Expand Up @@ -425,7 +425,7 @@ pub async fn configure_provider_dialog() -> Result<bool, Box<dyn Error>> {
// Create selection items from provider metadata
let provider_items: Vec<(&String, &str, &str)> = available_providers
.iter()
.map(|p| (&p.name, p.display_name.as_str(), p.description.as_str()))
.map(|(p, _)| (&p.name, p.display_name.as_str(), p.description.as_str()))
.collect();

// Get current default provider if it exists
Expand All @@ -439,9 +439,9 @@ pub async fn configure_provider_dialog() -> Result<bool, Box<dyn Error>> {
.interact()?;

// Get the selected provider's metadata
let provider_meta = available_providers
let (provider_meta, _) = available_providers
.iter()
.find(|p| &p.name == provider_name)
.find(|(p, _)| &p.name == provider_name)
.expect("Selected provider must exist in metadata");

// Configure required provider keys
Expand Down Expand Up @@ -1915,7 +1915,7 @@ fn add_provider() -> Result<(), Box<dyn Error>> {
.initial_value(true)
.interact()?;

CustomProviderConfig::create_and_save(
create_custom_provider(
provider_type,
display_name.clone(),
api_url,
Expand All @@ -1929,9 +1929,9 @@ fn add_provider() -> Result<(), Box<dyn Error>> {
}

fn remove_provider() -> Result<(), Box<dyn Error>> {
let custom_providers_dir = goose::config::custom_providers::custom_providers_dir();
let custom_providers_dir = goose::config::declarative_providers::custom_providers_dir();
let custom_providers = if custom_providers_dir.exists() {
goose::config::custom_providers::load_custom_providers(&custom_providers_dir)?
goose::config::declarative_providers::load_custom_providers(&custom_providers_dir)?
} else {
Vec::new()
};
Expand All @@ -1950,7 +1950,7 @@ fn remove_provider() -> Result<(), Box<dyn Error>> {
.items(&provider_items)
.interact()?;

CustomProviderConfig::remove(selected_id)?;
remove_custom_provider(selected_id)?;
cliclack::outro(format!("Removed custom provider: {}", selected_id))?;
Ok(())
}
Expand Down
3 changes: 3 additions & 0 deletions crates/goose-server/src/auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ pub async fn check_token(
request: Request,
next: Next,
) -> Result<Response, StatusCode> {
if request.uri().path() == "/status" {
return Ok(next.run(request).await);
}
let secret_key = request
.headers()
.get("X-Secret-Key")
Expand Down
13 changes: 11 additions & 2 deletions crates/goose-server/src/openapi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use goose::config::permission::PermissionLevel;
use goose::config::ExtensionEntry;
use goose::conversation::Conversation;
use goose::permission::permission_confirmation::PrincipalType;
use goose::providers::base::{ConfigKey, ModelInfo, ProviderMetadata};
use goose::providers::base::{ConfigKey, ModelInfo, ProviderMetadata, ProviderType};
use goose::session::{Session, SessionInsights};
use rmcp::model::{
Annotations, Content, EmbeddedResource, Icon, ImageContent, JsonObject, RawAudioContent,
Expand All @@ -14,6 +14,9 @@ use rmcp::model::{
};
use utoipa::{OpenApi, ToSchema};

use goose::config::declarative_providers::{
DeclarativeProviderConfig, LoadedProvider, ProviderEngine,
};
use goose::conversation::message::{
ContextLengthExceeded, FrontendToolRequest, Message, MessageContent, MessageMetadata,
RedactedThinkingContent, SummarizationRequested, ThinkingContent, ToolConfirmationRequest,
Expand Down Expand Up @@ -335,6 +338,8 @@ derive_utoipa!(Icon as IconSchema);
super::routes::config_management::get_provider_models,
super::routes::config_management::upsert_permissions,
super::routes::config_management::create_custom_provider,
super::routes::config_management::get_custom_provider,
super::routes::config_management::update_custom_provider,
super::routes::config_management::remove_custom_provider,
super::routes::agent::start_agent,
super::routes::agent::resume_agent,
Expand Down Expand Up @@ -386,7 +391,7 @@ derive_utoipa!(Icon as IconSchema);
super::routes::config_management::ExtensionQuery,
super::routes::config_management::ToolPermission,
super::routes::config_management::UpsertPermissionsQuery,
super::routes::config_management::CreateCustomProviderRequest,
super::routes::config_management::UpdateCustomProviderRequest,
super::routes::reply::PermissionConfirmationRequest,
super::routes::reply::ChatRequest,
super::routes::context::ContextManageRequest,
Expand Down Expand Up @@ -420,6 +425,10 @@ derive_utoipa!(Icon as IconSchema);
JsonObjectSchema,
RoleSchema,
ProviderMetadata,
ProviderType,
LoadedProvider,
ProviderEngine,
DeclarativeProviderConfig,
ExtensionEntry,
ExtensionConfig,
ConfigKey,
Expand Down
Loading
Loading