Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
023bc0218b | ||
|
|
634506f902 | ||
|
|
8c7f4e8008 | ||
|
|
b8d718caa6 | ||
|
|
d92005bf95 | ||
|
|
e90d154b83 | ||
|
|
fa749b571d | ||
|
|
ef188e1f67 | ||
|
|
f7b9695418 | ||
|
|
b4c0589b04 | ||
|
|
66c441b17f | ||
|
|
94bc704950 | ||
|
|
7900d2d9f2 | ||
|
|
e0396df7b0 |
@@ -39,27 +39,7 @@ jobs:
|
|||||||
- name: Install npm dependencies
|
- name: Install npm dependencies
|
||||||
run: npm ci
|
run: npm ci
|
||||||
|
|
||||||
- name: Setup code signing
|
|
||||||
env:
|
|
||||||
APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
|
|
||||||
APPLE_API_KEY_CONTENT: ${{ secrets.APPLE_API_KEY_CONTENT }}
|
|
||||||
run: |
|
|
||||||
if [ -n "${APPLE_API_KEY_CONTENT}" ]; then
|
|
||||||
echo "Setting up notarization API key..."
|
|
||||||
mkdir -p ~/private_keys
|
|
||||||
echo "${APPLE_API_KEY_CONTENT}" > ~/private_keys/AuthKey_${APPLE_API_KEY}.p8
|
|
||||||
else
|
|
||||||
echo "No signing secrets configured, skipping code signing setup"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Build Tauri app
|
- name: Build Tauri app
|
||||||
env:
|
|
||||||
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
|
|
||||||
APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
|
|
||||||
APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
|
|
||||||
APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
|
|
||||||
APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
|
|
||||||
APPLE_API_KEY_PATH: ~/private_keys/AuthKey_${{ secrets.APPLE_API_KEY }}.p8
|
|
||||||
run: npm run tauri build
|
run: npm run tauri build
|
||||||
|
|
||||||
- name: Upload to release
|
- name: Upload to release
|
||||||
@@ -111,6 +91,3 @@ jobs:
|
|||||||
"${REPO_API}/releases/${RELEASE_ID}/assets?name=${encoded_name}")
|
"${REPO_API}/releases/${RELEASE_ID}/assets?name=${encoded_name}")
|
||||||
echo "Upload response: HTTP ${HTTP_CODE}"
|
echo "Upload response: HTTP ${HTTP_CODE}"
|
||||||
done
|
done
|
||||||
|
|
||||||
- name: Cleanup signing artifacts
|
|
||||||
run: rm -rf ~/private_keys
|
|
||||||
|
|||||||
@@ -73,8 +73,15 @@ class APIServer:
|
|||||||
original_state_cb = self.controller.on_state_changed
|
original_state_cb = self.controller.on_state_changed
|
||||||
|
|
||||||
def on_state_changed(state: str, message: str):
|
def on_state_changed(state: str, message: str):
|
||||||
|
# Isolate the upstream callback so a failure there (e.g. a
|
||||||
|
# broken stdout pipe in main_headless) cannot propagate into
|
||||||
|
# _set_state and tear down engine init / reload_engine /
|
||||||
|
# apply_settings request handling.
|
||||||
if original_state_cb:
|
if original_state_cb:
|
||||||
original_state_cb(state, message)
|
try:
|
||||||
|
original_state_cb(state, message)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
self._broadcast_control({"type": "state_changed", "state": state, "message": message})
|
self._broadcast_control({"type": "state_changed", "state": state, "message": message})
|
||||||
|
|
||||||
self.controller.on_state_changed = on_state_changed
|
self.controller.on_state_changed = on_state_changed
|
||||||
@@ -212,7 +219,11 @@ class APIServer:
|
|||||||
|
|
||||||
@app.put("/api/config")
|
@app.put("/api/config")
|
||||||
async def update_config(update: ConfigUpdate):
|
async def update_config(update: ConfigUpdate):
|
||||||
engine_reloaded, message = ctrl.apply_settings(update.settings)
|
import asyncio
|
||||||
|
loop = asyncio.get_event_loop()
|
||||||
|
engine_reloaded, message = await loop.run_in_executor(
|
||||||
|
None, ctrl.apply_settings, update.settings
|
||||||
|
)
|
||||||
return {
|
return {
|
||||||
"status": "ok",
|
"status": "ok",
|
||||||
"message": message,
|
"message": message,
|
||||||
@@ -269,6 +280,7 @@ class APIServer:
|
|||||||
data = resp.json()
|
data = resp.json()
|
||||||
ctrl.config.set('remote.auth_token', data.get('token', ''))
|
ctrl.config.set('remote.auth_token', data.get('token', ''))
|
||||||
ctrl.config.set('remote.server_url', req.server_url)
|
ctrl.config.set('remote.server_url', req.server_url)
|
||||||
|
ctrl.config.set('remote.email', req.email)
|
||||||
return {"status": "ok", "token": data.get('token', '')}
|
return {"status": "ok", "token": data.get('token', '')}
|
||||||
else:
|
else:
|
||||||
raise HTTPException(status_code=resp.status_code, detail=resp.text)
|
raise HTTPException(status_code=resp.status_code, detail=resp.text)
|
||||||
|
|||||||
@@ -608,8 +608,17 @@ class AppController:
|
|||||||
Returns (engine_reload_needed, message).
|
Returns (engine_reload_needed, message).
|
||||||
"""
|
"""
|
||||||
if new_config:
|
if new_config:
|
||||||
for key, value in new_config.items():
|
# Flatten nested dicts into dot-notation keys so we merge
|
||||||
self.config.set(key, value)
|
# individual values instead of replacing entire sections
|
||||||
|
# (e.g. remote.mode instead of overwriting all of remote)
|
||||||
|
def _flatten(d, prefix=""):
|
||||||
|
for k, v in d.items():
|
||||||
|
full_key = f"{prefix}{k}" if not prefix else f"{prefix}.{k}"
|
||||||
|
if isinstance(v, dict):
|
||||||
|
_flatten(v, full_key)
|
||||||
|
else:
|
||||||
|
self.config.set(full_key, v)
|
||||||
|
_flatten(new_config)
|
||||||
|
|
||||||
# Update web server display settings
|
# Update web server display settings
|
||||||
if self.web_server:
|
if self.web_server:
|
||||||
|
|||||||
@@ -75,10 +75,16 @@ def main():
|
|||||||
# Create controller and initialize
|
# Create controller and initialize
|
||||||
controller = AppController(config=config)
|
controller = AppController(config=config)
|
||||||
|
|
||||||
# Wire a state callback that prints the ready event
|
# Wire a state callback that prints state events for the parent
|
||||||
|
# process to read. Stdout writes can fail with EINVAL on Windows
|
||||||
|
# when the parent stops reading the sidecar pipe; swallow those
|
||||||
|
# so the engine state machine isn't taken down by a logging path.
|
||||||
def on_state_changed(state, message):
|
def on_state_changed(state, message):
|
||||||
event = {"event": "state", "state": state, "message": message}
|
event = {"event": "state", "state": state, "message": message}
|
||||||
print(json.dumps(event), flush=True)
|
try:
|
||||||
|
print(json.dumps(event), flush=True)
|
||||||
|
except (OSError, ValueError):
|
||||||
|
pass
|
||||||
|
|
||||||
controller.on_state_changed = on_state_changed
|
controller.on_state_changed = on_state_changed
|
||||||
|
|
||||||
|
|||||||
@@ -320,9 +320,13 @@ class DeepgramTranscriptionEngine:
|
|||||||
def _build_ws_url_and_headers(self):
|
def _build_ws_url_and_headers(self):
|
||||||
"""Return ``(url, headers)`` depending on the current mode."""
|
"""Return ``(url, headers)`` depending on the current mode."""
|
||||||
if self.mode == "managed":
|
if self.mode == "managed":
|
||||||
# Ensure the server URL uses wss:// and append the path
|
# Convert HTTP(S) URLs to WS(S) for WebSocket connection
|
||||||
url = self.server_url.rstrip("/")
|
url = self.server_url.rstrip("/")
|
||||||
if not url.startswith("ws://") and not url.startswith("wss://"):
|
if url.startswith("https://"):
|
||||||
|
url = "wss://" + url[len("https://"):]
|
||||||
|
elif url.startswith("http://"):
|
||||||
|
url = "ws://" + url[len("http://"):]
|
||||||
|
elif not url.startswith("ws://") and not url.startswith("wss://"):
|
||||||
url = f"wss://{url}"
|
url = f"wss://{url}"
|
||||||
url = f"{url}/ws/transcribe"
|
url = f"{url}/ws/transcribe"
|
||||||
return url, {}
|
return url, {}
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ remote:
|
|||||||
mode: byok # local | managed | byok
|
mode: byok # local | managed | byok
|
||||||
server_url: "https://transcribe.shadowdao.com" # Proxy server URL for managed mode
|
server_url: "https://transcribe.shadowdao.com" # Proxy server URL for managed mode
|
||||||
auth_token: "" # JWT stored after login (managed mode)
|
auth_token: "" # JWT stored after login (managed mode)
|
||||||
|
email: "" # Email of the logged-in managed-mode account (for UI display)
|
||||||
byok_api_key: "" # Deepgram API key for BYOK mode
|
byok_api_key: "" # Deepgram API key for BYOK mode
|
||||||
deepgram_model: nova-2 # Deepgram model to use
|
deepgram_model: nova-2 # Deepgram model to use
|
||||||
language: en-US # Language code
|
language: en-US # Language code
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "local-transcription",
|
"name": "local-transcription",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "2.0.17",
|
"version": "2.0.20",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite dev",
|
"dev": "vite dev",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "local-transcription"
|
name = "local-transcription"
|
||||||
version = "1.0.11"
|
version = "1.0.14"
|
||||||
description = "A standalone desktop application for real-time speech-to-text transcription using Whisper models"
|
description = "A standalone desktop application for real-time speech-to-text transcription using Whisper models"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.9"
|
requires-python = ">=3.9"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "local-transcription"
|
name = "local-transcription"
|
||||||
version = "2.0.17"
|
version = "2.0.20"
|
||||||
description = "Real-time speech-to-text transcription for streamers"
|
description = "Real-time speech-to-text transcription for streamers"
|
||||||
authors = ["Local Transcription Contributors"]
|
authors = ["Local Transcription Contributors"]
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"productName": "Local Transcription",
|
"productName": "Local Transcription",
|
||||||
"version": "2.0.17",
|
"version": "2.0.20",
|
||||||
"identifier": "net.anhonesthost.local-transcription",
|
"identifier": "net.anhonesthost.local-transcription",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../dist",
|
"frontendDist": "../dist",
|
||||||
|
|||||||
@@ -44,9 +44,13 @@
|
|||||||
let byokApiKey = $state("");
|
let byokApiKey = $state("");
|
||||||
let managedEmail = $state("");
|
let managedEmail = $state("");
|
||||||
let managedPassword = $state("");
|
let managedPassword = $state("");
|
||||||
|
let managedLoggedIn = $state(false);
|
||||||
let autoCheckUpdates = $state(true);
|
let autoCheckUpdates = $state(true);
|
||||||
|
|
||||||
let isCloudMode = $derived(remoteMode === "managed" || remoteMode === "byok");
|
let isCloudMode = $derived(remoteMode === "managed" || remoteMode === "byok");
|
||||||
|
let isCloudOnly = $derived(
|
||||||
|
computeDevices.some(d => d.id === "cloud")
|
||||||
|
);
|
||||||
|
|
||||||
// Room creation / join state
|
// Room creation / join state
|
||||||
let shareCode = $state("");
|
let shareCode = $state("");
|
||||||
@@ -128,6 +132,8 @@
|
|||||||
remoteMode = cfg.remote.mode;
|
remoteMode = cfg.remote.mode;
|
||||||
remoteServerUrl = cfg.remote.server_url;
|
remoteServerUrl = cfg.remote.server_url;
|
||||||
byokApiKey = cfg.remote.byok_api_key ?? "";
|
byokApiKey = cfg.remote.byok_api_key ?? "";
|
||||||
|
managedEmail = cfg.remote.email ?? "";
|
||||||
|
managedLoggedIn = !!(cfg.remote.auth_token && cfg.remote.email);
|
||||||
autoCheckUpdates = cfg.updates.auto_check;
|
autoCheckUpdates = cfg.updates.auto_check;
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -254,15 +260,37 @@
|
|||||||
|
|
||||||
const MANAGED_SERVER_URL = "https://transcribe.shadowdao.com";
|
const MANAGED_SERVER_URL = "https://transcribe.shadowdao.com";
|
||||||
|
|
||||||
|
let loginMessage = $state("");
|
||||||
|
|
||||||
async function handleManagedLogin() {
|
async function handleManagedLogin() {
|
||||||
|
loginMessage = "";
|
||||||
try {
|
try {
|
||||||
await backendStore.apiPost("/api/login", {
|
await backendStore.apiPost("/api/login", {
|
||||||
email: managedEmail,
|
email: managedEmail,
|
||||||
password: managedPassword,
|
password: managedPassword,
|
||||||
server_url: remoteServerUrl || MANAGED_SERVER_URL,
|
server_url: remoteServerUrl || MANAGED_SERVER_URL,
|
||||||
});
|
});
|
||||||
|
loginMessage = "Logged in successfully!";
|
||||||
|
managedPassword = "";
|
||||||
|
managedLoggedIn = true;
|
||||||
|
await configStore.fetchConfig();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error("Login failed:", err);
|
console.error("Login failed:", err);
|
||||||
|
loginMessage = "Login failed. Check your email and password.";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleManagedLogout() {
|
||||||
|
try {
|
||||||
|
await configStore.updateConfig({
|
||||||
|
remote: { auth_token: "", email: "" },
|
||||||
|
});
|
||||||
|
managedLoggedIn = false;
|
||||||
|
managedPassword = "";
|
||||||
|
loginMessage = "";
|
||||||
|
} catch (err) {
|
||||||
|
console.error("Logout failed:", err);
|
||||||
|
loginMessage = `Error: ${err}`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -453,7 +481,7 @@
|
|||||||
/>
|
/>
|
||||||
Managed Service
|
Managed Service
|
||||||
</label>
|
</label>
|
||||||
{#if !backendStore.isCloudOnly}
|
{#if !isCloudOnly}
|
||||||
<label>
|
<label>
|
||||||
<input
|
<input
|
||||||
type="radio"
|
type="radio"
|
||||||
@@ -481,29 +509,44 @@
|
|||||||
{/if}
|
{/if}
|
||||||
{#if remoteMode === "managed"}
|
{#if remoteMode === "managed"}
|
||||||
<div class="managed-auth">
|
<div class="managed-auth">
|
||||||
<div class="field">
|
{#if managedLoggedIn}
|
||||||
<label for="managed-email">Email</label>
|
<p style="font-size: 13px; margin: 0 0 8px;">
|
||||||
<input
|
<span style="color: var(--accent-green, #4CAF50);">✓ Logged in</span>
|
||||||
id="managed-email"
|
as <strong>{managedEmail}</strong>
|
||||||
type="email"
|
</p>
|
||||||
bind:value={managedEmail}
|
<div class="auth-buttons">
|
||||||
placeholder="email@example.com"
|
<button onclick={handleManagedLogout}>Log out</button>
|
||||||
/>
|
</div>
|
||||||
</div>
|
{:else}
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<label for="managed-password">Password</label>
|
<label for="managed-email">Email</label>
|
||||||
<input
|
<input
|
||||||
id="managed-password"
|
id="managed-email"
|
||||||
type="password"
|
type="email"
|
||||||
bind:value={managedPassword}
|
bind:value={managedEmail}
|
||||||
/>
|
placeholder="email@example.com"
|
||||||
</div>
|
/>
|
||||||
<div class="auth-buttons">
|
</div>
|
||||||
<button onclick={handleManagedLogin}>Login</button>
|
<div class="field">
|
||||||
</div>
|
<label for="managed-password">Password</label>
|
||||||
<p style="font-size: 11px; color: var(--text-muted); margin-top: 8px;">
|
<input
|
||||||
Don't have an account? <a href="https://transcribe.shadowdao.com/register.html" target="_blank" rel="noopener" style="color: var(--accent-blue);">Sign up here</a>
|
id="managed-password"
|
||||||
</p>
|
type="password"
|
||||||
|
bind:value={managedPassword}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="auth-buttons">
|
||||||
|
<button onclick={handleManagedLogin}>Login</button>
|
||||||
|
</div>
|
||||||
|
<p style="font-size: 11px; color: var(--text-muted); margin-top: 8px;">
|
||||||
|
Don't have an account? <a href="https://transcribe.shadowdao.com/register.html" target="_blank" rel="noopener" style="color: var(--accent-blue);">Sign up here</a>
|
||||||
|
</p>
|
||||||
|
{/if}
|
||||||
|
{#if loginMessage}
|
||||||
|
<p style="font-size: 12px; margin-top: 6px; color: {loginMessage.startsWith('Logged') ? 'var(--accent-green, #4CAF50)' : 'var(--accent-red, #f44336)'};">
|
||||||
|
{loginMessage}
|
||||||
|
</p>
|
||||||
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ export interface AppConfig {
|
|||||||
mode: string;
|
mode: string;
|
||||||
server_url: string;
|
server_url: string;
|
||||||
auth_token: string;
|
auth_token: string;
|
||||||
|
email: string;
|
||||||
byok_api_key: string;
|
byok_api_key: string;
|
||||||
deepgram_model: string;
|
deepgram_model: string;
|
||||||
language: string;
|
language: string;
|
||||||
@@ -131,6 +132,7 @@ function getDefaultConfig(): AppConfig {
|
|||||||
mode: "byok",
|
mode: "byok",
|
||||||
server_url: "",
|
server_url: "",
|
||||||
auth_token: "",
|
auth_token: "",
|
||||||
|
email: "",
|
||||||
byok_api_key: "",
|
byok_api_key: "",
|
||||||
deepgram_model: "nova-2",
|
deepgram_model: "nova-2",
|
||||||
language: "en-US",
|
language: "en-US",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
"""Version information for Local Transcription."""
|
"""Version information for Local Transcription."""
|
||||||
|
|
||||||
__version__ = "2.0.17"
|
__version__ = "2.0.20"
|
||||||
__version_info__ = (2, 0, 17)
|
__version_info__ = (2, 0, 20)
|
||||||
|
|
||||||
# Version history:
|
# Version history:
|
||||||
# 1.4.0 - Auto-update feature:
|
# 1.4.0 - Auto-update feature:
|
||||||
|
|||||||
Reference in New Issue
Block a user