move global config access out of ModelConfig, and move ModelConfig into goose_providers (#9769)
This commit is contained in:
@@ -9,7 +9,7 @@ use async_trait::async_trait;
|
||||
use axum::http;
|
||||
use chrono::{DateTime, Utc};
|
||||
use goose_providers::errors::ProviderError;
|
||||
use goose_providers::formats::openai::{is_openai_responses_model, ModelConfigParams};
|
||||
use goose_providers::formats::openai::is_openai_responses_model;
|
||||
use goose_providers::images::ImageFormat;
|
||||
use reqwest::{Client, Response};
|
||||
use serde::{Deserialize, Serialize};
|
||||
@@ -36,10 +36,10 @@ use goose_providers::formats::openai::{create_request, get_usage, response_to_me
|
||||
use crate::config::{Config, ConfigError};
|
||||
use crate::conversation::message::{Message, MessageContent};
|
||||
|
||||
use crate::model::ModelConfig;
|
||||
use crate::providers::base::{ConfigKey, MessageStream};
|
||||
use futures::future::BoxFuture;
|
||||
use goose_providers::conversation::token_usage::{ProviderUsage, Usage};
|
||||
use goose_providers::model::ModelConfig;
|
||||
use rmcp::model::{RawContent, Tool};
|
||||
use std::ops::Deref;
|
||||
|
||||
@@ -444,13 +444,7 @@ impl GithubCopilotProvider {
|
||||
|
||||
if supports_streaming {
|
||||
let payload = create_request(
|
||||
ModelConfigParams {
|
||||
model_name: model_config.model_name.as_str(),
|
||||
thinking_effort: model_config.thinking_effort(),
|
||||
temperature: model_config.temperature,
|
||||
max_tokens: model_config.max_tokens,
|
||||
request_params: model_config.request_params.as_ref(),
|
||||
},
|
||||
model_config,
|
||||
system,
|
||||
messages,
|
||||
tools,
|
||||
@@ -486,13 +480,7 @@ impl GithubCopilotProvider {
|
||||
Some(session_id)
|
||||
};
|
||||
let payload = create_request(
|
||||
ModelConfigParams {
|
||||
model_name: model_config.model_name.as_str(),
|
||||
thinking_effort: model_config.thinking_effort(),
|
||||
temperature: model_config.temperature,
|
||||
max_tokens: model_config.max_tokens,
|
||||
request_params: model_config.request_params.as_ref(),
|
||||
},
|
||||
model_config,
|
||||
system,
|
||||
messages,
|
||||
tools,
|
||||
|
||||
Reference in New Issue
Block a user