chores

Author: yujonglee

.github/workflows/test.yml

@@ -8,16 +8,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-
-      - name: Create test file
-        run: echo "This is a test file for R2 verification" > test-file.txt
-
-      - name: Copy file to R2
-        uses: prewk/s3-cp-action@v2
+      - uses: prewk/s3-cp-action@v2
         with:
           aws_access_key_id: ${{ secrets.CLOUDFLARE_R2_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.CLOUDFLARE_R2_SECRET_ACCESS_KEY }}
-          source: test-file.txt
-          dest: s3://hyprnote-cache2/test-file.txt
+          source: "s3://hyprnote-cache2/v0/binaries/stt"
+          dest: "./stt"
           aws_s3_endpoint: ${{ secrets.CLOUDFLARE_R2_ENDPOINT_URL }}
           aws_region: auto
+      - run: ls -l

owhisper/owhisper-server/src/commands/run/mod.rs

@@ -16,6 +16,8 @@ use crate::{misc::shutdown_signal, Server};
 
 #[derive(clap::Parser)]
 pub struct RunArgs {
+    /// Model ID from the config file
+    #[arg(value_parser = validate_model_from_config)]
     pub model: String,
 
     /// Audio file path, '-' for stdin, or omit for microphone
@@ -32,13 +34,6 @@ pub async fn handle_run(args: RunArgs) -> anyhow::Result<()> {
     log::set_max_level(log::LevelFilter::Off);
 
     let config = owhisper_config::Config::new(args.config.clone())?;
-    if !config.models.iter().any(|m| m.id() == args.model) {
-        return Err(anyhow::anyhow!(
-            "'{}' not found in '{:?}'",
-            args.model,
-            owhisper_config::global_config_path()
-        ));
-    }
 
     let api_key = config.general.as_ref().and_then(|g| g.api_key.clone());
     let server = Server::new(config, None);
@@ -84,6 +79,29 @@ pub async fn handle_run(args: RunArgs) -> anyhow::Result<()> {
     Ok(())
 }
 
+fn validate_model_from_config(s: &str) -> Result<String, String> {
+    let config =
+        owhisper_config::Config::new(None).map_err(|e| format!("Failed to load config: {}", e))?;
+
+    let model_ids: Vec<String> = config.models.iter().map(|m| m.id().to_string()).collect();
+
+    if model_ids.contains(&s.to_string()) {
+        Ok(s.to_string())
+    } else {
+        let available = if model_ids.is_empty() {
+            "No models found in config".to_string()
+        } else {
+            format!("Available models: {}", model_ids.join(", "))
+        };
+        Err(format!(
+            "'{}' not found in config at '{:?}'. {}",
+            s,
+            owhisper_config::global_config_path(),
+            available
+        ))
+    }
+}
+
 enum InputMode {
     File(String),
     Stdin,

owhisper/owhisper-server/src/server.rs

@@ -44,7 +44,7 @@ impl Server {
         Self { config, port }
     }
 
-    pub async fn build_router(&self) -> anyhow::Result<Router> {
+    pub async fn build_router(&self) -> anyhow::Result<Router<()>> {
         let api_key = self.config.general.as_ref().and_then(|g| g.api_key.clone());
 
         let mut services = HashMap::new();
@@ -77,9 +77,13 @@ impl Server {
         let app_state = Arc::new(AppState { api_key, services });
 
         let stt_router = self.build_stt_router(app_state.clone()).await;
-
-        let app = Router::new()
+        let other_router = Router::new()
             .route("/health", axum::routing::get(health))
+            .route("/models", axum::routing::get(list_models))
+            .route("/v1/models", axum::routing::get(list_models))
+            .with_state(app_state.clone());
+
+        let app = other_router
             .merge(stt_router)
             // .layer(middleware::from_fn_with_state(
             //     app_state.clone(),
@@ -125,7 +129,7 @@ impl Server {
         Ok(addr.port())
     }
 
-    async fn build_stt_router(&self, app_state: Arc<AppState>) -> Router {
+    async fn build_stt_router(&self, app_state: Arc<AppState>) -> Router<()> {
         Router::new()
             .route("/listen", axum::routing::any(handle_transcription))
             .route("/v1/listen", axum::routing::any(handle_transcription))
@@ -249,6 +253,34 @@ async fn health() -> &'static str {
     "OK"
 }
 
+#[derive(serde::Serialize)]
+struct ModelInfo {
+    id: String,
+    object: String,
+}
+
+#[derive(serde::Serialize)]
+struct ModelsResponse {
+    object: String,
+    data: Vec<ModelInfo>,
+}
+
+async fn list_models(State(state): State<Arc<AppState>>) -> axum::Json<ModelsResponse> {
+    let models: Vec<ModelInfo> = state
+        .services
+        .keys()
+        .map(|id| ModelInfo {
+            id: id.clone(),
+            object: "model".to_string(),
+        })
+        .collect();
+
+    axum::Json(ModelsResponse {
+        object: "list".to_string(),
+        data: models,
+    })
+}
+
 async fn auth_middleware(
     State(state): State<Arc<AppState>>,
     token_header: Option<TypedHeader<Authorization<Token>>>,