Site Modernization (switch to uv, tailwind v4 and more)

.github/workflows/ruff.yml

@@ -1,28 +1,21 @@
-name: Ruff check
+name: ruff check
 
 on:
-    push:
-    workflow_dispatch:
+  push:
+  pull_request:
 
 jobs:
-    test:
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                python-version: ["3.10", "3.11", "3.12", "3.13"]
+  ruff_check:
+    runs-on: ubuntu-latest
 
-        steps:
-            - uses: actions/checkout@v4
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: "3.13"
 
-            - name: Set up Python ${{ matrix.python-version }}
-              uses: actions/setup-python@v4
-              with:
-                  python-version: ${{ matrix.python-version }}
+      - run: python -m venv .venv && source .venv/bin/activate
+      - run: python -m pip install --group dev
 
-            - name: Install dependencies
-              run: |
-                pip install -r requirements.txt
-                pip install -r requirements-dev.txt
-
-            - name: Run ruff check
-              run: ruff check .
+      - name: Run ruff check
+        run: ruff check --output-format=github .

.gitignore

@@ -6,7 +6,10 @@ __pycache__
 node_modules
 package-lock.json
 .env
+.venv
 jikan4snek_cache
 config.xml
 .ruff_cache
-config.toml
+config.toml
+*.egg-info
+package.json

Dockerfile

@@ -1,4 +1,6 @@
-FROM python:3.11-slim-bookworm
+FROM python:3.13.12-slim-bookworm
+
+COPY --from=ghcr.io/astral-sh/uv:0.11.2 /uv /uvx /bin/
 
 USER root
 
@@ -10,15 +12,18 @@ COPY /templates ./templates
 COPY /markdown ./markdown
 
 COPY input.css .
-COPY requirements.txt .
+COPY pyproject.toml .
 COPY static_config.toml .
 COPY tailwind.config.js .
 
 RUN apt-get update && apt-get install -y git
 
-RUN pip install -r requirements.txt
+ENV UV_NO_DEV=1
+
+COPY uv.lock .
+RUN uv sync --locked
 
 EXPOSE 8000
 ENV LISTEN_PORT=8000
 
-CMD ["uvicorn", "app.main:app", "--host=0.0.0.0", "--proxy-headers"]
+CMD ["uv", "run", "uvicorn", "app.main:app", "--host=0.0.0.0", "--proxy-headers"]

README.md

