Refactor Dockerfile and server implementation for improved containerization and functionality

- Updated Dockerfile to streamline the build process by removing the builder stage and directly installing dependencies from requirements.txt.
- Configured Hypercorn to bind to port 7860 and added WebSocket settings in hypercorn.toml.
- Enhanced README.md with updated server title, description, and API endpoints.
- Added health check endpoint to server.py and enabled CORS for better client interaction.
- Updated requirements.txt to include necessary packages for the application.

Dockerfile

@@ -1,34 +1,27 @@
 # Dockerfile
-FROM python:3.11-slim as builder
-
-# Instala dependencias de compilación si es necesario
-RUN apt-get update && apt-get install -y build-essential
-
-# Instala poetry
-RUN pip install poetry
+FROM python:3.11-slim
 
-# Copia archivos de la aplicación
 WORKDIR /app
-COPY pyproject.toml poetry.lock /app/
-COPY broker.py /app/broker.py
-COPY server.py /app/server.py
 
-# Instala dependencias
-RUN poetry install --no-dev --no-root
+# Instalar dependencias del sistema si son necesarias
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    && rm -rf /var/lib/apt/lists/*
 
-# Imagen final
-FROM python:3.11-slim
-
-WORKDIR /app
+# Copiar archivos de la aplicación
+COPY requirements.txt .
+COPY broker.py .
+COPY server.py .
+COPY hypercorn.toml .
 
-# Copia desde el builder
-COPY --from=builder /app /app
+# Instalar dependencias de Python
+RUN pip install --no-cache-dir -r requirements.txt
 
 # Variables de entorno
 ENV PYTHONUNBUFFERED=1
 
-# Expone el puerto
+# Exponer el puerto que Hugging Face Spaces espera
 EXPOSE 7860
 
-# Comando para ejecutar la aplicación
-CMD ["poetry", "run", "python", "server.py"]
+# Comando para ejecutar la aplicación con Hypercorn
+CMD ["hypercorn", "--config", "hypercorn.toml", "server:app"]

README.md

@@ -1,10 +1,24 @@
 ---
-title: Kaiobash Server
-emoji: 🌖
-colorFrom: indigo
+title: Kaio API Server
+emoji: 🚀
+colorFrom: blue
 colorTo: indigo
 sdk: docker
+app_port: 7860
 pinned: false
 ---
 
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+# Kaio API Server
+
+Este servidor proporciona una API REST y WebSocket para ejecutar comandos y gestionar archivos.
+
+## Endpoints
+
+- REST API: `https://<space-name>.hf.space/`
+- WebSocket: `wss://<space-name>.hf.space/session`
+
+## Estado
+
+Puedes verificar el estado del servidor accediendo a:
+- `https://<space-name>.hf.space/health`
+- `https://<space-name>.hf.space/status`

hypercorn.toml

@@ -1,9 +1,14 @@
 # Hypercorn configuration file
 
 # Server binding options
-bind = "0.0.0.0:8000" 
-workers = 1 
+bind = "0.0.0.0:7860"
+workers = 1
+
+# Websocket settings
+websocket_ping_interval = 20
+websocket_max_message_size = 16777216
 
 # Logging configuration
-accesslog = "/var/log/serverwitch/access.log"
-logconfig = "logging.toml"
+accesslog = "-"
+errorlog = "-"
+loglevel = "INFO"

requirements.txt

@@ -1 +1,4 @@
- 
+quart>=0.18.4
+quart-schema>=0.15.0
+hypercorn>=0.14.3
+websockets>=11.0.3 

server.py

@@ -3,11 +3,13 @@ import asyncio
 import uuid
 from typing import AsyncGenerator, Dict, Tuple, Any, Optional
 from dataclasses import dataclass
-from quart import Quart, websocket, request, FileResponse
+from quart import Quart, websocket, request, Response
 from quart_schema import QuartSchema, validate_request, validate_response
+from quart_cors import cors
 import importlib.metadata
 import secrets
 import logging
+import hypercorn.asyncio
 
 from broker import SessionBroker, SessionDoesNotExist, ClientRequest, ClientResponse, ClientError
 
@@ -16,8 +18,9 @@ TIMEOUT: int = 60
 LOG_LEVEL: int = logging.INFO
 TRUSTED_HOSTS: list[str] = ["127.0.0.1"]
 
-# Crear aplicación
+# Crear aplicación con CORS habilitado
 app = Quart(__name__)
+app = cors(app, allow_origin="*")
 QuartSchema(app)
 app.logger.setLevel(LOG_LEVEL)
 
@@ -97,7 +100,14 @@ async def command(data: Command) -> Tuple[CommandResponse | ErrorResponse, int]:
 
 # Ejecutar aplicación
 def run():
-    app.run(port=7860)
+    config = hypercorn.Config()
+    config.bind = ["0.0.0.0:7860"]
+    asyncio.run(hypercorn.asyncio.serve(app, config))
+
+# Agregar un endpoint de health check
+@app.route("/health")
+async def health_check():
+    return {"status": "healthy"}
 
 if __name__ == "__main__":
     run()