Merge remote-tracking branch 'chronicle/fix/cleanup-model' into fix/cleanup-model

Author: 0xrushi

.github/workflows/advanced-docker-compose-build.yml

@@ -199,7 +199,7 @@ jobs:
           cd ../../extras/asr-services
           for cuda_variant in cu121 cu126 cu128; do
             echo "Building parakeet-asr-${cuda_variant}"
-            export CUDA_VERSION="${cuda_variant}"
+            export PYTORCH_CUDA_VERSION="${cuda_variant}"
             docker compose build parakeet-asr
             
             img_id=$(docker compose images -q parakeet-asr | head -n1)

.github/workflows/robot-tests.yml

@@ -63,10 +63,14 @@ jobs:
         python-version: "3.12"
         cache: 'pip'
 
+    - name: Install uv
+      uses: astral-sh/setup-uv@v4
+      with:
+        version: "latest"
+
     - name: Install Robot Framework and dependencies
       run: |
-        pip install --upgrade pip
-        pip install robotframework robotframework-requests python-dotenv websockets
+        uv pip install --system robotframework robotframework-requests python-dotenv websockets
 
     - name: Create test environment file
       working-directory: tests/setup

Docs/init-system.md

@@ -148,13 +148,33 @@ uv run --with-requirements setup-requirements.txt python services.py start backe
 # Check service status
 uv run --with-requirements setup-requirements.txt python services.py status
 
+# Restart all services
+uv run --with-requirements setup-requirements.txt python services.py restart --all
+
+# Restart specific services
+uv run --with-requirements setup-requirements.txt python services.py restart backend
+
 # Stop all services
 uv run --with-requirements setup-requirements.txt python services.py stop --all
 
-# Stop specific services  
+# Stop specific services
 uv run --with-requirements setup-requirements.txt python services.py stop asr-services openmemory-mcp
 ```
 
+**Convenience Scripts:**
+```bash
+# Quick start (from project root)
+./start.sh
+
+# Quick restart (from project root)
+./restart.sh
+```
+
+**Important Notes:**
+- **Restart** restarts containers without rebuilding - use for configuration changes (.env updates)
+- **For code changes**, use `stop` + `start --build` to rebuild images
+- Example: `uv run --with-requirements setup-requirements.txt python services.py stop --all && uv run --with-requirements setup-requirements.txt python services.py start --all --build`
+
 ### Manual Service Management
 You can also manage services individually:
 

Docs/ports-and-access.md

@@ -101,10 +101,24 @@ uv run --with-requirements setup-requirements.txt python services.py start --all
 # Start only specific services
 uv run --with-requirements setup-requirements.txt python services.py start backend speaker-recognition
 
+# Restart all services
+uv run --with-requirements setup-requirements.txt python services.py restart --all
+
+# Restart specific services
+uv run --with-requirements setup-requirements.txt python services.py restart backend
+
 # Stop all services
 uv run --with-requirements setup-requirements.txt python services.py stop --all
 ```
 
+**Convenience Scripts:**
+```bash
+./start.sh    # Quick start all configured services
+./restart.sh  # Quick restart all configured services
+```
+
+**Important:** Use `restart` for configuration changes (.env updates). For code changes, use `stop` + `start --build` to rebuild images.
+
 ---
 
 ## Microphone Access Requirements
@@ -128,7 +142,7 @@ If you encounter port conflicts:
 1. **Check running services**: `uv run --with-requirements setup-requirements.txt python services.py status`
 2. **Stop conflicting services**: `uv run --with-requirements setup-requirements.txt python services.py stop --all`
 3. **Change ports in .env files** if needed
-4. **Restart services**: `uv run --with-requirements setup-requirements.txt python services.py start --all`
+4. **Restart services**: `uv run --with-requirements setup-requirements.txt python services.py restart --all` or `./restart.sh`
 
 ---
 

backends/advanced/docker-compose.yml

@@ -19,7 +19,7 @@ services:
       - MISTRAL_MODEL=${MISTRAL_MODEL}
       - TRANSCRIPTION_PROVIDER=${TRANSCRIPTION_PROVIDER}
       - PARAKEET_ASR_URL=${PARAKEET_ASR_URL}