@@ -10,9 +10,8 @@
 
 ## Prerequisites
 - ~~[NodeJS](https://nodejs.org/en)~~ (no longer needed)
-- ~~[Python 3.8+](https://www.python.org/)~~ (Might still work on 3.8 but versions below 3.9 are now depreacted)
-- [Python 3.9+](https://www.python.org/)
-- [Make](https://www.gnu.org/software/make/) (Optional)
+- ~~[Python 3.8+](https://www.python.org/)~~ (is now constrained to one major python version)
+- [Python 3.13](https://www.python.org/)
 
 ## Run Locally
 > [!WARNING]
@@ -50,4 +49,4 @@ cp config.template.toml config.toml
 6. RUN!!!!
 ```sh
 fastapi dev
-```
+```

app/__init__.py

@@ -1 +1 @@
-__version__ = "1.3.17"
+__version__ = "1.3.30"

app/anime_api.py

@@ -0,0 +1,102 @@
+import typing
+
+import logging
+from datetime import datetime, timedelta
+
+from .http_client import HTTPClient
+
+__all__ = ()
+
+logger = logging.getLogger(__name__)
+
+class AnimeAPI():
+    def __init__(self, username: str) -> None:
+        self.username = username
+
+        self.__history_cache: tuple[float, dict[str, str]] = (0, {})
+        self.__updates_cache: tuple[float, dict[str, str]] = (0, {})
+
+        self.cache_expire = timedelta(minutes = 5)
+
+    async def get_anime_status(self, http_client: HTTPClient) -> list[dict]:
+        anime_list = []
+
+        mal_history = await self.__get_history(http_client)
+        mal_updates = await self.__get_updates(http_client)
+
+        if not mal_updates == {}:
+
+            for anime_update in mal_updates["data"]["anime"]:
+                action = ""
+
+                status = anime_update["status"].lower()
+
+                if status == "watching":
+                    continue
+
+                elif status == "plan to watch":
+                    action = "Planned to watch"
+
+                elif status == "completed":
+                    action = "Completed"
+
+                anime_list.append(
+                    {
+                        "action": action,
+                        "url": anime_update["entry"]["url"],
+                        "title": anime_update["entry"]["title"],
+                        "date": datetime.fromisoformat(anime_update["date"]).strftime("%b %d %Y"),
+                        "date_timestamp": datetime.fromisoformat(anime_update["date"]).timestamp()
+                    }
+                )
+
+        if not mal_history == {}:
+            anime_list += [
+                {
+                    "action": f"Watched episode {anime['increment']} of",
+                    "url": anime["entry"]["url"],
+                    "title": anime["entry"]["name"],
+                    "date": datetime.fromisoformat(anime["date"]).strftime("%b %d %Y"),
+                    "date_timestamp": datetime.fromisoformat(anime["date"]).timestamp()
+                } for anime in mal_history["data"][:20]
+            ]
+
+        anime_list.sort(key = lambda x: x["date_timestamp"], reverse = True)
+
+        return anime_list
+
+    async def __get_history(self, http_client: HTTPClient) -> dict[str, str]:
+        current_timestamp = datetime.now().timestamp()
+
+        if current_timestamp > self.__history_cache[0]:
+            http_session = await http_client.get_http_session()
+
+            async with http_session.get(f"https://api.jikan.moe/v4/users/{self.username}/history") as response:
+                if not response.ok:
+                    logger.error(f"Received unsuccessful response from jikan! Response: {response}")
+
+                data = typing.cast(dict, val = await response.json() if response.ok else {})
+
+            self.__history_cache = (
+                current_timestamp + self.cache_expire.seconds, data
+            )
+
+        return self.__history_cache[1]
+
+    async def __get_updates(self, http_client: HTTPClient) -> dict[str, str]:
+        current_timestamp = datetime.now().timestamp()
+
+        if current_timestamp > self.__updates_cache[0]:
+            http_session = await http_client.get_http_session()
+
+            async with http_session.get(f"https://api.jikan.moe/v4/users/{self.username}/userupdates") as response:
+                if not response.ok:
+                    logger.error(f"Received unsuccessful response from jikan! Response: {response}")
+
+                data = typing.cast(dict, val = await response.json() if response.ok else {})
+
+            self.__updates_cache = (
+                current_timestamp + self.cache_expire.seconds, data
+            )
+
+        return self.__updates_cache[1]

app/goldy_exe_api.py → app/blog_api.py

@@ -6,16 +6,16 @@
 
 from datetime import datetime
 
-from . import constants
-from .async_http_client import get_http_client
+from .http_client import HTTPClient
+from .constants import BLOG_CDN_URL, BLOG_API_URL
 
 __all__ = ()
 
-class GoldyEXEAPI():
+class BlogAPI():
     def __init__(self) -> None:
-        self.blogs_data: Tuple[int, list] = (0.0, [])
+        self.blogs_data: Tuple[float, list] = (0.0, [])
 
-    async def get_blog_posts(self, limit: Optional[int] = None) -> List[dict]:
+    async def get_blog_posts(self, http_client: HTTPClient, limit: Optional[int] = None) -> List[dict]:
         params = {}
 
         if limit is not None:
@@ -24,15 +24,15 @@ async def get_blog_posts(self, limit: Optional[int] = None) -> List[dict]:
         now = datetime.now().timestamp()
 
         if now > self.blogs_data[0] + 60 * 60 * 12: # 12 hours
-            http_client = await get_http_client()
+            http_session = await http_client.get_http_session()
 
-            async with http_client.request("GET", constants.BLOG_API_URL + "/posts", params = params) as r:
+            async with http_session.request("GET", BLOG_API_URL + "/posts", params = params) as r:
                 if r.ok:
                     blog_posts = [
                         {
                             "id": post["id"],
                             "name": post["name"],
-                            "thumbnail_url": constants.BLOG_CDN_URL + post["thumbnail"] if post["thumbnail"] is not None else None,
+                            "thumbnail_url": BLOG_CDN_URL + post["thumbnail"] if post["thumbnail"] is not None else None,
                             "date_added": datetime.fromisoformat(post["date_added"]).strftime("%b %d %Y")
                         } for post in await r.json()
                     ]