Merge branch 'agread' into dev

Author: Sskift

scripts/dev.ps1

@@ -17,6 +17,8 @@ $RootDir = Resolve-Path "$PSScriptRoot\.."
 $FrontendDir = Join-Path $RootDir "frontend"
 $BackendDir = Join-Path $RootDir "backend"
 $ComposeFile = Join-Path $RootDir "docker-compose.yml"
+$LogLevel = if ([string]::IsNullOrWhiteSpace($env:LOG_LEVEL)) { "info" } else { $env:LOG_LEVEL }
+$WorkerConcurrency = if ([string]::IsNullOrWhiteSpace($env:WORKER_CONCURRENCY)) { [Environment]::ProcessorCount } else { $env:WORKER_CONCURRENCY }
 
 function Write-Info { param($Message) Write-Host "[info] $Message" -ForegroundColor Cyan }
 function Write-Warn { param($Message) Write-Host "[warn] $Message" -ForegroundColor Yellow }
@@ -26,43 +28,20 @@ function Write-Error { param($Message) Write-Host "[error] $Message" -Foreground
 if (Get-Command docker -ErrorAction SilentlyContinue) {
     Write-Info "Starting postgres/redis via docker compose..."
     docker compose -f "$ComposeFile" up -d postgres redis
-    
-    Write-Info "Ensuring notes table exists..."
-    $SqlScript = @"
-CREATE TABLE IF NOT EXISTS notes (
-  id SERIAL PRIMARY KEY,
-  user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-  uploaded_paper_id INTEGER REFERENCES uploaded_papers(id) ON DELETE SET NULL,
-  title VARCHAR(255) NOT NULL,
-  content TEXT,
-  tags JSONB,
-  created_at TIMESTAMP NOT NULL DEFAULT NOW(),
-  updated_at TIMESTAMP NOT NULL DEFAULT NOW()
-);
-CREATE INDEX IF NOT EXISTS idx_notes_user_id ON notes(user_id);
-CREATE INDEX IF NOT EXISTS idx_notes_updated_at ON notes(updated_at DESC);
-CREATE TABLE IF NOT EXISTS library_folders (
-  id SERIAL PRIMARY KEY,
-  user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-  name VARCHAR(120) NOT NULL,
-  color VARCHAR(32),
-  created_at TIMESTAMP NOT NULL DEFAULT NOW(),
-  updated_at TIMESTAMP NOT NULL DEFAULT NOW()
-);
-CREATE INDEX IF NOT EXISTS idx_library_folders_user_id ON library_folders(user_id);
-ALTER TABLE uploaded_papers ADD COLUMN IF NOT EXISTS folder_id INTEGER;
-DO `$`$
-BEGIN
-  IF NOT EXISTS (SELECT 1 FROM pg_constraint WHERE conname = 'uploaded_papers_folder_id_fkey') THEN
-    ALTER TABLE uploaded_papers
-      ADD CONSTRAINT uploaded_papers_folder_id_fkey
-      FOREIGN KEY (folder_id) REFERENCES library_folders(id) ON DELETE SET NULL;
-  END IF;
-END`$`$;
-CREATE INDEX IF NOT EXISTS idx_uploaded_papers_folder_id ON uploaded_papers(folder_id);
-"@
-    
-    $SqlScript | docker compose -f "$ComposeFile" exec -T postgres psql -U postgres -d papers | Out-Null
+        Write-Info "Waiting for postgres to become ready..."
+        $pgReady = $false
+        for ($i = 1; $i -le 30; $i++) {
+                $result = docker compose -f "$ComposeFile" exec -T postgres pg_isready -U postgres -d papers 2>$null
+                if ($LASTEXITCODE -eq 0) {
+                        $pgReady = $true
+                        Write-Info "Postgres is ready."
+                        break
+                }
+                Start-Sleep -Seconds 1
+        }
+        if (-not $pgReady) {
+                Write-Warn "Postgres did not become ready in time; migrations may fail."
+        }
 } else {
     Write-Warn "docker not found; skipping postgres/redis startup"
 }
@@ -103,25 +82,30 @@ Write-Info "Starting FastAPI backend on :8000 (New Window)..."
 $BackendCmd = "
     Write-Host 'Starting FastAPI Backend...' -ForegroundColor Cyan;
     cd '$BackendDir';
-    `$env:POSTGRES_HOST='127.0.0.1';
-    `$env:REDIS_HOST='127.0.0.1';
+    `$env:POSTGRES_HOST='localhost';
+    `$env:REDIS_HOST='localhost';
     `$env:PYTHONPATH='$BackendDir';
+    `$env:LOG_LEVEL='$LogLevel';
     uv run alembic upgrade head;
-    uv run uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload;
+    uv run uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload --log-level `$env:LOG_LEVEL;
     if (`$LastExitCode -ne 0) { Read-Host 'Backend exited with error. Press Enter to close...' }
 "
 Start-Process powershell -ArgumentList "-NoExit", "-Command", "$BackendCmd"
 
 # 3.2) Celery Worker
 Write-Info "Starting Celery worker (MinerU queue) (New Window)..."
-# Note: Windows requires -P solo (or threads) and we must listen to 'default' queue
+# Align with dev.sh: threads pool, concurrency=CPU cores (Windows-safe)
 $CeleryCmd = "
     Write-Host 'Starting Celery Worker...' -ForegroundColor Cyan;
     cd '$BackendDir';
-    `$env:POSTGRES_HOST='127.0.0.1';
-    `$env:REDIS_HOST='127.0.0.1';
+    `$env:POSTGRES_HOST='localhost';
+    `$env:REDIS_HOST='localhost';
     `$env:PYTHONPATH='$BackendDir';
-    uv run celery -A app.workers.celery_app worker --loglevel=info -P solo -Q default;
+    `$env:OBJC_DISABLE_INITIALIZE_FORK_SAFETY='YES';
+    `$env:CPU_CORES=[Environment]::ProcessorCount;
+    `$env:WORKER_POOL='threads';
+    `$env:WORKER_CONCURRENCY='$WorkerConcurrency';
+    uv run celery -A app.workers.celery_app worker --loglevel=info --queues default --pool `$env:WORKER_POOL --concurrency `$env:WORKER_CONCURRENCY;
     if (`$LastExitCode -ne 0) { Read-Host 'Celery exited with error. Press Enter to close...' }
 "
 Start-Process powershell -ArgumentList "-NoExit", "-Command", "$CeleryCmd"