-      - OFFLINE_ASR_TCP_URI=${OFFLINE_ASR_TCP_URI}
+      - OLLAMA_BASE_URL=${OLLAMA_BASE_URL}
       - HF_TOKEN=${HF_TOKEN}
       - SPEAKER_SERVICE_URL=${SPEAKER_SERVICE_URL}
       - ADMIN_PASSWORD=${ADMIN_PASSWORD}

backends/advanced/init.py

@@ -191,7 +191,7 @@ def setup_transcription(self):
                 self.console.print("[yellow][WARNING][/yellow] No API key provided - transcription will not work")
 
         elif choice == "3":
-            self.config["TRANSCRIPTION_PROVIDER"] = "offline"
+            self.config["TRANSCRIPTION_PROVIDER"] = "parakeet"
             self.console.print("[blue][INFO][/blue] Offline Parakeet ASR selected")
             parakeet_url = self.prompt_value("Parakeet ASR URL", "http://host.docker.internal:8767")
             self.config["PARAKEET_ASR_URL"] = parakeet_url

backends/advanced/pyproject.toml

@@ -25,6 +25,9 @@ dependencies = [
     "redis>=5.0.0",
     "rq>=1.16.0",
     "soundfile>=0.12.1",
+    "google-api-python-client>=2.0.0",
+    "google-auth-oauthlib>=1.0.0",
+    "google-auth-httplib2>=0.2.0",
     "websockets>=12.0",
 ]
 

backends/advanced/run-test.sh

@@ -39,33 +39,74 @@ print_info "Advanced Backend Integration Test Runner"
 print_info "========================================"
 
 # Load environment variables (CI or local)
-if [ -f ".env" ] && [ -z "$DEEPGRAM_API_KEY" ]; then
+# Priority: CI environment > .env.test > .env
+if [ -n "$DEEPGRAM_API_KEY" ]; then
+    print_info "Using environment variables from CI/environment..."
+elif [ -f ".env.test" ]; then
+    print_info "Loading environment variables from .env.test..."
+    set -a
+    source .env.test
+    set +a
+elif [ -f ".env" ]; then
     print_info "Loading environment variables from .env..."
     set -a
     source .env
     set +a
-elif [ -n "$DEEPGRAM_API_KEY" ]; then
-    print_info "Using environment variables from CI..."
 else
-    print_error "Neither .env file nor CI environment variables found!"
-    print_info "For local development: cp .env.template .env and configure API keys"
-    print_info "For CI: ensure DEEPGRAM_API_KEY and OPENAI_API_KEY secrets are set"
+    print_error "Neither .env.test nor .env file found, and no environment variables set!"
+    print_info "For local development: cp .env.template .env and configure required API keys"
+    print_info "For CI: ensure required API keys are set based on configured providers"
     exit 1
 fi
 
