Merge branch 'main' of https://github.com/fastrepl/hyprnote into redemption-settings-hotfix

Author: duckduckhero

.github/actions/rust_install/action.yaml

@@ -1,5 +1,5 @@
 inputs:
-  target:
+  platform:
     required: false
     type: string
 
@@ -8,23 +8,23 @@ runs:
   steps:
     - run: rustup toolchain install 1.88.0 --profile minimal --no-self-update
       shell: bash
-    - if: inputs.target == 'macos'
+    - if: inputs.platform == 'macos'
       run: rustup target add aarch64-apple-darwin x86_64-apple-darwin
       shell: bash
-    - if: inputs.target == 'ios'
+    - if: inputs.platform == 'ios'
       run: rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
       shell: bash
-    - if: inputs.target == 'android'
+    - if: inputs.platform == 'android'
       run: rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
       shell: bash
-    - if: inputs.target == 'windows'
+    - if: inputs.platform == 'windows'
       run: |
         rustup target add x86_64-pc-windows-msvc
         # https://tauri.app/distribute/sign/windows/#install-trusted-signing-cli
         cargo install trusted-signing-cli
       shell: bash
-    - if: contains(inputs.target, 'linux-gnu') || contains(inputs.target, 'linux-musl')
-      run: rustup target add ${{ inputs.target }}
+    - if: inputs.platform == 'linux'
+      run: rustup target add linux-gnu linux-musl
       shell: bash
     - uses: Swatinem/rust-cache@v2
       with:

.github/workflows/owhisper_cd.yaml

@@ -1,4 +1,3 @@
-# https://docs.crabnebula.dev/cloud/ci/tauri-v2-workflow/
 on:
   workflow_dispatch:
   release:
@@ -41,11 +40,7 @@ jobs:
           if [[ "${{ matrix.target }}" == *"musl"* ]]; then
             sudo apt-get install -y musl-tools musl-dev
           fi
-      - run: |
-          VERSION=$(cargo metadata --format-version=1 --no-deps | jq -r '.packages[] | select(.name == "owhisper") | .version')
-          echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
       - uses: ./.github/actions/rust_install
         with:
-          target: ${{ matrix.target }}
-      - name: Build binary
-        run: cargo build --release --bin owhisper --target ${{ matrix.target }}
+          platform: ${{ matrix.platform }}
+      - run: cargo build --release --bin owhisper-cli --target ${{ matrix.target }}

Cargo.lock

@@ -13,7 +13,7 @@ members = [
   "apps/app/server",
   "apps/desktop/src-tauri",
   "crates/*",
-  "owhisper",
+  "owhisper/*",
   "plugins/*",
 ]
 

Cargo.toml

@@ -33,7 +33,8 @@
     "**/permissions/**",
     "**/*.swift",
     "**/migrations/**",
-    "**/charts/**"
+    "**/charts/**",
+    "**/schema.json"
   ],
   "exec": {
     "cwd": "${configDir}",

dprint.json

@@ -1,3 +1,5 @@
 # OWhisper
 
 > Something like Ollama, but for speech-to-text.
+
+## Usage

owhisper/README.md

@@ -1,24 +1,32 @@
 [package]
-name = "owhisper"
+name = "owhisper-cli"
 version = "0.0.1"
 edition = "2024"
 
+[build-dependencies]
+owhisper-config = { path = "../owhisper-config" }
+schemars = { workspace = true }
+serde_json = { workspace = true }
+
 [dependencies]
+owhisper-config = { path = "../owhisper-config" }
+
 hypr-transcribe-aws = { workspace = true }
 hypr-transcribe-azure = { workspace = true }
 hypr-transcribe-gcp = { workspace = true }
+hypr-transcribe-whisper-local = { workspace = true }
 
 axum = { workspace = true }
-serde = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tower = { workspace = true }
 tracing = { workspace = true }
 
 clap = { version = "4", features = ["derive", "env"] }
 colored = "3.0.0"
-config = "0.15.13"
 indicatif = "0.18.0"
 
 anyhow = { workspace = true }
+clap_autocomplete = "0.4.2"
 open = "5.3.2"
 rubato = "0.16.2"
+schemars = { workspace = true }

owhisper/Cargo.toml renamed to owhisper/owhisper-cli/Cargo.toml

@@ -0,0 +1,6 @@
+fn main() {
+    let schema = schemars::schema_for!(owhisper_config::Config);
+    let out_content = serde_json::to_string_pretty(&schema).unwrap();
+    let out_path = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../schema.json");
+    std::fs::write(out_path, out_content).unwrap();
+}

owhisper/Dockerfile renamed to owhisper/owhisper-cli/Dockerfile

@@ -1,5 +1,7 @@
+mod pull;
 mod readme;
 mod serve;
 
+pub use pull::*;
 pub use readme::*;
 pub use serve::*;