Merge pull request #1 from east-and-west-magic/downloader

Dockerfile

@@ -1,16 +1,25 @@
-FROM python:3.11
+# read the doc: https://huggingface.co/docs/hub/spaces-sdks-docker
+# you will also find guides on how best to write your Dockerfile
 
-WORKDIR /code
+FROM python:3.10.10
+
+# Set up a new user named "user" with user ID 1000
+RUN useradd -m -u 1000 user
+
+# Switch to the "user" user
+USER user
+
+# Set home to the user's home directory
+ENV HOME=/home/user \
+	PATH=/home/user/.local/bin:$PATH
+
+# Set the working directory to the user's home directory
+WORKDIR $HOME/code
 
 COPY ./requirements.txt /code/requirements.txt
-RUN python3 -m pip install --no-cache-dir --upgrade pip
-RUN python3 -m pip install --no-cache-dir --upgrade -r /code/requirements.txt
+
+RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
 
 COPY . .
 
 CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]
-
-RUN mkdir /.cache
-RUN chmod 777 /.cache
-RUN mkdir .chroma
-RUN chmod 777 .chroma

main.py

@@ -1,24 +1,43 @@
-from fastapi import FastAPI
-from pydantic import BaseModel
+from fastapi import FastAPI, Body
+from fastapi.middleware.cors import CORSMiddleware
 from panel.io.fastapi import add_applications
-from page import page
+import page
+from utils import beijing
 import logging
 
-app = FastAPI()
-add_applications(page, app=app, title="Log Displayer")
+app = FastAPI(
+    title=f"Log Displayer",
+    description=f"Updated at {beijing()}",
+)
+
+print("Adding middlewares...", end="")
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+print("Done\n")
+add_applications(page.page, app=app, title="Log Displayer")
 
-class Log(BaseModel):
-    message: str
 
 @app.post("/app")
-async def log_app(log: Log):
+async def log_app(message: str = Body(..., embed=True)):
+    print(f"[APP] {message}")
     logger = logging.getLogger("APP")
-    logger.debug(log.message)
-    return {"details": "Logged Successfully. Please check the root page."}
+    logger.debug(message)
+    return True
 
 
 @app.post("/game")
-async def log_game(log: Log):
+async def log_game(message: str = Body(..., embed=True)):
+    print(f"[GAME] {message}")
     logger = logging.getLogger("Game")
-    logger.debug(log.message)
-    return {"details": "Logged Successfully. Please check the root page."}
+    logger.debug(message)
+    return True
+
+
+@app.get("/healthcheck")
+async def health_check():
+    return True

page.py

@@ -1,16 +1,14 @@
 import panel as pn
 import logging
+from pathlib import Path
 
 
 tab_console_names = ["APP", "Game"]
-pn.extension("terminal")
+pn.extension("terminal")  # type: ignore
 tabs = []
 for name in tab_console_names:
-    terminal = pn.widgets.Terminal(
-        f"Console for {name}\n=====================================================\n\n",
-        height=600,
-        sizing_mode="stretch_width",
-    )
+    terminal = pn.widgets.Terminal(height=600, sizing_mode="stretch_width")
+
     logger = logging.getLogger(name)
     logger.setLevel(logging.DEBUG)
     stream_handler = logging.StreamHandler(terminal)
@@ -19,15 +17,23 @@ for name in tab_console_names:
     stream_handler.setFormatter(formatter)
     stream_handler.setLevel(logging.DEBUG)
     logger.addHandler(stream_handler)
-    tabs.append((name, terminal))
 
-terminal_tabs = pn.Tabs(*tabs)
-main = pn.WidgetBox(terminal_tabs)
-title = "Log Displayer"
-page = pn.Column(
-    pn.pane.HTML(
-        f"""<h1 style="text-align: center; font-weight: bold;">{title}</h1>""",
-        sizing_mode="stretch_width",
-    ),
-    terminal_tabs,
-)
+    log_path = Path(f"data/logs/{name.lower()}.log")
+    log_path.parent.mkdir(parents=True, exist_ok=True)
+    file_handler = logging.FileHandler(log_path)
+    file_handler.setFormatter(formatter)
+    logger.addHandler(file_handler)
+    downloader = pn.widgets.FileDownload(log_path)
+    tabs.append(
+        (
+            name,
+            pn.Column(
+                pn.Row(terminal, align="center"),
+                pn.Row(downloader, align="center"),
+            ),
+        )
+    )
+
+
+def page():
+    return pn.Column(pn.Tabs(*tabs))

utils.py

@@ -0,0 +1,7 @@
+from datetime import datetime
+from zoneinfo import ZoneInfo
+
+
+def beijing():
+    """get beijing time"""
+    return datetime.now(tz=ZoneInfo("Asia/Shanghai"))