Merge pull request #24 from ks6088ts-labs/copilot/fix-23

Make WebSocket URL configurable for chats service

Author: ks6088ts

.env.template

@@ -17,3 +17,6 @@ AZURE_BLOB_STORAGE_CONTAINER_NAME="files"
 # Azure AI Speech
 AZURE_AI_SPEECH_API_KEY="<YOUR_AZURE_AI_SPEECH_API_KEY>"
 AZURE_AI_SPEECH_ENDPOINT="https://<speech-api-name>.cognitiveservices.azure.com/"
+
+# Chats WebSocket
+CHATS_WEBSOCKET_URL="ws://localhost:8000"

template_fastapi/repositories/chats.py

@@ -0,0 +1,42 @@
+from fastapi import WebSocket
+
+
+class ConnectionManager:
+    """WebSocket connection manager for handling multiple client connections."""
+
+    def __init__(self):
+        self.active_connections: list[WebSocket] = []
+
+    async def connect(self, websocket: WebSocket):
+        """Accept a WebSocket connection and add it to active connections."""
+        await websocket.accept()
+        self.active_connections.append(websocket)
+
+    def disconnect(self, websocket: WebSocket):
+        """Remove a WebSocket connection from active connections."""
+        self.active_connections.remove(websocket)
+
+    async def send_personal_message(self, message: str, websocket: WebSocket):
+        """Send a personal message to a specific WebSocket connection."""
+        await websocket.send_text(message)
+
+    async def broadcast(self, message: str):
+        """Broadcast a message to all active connections."""
+        for connection in self.active_connections:
+            await connection.send_text(message)
+
+
+class ChatRepository:
+    """Repository for handling chat-related operations."""
+
+    def __init__(self):
+        self.manager = ConnectionManager()
+
+    async def handle_client_message(self, data: str, websocket: WebSocket, client_id: int):
+        """Handle a message from a client."""
+        await self.manager.send_personal_message(f"You wrote: {data}", websocket)
+        await self.manager.broadcast(f"Client #{client_id} says: {data}")
+
+    async def handle_client_disconnect(self, client_id: int):
+        """Handle a client disconnect."""
+        await self.manager.broadcast(f"Client #{client_id} left the chat")

template_fastapi/routers/chats.py

@@ -1,57 +1,40 @@
-from fastapi import APIRouter, WebSocket, WebSocketDisconnect
-from fastapi.responses import HTMLResponse
+from fastapi import APIRouter, Request, WebSocket, WebSocketDisconnect
+from fastapi.templating import Jinja2Templates
 
-router = APIRouter()
-
-
-class ConnectionManager:
-    def __init__(self):
-        self.active_connections: list[WebSocket] = []
-
-    async def connect(self, websocket: WebSocket):
-        await websocket.accept()
-        self.active_connections.append(websocket)
-
-    def disconnect(self, websocket: WebSocket):
-        self.active_connections.remove(websocket)
+from template_fastapi.repositories.chats import ChatRepository
+from template_fastapi.settings.chats import get_chats_settings
 
-    async def send_personal_message(self, message: str, websocket: WebSocket):
-        await websocket.send_text(message)
-
-    async def broadcast(self, message: str):
-        for connection in self.active_connections:
-            await connection.send_text(message)
-
-
-manager = ConnectionManager()
+router = APIRouter()
+templates = Jinja2Templates(directory="template_fastapi/templates")
+chat_repository = ChatRepository()
 
 
 @router.get(
     "/chats/",
     tags=["chats"],
 )
-async def get():
-    # read the HTML file
-    try:
-        with open("template_fastapi/templates/chats.html") as file:
-            html = file.read()
-    except FileNotFoundError:
-        html = "<h1>Chat page not found</h1>"
-    except Exception as e:
-        html = f"<h1>Error reading chat page: {str(e)}</h1>"
-    return HTMLResponse(html)
+async def get(request: Request):
+    """Get the chat page with configurable WebSocket URL."""
+    settings = get_chats_settings()
+    return templates.TemplateResponse(
+        "chats.html",
+        {
+            "request": request,
+            "websocket_url": settings.chats_websocket_url,
+        },
+    )
 
 
 @router.websocket(
     "/ws/{client_id}",
 )
 async def websocket_endpoint(websocket: WebSocket, client_id: int):
-    await manager.connect(websocket)
+    """WebSocket endpoint for chat functionality."""
+    await chat_repository.manager.connect(websocket)
     try:
         while True:
             data = await websocket.receive_text()
-            await manager.send_personal_message(f"You wrote: {data}", websocket)
-            await manager.broadcast(f"Client #{client_id} says: {data}")
+            await chat_repository.handle_client_message(data, websocket, client_id)
     except WebSocketDisconnect:
-        manager.disconnect(websocket)
-        await manager.broadcast(f"Client #{client_id} left the chat")
+        chat_repository.manager.disconnect(websocket)
+        await chat_repository.handle_client_disconnect(client_id)

template_fastapi/settings/chats.py

@@ -0,0 +1,18 @@
+from functools import lru_cache
+
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class Settings(BaseSettings):
+    chats_websocket_url: str = "ws://localhost:8000"
+
+    model_config = SettingsConfigDict(
+        env_file=".env",
+        env_ignore_empty=True,
+        extra="ignore",
+    )
+
+
+@lru_cache
+def get_chats_settings() -> Settings:
+    return Settings()

template_fastapi/templates/chats.html

@@ -15,7 +15,7 @@ <h2>Your ID: <span id="ws-id"></span></h2>
         <script>
             var client_id = Date.now()
             document.querySelector("#ws-id").textContent = client_id;
-            var ws = new WebSocket(`ws://localhost:8000/ws/${client_id}`);
+            var ws = new WebSocket(`{{ websocket_url }}/ws/${client_id}`);
             ws.onmessage = function(event) {
                 var messages = document.getElementById('messages')
                 var message = document.createElement('li')