Compare commits
8
Commits
f65c816464
..
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1877fee258 | ||
|
|
b3fb74fb1b | ||
|
|
f42d124593 | ||
|
|
2b126ee4e6 | ||
|
|
ab14f5e452 | ||
|
|
761f1a1f78 | ||
|
|
5dd0a3aeac | ||
|
|
4898d5cfde |
+4
-2
@@ -3,6 +3,8 @@ APP_ENV=local
|
|||||||
APP_KEY=
|
APP_KEY=
|
||||||
APP_DEBUG=true
|
APP_DEBUG=true
|
||||||
APP_URL=http://localhost:8080
|
APP_URL=http://localhost:8080
|
||||||
|
# Production/CI: set to the Gitea registry image (local Compose builds andytranscribe-app:latest).
|
||||||
|
# APP_IMAGE=gitea.z00.nu/ben/andytranscribe:latest
|
||||||
|
|
||||||
APP_LOCALE=en
|
APP_LOCALE=en
|
||||||
APP_FALLBACK_LOCALE=en
|
APP_FALLBACK_LOCALE=en
|
||||||
@@ -27,7 +29,7 @@ DB_CONNECTION=sqlite
|
|||||||
# DB_USERNAME=root
|
# DB_USERNAME=root
|
||||||
# DB_PASSWORD=
|
# DB_PASSWORD=
|
||||||
|
|
||||||
SESSION_DRIVER=database
|
SESSION_DRIVER=file
|
||||||
SESSION_LIFETIME=120
|
SESSION_LIFETIME=120
|
||||||
SESSION_ENCRYPT=false
|
SESSION_ENCRYPT=false
|
||||||
SESSION_PATH=/
|
SESSION_PATH=/
|
||||||
@@ -37,7 +39,7 @@ BROADCAST_CONNECTION=reverb
|
|||||||
FILESYSTEM_DISK=local
|
FILESYSTEM_DISK=local
|
||||||
QUEUE_CONNECTION=database
|
QUEUE_CONNECTION=database
|
||||||
|
|
||||||
CACHE_STORE=database
|
CACHE_STORE=file
|
||||||
# CACHE_PREFIX=
|
# CACHE_PREFIX=
|
||||||
|
|
||||||
MEMCACHED_HOST=127.0.0.1
|
MEMCACHED_HOST=127.0.0.1
|
||||||
|
|||||||
@@ -0,0 +1,117 @@
|
|||||||
|
name: CI
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
pull_request:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: gitea.z00.nu
|
||||||
|
# Baked into the Vite client bundle for production WebSockets.
|
||||||
|
VITE_REVERB_HOST: reverb.transcribe.z00.nu
|
||||||
|
VITE_REVERB_PORT: "443"
|
||||||
|
VITE_REVERB_SCHEME: https
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
test:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
HOST="${{ gitea.server_url }}"
|
||||||
|
HOST="${HOST#https://}"
|
||||||
|
HOST="${HOST#http://}"
|
||||||
|
git clone --depth 1 \
|
||||||
|
"https://x-access-token:${{ secrets.GITHUB_TOKEN }}@${HOST}/${{ gitea.repository }}.git" \
|
||||||
|
.
|
||||||
|
git fetch --depth 1 origin "${{ gitea.sha }}"
|
||||||
|
git checkout --force "${{ gitea.sha }}"
|
||||||
|
|
||||||
|
- name: Install PHP dependencies
|
||||||
|
run: composer install --no-interaction --prefer-dist --optimize-autoloader
|
||||||
|
|
||||||
|
- name: Run tests
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
cp .env.example .env
|
||||||
|
php artisan key:generate --force --no-interaction
|
||||||
|
php -d memory_limit=512M artisan test --compact
|
||||||
|
|
||||||
|
- name: Validate compose
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
APP_IMAGE="${REGISTRY}/$(echo "${{ gitea.repository }}" | tr '[:upper:]' '[:lower:]'):test" \
|
||||||
|
APP_KEY="base64:dGVzdC1hcHAta2V5LWZvci1jaS1jb21wb3NlLXZhbGlkYXRpb24=" \
|
||||||
|
docker compose -f docker-compose.yml -f compose.z00.yaml config --quiet
|
||||||
|
|
||||||
|
build-and-push:
|
||||||
|
if: gitea.event_name != 'pull_request'
|
||||||
|
needs: test
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
HOST="${{ gitea.server_url }}"
|
||||||
|
HOST="${HOST#https://}"
|
||||||
|
HOST="${HOST#http://}"
|
||||||
|
git clone --depth 1 \
|
||||||
|
"https://x-access-token:${{ secrets.GITHUB_TOKEN }}@${HOST}/${{ gitea.repository }}.git" \
|
||||||
|
.
|
||||||
|
git fetch --depth 1 origin "${{ gitea.sha }}"
|
||||||
|
git checkout --force "${{ gitea.sha }}"
|
||||||
|
|
||||||
|
- name: Build and push image
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
REPO_LC="$(echo "${{ gitea.repository }}" | tr '[:upper:]' '[:lower:]')"
|
||||||
|
TAG_SHA="${REGISTRY}/${REPO_LC}:${{ gitea.sha }}"
|
||||||
|
TAG_LATEST="${REGISTRY}/${REPO_LC}:latest"
|
||||||
|
echo "${{ secrets.REGISTRY_TOKEN }}" | docker login "${REGISTRY}" -u "${{ gitea.actor }}" --password-stdin
|
||||||
|
DOCKER_BUILDKIT=1 docker build \
|
||||||
|
--build-arg VITE_APP_NAME=AndyTranscribe \
|
||||||
|
--build-arg VITE_REVERB_APP_KEY=andytranscribe-key \
|
||||||
|
--build-arg "VITE_REVERB_HOST=${VITE_REVERB_HOST}" \
|
||||||
|
--build-arg "VITE_REVERB_PORT=${VITE_REVERB_PORT}" \
|
||||||
|
--build-arg "VITE_REVERB_SCHEME=${VITE_REVERB_SCHEME}" \
|
||||||
|
-t "${TAG_SHA}" \
|
||||||
|
-t "${TAG_LATEST}" \
|
||||||
|
.
|
||||||
|
docker push "${TAG_SHA}"
|
||||||
|
docker push "${TAG_LATEST}"
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
if: gitea.ref == 'refs/heads/main' && gitea.event_name != 'pull_request'
|
||||||
|
needs: build-and-push
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
HOST="${{ gitea.server_url }}"
|
||||||
|
HOST="${HOST#https://}"
|
||||||
|
HOST="${HOST#http://}"
|
||||||
|
git clone --depth 1 \
|
||||||
|
"https://x-access-token:${{ secrets.GITHUB_TOKEN }}@${HOST}/${{ gitea.repository }}.git" \
|
||||||
|
.
|
||||||
|
git fetch --depth 1 origin "${{ gitea.sha }}"
|
||||||
|
git checkout --force "${{ gitea.sha }}"
|
||||||
|
|
||||||
|
- name: Deploy production
|
||||||
|
env:
|
||||||
|
DEPLOY_PATHS: ${{ secrets.DEPLOY_PATHS }}
|
||||||
|
DEPLOY_SHA: ${{ gitea.sha }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
REPO_LC="$(echo "${{ gitea.repository }}" | tr '[:upper:]' '[:lower:]')"
|
||||||
|
export APP_IMAGE="${REGISTRY}/${REPO_LC}:${{ gitea.sha }}"
|
||||||
|
chmod +x scripts/deploy-production.sh
|
||||||
|
if [ -z "${DEPLOY_PATHS:-}" ]; then
|
||||||
|
echo "DEPLOY_PATHS secret is not set; skipping deploy."
|
||||||
|
echo "Built image: ${APP_IMAGE}"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
./scripts/deploy-production.sh
|
||||||
@@ -154,6 +154,29 @@ Then a normal `docker compose up -d` enables:
|
|||||||
- `queue:listen` so worker code picks up changes between jobs
|
- `queue:listen` so worker code picks up changes between jobs
|
||||||
|
|
||||||
Open [http://localhost:8080](http://localhost:8080) as usual. After changing Composer packages, run `docker compose exec app composer install`.
|
Open [http://localhost:8080](http://localhost:8080) as usual. After changing Composer packages, run `docker compose exec app composer install`.
|
||||||
|
|
||||||
|
## CI/CD (Gitea Actions)
|
||||||
|
|
||||||
|
On push to `main`, Gitea Actions (host runner on z00):
|
||||||
|
|
||||||
|
1. Runs PHPUnit (+ compose config check)
|
||||||
|
2. Builds and pushes `gitea.z00.nu/ben/andytranscribe:<sha>` (+ `:latest`) — Vite assets are baked in the image build
|
||||||
|
3. Deploys by hard-resetting `~/andyTranscibe` to that SHA and pulling the image (`docker-compose.yml` + `compose.z00.yaml`)
|
||||||
|
|
||||||
|
Do not hot-patch production containers or the deploy checkout. Fix in git and push to `main` so CI deploys.
|
||||||
|
|
||||||
|
One-time server bootstrap (secrets + registry login):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./scripts/setup-gitea-ci.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
Manual deploy of an already-built tag:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
APP_IMAGE=gitea.z00.nu/ben/andytranscribe:<sha> DEPLOY_PATHS=$HOME/andyTranscibe ./scripts/deploy-production.sh
|
||||||
|
```
|
||||||
|
|
||||||
## Services and ports
|
## Services and ports
|
||||||
|
|
||||||
| Service | Host port | Role |
|
| Service | Host port | Role |
|
||||||
@@ -181,12 +204,13 @@ Edit `.env` before `docker compose up` when you need different ports or models:
|
|||||||
| Variable | Purpose | Default |
|
| Variable | Purpose | Default |
|
||||||
| --- | --- | --- |
|
| --- | --- | --- |
|
||||||
| `APP_KEY` | Required Laravel encryption key | — |
|
| `APP_KEY` | Required Laravel encryption key | — |
|
||||||
|
| `APP_IMAGE` | Pre-built image for CI/prod deploys (omit locally) | `andytranscribe-app:latest` |
|
||||||
| `APP_URL` | Public app URL | `http://localhost:8080` |
|
| `APP_URL` | Public app URL | `http://localhost:8080` |
|
||||||
| `APP_HOST_PORT` | Host port for the web app | `8080` |
|
| `APP_HOST_PORT` | Host port for the web app | `8080` |
|
||||||
| `REVERB_HOST_PORT` | Host port for WebSockets | `8081` |
|
| `REVERB_HOST_PORT` | Host port for WebSockets | `8081` |
|
||||||
| `WHISPER_HOST_PORT` | Host port for Whisper | `8090` |
|
| `WHISPER_HOST_PORT` | Host port for Whisper | `8090` |
|
||||||
| `LOCAL_WHISPER_MODEL` | Whisper model id | `Systran/faster-whisper-base` |
|
| `LOCAL_WHISPER_MODEL` | Whisper model id | `Systran/faster-whisper-base` |
|
||||||
| `TRANSCRIPTION_TIMEOUT` | Job/HTTP timeout (seconds) | `600` |
|
| `TRANSCRIPTION_TIMEOUT` | Job/HTTP timeout (seconds). Hung Whisper calls fail the job; UI can restart. | `600` |
|
||||||
| `DB_QUEUE_RETRY_AFTER` | Must exceed `TRANSCRIPTION_TIMEOUT` | `660` |
|
| `DB_QUEUE_RETRY_AFTER` | Must exceed `TRANSCRIPTION_TIMEOUT` | `660` |
|
||||||
|
|
||||||
Inside Compose, Laravel talks to Whisper at `http://whisper:8000/v1` and publishes broadcasts to the `reverb` service. The browser connects to Reverb on `localhost:8081`.
|
Inside Compose, Laravel talks to Whisper at `http://whisper:8000/v1` and publishes broadcasts to the `reverb` service. The browser connects to Reverb on `localhost:8081`.
|
||||||
|
|||||||
@@ -6,9 +6,11 @@ use App\Models\Recording;
|
|||||||
use App\Services\TranscriptionService;
|
use App\Services\TranscriptionService;
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
use Illuminate\Foundation\Queue\Queueable;
|
use Illuminate\Foundation\Queue\Queueable;
|
||||||
|
use Illuminate\Queue\Attributes\FailOnTimeout;
|
||||||
use Illuminate\Support\Facades\Log;
|
use Illuminate\Support\Facades\Log;
|
||||||
use Throwable;
|
use Throwable;
|
||||||
|
|
||||||
|
#[FailOnTimeout]
|
||||||
class TranscribeRecording implements ShouldQueue
|
class TranscribeRecording implements ShouldQueue
|
||||||
{
|
{
|
||||||
use Queueable;
|
use Queueable;
|
||||||
@@ -20,6 +22,9 @@ class TranscribeRecording implements ShouldQueue
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* The number of seconds the job can run before timing out.
|
* The number of seconds the job can run before timing out.
|
||||||
|
*
|
||||||
|
* Covers a hung Whisper HTTP call: the worker is killed, failed() runs,
|
||||||
|
* and the recording is marked failed so the UI can restart.
|
||||||
*/
|
*/
|
||||||
public int $timeout;
|
public int $timeout;
|
||||||
|
|
||||||
@@ -134,16 +139,7 @@ class TranscribeRecording implements ShouldQueue
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($this->recording->ownsTranscriptionRun($this->runStartedAt)) {
|
if ($this->recording->ownsTranscriptionRun($this->runStartedAt)) {
|
||||||
$this->recording->forceFill([
|
$this->recording->markTranscriptionComplete($text);
|
||||||
'transcript' => $text,
|
|
||||||
'transcription_status' => 'done',
|
|
||||||
'transcription_progress' => 'Transcription complete',
|
|
||||||
'transcription_percent' => 100,
|
|
||||||
'transcription_error' => null,
|
|
||||||
'transcribed_at' => now(),
|
|
||||||
])->save();
|
|
||||||
|
|
||||||
$this->recording->broadcastTranscriptionUpdated();
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -152,22 +148,16 @@ class TranscribeRecording implements ShouldQueue
|
|||||||
if (
|
if (
|
||||||
$this->recording->transcription_status === 'failed'
|
$this->recording->transcription_status === 'failed'
|
||||||
&& $this->recording->matchesTranscriptionRun($this->runStartedAt)
|
&& $this->recording->matchesTranscriptionRun($this->runStartedAt)
|
||||||
&& str_contains((string) $this->recording->transcription_error, 'worker stopped')
|
&& (
|
||||||
|
str_contains((string) $this->recording->transcription_error, 'worker stopped')
|
||||||
|
|| str_contains((string) $this->recording->transcription_error, 'timed out')
|
||||||
|
)
|
||||||
) {
|
) {
|
||||||
Log::warning('Recovering transcript after false orphan failure', [
|
Log::warning('Recovering transcript after false orphan failure', [
|
||||||
'recording_id' => $this->recording->id,
|
'recording_id' => $this->recording->id,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->recording->forceFill([
|
$this->recording->markTranscriptionComplete($text);
|
||||||
'transcript' => $text,
|
|
||||||
'transcription_status' => 'done',
|
|
||||||
'transcription_progress' => 'Transcription complete',
|
|
||||||
'transcription_percent' => 100,
|
|
||||||
'transcription_error' => null,
|
|
||||||
'transcribed_at' => now(),
|
|
||||||
])->save();
|
|
||||||
|
|
||||||
$this->recording->broadcastTranscriptionUpdated();
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
+95
-39
@@ -41,6 +41,7 @@ class Recording extends Model
|
|||||||
'transcription_driver',
|
'transcription_driver',
|
||||||
'ollama_url',
|
'ollama_url',
|
||||||
'transcribed_at',
|
'transcribed_at',
|
||||||
|
'transcription_duration_seconds',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -53,6 +54,7 @@ class Recording extends Model
|
|||||||
'transcribed_at' => 'datetime',
|
'transcribed_at' => 'datetime',
|
||||||
'transcription_started_at' => 'datetime',
|
'transcription_started_at' => 'datetime',
|
||||||
'duration_seconds' => 'integer',
|
'duration_seconds' => 'integer',
|
||||||
|
'transcription_duration_seconds' => 'integer',
|
||||||
'file_size_bytes' => 'integer',
|
'file_size_bytes' => 'integer',
|
||||||
'transcription_percent' => 'integer',
|
'transcription_percent' => 'integer',
|
||||||
'user_id' => 'integer',
|
'user_id' => 'integer',
|
||||||
@@ -138,6 +140,7 @@ class Recording extends Model
|
|||||||
'transcription_percent' => null,
|
'transcription_percent' => null,
|
||||||
'transcription_started_at' => now(),
|
'transcription_started_at' => now(),
|
||||||
'transcription_error' => null,
|
'transcription_error' => null,
|
||||||
|
'transcription_duration_seconds' => null,
|
||||||
// Keep the previous transcript until a new run succeeds.
|
// Keep the previous transcript until a new run succeeds.
|
||||||
'transcribed_at' => $this->transcribed_at,
|
'transcribed_at' => $this->transcribed_at,
|
||||||
]);
|
]);
|
||||||
@@ -228,33 +231,40 @@ class Recording extends Model
|
|||||||
return ($start > 0 ? '…' : '').$excerpt.(mb_strlen($transcript) > $start + mb_strlen($excerpt) ? '…' : '');
|
return ($start > 0 ? '…' : '').$excerpt.(mb_strlen($transcript) > $start + mb_strlen($excerpt) ? '…' : '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Seconds after which a reserved queue row is considered abandoned
|
||||||
|
* (worker died mid-Whisper without releasing the job).
|
||||||
|
*/
|
||||||
|
public function transcriptionJobStaleAfterSeconds(): int
|
||||||
|
{
|
||||||
|
return max(120, (int) config('ai.transcription_timeout', 600) + 90);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether a TranscribeRecording job for this recording is still on the queue.
|
* Whether a TranscribeRecording job for this recording is still on the queue.
|
||||||
|
*
|
||||||
|
* Reserved jobs older than the transcription timeout (+ grace) are ignored so
|
||||||
|
* orphan recovery can unblock the UI when Whisper/the worker is wedged.
|
||||||
*/
|
*/
|
||||||
public function hasActiveTranscriptionJob(): bool
|
public function hasActiveTranscriptionJob(): bool
|
||||||
{
|
{
|
||||||
|
$staleBefore = now()->timestamp - $this->transcriptionJobStaleAfterSeconds();
|
||||||
|
|
||||||
return DB::table('jobs')
|
return DB::table('jobs')
|
||||||
->pluck('payload')
|
->orderBy('id')
|
||||||
->contains(function (string $payload): bool {
|
->get(['id', 'payload', 'reserved_at'])
|
||||||
if (! str_contains($payload, TranscribeRecording::class)) {
|
->contains(function (object $job) use ($staleBefore): bool {
|
||||||
|
$payload = (string) $job->payload;
|
||||||
|
|
||||||
|
if (! str_contains($payload, 'TranscribeRecording')) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = json_decode($payload, true);
|
if ($job->reserved_at !== null && (int) $job->reserved_at <= $staleBefore) {
|
||||||
$command = $data['data']['command'] ?? null;
|
|
||||||
|
|
||||||
if (! is_string($command)) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
return $this->jobPayloadBelongsToRecording($payload);
|
||||||
$job = unserialize($command);
|
|
||||||
} catch (Throwable) {
|
|
||||||
return $this->payloadMentionsRecording($payload);
|
|
||||||
}
|
|
||||||
|
|
||||||
return $job instanceof TranscribeRecording
|
|
||||||
&& (int) $job->recording->getKey() === (int) $this->id;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -263,8 +273,11 @@ class Recording extends Model
|
|||||||
*/
|
*/
|
||||||
private function payloadMentionsRecording(string $payload): bool
|
private function payloadMentionsRecording(string $payload): bool
|
||||||
{
|
{
|
||||||
return (bool) preg_match('/id";i:'.$this->id.';/', $payload)
|
// Jobs table stores JSON; the serialized command inside escapes quotes as \".
|
||||||
|| str_contains($payload, 'id";s:'.strlen((string) $this->id).':"'.$this->id.'"');
|
return (bool) preg_match('/id\\\\";i:'.$this->id.';/', $payload)
|
||||||
|
|| (bool) preg_match('/id";i:'.$this->id.';/', $payload)
|
||||||
|
|| str_contains($payload, 'id";s:'.strlen((string) $this->id).':"'.$this->id.'"')
|
||||||
|
|| str_contains($payload, 'id\\\\";s:'.strlen((string) $this->id).':\\"'.$this->id.'\\"');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -332,34 +345,16 @@ class Recording extends Model
|
|||||||
->each(function (object $job) use (&$deleted): void {
|
->each(function (object $job) use (&$deleted): void {
|
||||||
$payload = (string) $job->payload;
|
$payload = (string) $job->payload;
|
||||||
|
|
||||||
if (! str_contains($payload, TranscribeRecording::class)) {
|
if (! str_contains($payload, 'TranscribeRecording')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = json_decode($payload, true);
|
if (! $this->jobPayloadBelongsToRecording($payload)) {
|
||||||
$command = $data['data']['command'] ?? null;
|
|
||||||
|
|
||||||
if (! is_string($command)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$queued = unserialize($command);
|
|
||||||
} catch (Throwable) {
|
|
||||||
if (! preg_match('/id";i:'.$this->id.';/', $payload)) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
DB::table('jobs')->where('id', $job->id)->delete();
|
DB::table('jobs')->where('id', $job->id)->delete();
|
||||||
$deleted++;
|
$deleted++;
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($queued instanceof TranscribeRecording && (int) $queued->recording->getKey() === (int) $this->id) {
|
|
||||||
DB::table('jobs')->where('id', $job->id)->delete();
|
|
||||||
$deleted++;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
$this->releaseTranscriptionUniqueLock();
|
$this->releaseTranscriptionUniqueLock();
|
||||||
@@ -367,6 +362,36 @@ class Recording extends Model
|
|||||||
return $deleted;
|
return $deleted;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether a jobs.payload row targets this recording.
|
||||||
|
*/
|
||||||
|
private function jobPayloadBelongsToRecording(string $payload): bool
|
||||||
|
{
|
||||||
|
$data = json_decode($payload, true);
|
||||||
|
$command = $data['data']['command'] ?? null;
|
||||||
|
|
||||||
|
if (is_string($command)) {
|
||||||
|
if (
|
||||||
|
preg_match('/id";i:'.$this->id.';/', $command)
|
||||||
|
|| str_contains($command, 'id";s:'.strlen((string) $this->id).':"'.$this->id.'"')
|
||||||
|
) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$queued = unserialize($command);
|
||||||
|
|
||||||
|
if ($queued instanceof TranscribeRecording) {
|
||||||
|
return (int) $queued->recording->getKey() === (int) $this->id;
|
||||||
|
}
|
||||||
|
} catch (Throwable) {
|
||||||
|
// Fall through to escaped JSON heuristics.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $this->payloadMentionsRecording($payload);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Stop transcription: drop queued jobs and mark the run cancelled.
|
* Stop transcription: drop queued jobs and mark the run cancelled.
|
||||||
*
|
*
|
||||||
@@ -400,6 +425,30 @@ class Recording extends Model
|
|||||||
)->forceRelease();
|
)->forceRelease();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Persist a successful transcript and how long the run took.
|
||||||
|
*/
|
||||||
|
public function markTranscriptionComplete(string $text): void
|
||||||
|
{
|
||||||
|
$finishedAt = now();
|
||||||
|
$startedAt = $this->transcription_started_at;
|
||||||
|
$durationSeconds = $startedAt === null
|
||||||
|
? null
|
||||||
|
: max(0, $finishedAt->getTimestamp() - $startedAt->getTimestamp());
|
||||||
|
|
||||||
|
$this->forceFill([
|
||||||
|
'transcript' => $text,
|
||||||
|
'transcription_status' => 'done',
|
||||||
|
'transcription_progress' => 'Transcription complete',
|
||||||
|
'transcription_percent' => 100,
|
||||||
|
'transcription_error' => null,
|
||||||
|
'transcribed_at' => $finishedAt,
|
||||||
|
'transcription_duration_seconds' => $durationSeconds,
|
||||||
|
])->save();
|
||||||
|
|
||||||
|
RecordingTranscriptionUpdated::dispatch($this->fresh());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mark transcription as failed and unblock the UI.
|
* Mark transcription as failed and unblock the UI.
|
||||||
*/
|
*/
|
||||||
@@ -420,7 +469,7 @@ class Recording extends Model
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Recover a stuck transcription if the queue job is gone.
|
* Recover a stuck transcription if the queue job is gone or a reservation is stale.
|
||||||
*/
|
*/
|
||||||
public function recoverOrphanedTranscription(): bool
|
public function recoverOrphanedTranscription(): bool
|
||||||
{
|
{
|
||||||
@@ -428,8 +477,11 @@ class Recording extends Model
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Drop abandoned reserved rows so a restart can enqueue cleanly.
|
||||||
|
$this->discardQueuedTranscriptionJobs();
|
||||||
|
|
||||||
$this->markTranscriptionFailed(
|
$this->markTranscriptionFailed(
|
||||||
'Transcription worker stopped before finishing. Start transcription again.',
|
'Transcription timed out or the worker stopped before finishing. Start transcription again.',
|
||||||
);
|
);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
@@ -519,6 +571,10 @@ class Recording extends Model
|
|||||||
'elapsed_seconds' => $elapsed,
|
'elapsed_seconds' => $elapsed,
|
||||||
'elapsed_human' => $elapsed === null ? null : $this->formatElapsed($elapsed),
|
'elapsed_human' => $elapsed === null ? null : $this->formatElapsed($elapsed),
|
||||||
'duration_seconds' => $this->duration_seconds,
|
'duration_seconds' => $this->duration_seconds,
|
||||||
|
'transcription_duration_seconds' => $this->transcription_duration_seconds,
|
||||||
|
'transcription_duration_human' => $this->transcription_duration_seconds === null
|
||||||
|
? null
|
||||||
|
: $this->formatElapsed($this->transcription_duration_seconds),
|
||||||
'is_active' => $this->isTranscribing(),
|
'is_active' => $this->isTranscribing(),
|
||||||
'has_transcript' => filled($this->transcript),
|
'has_transcript' => filled($this->transcript),
|
||||||
'transcript' => $this->transcript,
|
'transcript' => $this->transcript,
|
||||||
|
|||||||
@@ -33,24 +33,6 @@ class DiskSpaceBar extends Component
|
|||||||
return $this->disk !== null;
|
return $this->disk !== null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Progress fill color based on remaining free space.
|
|
||||||
*/
|
|
||||||
public function barColor(): string
|
|
||||||
{
|
|
||||||
$freePercent = $this->disk['free_percent'] ?? 100;
|
|
||||||
|
|
||||||
if ($freePercent <= 5) {
|
|
||||||
return 'bg-red-600';
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($freePercent <= 15) {
|
|
||||||
return 'bg-amber-500';
|
|
||||||
}
|
|
||||||
|
|
||||||
return 'bg-teal-600';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the view / contents that represent the component.
|
* Get the view / contents that represent the component.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
# z00 production overlay for AndyTranscribe (behind Caddy Proxy Manager)
|
||||||
|
services:
|
||||||
|
app:
|
||||||
|
networks:
|
||||||
|
- default
|
||||||
|
- caddy
|
||||||
|
environment:
|
||||||
|
APP_ENV: production
|
||||||
|
APP_DEBUG: "false"
|
||||||
|
APP_URL: https://transcribe.z00.nu
|
||||||
|
TRUSTED_PROXIES: "*"
|
||||||
|
REVERB_HOST: reverb
|
||||||
|
REVERB_PORT: "8080"
|
||||||
|
REVERB_SCHEME: http
|
||||||
|
reverb:
|
||||||
|
networks:
|
||||||
|
- default
|
||||||
|
- caddy
|
||||||
|
environment:
|
||||||
|
APP_URL: https://transcribe.z00.nu
|
||||||
|
REVERB_HOST: reverb.transcribe.z00.nu
|
||||||
|
REVERB_PORT: "443"
|
||||||
|
REVERB_SCHEME: https
|
||||||
|
queue:
|
||||||
|
networks:
|
||||||
|
- default
|
||||||
|
environment:
|
||||||
|
APP_ENV: production
|
||||||
|
APP_DEBUG: "false"
|
||||||
|
APP_URL: https://transcribe.z00.nu
|
||||||
|
REVERB_HOST: reverb
|
||||||
|
REVERB_PORT: "8080"
|
||||||
|
REVERB_SCHEME: http
|
||||||
|
whisper:
|
||||||
|
networks:
|
||||||
|
- default
|
||||||
|
|
||||||
|
networks:
|
||||||
|
caddy:
|
||||||
|
external: true
|
||||||
|
name: caddy-proxy-manager-test_caddy-test-network
|
||||||
+2
-1
@@ -38,7 +38,8 @@ return [
|
|||||||
'database' => env('DB_DATABASE', database_path('database.sqlite')),
|
'database' => env('DB_DATABASE', database_path('database.sqlite')),
|
||||||
'prefix' => '',
|
'prefix' => '',
|
||||||
'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
|
'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
|
||||||
'busy_timeout' => 5000,
|
// Wait longer under concurrent writers (queue + web on one SQLite file).
|
||||||
|
'busy_timeout' => (int) env('DB_BUSY_TIMEOUT', 30000),
|
||||||
'journal_mode' => 'WAL',
|
'journal_mode' => 'WAL',
|
||||||
'synchronous' => 'NORMAL',
|
'synchronous' => 'NORMAL',
|
||||||
'transaction_mode' => 'DEFERRED',
|
'transaction_mode' => 'DEFERRED',
|
||||||
|
|||||||
+30
@@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*/
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('recordings', function (Blueprint $table) {
|
||||||
|
$table->unsignedInteger('transcription_duration_seconds')
|
||||||
|
->nullable()
|
||||||
|
->after('transcribed_at');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*/
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('recordings', function (Blueprint $table) {
|
||||||
|
$table->dropColumn('transcription_duration_seconds');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
+13
-8
@@ -14,9 +14,11 @@ x-app-env: &app-env
|
|||||||
LOG_CHANNEL: stderr
|
LOG_CHANNEL: stderr
|
||||||
DB_CONNECTION: sqlite
|
DB_CONNECTION: sqlite
|
||||||
DB_DATABASE: /app/database/database.sqlite
|
DB_DATABASE: /app/database/database.sqlite
|
||||||
SESSION_DRIVER: database
|
# File drivers avoid SQLite lock storms: Livewire polls + database queue +
|
||||||
|
# session/cache all writing the same sqlite file caused "database is locked".
|
||||||
|
SESSION_DRIVER: file
|
||||||
QUEUE_CONNECTION: database
|
QUEUE_CONNECTION: database
|
||||||
CACHE_STORE: database
|
CACHE_STORE: file
|
||||||
BROADCAST_CONNECTION: reverb
|
BROADCAST_CONNECTION: reverb
|
||||||
FILESYSTEM_DISK: local
|
FILESYSTEM_DISK: local
|
||||||
REVERB_APP_ID: ${REVERB_APP_ID:-andytranscribe}
|
REVERB_APP_ID: ${REVERB_APP_ID:-andytranscribe}
|
||||||
@@ -37,8 +39,14 @@ x-app-env: &app-env
|
|||||||
SEED_USER_EMAIL: ${SEED_USER_EMAIL:-demo@example.com}
|
SEED_USER_EMAIL: ${SEED_USER_EMAIL:-demo@example.com}
|
||||||
SEED_USER_PASSWORD: ${SEED_USER_PASSWORD:-password}
|
SEED_USER_PASSWORD: ${SEED_USER_PASSWORD:-password}
|
||||||
|
|
||||||
|
# Local: omit APP_IMAGE (builds andytranscribe-app:latest).
|
||||||
|
# CI/prod: set APP_IMAGE=gitea.z00.nu/ben/andytranscribe:<sha> and pull.
|
||||||
|
x-app-image: &app-image
|
||||||
|
image: ${APP_IMAGE:-andytranscribe-app:latest}
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
|
<<: *app-image
|
||||||
build:
|
build:
|
||||||
context: .
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
@@ -48,7 +56,6 @@ services:
|
|||||||
VITE_REVERB_HOST: ${VITE_REVERB_HOST:-localhost}
|
VITE_REVERB_HOST: ${VITE_REVERB_HOST:-localhost}
|
||||||
VITE_REVERB_PORT: ${REVERB_HOST_PORT:-8081}
|
VITE_REVERB_PORT: ${REVERB_HOST_PORT:-8081}
|
||||||
VITE_REVERB_SCHEME: ${VITE_REVERB_SCHEME:-http}
|
VITE_REVERB_SCHEME: ${VITE_REVERB_SCHEME:-http}
|
||||||
image: andytranscribe-app:latest
|
|
||||||
container_name: andytranscribe-app
|
container_name: andytranscribe-app
|
||||||
ports:
|
ports:
|
||||||
- "${APP_HOST_PORT:-8080}:80"
|
- "${APP_HOST_PORT:-8080}:80"
|
||||||
@@ -70,11 +77,10 @@ services:
|
|||||||
condition: service_started
|
condition: service_started
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
# Shares andytranscribe-app:latest — do not declare build: here (avoids rebuilding 3×).
|
# Shares the app image — do not declare build: here (avoids rebuilding 3×).
|
||||||
# `docker compose up --build` builds `app` first, then starts these with the tagged image.
|
# `docker compose up --build` builds `app` first, then starts these with the tagged image.
|
||||||
queue:
|
queue:
|
||||||
image: andytranscribe-app:latest
|
<<: *app-image
|
||||||
pull_policy: never
|
|
||||||
container_name: andytranscribe-queue
|
container_name: andytranscribe-queue
|
||||||
command:
|
command:
|
||||||
- php
|
- php
|
||||||
@@ -101,8 +107,7 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
reverb:
|
reverb:
|
||||||
image: andytranscribe-app:latest
|
<<: *app-image
|
||||||
pull_policy: never
|
|
||||||
container_name: andytranscribe-reverb
|
container_name: andytranscribe-reverb
|
||||||
command:
|
command:
|
||||||
- php
|
- php
|
||||||
|
|||||||
@@ -36,7 +36,22 @@ if [ ! -f vendor/autoload.php ]; then
|
|||||||
composer install --prefer-dist --no-interaction
|
composer install --prefer-dist --no-interaction
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Only the web app should migrate/seed. Queue and Reverb share the DB and must
|
||||||
|
# not race on sqlite (locks) or re-seed on every restart/deploy.
|
||||||
|
should_bootstrap_db() {
|
||||||
|
case " $* " in
|
||||||
|
*" queue:work "*|*" queue:listen "*|*" reverb:start "*)
|
||||||
|
return 1
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
if should_bootstrap_db "$@"; then
|
||||||
php artisan migrate --force --no-interaction
|
php artisan migrate --force --no-interaction
|
||||||
php artisan db:seed --force --no-interaction
|
php artisan db:seed --force --no-interaction
|
||||||
|
fi
|
||||||
|
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
|||||||
@@ -1,24 +1,33 @@
|
|||||||
@php
|
@php
|
||||||
/** @var array{used_percent: float, free_percent: float, free_human: string, total_human: string, used_human: string} $disk */
|
/** @var array{used_percent: float, free_percent: float, free_human: string, total_human: string, used_human: string} $disk */
|
||||||
|
$usedPercent = min(100, max(0, (float) $disk['used_percent']));
|
||||||
|
$usedPercentLabel = rtrim(rtrim(number_format($usedPercent, 1, '.', ''), '0'), '.') ?: '0';
|
||||||
|
$freePercent = (float) ($disk['free_percent'] ?? 100);
|
||||||
|
// Inline colors so the fill is visible even before / without a Tailwind rebuild.
|
||||||
|
$fillColor = match (true) {
|
||||||
|
$freePercent <= 5 => '#dc2626',
|
||||||
|
$freePercent <= 15 => '#f59e0b',
|
||||||
|
default => '#0d9488',
|
||||||
|
};
|
||||||
@endphp
|
@endphp
|
||||||
<div
|
<div
|
||||||
class="flex items-center gap-2 rounded-lg border border-zinc-200 bg-zinc-50 px-2.5 py-1.5 dark:border-zinc-600 dark:bg-zinc-900/50"
|
class="flex min-w-36 flex-col gap-1 rounded-lg border border-zinc-200 bg-zinc-50 px-2.5 py-1.5 dark:border-zinc-600 dark:bg-zinc-900/50"
|
||||||
title="{{ $disk['free_human'] }} free of {{ $disk['total_human'] }} · {{ $disk['used_percent'] }}% used"
|
title="{{ $disk['free_human'] }} free of {{ $disk['total_human'] }} · {{ $usedPercentLabel }}% used"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="h-1.5 w-14 shrink-0 overflow-hidden rounded-full bg-zinc-200 dark:bg-zinc-700"
|
class="h-2 w-full overflow-hidden rounded-full bg-zinc-200 dark:bg-zinc-700"
|
||||||
role="progressbar"
|
role="progressbar"
|
||||||
aria-valuemin="0"
|
aria-valuemin="0"
|
||||||
aria-valuemax="100"
|
aria-valuemax="100"
|
||||||
aria-valuenow="{{ (int) round($disk['used_percent']) }}"
|
aria-valuenow="{{ (int) round($usedPercent) }}"
|
||||||
aria-label="Disk space used"
|
aria-label="Disk space {{ $usedPercentLabel }}% used"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="h-full rounded-full transition-[width] duration-300 {{ $barColor }}"
|
class="h-full rounded-full transition-[width] duration-300"
|
||||||
style="width: {{ min(100, max(0, $disk['used_percent'])) }}%"
|
style="width: {{ $usedPercent }}%; background-color: {{ $fillColor }};"
|
||||||
></div>
|
></div>
|
||||||
</div>
|
</div>
|
||||||
<span class="hidden text-xs font-medium tabular-nums text-zinc-600 sm:inline dark:text-zinc-300">
|
<span class="text-xs font-medium tabular-nums text-zinc-600 dark:text-zinc-300">
|
||||||
{{ $disk['free_human'] }} free
|
{{ $usedPercentLabel }}% used · {{ $disk['free_human'] }} free
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -216,7 +216,10 @@
|
|||||||
<flux:text
|
<flux:text
|
||||||
class="mt-4 text-xs"
|
class="mt-4 text-xs"
|
||||||
x-show="status.transcribed_at"
|
x-show="status.transcribed_at"
|
||||||
x-text="status.transcribed_at ? ('Transcribed ' + formatTimestamp(status.transcribed_at)) : ''"
|
x-text="status.transcribed_at
|
||||||
|
? ('Transcribed ' + formatTimestamp(status.transcribed_at)
|
||||||
|
+ (status.transcription_duration_human ? (' · took ' + status.transcription_duration_human) : ''))
|
||||||
|
: ''"
|
||||||
></flux:text>
|
></flux:text>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Executable
+122
@@ -0,0 +1,122 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
usage() {
|
||||||
|
cat <<'EOF'
|
||||||
|
Deploy a pre-built APP_IMAGE to one or more AndyTranscribe directories.
|
||||||
|
|
||||||
|
Environment:
|
||||||
|
APP_IMAGE Required. e.g. gitea.z00.nu/ben/andytranscribe:abc1234
|
||||||
|
DEPLOY_PATHS Comma-separated instance directories (default: current directory)
|
||||||
|
DEPLOY_SHA Optional git SHA to hard-reset each directory to (CI sets this)
|
||||||
|
GIT_PULL When 1 (default) and DEPLOY_SHA is empty, run git pull --ff-only
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
APP_IMAGE=gitea.z00.nu/ben/andytranscribe:tag DEPLOY_PATHS=$HOME/andyTranscibe ./scripts/deploy-production.sh
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
IMAGE="${APP_IMAGE:-${1:-}}"
|
||||||
|
if [[ -z "${IMAGE}" ]]; then
|
||||||
|
usage >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
PATHS_CSV="${DEPLOY_PATHS:-${2:-.}}"
|
||||||
|
GIT_PULL="${GIT_PULL:-1}"
|
||||||
|
DEPLOY_SHA="${DEPLOY_SHA:-}"
|
||||||
|
IFS=',' read -r -a DIRS <<< "${PATHS_CSV}"
|
||||||
|
|
||||||
|
for dir in "${DIRS[@]}"; do
|
||||||
|
dir="${dir#"${dir%%[![:space:]]*}"}"
|
||||||
|
dir="${dir%"${dir##*[![:space:]]}"}"
|
||||||
|
|
||||||
|
if [[ ! -d "${dir}" ]]; then
|
||||||
|
echo "Missing instance directory: ${dir}" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
name="$(basename "${dir}")"
|
||||||
|
echo "==> Deploying ${IMAGE} in ${dir}"
|
||||||
|
|
||||||
|
(
|
||||||
|
cd "${dir}"
|
||||||
|
|
||||||
|
if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
|
||||||
|
if [[ -n "${DEPLOY_SHA}" ]]; then
|
||||||
|
git fetch --force origin "${DEPLOY_SHA}"
|
||||||
|
git checkout --force --detach "${DEPLOY_SHA}"
|
||||||
|
git reset --hard "${DEPLOY_SHA}"
|
||||||
|
# Drop local edits/hot-patches; keep runtime data and secrets.
|
||||||
|
git clean -fd \
|
||||||
|
--exclude=database/ \
|
||||||
|
--exclude=storage/ \
|
||||||
|
--exclude=.env \
|
||||||
|
--exclude=.env.*
|
||||||
|
elif [[ "${GIT_PULL}" == "1" ]]; then
|
||||||
|
git pull --ff-only
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
export APP_IMAGE="${IMAGE}"
|
||||||
|
export COMPOSE_PROJECT_NAME="${COMPOSE_PROJECT_NAME:-${name,,}}"
|
||||||
|
|
||||||
|
compose_files=(-f docker-compose.yml)
|
||||||
|
if [[ -f compose.z00.yaml ]]; then
|
||||||
|
compose_files+=(-f compose.z00.yaml)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if grep -q '^APP_IMAGE=' .env 2>/dev/null; then
|
||||||
|
sed -i "s|^APP_IMAGE=.*|APP_IMAGE=${IMAGE}|" .env
|
||||||
|
else
|
||||||
|
printf '\nAPP_IMAGE=%s\n' "${IMAGE}" >> .env
|
||||||
|
fi
|
||||||
|
|
||||||
|
docker compose "${compose_files[@]}" pull app queue reverb
|
||||||
|
docker compose "${compose_files[@]}" up -d --remove-orphans
|
||||||
|
docker compose "${compose_files[@]}" ps
|
||||||
|
|
||||||
|
app_port="$(awk -F= '/^APP_HOST_PORT=/ {print $2; exit}' .env 2>/dev/null || true)"
|
||||||
|
app_port="${app_port:-18080}"
|
||||||
|
health_url="http://127.0.0.1:${app_port}/up"
|
||||||
|
echo "waiting for ${health_url}"
|
||||||
|
ok=0
|
||||||
|
for _ in $(seq 1 45); do
|
||||||
|
if curl -fsS "${health_url}" >/dev/null 2>&1; then
|
||||||
|
echo "healthy"
|
||||||
|
ok=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
if [[ "${ok}" -ne 1 ]]; then
|
||||||
|
echo "ERROR: health check failed for ${name}" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Hit /login as the public HTTPS edge would (trustProxies needs forwarded proto).
|
||||||
|
app_url="$(awk -F= '/^APP_URL=/ {print $2; exit}' .env 2>/dev/null || true)"
|
||||||
|
app_url="${app_url:-https://transcribe.z00.nu}"
|
||||||
|
public_host="$(python3 - <<PY
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
print(urlparse("${app_url}").hostname or "transcribe.z00.nu")
|
||||||
|
PY
|
||||||
|
)"
|
||||||
|
asset_scheme="$(
|
||||||
|
curl -fsS \
|
||||||
|
-H "X-Forwarded-Proto: https" \
|
||||||
|
-H "X-Forwarded-Host: ${public_host}" \
|
||||||
|
-H "X-Forwarded-Port: 443" \
|
||||||
|
"http://127.0.0.1:${app_port}/login" \
|
||||||
|
| grep -oE 'https?://[^"'\'' ]+\.css' \
|
||||||
|
| head -1 || true
|
||||||
|
)"
|
||||||
|
if [[ "${asset_scheme}" == http://* ]]; then
|
||||||
|
echo "ERROR: login page still emits http:// asset URLs (${asset_scheme})" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "asset check ok: ${asset_scheme:-no absolute css url (relative/ok)}"
|
||||||
|
)
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "Deploy complete: ${IMAGE}"
|
||||||
Executable
+80
@@ -0,0 +1,80 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Idempotent bootstrap for AndyTranscribe Gitea Actions secrets on z00.
|
||||||
|
# Requires an already-running Gitea + act_runner (see airports setup).
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
GITEA_DIR="${GITEA_DIR:-${HOME}/gitea}"
|
||||||
|
REPO_OWNER="${REPO_OWNER:-ben}"
|
||||||
|
REPO_NAME="${REPO_NAME:-AndyTranscribe}"
|
||||||
|
REGISTRY_HOST="${REGISTRY_HOST:-gitea.z00.nu}"
|
||||||
|
DEPLOY_PATH="${DEPLOY_PATH:-${HOME}/andyTranscibe}"
|
||||||
|
CREDENTIALS_FILE="${GITEA_DIR}/.credentials"
|
||||||
|
|
||||||
|
if [[ ! -f "${CREDENTIALS_FILE}" ]]; then
|
||||||
|
echo "Missing ${CREDENTIALS_FILE}" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# shellcheck disable=SC1090
|
||||||
|
source "${CREDENTIALS_FILE}"
|
||||||
|
|
||||||
|
API="https://${REGISTRY_HOST}/api/v1"
|
||||||
|
AUTH=(-u "${ADMIN_USERNAME}:${ADMIN_PASSWORD}")
|
||||||
|
|
||||||
|
if ! curl -fsS "${AUTH[@]}" "${API}/repos/${REPO_OWNER}/${REPO_NAME}" >/dev/null 2>&1; then
|
||||||
|
echo "Repository ${REPO_OWNER}/${REPO_NAME} not found on ${REGISTRY_HOST}" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
CI_TOKEN="$(
|
||||||
|
docker exec -u git gitea gitea admin user generate-access-token \
|
||||||
|
-u "${ADMIN_USERNAME}" \
|
||||||
|
-t "ci-${REPO_NAME}-$(date +%Y%m%d%H%M%S)" \
|
||||||
|
--scopes "write:package,read:package,write:repository,read:repository" \
|
||||||
|
--raw
|
||||||
|
)"
|
||||||
|
|
||||||
|
PULL_TOKEN="$(
|
||||||
|
docker exec -u git gitea gitea admin user generate-access-token \
|
||||||
|
-u "${ADMIN_USERNAME}" \
|
||||||
|
-t "pull-${REPO_NAME}-$(date +%Y%m%d%H%M%S)" \
|
||||||
|
--scopes "read:package" \
|
||||||
|
--raw
|
||||||
|
)"
|
||||||
|
|
||||||
|
set_secret() {
|
||||||
|
local name="$1"
|
||||||
|
local value="$2"
|
||||||
|
local tmp
|
||||||
|
tmp="$(mktemp)"
|
||||||
|
python3 -c 'import json,sys; json.dump({"data": sys.argv[1]}, open(sys.argv[2], "w"))' "${value}" "${tmp}"
|
||||||
|
curl -fsS "${AUTH[@]}" -X PUT \
|
||||||
|
"${API}/repos/${REPO_OWNER}/${REPO_NAME}/actions/secrets/${name}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
--data-binary @"${tmp}" >/dev/null
|
||||||
|
rm -f "${tmp}"
|
||||||
|
}
|
||||||
|
|
||||||
|
set_secret "REGISTRY_TOKEN" "${CI_TOKEN}"
|
||||||
|
set_secret "DEPLOY_PATHS" "${DEPLOY_PATH}"
|
||||||
|
|
||||||
|
printf '%s' "${PULL_TOKEN}" | docker login "${REGISTRY_HOST}" -u "${ADMIN_USERNAME}" --password-stdin
|
||||||
|
|
||||||
|
REPO_LC="$(echo "${REPO_OWNER}/${REPO_NAME}" | tr '[:upper:]' '[:lower:]')"
|
||||||
|
if [[ -f "${DEPLOY_PATH}/.env" ]]; then
|
||||||
|
if grep -q '^APP_IMAGE=' "${DEPLOY_PATH}/.env"; then
|
||||||
|
sed -i "s|^APP_IMAGE=.*|APP_IMAGE=${REGISTRY_HOST}/${REPO_LC}:latest|" "${DEPLOY_PATH}/.env"
|
||||||
|
else
|
||||||
|
printf '\nAPP_IMAGE=%s/%s:latest\n' "${REGISTRY_HOST}" "${REPO_LC}" >> "${DEPLOY_PATH}/.env"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Ensure the existing host runner is up (shared with airports).
|
||||||
|
if systemctl --user is-enabled gitea-act-runner.service >/dev/null 2>&1; then
|
||||||
|
systemctl --user restart gitea-act-runner.service || true
|
||||||
|
systemctl --user --no-pager --lines=5 status gitea-act-runner.service || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Gitea CI secrets configured for ${REGISTRY_HOST}/${REPO_OWNER}/${REPO_NAME}"
|
||||||
|
echo "Deploy path: ${DEPLOY_PATH}"
|
||||||
|
echo "Push to main to build, push the image, and deploy."
|
||||||
@@ -50,10 +50,17 @@ class DiskSpaceTest extends TestCase
|
|||||||
{
|
{
|
||||||
Cache::flush();
|
Cache::flush();
|
||||||
|
|
||||||
$this->get(route('recordings.index'))
|
$response = $this->get(route('recordings.index'))
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertSee('Disk space used', false)
|
->assertSee('Disk space', false)
|
||||||
|
->assertSee('% used', false)
|
||||||
->assertSee('free')
|
->assertSee('free')
|
||||||
->assertSee('role="progressbar"', false);
|
->assertSee('role="progressbar"', false)
|
||||||
|
->assertSee('background-color:', false);
|
||||||
|
|
||||||
|
$this->assertMatchesRegularExpression(
|
||||||
|
'/width:\s*[\d.]+%;\s*background-color:\s*#(0d9488|f59e0b|dc2626)/',
|
||||||
|
$response->getContent(),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ use App\Services\TranscriptionService;
|
|||||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
use Illuminate\Http\UploadedFile;
|
use Illuminate\Http\UploadedFile;
|
||||||
use Illuminate\Support\Facades\Bus;
|
use Illuminate\Support\Facades\Bus;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
use Laravel\Ai\Transcription;
|
use Laravel\Ai\Transcription;
|
||||||
use Livewire\Livewire;
|
use Livewire\Livewire;
|
||||||
@@ -209,6 +210,8 @@ class RecordingUploadTest extends TestCase
|
|||||||
|
|
||||||
Transcription::fake(['Hello from the recorder.']);
|
Transcription::fake(['Hello from the recorder.']);
|
||||||
|
|
||||||
|
$this->travelTo(now()->startOfSecond());
|
||||||
|
|
||||||
$recording = Recording::query()->create([
|
$recording = Recording::query()->create([
|
||||||
'user_id' => $this->user->id,
|
'user_id' => $this->user->id,
|
||||||
'title' => 'Sample',
|
'title' => 'Sample',
|
||||||
@@ -217,6 +220,7 @@ class RecordingUploadTest extends TestCase
|
|||||||
'file_size_bytes' => 12,
|
'file_size_bytes' => 12,
|
||||||
'transcription_status' => 'pending',
|
'transcription_status' => 'pending',
|
||||||
'transcription_driver' => 'local',
|
'transcription_driver' => 'local',
|
||||||
|
'transcription_started_at' => now()->subSeconds(42),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
(new TranscribeRecording($recording))->handle(app(TranscriptionService::class));
|
(new TranscribeRecording($recording))->handle(app(TranscriptionService::class));
|
||||||
@@ -227,6 +231,12 @@ class RecordingUploadTest extends TestCase
|
|||||||
$this->assertSame(100, $recording->transcription_percent);
|
$this->assertSame(100, $recording->transcription_percent);
|
||||||
$this->assertSame('Transcription complete', $recording->transcription_progress);
|
$this->assertSame('Transcription complete', $recording->transcription_progress);
|
||||||
$this->assertNotNull($recording->transcribed_at);
|
$this->assertNotNull($recording->transcribed_at);
|
||||||
|
$this->assertSame(
|
||||||
|
$recording->transcribed_at->getTimestamp() - $recording->transcription_started_at->getTimestamp(),
|
||||||
|
$recording->transcription_duration_seconds,
|
||||||
|
);
|
||||||
|
$this->assertSame(42, $recording->transcription_duration_seconds);
|
||||||
|
$this->assertSame('42s', $recording->transcriptionStatusPayload()['transcription_duration_human']);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_transcription_job_stores_error_on_failure(): void
|
public function test_transcription_job_stores_error_on_failure(): void
|
||||||
@@ -283,7 +293,70 @@ class RecordingUploadTest extends TestCase
|
|||||||
|
|
||||||
$recording->refresh();
|
$recording->refresh();
|
||||||
$this->assertSame('failed', $recording->transcription_status);
|
$this->assertSame('failed', $recording->transcription_status);
|
||||||
$this->assertStringContainsString('worker stopped', $recording->transcription_error);
|
$this->assertStringContainsString('timed out', $recording->transcription_error);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_stale_reserved_job_is_treated_as_orphaned(): void
|
||||||
|
{
|
||||||
|
$recording = Recording::query()->create([
|
||||||
|
'user_id' => $this->user->id,
|
||||||
|
'title' => 'Wedged whisper',
|
||||||
|
'original_filename' => 'wedged.mp3',
|
||||||
|
'file_path' => 'recordings/wedged.mp3',
|
||||||
|
'file_size_bytes' => 100,
|
||||||
|
'transcription_status' => 'processing',
|
||||||
|
'transcription_progress' => 'Transcribing locally…',
|
||||||
|
'transcription_percent' => 50,
|
||||||
|
'transcription_driver' => 'local',
|
||||||
|
'transcription_started_at' => now()->subMinutes(20),
|
||||||
|
'updated_at' => now()->subMinutes(20),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$job = new TranscribeRecording($recording);
|
||||||
|
$payload = json_encode([
|
||||||
|
'displayName' => TranscribeRecording::class,
|
||||||
|
'data' => [
|
||||||
|
'command' => serialize($job),
|
||||||
|
],
|
||||||
|
], JSON_THROW_ON_ERROR);
|
||||||
|
|
||||||
|
DB::table('jobs')->insert([
|
||||||
|
'queue' => 'default',
|
||||||
|
'payload' => $payload,
|
||||||
|
'attempts' => 1,
|
||||||
|
'reserved_at' => now()->subMinutes(15)->timestamp,
|
||||||
|
'available_at' => now()->subMinutes(20)->timestamp,
|
||||||
|
'created_at' => now()->subMinutes(20)->timestamp,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertFalse($recording->hasActiveTranscriptionJob());
|
||||||
|
$this->assertTrue($recording->isOrphanedTranscription());
|
||||||
|
|
||||||
|
$deleted = $recording->discardQueuedTranscriptionJobs();
|
||||||
|
$this->assertSame(1, $deleted, 'stale reserved job should be discarded');
|
||||||
|
$this->assertDatabaseCount('jobs', 0);
|
||||||
|
|
||||||
|
// Put the stale job back to exercise status-poll recovery.
|
||||||
|
DB::table('jobs')->insert([
|
||||||
|
'queue' => 'default',
|
||||||
|
'payload' => $payload,
|
||||||
|
'attempts' => 1,
|
||||||
|
'reserved_at' => now()->subMinutes(15)->timestamp,
|
||||||
|
'available_at' => now()->subMinutes(20)->timestamp,
|
||||||
|
'created_at' => now()->subMinutes(20)->timestamp,
|
||||||
|
]);
|
||||||
|
$recording->forceFill([
|
||||||
|
'transcription_status' => 'processing',
|
||||||
|
'transcription_error' => null,
|
||||||
|
])->save();
|
||||||
|
|
||||||
|
$this->getJson(route('recordings.transcription-status', $recording))
|
||||||
|
->assertOk()
|
||||||
|
->assertJsonPath('status', 'failed');
|
||||||
|
|
||||||
|
$this->assertDatabaseCount('jobs', 0);
|
||||||
|
$recording->refresh();
|
||||||
|
$this->assertSame('failed', $recording->transcription_status);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_recent_processing_is_not_marked_orphaned(): void
|
public function test_recent_processing_is_not_marked_orphaned(): void
|
||||||
|
|||||||
+7
-1
@@ -6,5 +6,11 @@ use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
|
|||||||
|
|
||||||
abstract class TestCase extends BaseTestCase
|
abstract class TestCase extends BaseTestCase
|
||||||
{
|
{
|
||||||
//
|
protected function setUp(): void
|
||||||
|
{
|
||||||
|
parent::setUp();
|
||||||
|
|
||||||
|
// Feature tests render Blade without a Vite build in CI.
|
||||||
|
$this->withoutVite();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user