Skip to content

Commit b189488

Browse files
erhanterhant
committed
rm non ollama models
1 parent 3ab82cd commit b189488

File tree

9 files changed

+127
-186
lines changed

9 files changed

+127
-186
lines changed

‎compute/src/reqres/task.rs‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -175,63 +175,63 @@ fn map_prompt_error_to_task_error(provider: ModelProvider, err: PromptError) ->
175175
}
176176

177177
match provider {
178-
ModelProvider::Gemini => {
179-
/// Gemini API [error object](https://github.com/googleapis/go-genai/blob/main/api_client.go#L273).
180-
#[derive(Clone, serde::Deserialize)]
181-
pub struct GeminiError {
182-
code: u32,
183-
message: String,
184-
status: String,
185-
}
178+
// ModelProvider::Gemini => {
179+
// /// Gemini API [error object](https://github.com/googleapis/go-genai/blob/main/api_client.go#L273).
180+
// #[derive(Clone, serde::Deserialize)]
181+
// pub struct GeminiError {
182+
// code: u32,
183+
// message: String,
184+
// status: String,
185+
// }
186186

187-
serde_json::from_str::<ErrorObject<GeminiError>>(err_inner).map(
188-
|ErrorObject {
189-
error: gemini_error,
190-
}| TaskError::ProviderError {
191-
code: format!("{} ({})", gemini_error.code, gemini_error.status),
192-
message: gemini_error.message,
193-
provider: provider.to_string(),
194-
},
195-
)
196-
}
197-
ModelProvider::OpenAI => {
198-
/// OpenAI API [error object](https://github.com/openai/openai-go/blob/main/internal/apierror/apierror.go#L17).
199-
#[derive(Clone, serde::Deserialize)]
200-
pub struct OpenAIError {
201-
code: String,
202-
message: String,
203-
}
187+
// serde_json::from_str::<ErrorObject<GeminiError>>(err_inner).map(
188+
// |ErrorObject {
189+
// error: gemini_error,
190+
// }| TaskError::ProviderError {
191+
// code: format!("{} ({})", gemini_error.code, gemini_error.status),
192+
// message: gemini_error.message,
193+
// provider: provider.to_string(),
194+
// },
195+
// )
196+
// }
197+
// ModelProvider::OpenAI => {
198+
// /// OpenAI API [error object](https://github.com/openai/openai-go/blob/main/internal/apierror/apierror.go#L17).
199+
// #[derive(Clone, serde::Deserialize)]
200+
// pub struct OpenAIError {
201+
// code: String,
202+
// message: String,
203+
// }
204204

205-
serde_json::from_str::<ErrorObject<OpenAIError>>(err_inner).map(
206-
|ErrorObject {
207-
error: openai_error,
208-
}| TaskError::ProviderError {
209-
code: openai_error.code,
210-
message: openai_error.message,
211-
provider: provider.to_string(),
212-
},
213-
)
214-
}
215-
ModelProvider::OpenRouter => {
216-
/// OpenRouter API [error object](https://openrouter.ai/docs/api-reference/errors).
217-
#[derive(Clone, serde::Deserialize)]
218-
pub struct OpenRouterError {
219-
code: u32,
220-
message: String,
221-
}
205+
// serde_json::from_str::<ErrorObject<OpenAIError>>(err_inner).map(
206+
// |ErrorObject {
207+
// error: openai_error,
208+
// }| TaskError::ProviderError {
209+
// code: openai_error.code,
210+
// message: openai_error.message,
211+
// provider: provider.to_string(),
212+
// },
213+
// )
214+
// }
215+
// ModelProvider::OpenRouter => {
216+
// /// OpenRouter API [error object](https://openrouter.ai/docs/api-reference/errors).
217+
// #[derive(Clone, serde::Deserialize)]
218+
// pub struct OpenRouterError {
219+
// code: u32,
220+
// message: String,
221+
// }
222222

223-
serde_json::from_str::<ErrorObject<OpenRouterError>>(err_inner).map(
224-
|ErrorObject {
225-
error: openrouter_error,
226-
}| {
227-
TaskError::ProviderError {
228-
code: openrouter_error.code.to_string(),
229-
message: openrouter_error.message,
230-
provider: provider.to_string(),
231-
}
232-
},
233-
)
234-
}
223+
// serde_json::from_str::<ErrorObject<OpenRouterError>>(err_inner).map(
224+
// |ErrorObject {
225+
// error: openrouter_error,
226+
// }| {
227+
// TaskError::ProviderError {
228+
// code: openrouter_error.code.to_string(),
229+
// message: openrouter_error.message,
230+
// provider: provider.to_string(),
231+
// }
232+
// },
233+
// )
234+
// }
235235
ModelProvider::Ollama => serde_json::from_str::<ErrorObject<String>>(err_inner)
236236
.map(
237237
// Ollama just returns a string error message

‎compute/src/utils/specs.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ mod tests {
9191
vec![Model::Gemma3_4b.to_string()],
9292
HashMap::from_iter([
9393
(Model::Gemma3_4b, SpecModelPerformance::PassedWithTPS(100.0)),
94-
(Model::GPT4oMini, SpecModelPerformance::NotFound),
9594
(Model::Gemma3_27b, SpecModelPerformance::ExecutionFailed),
9695
]),
9796
SemanticVersion {

‎compute/src/workers/task.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ mod tests {
254254
/// cargo test --package dkn-compute --lib --all-features -- workers::task::tests::test_executor_worker --exact --show-output --nocapture --ignored
255255
/// ```
256256
#[tokio::test]
257-
#[ignore = "run manually"]
257+
#[ignore = "run manually with Ollama"]
258258
async fn test_executor_worker() {
259259
let _ = env_logger::builder()
260260
.filter_level(log::LevelFilter::Off)
@@ -271,7 +271,7 @@ mod tests {
271271
});
272272

273273
let num_tasks = 4;
274-
let model = Model::GPT4o;
274+
let model = Model::Llama3_2_1bInstructQ4Km;
275275
let executor = DriaExecutor::new_from_env(model.provider()).unwrap();
276276
let task = TaskBody::new_prompt("Write a poem about Julius Caesar.", model.clone());
277277

‎executor/examples/gemini.rs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎executor/examples/openai.rs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎executor/examples/openrouter.rs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎executor/src/executors/mod.rs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,42 +6,42 @@ use std::collections::{HashMap, HashSet};
66
mod ollama;
77
use ollama::OllamaClient;
88

9-
mod openai;
10-
use openai::OpenAIClient;
9+
// mod openai;
10+
// use openai::OpenAIClient;
1111

12-
mod gemini;
13-
use gemini::GeminiClient;
12+
// mod gemini;
13+
// use gemini::GeminiClient;
1414

15-
mod openrouter;
16-
use openrouter::OpenRouterClient;
15+
// mod openrouter;
16+
// use openrouter::OpenRouterClient;
1717

1818
/// A wrapper enum for all model providers.
1919
#[derive(Clone)]
2020
pub enum DriaExecutor {
2121
Ollama(OllamaClient),
22-
OpenAI(OpenAIClient),
23-
Gemini(GeminiClient),
24-
OpenRouter(OpenRouterClient),
22+
// OpenAI(OpenAIClient),
23+
// Gemini(GeminiClient),
24+
// OpenRouter(OpenRouterClient),
2525
}
2626

2727
impl DriaExecutor {
2828
/// Creates a new executor for the given provider using the API key in the environment variables.
2929
pub fn new_from_env(provider: ModelProvider) -> Result<Self, std::env::VarError> {
3030
match provider {
3131
ModelProvider::Ollama => OllamaClient::from_env().map(DriaExecutor::Ollama),
32-
ModelProvider::OpenAI => OpenAIClient::from_env().map(DriaExecutor::OpenAI),
33-
ModelProvider::Gemini => GeminiClient::from_env().map(DriaExecutor::Gemini),
34-
ModelProvider::OpenRouter => OpenRouterClient::from_env().map(DriaExecutor::OpenRouter),
32+
// ModelProvider::OpenAI => OpenAIClient::from_env().map(DriaExecutor::OpenAI),
33+
// ModelProvider::Gemini => GeminiClient::from_env().map(DriaExecutor::Gemini),
34+
// ModelProvider::OpenRouter => OpenRouterClient::from_env().map(DriaExecutor::OpenRouter),
3535
}
3636
}
3737

3838
/// Executes the given task using the appropriate provider.
3939
pub async fn execute(&self, task: TaskBody) -> Result<String, PromptError> {
4040
match self {
4141
DriaExecutor::Ollama(provider) => provider.execute(task).await,
42-
DriaExecutor::OpenAI(provider) => provider.execute(task).await,
43-
DriaExecutor::Gemini(provider) => provider.execute(task).await,
44-
DriaExecutor::OpenRouter(provider) => provider.execute(task).await,
42+
// DriaExecutor::OpenAI(provider) => provider.execute(task).await,
43+
// DriaExecutor::Gemini(provider) => provider.execute(task).await,
44+
// DriaExecutor::OpenRouter(provider) => provider.execute(task).await,
4545
}
4646
}
4747

@@ -54,18 +54,18 @@ impl DriaExecutor {
5454
) -> eyre::Result<HashMap<Model, SpecModelPerformance>> {
5555
match self {
5656
DriaExecutor::Ollama(provider) => provider.check(models).await,
57-
DriaExecutor::OpenAI(provider) => provider.check(models).await,
58-
DriaExecutor::Gemini(provider) => provider.check(models).await,
59-
DriaExecutor::OpenRouter(provider) => provider.check(models).await,
57+
// DriaExecutor::OpenAI(provider) => provider.check(models).await,
58+
// DriaExecutor::Gemini(provider) => provider.check(models).await,
59+
// DriaExecutor::OpenRouter(provider) => provider.check(models).await,
6060
}
6161
}
6262

6363
pub fn name(&self) -> String {
6464
match self {
6565
DriaExecutor::Ollama(_) => ModelProvider::Ollama.to_string(),
66-
DriaExecutor::OpenAI(_) => ModelProvider::OpenAI.to_string(),
67-
DriaExecutor::Gemini(_) => ModelProvider::Gemini.to_string(),
68-
DriaExecutor::OpenRouter(_) => ModelProvider::OpenRouter.to_string(),
66+
// DriaExecutor::OpenAI(_) => ModelProvider::OpenAI.to_string(),
67+
// DriaExecutor::Gemini(_) => ModelProvider::Gemini.to_string(),
68+
// DriaExecutor::OpenRouter(_) => ModelProvider::OpenRouter.to_string(),
6969
}
7070
}
7171
}

0 commit comments

Comments
 (0)