Merge branch 'padws:main' into mataai:main

Author: mataai

.env.template

@@ -5,8 +5,9 @@ CODER_PORT=7080
 APP_PORT=8000
 
 # API Configuration
-API_WORKERS=4
+API_WORKERS=1
 FRONTEND_URL=your_frontend_url
+REDIRECT_URI=http://localhost:8000/api/auth/callback
 
 # Database Configuration
 POSTGRES_USER=admin
@@ -38,3 +39,4 @@ CODER_ADDITIONAL_CSP_POLICY=frame-ancestors *
 CODER_API_KEY=your_coder_api_key
 CODER_TEMPLATE_ID=your_template_id
 CODER_DEFAULT_ORGANIZATION=your_organization_id
+CODER_WORKSPACE_NAME=your_workspace_name

.gitignore

@@ -6,3 +6,4 @@ src/excalidraw
 .env
 src/frontend/.env.local
 .vscode/settings.json
+dev/

README.md

@@ -86,7 +86,14 @@ This simplified example lets you host pad on `localhost` but is not safe for rea
     *   Fill in the details
     *   **Important:** Tick `Email verified`
     *   Go to the `Credentials` tab for the new user and set a password
-
+*   **Create an Audience:**
+    *   Navigate to `Clients` -> `[Your Client ID]` -> `Client Scopes`
+    *   Click on the dedicated scope of your Client (`[clientid]-dedicated`)
+    *   Click on `Configure a new mapper`
+    *   Then click on `Audience`
+    *   Ensure `Included Client Audience` matches your `Client ID`
+    *   Ensure `Add to access token` is On
+    
 ### 5️⃣ Coder 🧑‍💻
 
 *   **Find Docker Group ID:** You'll need this to grant necessary permissions
@@ -127,6 +134,8 @@ This simplified example lets you host pad on `localhost` but is not safe for rea
         ```dotenv
         CODER_DEFAULT_ORGANIZATION=your_organization_id # Example: 70f6af06-ef3a-4b4c-a663-c03c9ee423bb
         ```
+*   **If you use a custom name for your workspace:**
+    *   You need to provide the name as `CODER_WORKSPACE_NAME` in your `.env`. Otherwise, it will assume your workspace name is the default we chose: `ubuntu`.
 
 ### 6️⃣ Pad App 📝
 > The fastAPI app that both serves the build frontend and the backend API to interface with Coder

docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - postgres_data:/var/lib/postgresql/data
     restart: unless-stopped
     network_mode: host
-    
+
   redis:
     image: redis:alpine
     container_name: redis
@@ -78,7 +78,7 @@ services:
       - OIDC_CLIENT_SECRET=${OIDC_CLIENT_SECRET}
       - OIDC_SERVER_URL=http://localhost:${KEYCLOAK_PORT}
       - OIDC_REALM=${OIDC_REALM}
-      - REDIRECT_URI=http://localhost:${APP_PORT}/auth/callback
+      - REDIRECT_URI=${REDIRECT_URI}
       - POSTGRES_USER=${POSTGRES_USER}
       - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
       - POSTGRES_DB=${POSTGRES_DB}

docs/frontend-backend-communication.md

@@ -1,15 +1,5 @@
 #!/bin/bash
 set -e
 
-# Create runtime config with environment variables
-mkdir -p /app/frontend/dist/assets
-cat > /app/frontend/dist/assets/runtime-config.js <<EOL
-window.RUNTIME_CONFIG = {
-  CODER_URL: "${CODER_URL}",
-  VITE_PUBLIC_POSTHOG_KEY: "${VITE_PUBLIC_POSTHOG_KEY}",
-  VITE_PUBLIC_POSTHOG_HOST: "${VITE_PUBLIC_POSTHOG_HOST}"  
-};
-EOL
-
 # Start the application
 exec uvicorn main:app --host 0.0.0.0 --port 8000 --workers $API_WORKERS

scripts/startup.sh

@@ -0,0 +1,3 @@
+from .redis_client import RedisClient
+
+__all__ = ["RedisClient"]

src/backend/cache/__init__.py

@@ -0,0 +1,44 @@
+import os
+from redis import asyncio as aioredis
+from dotenv import load_dotenv
+
+# Load environment variables
+load_dotenv()
+
+# Redis Configuration
+REDIS_HOST = os.getenv('REDIS_HOST', 'localhost')
+REDIS_PASSWORD = os.getenv('REDIS_PASSWORD', None)
+REDIS_PORT = int(os.getenv('REDIS_PORT', 6379))
+REDIS_URL = f"redis://{REDIS_HOST}:{REDIS_PORT}"
+
+class RedisClient:
+    """Service for managing Redis connections with proper lifecycle management."""
+    
+    _instance = None
+    
+    @classmethod
+    async def get_instance(cls) -> aioredis.Redis:
+        """Get or create a Redis client instance."""
+        if cls._instance is None:
+            cls._instance = cls()
+            await cls._instance.initialize()
+        return cls._instance.client
+    
+    def __init__(self):
+        self.client = None
+    
+    async def initialize(self) -> None:
+        """Initialize the Redis client."""
+        self.client = aioredis.from_url(
+            REDIS_URL,
+            password=REDIS_PASSWORD,
+            decode_responses=True,
+            health_check_interval=30
+        )
+        
+    async def close(self) -> None:
+        """Close the Redis client connection."""
+        if self.client:
+            await self.client.close()
+            self.client = None
+            print("Redis client closed.")