Compare commits
43 Commits
34e3e886ee
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c7ed88ef1f | ||
|
|
b8db4b0882 | ||
|
|
21e2a7747d | ||
|
|
c13dfa5b83 | ||
|
|
22a16affa5 | ||
|
|
c1db6ae562 | ||
|
|
dfcf729355 | ||
| dc25b8780c | |||
|
|
48c3b33bf4 | ||
|
|
4cca68e12b | ||
|
|
658ef42e72 | ||
| e823d59821 | |||
|
|
1870889abb | ||
| d00e601f16 | |||
|
|
dc94b7bcd7 | ||
| fc31b9fd88 | |||
| 04cbdb70ce | |||
|
|
2afc179894 | ||
| 9366b24c5d | |||
| ee22d23220 | |||
| 9bb6f77486 | |||
| 3e77e952c7 | |||
| 9ab5b517f2 | |||
| 50196bc7e5 | |||
| 2f10322d49 | |||
| 39d3fb673e | |||
| 61fe2af94a | |||
| c2e1678416 | |||
| 922d25cc9d | |||
| a428cf3b92 | |||
| 1cdc23b650 | |||
| ff0cf5b5c4 | |||
| af16420ced | |||
| 06705544db | |||
| fc56ba806b | |||
| a2087d1824 | |||
| a7d47be06e | |||
| c3001198f4 | |||
| 25ee248c65 | |||
| 98573ad697 | |||
| 59c6506f0c | |||
| cddc785ac7 | |||
|
|
626686e045 |
@@ -1,38 +0,0 @@
|
|||||||
when:
|
|
||||||
branch: main
|
|
||||||
event: push
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: build-and-push
|
|
||||||
image: gcr.io/kaniko-project/executor:debug
|
|
||||||
environment:
|
|
||||||
DOCKER_USERNAME:
|
|
||||||
from_secret: docker_username
|
|
||||||
DOCKER_PASSWORD:
|
|
||||||
from_secret: docker_password
|
|
||||||
commands:
|
|
||||||
- TAG=${CI_COMMIT_SHA:0:8}
|
|
||||||
- REGISTRY=git.mikhailkilin.ru
|
|
||||||
- REPO=killingdruid/bcard
|
|
||||||
- echo "Building $REGISTRY/$REPO:$TAG"
|
|
||||||
- AUTH=$(echo -n "$DOCKER_USERNAME:$DOCKER_PASSWORD" | base64)
|
|
||||||
- mkdir -p /kaniko/.docker
|
|
||||||
- 'printf "{\"auths\":{\"%s\":{\"auth\":\"%s\"}}}" "$REGISTRY" "$AUTH" > /kaniko/.docker/config.json'
|
|
||||||
- /kaniko/executor --context=$CI_WORKSPACE --dockerfile=$CI_WORKSPACE/Dockerfile --destination=$REGISTRY/$REPO:$TAG --destination=$REGISTRY/$REPO:latest --insecure --skip-tls-verify --verbosity=info
|
|
||||||
|
|
||||||
- name: update-manifests
|
|
||||||
image: alpine
|
|
||||||
environment:
|
|
||||||
DOCKER_USERNAME:
|
|
||||||
from_secret: docker_username
|
|
||||||
DOCKER_PASSWORD:
|
|
||||||
from_secret: docker_password
|
|
||||||
commands:
|
|
||||||
- apk add --no-cache git
|
|
||||||
- 'TAG=${CI_COMMIT_SHA:0:8}'
|
|
||||||
- 'sed -i "s|image:.*killingdruid/bcard:.*|image: git.mikhailkilin.ru/killingdruid/bcard:$TAG|" k8s/bcard.yaml'
|
|
||||||
- 'git config user.email "ci@mikhailkilin.ru"'
|
|
||||||
- 'git config user.name "Woodpecker CI"'
|
|
||||||
- git add k8s/bcard.yaml
|
|
||||||
- 'git diff --cached --quiet && echo No_changes || git commit -m "[skip ci] deploy bcard:$TAG"'
|
|
||||||
- 'git push https://$DOCKER_USERNAME:$DOCKER_PASSWORD@git.mikhailkilin.ru/killingdruid/bcard.git HEAD:main'
|
|
||||||
20
.woodpecker/check.yml
Normal file
20
.woodpecker/check.yml
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
when:
|
||||||
|
- event: pull_request
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: fmt
|
||||||
|
image: rust:1.84
|
||||||
|
commands:
|
||||||
|
- rustup component add rustfmt
|
||||||
|
- cargo fmt -- --check
|
||||||
|
|
||||||
|
- name: clippy
|
||||||
|
image: rust:1.84
|
||||||
|
commands:
|
||||||
|
- rustup component add clippy
|
||||||
|
- cargo clippy -- -D warnings
|
||||||
|
|
||||||
|
- name: test
|
||||||
|
image: rust:1.84
|
||||||
|
commands:
|
||||||
|
- cargo test
|
||||||
33
.woodpecker/deploy.yml
Normal file
33
.woodpecker/deploy.yml
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
when:
|
||||||
|
- branch: main
|
||||||
|
event: push
|
||||||
|
path:
|
||||||
|
exclude:
|
||||||
|
- 'k8s/**'
|
||||||
|
on_empty: true
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: build-and-push
|
||||||
|
image: woodpeckerci/plugin-kaniko
|
||||||
|
settings:
|
||||||
|
registry: git.mikhailkilin.ru
|
||||||
|
repo: killingdruid/bcard
|
||||||
|
tags: ${CI_COMMIT_SHA}
|
||||||
|
username:
|
||||||
|
from_secret: docker_username
|
||||||
|
password:
|
||||||
|
from_secret: docker_password
|
||||||
|
|
||||||
|
- name: update-manifests
|
||||||
|
image: alpine/git
|
||||||
|
environment:
|
||||||
|
GIT_TOKEN:
|
||||||
|
from_secret: git_push_token
|
||||||
|
commands:
|
||||||
|
- 'printf "machine git.mikhailkilin.ru\nlogin killingdruid\npassword %s\n" "$GIT_TOKEN" > ~/.netrc'
|
||||||
|
- 'chmod 600 ~/.netrc'
|
||||||
|
- 'sed -i "s#image: git.mikhailkilin.ru/killingdruid/bcard:.*#image: git.mikhailkilin.ru/killingdruid/bcard:${CI_COMMIT_SHA}#" k8s/bcard.yaml'
|
||||||
|
- 'git config user.email "woodpecker@ci"'
|
||||||
|
- 'git config user.name "Woodpecker CI"'
|
||||||
|
- 'git add k8s/bcard.yaml'
|
||||||
|
- 'git diff --cached --quiet && echo "No changes" || (git commit -m "[CI SKIP] deploy ${CI_COMMIT_SHA}" && git push origin HEAD:main)'
|
||||||
954
Cargo.lock
generated
954
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -4,5 +4,8 @@ version = "0.1.0"
|
|||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
axum = "0.7"
|
axum = { version = "0.7", features = ["multipart"] }
|
||||||
|
reqwest = { version = "0.12", default-features = false, features = ["multipart", "json", "rustls-tls"] }
|
||||||
|
serde = { version = "1", features = ["derive"] }
|
||||||
|
serde_json = "1"
|
||||||
tokio = { version = "1", features = ["full"] }
|
tokio = { version = "1", features = ["full"] }
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# Этап сборки
|
# Этап сборки
|
||||||
FROM rust:1.84 as builder
|
FROM rust:1.85 as builder
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN cargo build --release
|
RUN cargo build --release
|
||||||
|
|||||||
@@ -2,3 +2,4 @@
|
|||||||
|
|
||||||
Personal site: https://mikhailkilin.ru
|
Personal site: https://mikhailkilin.ru
|
||||||
|
|
||||||
|
# test
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ spec:
|
|||||||
- name: gitea-registry
|
- name: gitea-registry
|
||||||
containers:
|
containers:
|
||||||
- name: bcard
|
- name: bcard
|
||||||
image: git.mikhailkilin.ru/killingdruid/bcard:91c2fa7c
|
image: git.mikhailkilin.ru/killingdruid/bcard:b8db4b08828e27c8b7cad4eedb59f855e43eb584
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 3000
|
- containerPort: 3000
|
||||||
---
|
---
|
||||||
|
|||||||
32
src/main.rs
32
src/main.rs
@@ -1,13 +1,16 @@
|
|||||||
use axum::{response::Html, routing::get, Router};
|
mod transcribe;
|
||||||
|
|
||||||
|
use axum::{response::Html, routing::{get, post}, Router};
|
||||||
use std::net::SocketAddr;
|
use std::net::SocketAddr;
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() {
|
async fn main() {
|
||||||
let app = Router::new().route("/", get(handler));
|
let app = Router::new()
|
||||||
|
.route("/", get(handler))
|
||||||
|
.route("/transcribator", get(transcribator_page))
|
||||||
|
.route("/api/transcribe", post(transcribe::transcribe));
|
||||||
let addr = SocketAddr::from(([0, 0, 0, 0], 3000));
|
let addr = SocketAddr::from(([0, 0, 0, 0], 3000));
|
||||||
println!("listening on {}", addr);
|
println!("listening on {}", addr);
|
||||||
|
|
||||||
let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
|
let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
|
||||||
axum::serve(listener, app).await.unwrap();
|
axum::serve(listener, app).await.unwrap();
|
||||||
}
|
}
|
||||||
@@ -15,3 +18,24 @@ async fn main() {
|
|||||||
async fn handler() -> Html<&'static str> {
|
async fn handler() -> Html<&'static str> {
|
||||||
Html("<h1>Mikhail Kilin</h1>")
|
Html("<h1>Mikhail Kilin</h1>")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn transcribator_page() -> Html<&'static str> {
|
||||||
|
Html(include_str!("../static/transcribator.html"))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_handler() {
|
||||||
|
let response = handler().await;
|
||||||
|
assert!(response.0.contains("Mikhail Kilin"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn test_transcribator_page() {
|
||||||
|
let response = transcribator_page().await;
|
||||||
|
assert!(response.0.contains("Transcribator"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
78
src/transcribe.rs
Normal file
78
src/transcribe.rs
Normal file
@@ -0,0 +1,78 @@
|
|||||||
|
use axum::{extract::Multipart, http::StatusCode, Json};
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
const WHISPER_URL: &str = "http://whisper.whisper.svc:8000/v1/audio/transcriptions";
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
pub struct TranscribeResponse {
|
||||||
|
pub text: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn transcribe(
|
||||||
|
mut multipart: Multipart,
|
||||||
|
) -> Result<Json<TranscribeResponse>, (StatusCode, String)> {
|
||||||
|
let mut audio_data: Option<(Vec<u8>, String)> = None;
|
||||||
|
|
||||||
|
while let Some(field) = multipart
|
||||||
|
.next_field()
|
||||||
|
.await
|
||||||
|
.map_err(|e| (StatusCode::BAD_REQUEST, e.to_string()))?
|
||||||
|
{
|
||||||
|
if field.name() == Some("audio") {
|
||||||
|
let file_name = field
|
||||||
|
.file_name()
|
||||||
|
.unwrap_or("recording.webm")
|
||||||
|
.to_string();
|
||||||
|
let data = field
|
||||||
|
.bytes()
|
||||||
|
.await
|
||||||
|
.map_err(|e| (StatusCode::BAD_REQUEST, e.to_string()))?;
|
||||||
|
audio_data = Some((data.to_vec(), file_name));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let (data, file_name) = audio_data
|
||||||
|
.ok_or((StatusCode::BAD_REQUEST, "No audio field".to_string()))?;
|
||||||
|
|
||||||
|
let mime = if file_name.ends_with(".m4a") || file_name.ends_with(".mp4") {
|
||||||
|
"audio/mp4"
|
||||||
|
} else {
|
||||||
|
"audio/webm"
|
||||||
|
};
|
||||||
|
|
||||||
|
let part = reqwest::multipart::Part::bytes(data)
|
||||||
|
.file_name(file_name)
|
||||||
|
.mime_str(mime)
|
||||||
|
.map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
|
||||||
|
|
||||||
|
let form = reqwest::multipart::Form::new()
|
||||||
|
.part("file", part)
|
||||||
|
.text("model", "Systran/faster-whisper-medium")
|
||||||
|
.text("language", "ru");
|
||||||
|
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
let resp = client
|
||||||
|
.post(WHISPER_URL)
|
||||||
|
.multipart(form)
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| (StatusCode::BAD_GATEWAY, format!("Whisper unavailable: {e}")))?;
|
||||||
|
|
||||||
|
if !resp.status().is_success() {
|
||||||
|
let status = resp.status();
|
||||||
|
let body = resp.text().await.unwrap_or_default();
|
||||||
|
return Err((StatusCode::BAD_GATEWAY, format!("Whisper {status}: {body}")));
|
||||||
|
}
|
||||||
|
|
||||||
|
let whisper_resp: serde_json::Value = resp
|
||||||
|
.json()
|
||||||
|
.await
|
||||||
|
.map_err(|e| (StatusCode::BAD_GATEWAY, format!("Invalid Whisper response: {e}")))?;
|
||||||
|
|
||||||
|
let text = whisper_resp["text"]
|
||||||
|
.as_str()
|
||||||
|
.unwrap_or("")
|
||||||
|
.to_string();
|
||||||
|
|
||||||
|
Ok(Json(TranscribeResponse { text }))
|
||||||
|
}
|
||||||
118
static/transcribator.html
Normal file
118
static/transcribator.html
Normal file
@@ -0,0 +1,118 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="ru" data-theme="dark">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>Transcribator</title>
|
||||||
|
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@picocss/pico@2/css/pico.min.css">
|
||||||
|
<style>
|
||||||
|
:root { --pico-font-size: 16px; }
|
||||||
|
html, body { height: 100dvh; margin: 0; overflow: hidden; }
|
||||||
|
body { display: flex; flex-direction: column; }
|
||||||
|
main { flex: 1; display: flex; flex-direction: column; max-width: 640px; width: 100%; margin: 0 auto; padding: 0.5rem; overflow: hidden; }
|
||||||
|
h1 { text-align: center; margin: 0.5rem 0; font-size: 1.4rem; }
|
||||||
|
#chat { flex: 1; overflow-y: auto; display: flex; flex-direction: column; gap: 0.75rem; padding: 0.5rem 0; }
|
||||||
|
#chat:empty::before { content: "Tap the microphone to start recording"; display: block; text-align: center; opacity: 0.5; margin-top: 2rem; }
|
||||||
|
#chat article { margin: 0; padding: 0.75rem; }
|
||||||
|
#chat article audio { width: 100%; margin-bottom: 0.5rem; }
|
||||||
|
#chat article p { margin: 0; }
|
||||||
|
.input-area { padding: 0.5rem 0; display: flex; justify-content: center; }
|
||||||
|
#mic-btn {
|
||||||
|
width: 64px; height: 64px; border-radius: 50%; font-size: 1.8rem;
|
||||||
|
display: flex; align-items: center; justify-content: center;
|
||||||
|
cursor: pointer; border: none; padding: 0; min-height: 48px;
|
||||||
|
}
|
||||||
|
#mic-btn.recording { background: var(--pico-del-color); animation: pulse 1s infinite; }
|
||||||
|
@keyframes pulse { 0%, 100% { transform: scale(1); } 50% { transform: scale(1.1); } }
|
||||||
|
.spinner { display: inline-block; width: 1em; height: 1em; border: 2px solid currentColor; border-right-color: transparent; border-radius: 50%; animation: spin 0.6s linear infinite; vertical-align: middle; }
|
||||||
|
@keyframes spin { to { transform: rotate(360deg); } }
|
||||||
|
.error { color: var(--pico-del-color); }
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<main>
|
||||||
|
<h1>Transcribator</h1>
|
||||||
|
<div id="chat"></div>
|
||||||
|
<div class="input-area">
|
||||||
|
<button id="mic-btn" aria-label="Record">🎤</button>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script>
|
||||||
|
const chat = document.getElementById('chat');
|
||||||
|
const micBtn = document.getElementById('mic-btn');
|
||||||
|
let mediaRecorder = null;
|
||||||
|
let chunks = [];
|
||||||
|
|
||||||
|
function getMimeType() {
|
||||||
|
if (MediaRecorder.isTypeSupported('audio/webm;codecs=opus')) return 'audio/webm';
|
||||||
|
if (MediaRecorder.isTypeSupported('audio/mp4')) return 'audio/mp4';
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function getExtension(mime) {
|
||||||
|
if (mime.includes('webm')) return 'webm';
|
||||||
|
if (mime.includes('mp4')) return 'm4a';
|
||||||
|
return 'bin';
|
||||||
|
}
|
||||||
|
|
||||||
|
function addMessage(audioBlob) {
|
||||||
|
const article = document.createElement('article');
|
||||||
|
const audio = document.createElement('audio');
|
||||||
|
audio.controls = true;
|
||||||
|
audio.src = URL.createObjectURL(audioBlob);
|
||||||
|
const text = document.createElement('p');
|
||||||
|
text.innerHTML = '<span class="spinner"></span> Transcribing...';
|
||||||
|
article.append(audio, text);
|
||||||
|
chat.append(article);
|
||||||
|
chat.scrollTop = chat.scrollHeight;
|
||||||
|
return text;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function sendAudio(blob, textEl) {
|
||||||
|
const mime = blob.type || 'audio/webm';
|
||||||
|
const ext = getExtension(mime);
|
||||||
|
const form = new FormData();
|
||||||
|
form.append('audio', blob, `recording.${ext}`);
|
||||||
|
try {
|
||||||
|
const res = await fetch('/api/transcribe', { method: 'POST', body: form });
|
||||||
|
if (!res.ok) {
|
||||||
|
const err = await res.text();
|
||||||
|
textEl.innerHTML = `<span class="error">Error: ${err}</span>`;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const data = await res.json();
|
||||||
|
textEl.textContent = data.text || '(empty)';
|
||||||
|
} catch (e) {
|
||||||
|
textEl.innerHTML = `<span class="error">Error: ${e.message}</span>`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function toggleRecording() {
|
||||||
|
if (mediaRecorder && mediaRecorder.state === 'recording') {
|
||||||
|
mediaRecorder.stop();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const stream = await navigator.mediaDevices.getUserMedia({ audio: true });
|
||||||
|
const mime = getMimeType();
|
||||||
|
mediaRecorder = new MediaRecorder(stream, mime ? { mimeType: mime } : {});
|
||||||
|
chunks = [];
|
||||||
|
mediaRecorder.ondataavailable = e => { if (e.data.size > 0) chunks.push(e.data); };
|
||||||
|
mediaRecorder.onstop = () => {
|
||||||
|
stream.getTracks().forEach(t => t.stop());
|
||||||
|
micBtn.classList.remove('recording');
|
||||||
|
const blob = new Blob(chunks, { type: mediaRecorder.mimeType });
|
||||||
|
const textEl = addMessage(blob);
|
||||||
|
sendAudio(blob, textEl);
|
||||||
|
};
|
||||||
|
mediaRecorder.start();
|
||||||
|
micBtn.classList.add('recording');
|
||||||
|
} catch (e) {
|
||||||
|
alert('Microphone access denied: ' + e.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
micBtn.addEventListener('click', toggleRecording);
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
Reference in New Issue
Block a user