-# Verify required environment variables
-if [ -z "$DEEPGRAM_API_KEY" ]; then
-    print_error "DEEPGRAM_API_KEY not set"
-    exit 1
-fi
-
-if [ -z "$OPENAI_API_KEY" ]; then
-    print_error "OPENAI_API_KEY not set"
-    exit 1
-fi
-
-print_info "DEEPGRAM_API_KEY length: ${#DEEPGRAM_API_KEY}"
-print_info "OPENAI_API_KEY length: ${#OPENAI_API_KEY}"
+# Verify required environment variables based on configured providers
+TRANSCRIPTION_PROVIDER=${TRANSCRIPTION_PROVIDER:-deepgram}
+LLM_PROVIDER=${LLM_PROVIDER:-openai}
+
+print_info "Configured providers:"
+print_info "  TRANSCRIPTION_PROVIDER: $TRANSCRIPTION_PROVIDER"
+print_info "  LLM_PROVIDER: $LLM_PROVIDER"
+
+# Check transcription provider API key
+case "$TRANSCRIPTION_PROVIDER" in
+    deepgram)
+        if [ -z "$DEEPGRAM_API_KEY" ]; then
+            print_error "DEEPGRAM_API_KEY not set (required for TRANSCRIPTION_PROVIDER=deepgram)"
+            exit 1
+        fi
+        print_info "DEEPGRAM_API_KEY length: ${#DEEPGRAM_API_KEY}"
+        ;;
+    mistral)
+        if [ -z "$MISTRAL_API_KEY" ]; then
+            print_error "MISTRAL_API_KEY not set (required for TRANSCRIPTION_PROVIDER=mistral)"
+            exit 1
+        fi
+        print_info "MISTRAL_API_KEY length: ${#MISTRAL_API_KEY}"
+        ;;
+    offline|parakeet)
+        print_info "Using offline/local transcription - no API key required"
+        ;;
+    *)
+        print_warning "Unknown TRANSCRIPTION_PROVIDER: $TRANSCRIPTION_PROVIDER"
+        ;;
+esac
+
+# Check LLM provider API key (for memory extraction)
+case "$LLM_PROVIDER" in
+    openai)
+        if [ -z "$OPENAI_API_KEY" ]; then
+            print_error "OPENAI_API_KEY not set (required for LLM_PROVIDER=openai)"
+            exit 1
+        fi
+        print_info "OPENAI_API_KEY length: ${#OPENAI_API_KEY}"
+        ;;
+    ollama)
+        print_info "Using Ollama for LLM - no API key required"
+        ;;
+    *)
+        print_warning "Unknown LLM_PROVIDER: $LLM_PROVIDER"
+        ;;
+esac
 
 # memory_config.yaml deprecated; using config.yml for memory settings
 
@@ -114,9 +155,19 @@ export DOCKER_BUILDKIT=0
 
 # Run the integration test with extended timeout (mem0 needs time for comprehensive extraction)
 print_info "Starting integration test (timeout: 15 minutes)..."
-timeout 900 uv run pytest tests/test_integration.py::test_full_pipeline_integration -v -s --tb=short --log-cli-level=INFO
+if timeout 900 uv run pytest tests/test_integration.py::test_full_pipeline_integration -v -s --tb=short --log-cli-level=INFO; then
+    print_success "Integration tests completed successfully!"
+else
+    TEST_EXIT_CODE=$?
+    print_error "Integration tests FAILED with exit code: $TEST_EXIT_CODE"
 
-print_success "Integration tests completed successfully!"
+    # Clean up test containers before exiting
+    print_info "Cleaning up test containers after failure..."
+    docker compose -f docker-compose-test.yml down -v || true
+    docker system prune -f || true
+
+    exit $TEST_EXIT_CODE
+fi
 
 # Clean up test containers
 print_info "Cleaning up test containers..."

backends/advanced/src/advanced_omi_backend/app_config.py

@@ -86,6 +86,9 @@ def __init__(self):
         # Memory service configuration
         self.memory_service_supports_threshold = self.memory_provider == "chronicle"
 
+        self.gdrive_credentials_path = "data/gdrive_service_account.json"
+        self.gdrive_scopes = ["https://www.googleapis.com/auth/drive.readonly"]
+
 
 # Global configuration instance
 app_config = AppConfig()

backends/advanced/src/advanced_omi_backend/clients/gdrive_audio_client.py

@@ -0,0 +1,29 @@
+import os 
+from google.oauth2.service_account import Credentials
+from googleapiclient.discovery import build
+from advanced_omi_backend.app_config import get_app_config
+
+_drive_client_cache = None
+
+def get_google_drive_client():
+    """Singleton Google Drive client."""
+    global _drive_client_cache
+
+    if _drive_client_cache:
+        return _drive_client_cache
+
+    config = get_app_config()
+
+    if not os.path.exists(config.gdrive_credentials_path):
+        raise FileNotFoundError(
+            f"Missing Google Drive credentials at {config.gdrive_credentials_path}"
+        )
+
+    creds = Credentials.from_service_account_file(
+        config.gdrive_credentials_path,
+        scopes=config.gdrive_scopes
+    )
+
+    _drive_client_cache = build("drive", "v3", credentials=creds)
+
+    return _drive_client_cache