summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.dockerignore29
-rw-r--r--Cargo.toml2
-rw-r--r--makima/Cargo.toml2
-rw-r--r--makima/Dockerfile58
-rw-r--r--makima/sh/download-models.sh60
-rw-r--r--makima/src/bin/server.rs32
-rw-r--r--makima/src/server/mod.rs23
-rw-r--r--vendor/parakeet-rs/.cargo-ok (renamed from parakeet-rs/.cargo-ok)0
-rw-r--r--vendor/parakeet-rs/.github/workflows/rust.yml (renamed from parakeet-rs/.github/workflows/rust.yml)0
-rw-r--r--vendor/parakeet-rs/.gitignore (renamed from parakeet-rs/.gitignore)0
-rw-r--r--vendor/parakeet-rs/Cargo.lock (renamed from parakeet-rs/Cargo.lock)0
-rw-r--r--vendor/parakeet-rs/Cargo.toml (renamed from parakeet-rs/Cargo.toml)0
-rw-r--r--vendor/parakeet-rs/Cargo.toml.orig (renamed from parakeet-rs/Cargo.toml.orig)0
-rw-r--r--vendor/parakeet-rs/LICENSE (renamed from parakeet-rs/LICENSE)0
-rw-r--r--vendor/parakeet-rs/README.md (renamed from parakeet-rs/README.md)0
-rw-r--r--vendor/parakeet-rs/examples/diarization.rs (renamed from parakeet-rs/examples/diarization.rs)0
-rw-r--r--vendor/parakeet-rs/examples/raw.rs (renamed from parakeet-rs/examples/raw.rs)0
-rw-r--r--vendor/parakeet-rs/examples/streaming.rs (renamed from parakeet-rs/examples/streaming.rs)0
-rw-r--r--vendor/parakeet-rs/examples/transcribe.rs (renamed from parakeet-rs/examples/transcribe.rs)0
-rw-r--r--vendor/parakeet-rs/src/audio.rs (renamed from parakeet-rs/src/audio.rs)0
-rw-r--r--vendor/parakeet-rs/src/config.rs (renamed from parakeet-rs/src/config.rs)0
-rw-r--r--vendor/parakeet-rs/src/decoder.rs (renamed from parakeet-rs/src/decoder.rs)0
-rw-r--r--vendor/parakeet-rs/src/decoder_tdt.rs (renamed from parakeet-rs/src/decoder_tdt.rs)0
-rw-r--r--vendor/parakeet-rs/src/error.rs (renamed from parakeet-rs/src/error.rs)0
-rw-r--r--vendor/parakeet-rs/src/execution.rs (renamed from parakeet-rs/src/execution.rs)0
-rw-r--r--vendor/parakeet-rs/src/lib.rs (renamed from parakeet-rs/src/lib.rs)0
-rw-r--r--vendor/parakeet-rs/src/model.rs (renamed from parakeet-rs/src/model.rs)0
-rw-r--r--vendor/parakeet-rs/src/model_eou.rs (renamed from parakeet-rs/src/model_eou.rs)0
-rw-r--r--vendor/parakeet-rs/src/model_tdt.rs (renamed from parakeet-rs/src/model_tdt.rs)0
-rw-r--r--vendor/parakeet-rs/src/parakeet.rs (renamed from parakeet-rs/src/parakeet.rs)0
-rw-r--r--vendor/parakeet-rs/src/parakeet_eou.rs (renamed from parakeet-rs/src/parakeet_eou.rs)0
-rw-r--r--vendor/parakeet-rs/src/parakeet_tdt.rs (renamed from parakeet-rs/src/parakeet_tdt.rs)0
-rw-r--r--vendor/parakeet-rs/src/sortformer.rs (renamed from parakeet-rs/src/sortformer.rs)0
-rw-r--r--vendor/parakeet-rs/src/timestamps.rs (renamed from parakeet-rs/src/timestamps.rs)0
-rw-r--r--vendor/parakeet-rs/src/vocab.rs (renamed from parakeet-rs/src/vocab.rs)0
35 files changed, 195 insertions, 11 deletions
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..e190572
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,29 @@
+# Build artifacts
+target/
+**/target/
+
+# Exclude all models (downloaded at runtime)
+makima/models/
+
+# Audio files
+*.mp3
+*.wav
+*.flac
+*.ogg
+
+# IDE
+.idea/
+.vscode/
+
+# Git
+.git/
+.gitignore
+
+# Documentation
+*.md
+
+# Frontend (not needed for server)
+makima/frontend/
+
+# Other tools
+tools/
diff --git a/Cargo.toml b/Cargo.toml
index 5057d7a..377d0bb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,3 @@
[workspace]
-members = ["makima", "tools/stt-client", "parakeet-rs"]
+members = ["makima", "tools/stt-client", "vendor/parakeet-rs"]
resolver = "2"
diff --git a/makima/Cargo.toml b/makima/Cargo.toml
index 4d8076e..3368a6e 100644
--- a/makima/Cargo.toml
+++ b/makima/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/bin/server.rs"
[dependencies]
# ML/Audio (existing)
# Local fork with streaming API exposed (diarize_streaming method)
-parakeet-rs = { path = "../parakeet-rs", features = ["sortformer"] }
+parakeet-rs = { path = "../vendor/parakeet-rs", features = ["sortformer"] }
symphonia = { version = "0.5", features = ["mp3", "aac", "flac", "ogg", "vorbis", "wav", "pcm"] }
ort = "2.0.0-rc.10"
tokenizers = "0.21"
diff --git a/makima/Dockerfile b/makima/Dockerfile
new file mode 100644
index 0000000..c8e7a2b
--- /dev/null
+++ b/makima/Dockerfile
@@ -0,0 +1,58 @@
+# Build stage
+FROM rust:1.83-bookworm AS builder
+
+WORKDIR /app
+
+# Install build dependencies
+RUN apt-get update && apt-get install -y \
+ pkg-config \
+ libssl-dev \
+ && rm -rf /var/lib/apt/lists/*
+
+# Copy workspace files
+COPY Cargo.toml Cargo.lock ./
+COPY makima ./makima
+COPY vendor ./vendor
+
+# Build release binary
+RUN cargo build --release --package makima --bin makima-server
+
+# Runtime stage
+FROM debian:bookworm-slim
+
+WORKDIR /app
+
+# Install runtime dependencies
+RUN apt-get update && apt-get install -y \
+ ca-certificates \
+ libssl3 \
+ curl \
+ && rm -rf /var/lib/apt/lists/*
+
+# Copy the binary
+COPY --from=builder /app/target/release/makima-server /app/makima-server
+
+# Copy model download script
+COPY makima/sh/download-models.sh /app/download-models.sh
+RUN chmod +x /app/download-models.sh
+
+# Create models directory
+RUN mkdir -p /app/models
+
+# Set default environment variables
+ENV PORT=8080
+ENV RUST_LOG=makima=info,tower_http=info
+ENV MODELS_DIR=/app/models
+ENV PARAKEET_MODEL_DIR=/app/models/parakeet-tdt-0.6b-v3
+ENV PARAKEET_EOU_DIR=/app/models/realtime_eou_120m-v1-onnx
+ENV SORTFORMER_MODEL_PATH=/app/models/diarization/diar_streaming_sortformer_4spk-v2.onnx
+
+EXPOSE 8080
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=10s --start-period=120s --retries=3 \
+ CMD curl -f http://localhost:${PORT}/api/v1/healthcheck || exit 1
+
+# Use download script as entrypoint to ensure models exist
+ENTRYPOINT ["/app/download-models.sh"]
+CMD ["/app/makima-server"]
diff --git a/makima/sh/download-models.sh b/makima/sh/download-models.sh
new file mode 100644
index 0000000..ddb7454
--- /dev/null
+++ b/makima/sh/download-models.sh
@@ -0,0 +1,60 @@
+#!/bin/bash
+set -e
+
+MODELS_DIR="${MODELS_DIR:-/app/models}"
+MODEL_BASE_URL="${MODEL_BASE_URL:-}"
+
+# Model directories to check/download
+PARAKEET_DIR="parakeet-tdt-0.6b-v3"
+EOU_DIR="realtime_eou_120m-v1-onnx"
+DIARIZATION_DIR="diarization"
+
+download_model() {
+ local name=$1
+ local url=$2
+ local dest="$MODELS_DIR/$name"
+
+ if [ -d "$dest" ] && [ "$(ls -A $dest 2>/dev/null)" ]; then
+ echo "Model $name already exists, skipping..."
+ return 0
+ fi
+
+ echo "Downloading $name..."
+ mkdir -p "$dest"
+
+ # Download and extract tar.gz
+ curl -L "$url" | tar -xz -C "$dest" --strip-components=1
+
+ echo "Downloaded $name successfully"
+}
+
+# Check if models exist
+check_models_exist() {
+ [ -d "$MODELS_DIR/$PARAKEET_DIR" ] && \
+ [ -d "$MODELS_DIR/$EOU_DIR" ] && \
+ [ -f "$MODELS_DIR/$DIARIZATION_DIR/diar_streaming_sortformer_4spk-v2.onnx" ]
+}
+
+if check_models_exist; then
+ echo "All models present"
+else
+ if [ -z "$MODEL_BASE_URL" ]; then
+ echo "ERROR: Models not found and MODEL_BASE_URL not set"
+ echo "Please set MODEL_BASE_URL to the base URL containing model archives:"
+ echo " - \${MODEL_BASE_URL}/parakeet-tdt-0.6b-v3.tar.gz"
+ echo " - \${MODEL_BASE_URL}/realtime_eou_120m-v1-onnx.tar.gz"
+ echo " - \${MODEL_BASE_URL}/diarization.tar.gz"
+ exit 1
+ fi
+
+ mkdir -p "$MODELS_DIR"
+
+ download_model "$PARAKEET_DIR" "${MODEL_BASE_URL}/parakeet-tdt-0.6b-v3.tar.gz"
+ download_model "$EOU_DIR" "${MODEL_BASE_URL}/realtime_eou_120m-v1-onnx.tar.gz"
+ download_model "$DIARIZATION_DIR" "${MODEL_BASE_URL}/diarization.tar.gz"
+
+ echo "All models downloaded successfully"
+fi
+
+# Execute the main command
+exec "$@"
diff --git a/makima/src/bin/server.rs b/makima/src/bin/server.rs
index 06b6585..470e295 100644
--- a/makima/src/bin/server.rs
+++ b/makima/src/bin/server.rs
@@ -8,10 +8,10 @@ use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
use makima::server::{run_server, state::AppState};
-/// Default model paths relative to the working directory.
-const PARAKEET_MODEL_DIR: &str = "models/parakeet-tdt-0.6b-v3";
-const PARAKEET_EOU_DIR: &str = "models/realtime_eou_120m-v1-onnx";
-const SORTFORMER_MODEL_PATH: &str = "models/diarization/diar_streaming_sortformer_4spk-v2.onnx";
+/// Default model paths (can be overridden via environment variables).
+const DEFAULT_PARAKEET_MODEL_DIR: &str = "models/parakeet-tdt-0.6b-v3";
+const DEFAULT_PARAKEET_EOU_DIR: &str = "models/realtime_eou_120m-v1-onnx";
+const DEFAULT_SORTFORMER_MODEL_PATH: &str = "models/diarization/diar_streaming_sortformer_4spk-v2.onnx";
#[tokio::main]
async fn main() -> anyhow::Result<()> {
@@ -19,22 +19,38 @@ async fn main() -> anyhow::Result<()> {
tracing_subscriber::registry()
.with(
tracing_subscriber::EnvFilter::try_from_default_env()
- .unwrap_or_else(|_| "makima=debug,tower_http=debug".into()),
+ .unwrap_or_else(|_| "makima=info,tower_http=info".into()),
)
.with(tracing_subscriber::fmt::layer())
.init();
tracing::info!("Starting Makima Listening API Server");
- tracing::info!("Loading ML models...");
+
+ // Read configuration from environment
+ let port = std::env::var("PORT").unwrap_or_else(|_| "8080".to_string());
+ let parakeet_dir = std::env::var("PARAKEET_MODEL_DIR")
+ .unwrap_or_else(|_| DEFAULT_PARAKEET_MODEL_DIR.to_string());
+ let parakeet_eou_dir = std::env::var("PARAKEET_EOU_DIR")
+ .unwrap_or_else(|_| DEFAULT_PARAKEET_EOU_DIR.to_string());
+ let sortformer_path = std::env::var("SORTFORMER_MODEL_PATH")
+ .unwrap_or_else(|_| DEFAULT_SORTFORMER_MODEL_PATH.to_string());
+
+ tracing::info!(
+ parakeet = %parakeet_dir,
+ eou = %parakeet_eou_dir,
+ sortformer = %sortformer_path,
+ "Loading ML models..."
+ );
// Load ML models
let state = Arc::new(
- AppState::new(PARAKEET_MODEL_DIR, PARAKEET_EOU_DIR, SORTFORMER_MODEL_PATH)
+ AppState::new(&parakeet_dir, &parakeet_eou_dir, &sortformer_path)
.map_err(|e| anyhow::anyhow!("Failed to load models: {}", e))?,
);
tracing::info!("Models loaded successfully");
// Run the server
- run_server(state, "0.0.0.0:8080").await
+ let addr = format!("0.0.0.0:{}", port);
+ run_server(state, &addr).await
}
diff --git a/makima/src/server/mod.rs b/makima/src/server/mod.rs
index a6e0525..c509afa 100644
--- a/makima/src/server/mod.rs
+++ b/makima/src/server/mod.rs
@@ -6,9 +6,12 @@ pub mod openapi;
pub mod state;
use axum::{
+ http::StatusCode,
+ response::IntoResponse,
routing::get,
- Router,
+ Json, Router,
};
+use serde::Serialize;
use tower_http::cors::{Any, CorsLayer};
use tower_http::trace::TraceLayer;
use utoipa::OpenApi;
@@ -18,6 +21,23 @@ use crate::server::handlers::listen;
use crate::server::openapi::ApiDoc;
use crate::server::state::SharedState;
+#[derive(Serialize)]
+struct HealthResponse {
+ status: &'static str,
+ version: &'static str,
+}
+
+/// Health check endpoint for load balancers and orchestrators.
+async fn health_check() -> impl IntoResponse {
+ (
+ StatusCode::OK,
+ Json(HealthResponse {
+ status: "healthy",
+ version: env!("CARGO_PKG_VERSION"),
+ }),
+ )
+}
+
/// Create the axum Router with all routes configured.
pub fn make_router(state: SharedState) -> Router {
// API v1 routes
@@ -29,6 +49,7 @@ pub fn make_router(state: SharedState) -> Router {
.url("/api-docs/openapi.json", ApiDoc::openapi());
Router::new()
+ .route("/api/v1/healthcheck", get(health_check))
.nest("/api/v1", api_v1)
.merge(swagger)
.layer(
diff --git a/parakeet-rs/.cargo-ok b/vendor/parakeet-rs/.cargo-ok
index 5f8b795..5f8b795 100644
--- a/parakeet-rs/.cargo-ok
+++ b/vendor/parakeet-rs/.cargo-ok
diff --git a/parakeet-rs/.github/workflows/rust.yml b/vendor/parakeet-rs/.github/workflows/rust.yml
index c7f9726..c7f9726 100644
--- a/parakeet-rs/.github/workflows/rust.yml
+++ b/vendor/parakeet-rs/.github/workflows/rust.yml
diff --git a/parakeet-rs/.gitignore b/vendor/parakeet-rs/.gitignore
index fd045f6..fd045f6 100644
--- a/parakeet-rs/.gitignore
+++ b/vendor/parakeet-rs/.gitignore
diff --git a/parakeet-rs/Cargo.lock b/vendor/parakeet-rs/Cargo.lock
index 7f0b9f8..7f0b9f8 100644
--- a/parakeet-rs/Cargo.lock
+++ b/vendor/parakeet-rs/Cargo.lock
diff --git a/parakeet-rs/Cargo.toml b/vendor/parakeet-rs/Cargo.toml
index d3f83a6..d3f83a6 100644
--- a/parakeet-rs/Cargo.toml
+++ b/vendor/parakeet-rs/Cargo.toml
diff --git a/parakeet-rs/Cargo.toml.orig b/vendor/parakeet-rs/Cargo.toml.orig
index 4d91e18..4d91e18 100644
--- a/parakeet-rs/Cargo.toml.orig
+++ b/vendor/parakeet-rs/Cargo.toml.orig
diff --git a/parakeet-rs/LICENSE b/vendor/parakeet-rs/LICENSE
index 31ce7ce..31ce7ce 100644
--- a/parakeet-rs/LICENSE
+++ b/vendor/parakeet-rs/LICENSE
diff --git a/parakeet-rs/README.md b/vendor/parakeet-rs/README.md
index 75dfe85..75dfe85 100644
--- a/parakeet-rs/README.md
+++ b/vendor/parakeet-rs/README.md
diff --git a/parakeet-rs/examples/diarization.rs b/vendor/parakeet-rs/examples/diarization.rs
index 5982ecb..5982ecb 100644
--- a/parakeet-rs/examples/diarization.rs
+++ b/vendor/parakeet-rs/examples/diarization.rs
diff --git a/parakeet-rs/examples/raw.rs b/vendor/parakeet-rs/examples/raw.rs
index a1a2adc..a1a2adc 100644
--- a/parakeet-rs/examples/raw.rs
+++ b/vendor/parakeet-rs/examples/raw.rs
diff --git a/parakeet-rs/examples/streaming.rs b/vendor/parakeet-rs/examples/streaming.rs
index f5d36c9..f5d36c9 100644
--- a/parakeet-rs/examples/streaming.rs
+++ b/vendor/parakeet-rs/examples/streaming.rs
diff --git a/parakeet-rs/examples/transcribe.rs b/vendor/parakeet-rs/examples/transcribe.rs
index 685e8de..685e8de 100644
--- a/parakeet-rs/examples/transcribe.rs
+++ b/vendor/parakeet-rs/examples/transcribe.rs
diff --git a/parakeet-rs/src/audio.rs b/vendor/parakeet-rs/src/audio.rs
index 84d2616..84d2616 100644
--- a/parakeet-rs/src/audio.rs
+++ b/vendor/parakeet-rs/src/audio.rs
diff --git a/parakeet-rs/src/config.rs b/vendor/parakeet-rs/src/config.rs
index 1dae890..1dae890 100644
--- a/parakeet-rs/src/config.rs
+++ b/vendor/parakeet-rs/src/config.rs
diff --git a/parakeet-rs/src/decoder.rs b/vendor/parakeet-rs/src/decoder.rs
index 6da6d65..6da6d65 100644
--- a/parakeet-rs/src/decoder.rs
+++ b/vendor/parakeet-rs/src/decoder.rs
diff --git a/parakeet-rs/src/decoder_tdt.rs b/vendor/parakeet-rs/src/decoder_tdt.rs
index 65f576d..65f576d 100644
--- a/parakeet-rs/src/decoder_tdt.rs
+++ b/vendor/parakeet-rs/src/decoder_tdt.rs
diff --git a/parakeet-rs/src/error.rs b/vendor/parakeet-rs/src/error.rs
index 690e0e5..690e0e5 100644
--- a/parakeet-rs/src/error.rs
+++ b/vendor/parakeet-rs/src/error.rs
diff --git a/parakeet-rs/src/execution.rs b/vendor/parakeet-rs/src/execution.rs
index e29aa1d..e29aa1d 100644
--- a/parakeet-rs/src/execution.rs
+++ b/vendor/parakeet-rs/src/execution.rs
diff --git a/parakeet-rs/src/lib.rs b/vendor/parakeet-rs/src/lib.rs
index 0aaefd1..0aaefd1 100644
--- a/parakeet-rs/src/lib.rs
+++ b/vendor/parakeet-rs/src/lib.rs
diff --git a/parakeet-rs/src/model.rs b/vendor/parakeet-rs/src/model.rs
index b3cd131..b3cd131 100644
--- a/parakeet-rs/src/model.rs
+++ b/vendor/parakeet-rs/src/model.rs
diff --git a/parakeet-rs/src/model_eou.rs b/vendor/parakeet-rs/src/model_eou.rs
index 5b56e6d..5b56e6d 100644
--- a/parakeet-rs/src/model_eou.rs
+++ b/vendor/parakeet-rs/src/model_eou.rs
diff --git a/parakeet-rs/src/model_tdt.rs b/vendor/parakeet-rs/src/model_tdt.rs
index e00ebdc..e00ebdc 100644
--- a/parakeet-rs/src/model_tdt.rs
+++ b/vendor/parakeet-rs/src/model_tdt.rs
diff --git a/parakeet-rs/src/parakeet.rs b/vendor/parakeet-rs/src/parakeet.rs
index d2aabdd..d2aabdd 100644
--- a/parakeet-rs/src/parakeet.rs
+++ b/vendor/parakeet-rs/src/parakeet.rs
diff --git a/parakeet-rs/src/parakeet_eou.rs b/vendor/parakeet-rs/src/parakeet_eou.rs
index 25c7d64..25c7d64 100644
--- a/parakeet-rs/src/parakeet_eou.rs
+++ b/vendor/parakeet-rs/src/parakeet_eou.rs
diff --git a/parakeet-rs/src/parakeet_tdt.rs b/vendor/parakeet-rs/src/parakeet_tdt.rs
index 719ae75..719ae75 100644
--- a/parakeet-rs/src/parakeet_tdt.rs
+++ b/vendor/parakeet-rs/src/parakeet_tdt.rs
diff --git a/parakeet-rs/src/sortformer.rs b/vendor/parakeet-rs/src/sortformer.rs
index 2b1e5a3..2b1e5a3 100644
--- a/parakeet-rs/src/sortformer.rs
+++ b/vendor/parakeet-rs/src/sortformer.rs
diff --git a/parakeet-rs/src/timestamps.rs b/vendor/parakeet-rs/src/timestamps.rs
index 81ea600..81ea600 100644
--- a/parakeet-rs/src/timestamps.rs
+++ b/vendor/parakeet-rs/src/timestamps.rs
diff --git a/parakeet-rs/src/vocab.rs b/vendor/parakeet-rs/src/vocab.rs
index 888568e..888568e 100644
--- a/parakeet-rs/src/vocab.rs
+++ b/vendor/parakeet-rs/src/vocab.rs