update root path

.env.new

@@ -1,45 +0,0 @@
-# Groq API Configuration (from README.md)
-OPENAI_API_BASE=https://api.groq.com/openai/v1
-OPENAI_API_KEY=your_api_key_here
-MODEL_NAME=llama3-8b-8192
-LOCAL_MODEL=true
-
-# Gradio Configuration
-GRADIO_SERVER_NAME=0.0.0.0
-GRADIO_SERVER_PORT=7860
-
-# Database Configuration (if needed)
-DATABASE_URL=postgresql://postgres:postgres@postgres:5432/gradio_app
-
-# Django Configuration
-DJANGO_SECRET_KEY=your-secret-key-here
-DJANGO_DEBUG=False
-DJANGO_ALLOWED_HOSTS=localhost,127.0.0.1,0.0.0.0
-
-# Google Cloud Configuration (Base64 encoded to avoid issues)
-GOOGLE_APPLICATION_CREDENTIALS_CONTENT={"type":"service_account","project_id":"urlounge74620","private_key_id":"f24a8ae1770ddebd6ce9a0d113f605496227745e","private_key":"-----BEGIN PRIVATE KEY-----\nMIIEugIBADANBgkqhkiG9w0BAQEFAASCBKQwggSgAgEAAoIBAQC3XR4hg/vKb2MV\nVn3XX2n826kbOrZw3nqS/SUDqi084yJAqaHbbJR+ht8axsjBmltXL2mninpQSHJI\n4OCfoxNLOpSKe2cySYdDbtASHDpIRH/A8rnW0GAVoD5MBkxmQ5WEmyo6+vJAg8Rq\nuzXEfNPDangim9mJ5n7Egy/PU84kNh3G7DBti20/5rFr7YHS5rhuwisdB5zD7Rri\n9HEoBU1oRDlZBUuFMuQa7cgGUMC70MF7+ghgzxAThgh216fo5wrjdv13GtJX1Qlp\n6xMoxacscHzukPp1G/Mzb8aPLoO/GmyPxCIAF7pyU9U34V8gLSHKH5I6SdiCO0bN\nI89JKsZ3AgMBAAECgf8IlxolLIsqByDOgJlMY/0Cs+IV4LJjSxBq1nzMhcntYqBy\nds/f9OdGVZ1jBt+PA6EMVlmvrB+vTslULZCvweI91cSceQs6AMNiVRWhpBaRZ7wm\nYjtsJ+41K2jJFjGdznr+9AVdZEpcq2eApe50k8c4PlDdWkfqE2UpbF8AMOUoay1T\nafwo2xdfD5xquFcrwzZ8DYOosUQijIi99dquCeNKbYRe4lZMebV/QVzdVL6uSsYZ\ntOUAV0wQ3eC98XfNF9Bg61eTGCMwcaKDEJkgS/hqFZf6LndRHGNYksKyb1d+/OMv\n0eSuviqNsTubwzBvUTD+lUbjjV5dBRVBnVPeSPUCgYEA+qfFjl7w1Typ8ipIF51k\nKTP+h3cfNy0zMmuig4uFgDRhw+X/eJKWdFJTaaIqLPbynzBKmll992Cyf9owZypN\nvxC43geEtoK3UBWFkvbrQpFNBasHACM4ovf9ykOd63vZvbDqGv7n+E3CWHVD2Wlp\nxBqOAK7kM2QWkQS2CBOhjQsCgYEAu0YHGGvSxc7ubIs1YI4MtyRE2FNIgneBus+Y\nlrK0r9hkeLmtXtTVUjescbXKP0J/e3sqL7jFFBlPbUfl2hQClOHxpvC9W801B2ht\nB0bKuqLcqAF360LxQVasR14EC6vSrjY9tdawYzwFLkCDMMUJDSFN1RCPwkPSxIrq\nWy5P18UCgYBx5NgEuCkwi28hZYr6h/7iJgkK3trlRHmV+IiQw033ElY2IIUz8U/C\nLUJPpmsJoXBfWx8bAX0Wce7J34fM6NEI9305DiuEjuLi1dSrEd2WktVvtOXqbxam\nHo9IX+8a+FzZL9FAUQFwt0yOy0H4QUjY3cQWlWGF5H3IiV55TwpCPwKBgBH/Jsto\nATdVLYBs2FJRFFO9PohzaHJxPZxQOt+wiMClUPJxFYIZfe6Kvx2mVKtDnrClI2a2\noOnPjNx5nlMYvS7Fj811MR1TWRc/J8sdOHo7EG1sxrNrGXgn9iJdnJHqjzKCr+d7\nDPNHspVFMZpCPekDbC+CLKoheaxWtgsWSvpAoGACOoyu3gMv29eh+6wMsA9Qhsb\nhkbAl8oUQyEh1O45D/bbcYJTm8Ue98m8csIRYRdUWDm/DxeJD9v+uUZwVkMK1bNQ\nuJyWFtVdRwsf5jnbD11gPs4LZyW/ZvJKtiiBtWPqeK0gSPqKP1HY2TYvLIsBlSOY\nc2/xwB1+HB+TfuZwItM=\n-----END PRIVATE KEY-----\n","client_email":"t-louge@urlounge74620.iam.gserviceaccount.com","client_id":"113873685578046298528","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://oauth2.googleapis.com/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","client_x509_cert_url":"https://www.googleapis.com/robot/v1/metadata/x509/t-louge%40urlounge74620.iam.gserviceaccount.com","universe_domain":"googleapis.com"}
-GOOGLE_PROJECT_ID=urlounge74620
-GOOGLE_CLIENT_EMAIL=t-louge@urlounge74620.iam.gserviceaccount.com
-
-# Additional Environment Variables
-APPSHEET_APPID=YOUR_VALUE_HERE
-APPSHEET_KEY=YOUR_VALUE_HERE
-ASSSHEET_APPID=YOUR_VALUE_HERE
-ChannelAccessToken=YOUR_VALUE_HERE
-ChannelID=YOUR_VALUE_HERE
-ChannelSecret=YOUR_VALUE_HERE
-WEBHOOK_GAS=YOUR_VALUE_HERE
-WEBHOOK_URL=YOUR_VALUE_HERE
-api_key=YOUR_VALUE_HERE
-chat_url=YOUR_VALUE_HERE
-hf_token=YOUR_VALUE_HERE
-n8nhook=YOUR_VALUE_HERE
-openinterpreter_secret=YOUR_VALUE_HERE
-postgre_host=YOUR_VALUE_HERE
-postgre_pass=YOUR_VALUE_HERE
-postgre_url=YOUR_VALUE_HERE
-postgre_user=YOUR_VALUE_HERE
-token=YOUR_VALUE_HERE
-github_user=YOUR_VALUE_HERE
-github_token=YOUR_VALUE_HERE
-TOOL_KIT_DIR=usage

Dockerfile

@@ -14,7 +14,6 @@ RUN apt-get update && apt-get install -y \
     g++ \
     curl \
     git \
-    jq \
     && rm -rf /var/lib/apt/lists/*
 
 # Copy requirements first for better caching
@@ -23,7 +22,6 @@ COPY requirements.txt .
 # Install Python dependencies
 RUN pip install --no-cache-dir --upgrade pip && \
     pip install --no-cache-dir gradio==4.29.0 && \
-    pip install --no-cache-dir google-cloud-storage google-auth google-auth-oauthlib google-auth-httplib2 && \
     pip install --no-cache-dir -r requirements.txt
 
 # Copy the application code

README-Docker.md

@@ -1,121 +0,0 @@
-# 🦀 Gradio FastAPI Django Main - Docker Setup
-
-Based on the configuration in README.md:
-- **Title**: Gradio fastapi_django_main
-- **Emoji**: 🦀
-- **SDK**: Gradio 4.29.0
-- **App File**: app.py
-
-## Quick Start
-
-### Prerequisites
-- Docker Desktop installed and running
-- PowerShell (Windows) or Bash (Linux/macOS)
-
-### 🚀 Start Application
-```powershell
-# Windows
-.\start.ps1
-
-# Or manually:
-docker-compose up --build -d
-```
-
-### 🛑 Stop Application
-```powershell
-# Windows
-.\stop.ps1
-
-# Or manually:
-docker-compose down
-```
-
-## Configuration
-
-### Environment Variables
-Copy `.env.example` to `.env` and update the values:
-
-```bash
-# Groq API Configuration
-OPENAI_API_BASE=https://api.groq.com/openai/v1
-OPENAI_API_KEY=your_actual_api_key_here
-MODEL_NAME=llama3-8b-8192
-LOCAL_MODEL=true
-
-# Gradio Configuration
-GRADIO_SERVER_NAME=0.0.0.0
-GRADIO_SERVER_PORT=7860
-```
-
-## Services
-
-### Main Application
-- **Container**: `gradio-fastapi-django-main`
-- **Port**: 7860
-- **URL**: http://localhost:7860
-
-### Features
-- Gradio 4.29.0 Web Interface
-- FastAPI Backend
-- Django Integration
-- Groq API Support
-- Health Checks
-- Auto-restart on failure
-
-## Docker Commands
-
-```bash
-# Build only
-docker-compose build
-
-# Start in foreground (see logs)
-docker-compose up
-
-# Start in background
-docker-compose up -d
-
-# View logs
-docker-compose logs -f
-
-# Check status
-docker-compose ps
-
-# Stop and remove
-docker-compose down
-
-# Rebuild and start
-docker-compose up --build
-
-# Clean up everything
-docker-compose down -v --remove-orphans
-docker system prune -f
-```
-
-## Troubleshooting
-
-### Container won't start
-1. Check Docker Desktop is running
-2. Check logs: `docker-compose logs`
-3. Verify `.env` file exists and has correct values
-4. Ensure port 7860 is not in use
-
-### API Key Issues
-1. Update `OPENAI_API_KEY` in `.env` file
-2. Restart containers: `docker-compose restart`
-
-### Performance Issues
-1. Allocate more memory to Docker Desktop
-2. Check container resources: `docker stats`
-
-## Development
-
-### Local Development with Docker
-```bash
-# Mount source code for live reloading
-docker-compose -f docker-compose.dev.yml up
-```
-
-### Access Container Shell
-```bash
-docker-compose exec gradio-fastapi-django bash
-```

docker-compose-fixed.yml

@@ -1,39 +0,0 @@
-version: '3.8'
-
-services:
-  gradio-fastapi-django:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: gradio-fastapi-django-main
-    ports:
-      - "7860:7860"
-    environment:
-      - PYTHONUNBUFFERED=1
-      - GRADIO_SERVER_NAME=0.0.0.0
-      - GRADIO_SERVER_PORT=7860
-      - OPENAI_API_BASE=${OPENAI_API_BASE:-https://api.groq.com/openai/v1}
-      - OPENAI_API_KEY=${OPENAI_API_KEY}
-      - MODEL_NAME=${MODEL_NAME:-llama3-8b-8192}
-      - LOCAL_MODEL=${LOCAL_MODEL:-true}
-      - GOOGLE_APPLICATION_CREDENTIALS_CONTENT=${GOOGLE_APPLICATION_CREDENTIALS_CONTENT}
-      - GOOGLE_PROJECT_ID=${GOOGLE_PROJECT_ID}
-      - GOOGLE_CLIENT_EMAIL=${GOOGLE_CLIENT_EMAIL}
-    volumes:
-      - ./cache:/app/cache
-      - ./gradio_cached_examples:/app/gradio_cached_examples
-      - ./static:/app/static
-      - ./templates:/app/templates
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:7860/health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 30s
-    networks:
-      - gradio-network
-
-networks:
-  gradio-network:
-    driver: bridge

docker-compose-simple.yml

@@ -1,27 +0,0 @@
-version: '3.8'
-
-services:
-  gradio-fastapi-django:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: gradio-fastapi-django-main
-    ports:
-      - "7860:7860"
-    env_file:
-      - .env
-    volumes:
-      - ./cache:/app/cache
-      - ./static:/app/static
-      - ./templates:/app/templates
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:7860/health"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 30s
-
-networks:
-  default:
-    driver: bridge

gcp_auth.py

@@ -1,74 +0,0 @@
-#!/usr/bin/env python3
-"""
-Google Cloud Authentication Helper
-This script handles Google Cloud authentication using environment variables.
-"""
-
-import os
-import json
-import tempfile
-from google.auth import default
-from google.cloud import storage
-
-
-def setup_gcp_credentials():
-    """Setup Google Cloud credentials from environment variables."""
-    
-    # Get credentials content from environment variable
-    creds_content = os.getenv('GOOGLE_APPLICATION_CREDENTIALS_CONTENT')
-    
-    if creds_content:
-        # Parse JSON credentials
-        try:
-            creds_dict = json.loads(creds_content)
-            
-            # Create temporary credentials file
-            with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
-                json.dump(creds_dict, f)
-                temp_creds_path = f.name
-            
-            # Set environment variable for Google Cloud SDK
-            os.environ['GOOGLE_APPLICATION_CREDENTIALS'] = temp_creds_path
-            
-            print(f"✅ Google Cloud credentials configured successfully")
-            print(f"📁 Project ID: {creds_dict.get('project_id', 'N/A')}")
-            print(f"📧 Client Email: {creds_dict.get('client_email', 'N/A')}")
-            
-            return temp_creds_path
-            
-        except json.JSONDecodeError as e:
-            print(f"❌ Error parsing Google Cloud credentials: {e}")
-            return None
-    else:
-        print("⚠️  No Google Cloud credentials found in environment variables")
-        return None
-
-
-def test_gcp_connection():
-    """Test Google Cloud connection."""
-    try:
-        # Test authentication
-        credentials, project = default()
-        print(f"✅ Google Cloud authentication successful")
-        print(f"📁 Project: {project}")
-        
-        # Test Cloud Storage access
-        client = storage.Client()
-        buckets = list(client.list_buckets())
-        print(f"📦 Found {len(buckets)} storage buckets")
-        
-        return True
-    except Exception as e:
-        print(f"❌ Google Cloud connection test failed: {e}")
-        return False
-
-
-if __name__ == "__main__":
-    # Setup credentials
-    creds_path = setup_gcp_credentials()
-    
-    if creds_path:
-        # Test connection
-        test_gcp_connection()
-    else:
-        print("❌ Failed to setup Google Cloud credentials")

mysite/routers/gradio.py

@@ -19,7 +19,9 @@ import pkgutil
 import traceback
 
 def include_gradio_interfaces():
-    package_dir = "/home/user/app/controllers"  # `controllers/` 直下を探索
+    # プロジェクトルートからcontrollersディレクトリのパスを取得
+    current_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    package_dir = os.path.join(current_dir, "controllers")  # `controllers/` 直下を探索
     gradio_interfaces = {}  # 辞書型: { interface_name: gradio_interface }
     
     # `controllers/` 以下の全てのサブディレクトリを探索

start.ps1

@@ -1,30 +0,0 @@
-# Gradio FastAPI Django Main - Docker Compose Start Script
-# Based on README.md configuration: Gradio 4.29.0, app.py
-
-Write-Host "🦀 Starting Gradio FastAPI Django Main Application" -ForegroundColor Cyan
-Write-Host "Emoji: 🦀" -ForegroundColor Yellow
-Write-Host "SDK: Gradio 4.29.0" -ForegroundColor Green
-Write-Host "App File: app.py" -ForegroundColor Blue
-
-# Check if Docker is running
-if (!(Get-Process "Docker Desktop" -ErrorAction SilentlyContinue)) {
-    Write-Host "❌ Docker Desktop is not running. Please start Docker Desktop first." -ForegroundColor Red
-    exit 1
-}
-
-# Build and start the containers
-Write-Host "🔨 Building and starting containers..." -ForegroundColor Cyan
-docker-compose up --build -d
-
-if ($LASTEXITCODE -eq 0) {
-    Write-Host "✅ Application started successfully!" -ForegroundColor Green
-    Write-Host "🌐 Application is running at: http://localhost:7860" -ForegroundColor Blue
-    Write-Host "📊 Container status:" -ForegroundColor Yellow
-    docker-compose ps
-    
-    Write-Host "`n📝 To view logs: docker-compose logs -f" -ForegroundColor Cyan
-    Write-Host "🛑 To stop: docker-compose down" -ForegroundColor Cyan
-} else {
-    Write-Host "❌ Failed to start application. Check the logs:" -ForegroundColor Red
-    docker-compose logs
-}

stop.ps1

@@ -1,20 +0,0 @@
-# Gradio FastAPI Django Main - Docker Compose Stop Script
-
-Write-Host "🛑 Stopping Gradio FastAPI Django Main Application" -ForegroundColor Red
-
-# Stop and remove containers
-docker-compose down
-
-if ($LASTEXITCODE -eq 0) {
-    Write-Host "✅ Application stopped successfully!" -ForegroundColor Green
-} else {
-    Write-Host "❌ Failed to stop application properly." -ForegroundColor Red
-}
-
-# Optional: Remove unused volumes and images
-$cleanup = Read-Host "Do you want to clean up unused Docker resources? (y/N)"
-if ($cleanup -eq "y" -or $cleanup -eq "Y") {
-    Write-Host "🧹 Cleaning up Docker resources..." -ForegroundColor Yellow
-    docker system prune -f
-    Write-Host "✅ Cleanup completed!" -ForegroundColor Green
-}

test_docker_config.py

@@ -1,120 +0,0 @@
-#!/usr/bin/env python3
-"""
-Docker環境設定テストスクリプト
-README.md仕様: Gradio 4.29.0, 🦀 emoji, app.py
-"""
-
-import os
-import json
-import sys
-
-def test_environment_variables():
-    """環境変数の設定をテスト"""
-    print("🦀 Docker環境設定テスト - Gradio FastAPI Django Main")
-    print("=" * 60)
-    
-    # 必須環境変数のチェック
-    required_vars = [
-        'OPENAI_API_KEY',
-        'OPENAI_API_BASE', 
-        'MODEL_NAME',
-        'GRADIO_SERVER_NAME',
-        'GRADIO_SERVER_PORT',
-        'GOOGLE_APPLICATION_CREDENTIALS_CONTENT'
-    ]
-    
-    print("📋 必須環境変数チェック:")
-    all_set = True
-    for var in required_vars:
-        value = os.getenv(var, 'NOT_SET')
-        if value == 'NOT_SET' or value == 'YOUR_VALUE_HERE':
-            print(f"  ❌ {var}: 未設定")
-            all_set = False
-        else:
-            # 機密情報はマスク
-            if 'KEY' in var or 'SECRET' in var or 'TOKEN' in var:
-                display_value = value[:8] + '...' if len(value) > 8 else '***'
-            else:
-                display_value = value
-            print(f"  ✅ {var}: {display_value}")
-    
-    print("\n📦 オプション環境変数:")
-    optional_vars = [
-        'APPSHEET_APPID', 'APPSHEET_KEY', 'ChannelAccessToken',
-        'github_user', 'github_token', 'hf_token'
-    ]
-    
-    for var in optional_vars:
-        value = os.getenv(var, 'NOT_SET')
-        if value != 'NOT_SET' and value != 'YOUR_VALUE_HERE':
-            print(f"  ✅ {var}: 設定済み")
-        else:
-            print(f"  ⚠️  {var}: 未設定（オプション）")
-    
-    return all_set
-
-def test_gradio_version():
-    """Gradio バージョンチェック"""
-    try:
-        import gradio as gr
-        print(f"\n🎨 Gradio バージョン: {gr.__version__}")
-        
-        # README.md仕様との比較
-        expected_version = "4.29.0"
-        if gr.__version__ == expected_version:
-            print(f"  ✅ README.md仕様と一致: {expected_version}")
-        else:
-            print(f"  ⚠️  README.md仕様 ({expected_version}) と異なります")
-        
-        return True
-    except ImportError as e:
-        print(f"  ❌ Gradio インポートエラー: {e}")
-        return False
-
-def test_google_cloud_config():
-    """Google Cloud認証設定テスト"""
-    print("\n☁️  Google Cloud設定:")
-    
-    creds_content = os.getenv('GOOGLE_APPLICATION_CREDENTIALS_CONTENT')
-    if creds_content:
-        try:
-            creds_json = json.loads(creds_content)
-            project_id = creds_json.get('project_id', 'NOT_FOUND')
-            client_email = creds_json.get('client_email', 'NOT_FOUND')
-            
-            print(f"  ✅ プロジェクトID: {project_id}")
-            print(f"  ✅ サービスアカウント: {client_email}")
-            return True
-        except json.JSONDecodeError:
-            print("  ❌ 認証情報のJSON形式が無効です")
-            return False
-    else:
-        print("  ❌ Google Cloud認証情報が設定されていません")
-        return False
-
-def main():
-    """メインテスト実行"""
-    print("🚀 Docker環境設定検証開始\n")
-    
-    env_ok = test_environment_variables()
-    gradio_ok = test_gradio_version()
-    gcp_ok = test_google_cloud_config()
-    
-    print("\n" + "=" * 60)
-    print("📊 テスト結果サマリー:")
-    print(f"  環境変数: {'✅ OK' if env_ok else '❌ NG'}")
-    print(f"  Gradio: {'✅ OK' if gradio_ok else '❌ NG'}")
-    print(f"  Google Cloud: {'✅ OK' if gcp_ok else '❌ NG'}")
-    
-    overall_status = all([env_ok, gradio_ok, gcp_ok])
-    if overall_status:
-        print("\n🎉 すべてのテストが通過しました！")
-        print("✨ README.md仕様に準拠したDocker環境が正常に設定されています")
-    else:
-        print("\n⚠️  いくつかの設定に問題があります")
-        print("💡 上記のエラーを修正してから再度テストしてください")
-    
-    return 0 if overall_status else 1
-
-if __name__ == "__main__":
-    sys.exit(main())