structables 0.4.0__tar.gz → 0.4.1__tar.gz

{structables-0.4.0 → structables-0.4.1}/.forgejo/workflows/docker.yml

@@ -4,17 +4,14 @@ on:
   push:
     tags:
       - "*"
+  workflow_dispatch:
 
 jobs:
   docker:
     name: Docker Build and Push to Docker Hub
     container:
-      image: node:22-bookworm
+      image: catthehacker/ubuntu:act-latest
     steps:
-      - name: Install dependencies
-        run: |
-          apt update
-          apt install -y docker.io
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -30,4 +27,4 @@ jobs:
           push: true
           tags: |
             privatecoffee/structables:latest
-            privatecoffee/structables:${{ env.GITHUB_REF_NAME }}
+            privatecoffee/structables:${{ github.ref_name }}

{structables-0.4.0 → structables-0.4.1}/.gitignore

@@ -7,6 +7,7 @@ privacy.txt
 *.pyc
 venv/
 /output
+/cache/
 
 # Special rules needed for building the Docker image
 /dist/*

{structables-0.4.0 → structables-0.4.1}/Dockerfile

@@ -12,10 +12,8 @@ RUN $APP_ENV/bin/pip install --no-cache-dir pip && \
   $APP_ENV/bin/pip install /app && \
   adduser -S -D -H structables
 
-COPY entrypoint.sh /entrypoint.sh
-
 EXPOSE 8002
 
 USER structables
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/app/entrypoint.sh"]

{structables-0.4.0 → structables-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: structables
-Version: 0.4.0
+Version: 0.4.1
 Summary: A simple frontend for Instructables
 Project-URL: Homepage, https://git.private.coffee/privatecoffee/structables
 Project-URL: Bug Tracker, https://git.private.coffee/privatecoffee/structables/issues
@@ -672,7 +672,7 @@ Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
-Requires-Dist: bs4
+Requires-Dist: beautifulsoup4
 Requires-Dist: flask
 Requires-Dist: markdown2[all]
 Description-Content-Type: text/markdown
@@ -737,6 +737,8 @@ Of course, you can also join our [Matrix room](https://matrix.pcof.fi/#/#structa
 
 ### Production: Docker
 
+**Note:** The Docker image is now hosted on [git.private.coffee](https://git.private.coffee/privatecoffee/structables/packages) instead of Docker Hub. Please use the new image name `git.private.coffee/privatecoffee/structables` instead of `privatecoffee/structables` to continue receiving updates.
+
 1. Copy `.env.example` to `.env` and adjust the settings as necessary
 2. Copy `docker-compose-example.yml` to `docker-compose.yml` and adjust it as necessary, for example modifying resource limits or changing the port/host configuration
 3. Build and run the Docker container:

{structables-0.4.0 → structables-0.4.1}/README.md

@@ -58,6 +58,8 @@ Of course, you can also join our [Matrix room](https://matrix.pcof.fi/#/#structa
 
 ### Production: Docker
 
+**Note:** The Docker image is now hosted on [git.private.coffee](https://git.private.coffee/privatecoffee/structables/packages) instead of Docker Hub. Please use the new image name `git.private.coffee/privatecoffee/structables` instead of `privatecoffee/structables` to continue receiving updates.
+
 1. Copy `.env.example` to `.env` and adjust the settings as necessary
 2. Copy `docker-compose-example.yml` to `docker-compose.yml` and adjust it as necessary, for example modifying resource limits or changing the port/host configuration
 3. Build and run the Docker container:

{structables-0.4.0 → structables-0.4.1}/docker-compose-example-dev.yml

@@ -5,12 +5,13 @@ services:
     build: .
     ports:
       - "127.0.0.1:8002:8002"
+    volumes:
+      - ./cache:/app/structables_cache
     env_file: .env
     security_opt:
       - no-new-privileges:true
     cap_drop:
       - ALL
-    read_only: true
     deploy:
       resources:
         limits:

{structables-0.4.0 → structables-0.4.1}/docker-compose-example.yml

@@ -2,15 +2,16 @@ services:
   structables:
     container_name: structables
     restart: unless-stopped
-    image: privatecoffee/structables:latest
+    image: git.private.coffee/privatecoffee/structables:latest
     ports:
       - "127.0.0.1:8002:8002"
+    volumes:
+      - ./cache:/app/structables_cache
     env_file: .env
     security_opt:
       - no-new-privileges:true
     cap_drop:
       - ALL
-    read_only: true
     deploy:
       resources:
         limits:

{structables-0.4.0 → structables-0.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "structables"
-version = "0.4.0"
+version = "0.4.1"
 authors = [
   { name="Private.coffee Team", email="support@private.coffee" },
 ]
@@ -19,7 +19,7 @@ classifiers = [
 ]
 dependencies = [
   "flask",
-  "bs4",
+  "beautifulsoup4",
   "markdown2[all]",
 ]
 

{structables-0.4.0 → structables-0.4.1}/src/structables/config.py

@@ -1,8 +1,13 @@
 import os
 import tempfile
+import logging
+
+from pathlib import Path
 
 from .utils.helpers import get_typesense_api_key
 
+logger = logging.getLogger(__name__)
+
 
 class Config:
     DEBUG = os.environ.get("FLASK_DEBUG", os.environ.get("STRUCTABLES_DEBUG", False))
@@ -24,10 +29,20 @@ class Config:
     )
     CACHE_DIR = os.environ.get("STRUCTABLES_CACHE_DIR")
 
-    if CACHE_DIR is None:
-        CACHE_DIR = os.path.join(
-            tempfile.gettempdir(), "structables_cache"
-        )
+    if CACHE_ENABLED and CACHE_DIR is None:
+        try:
+            CACHE_DIR = Path(tempfile.gettempdir()) / "structables_cache"
+        except FileNotFoundError:
+            CACHE_DIR = Path(os.getcwd()) / "structables_cache"
+
+        try:
+            CACHE_DIR.mkdir(parents=True, exist_ok=True)
+            (CACHE_DIR / "test").write_text("test")
+            (CACHE_DIR / "test").unlink()
+        except Exception as e:
+            logger.error(f"Could not create or write to cache directory: {e} - disabling cache")
+            CACHE_ENABLED = False
+            CACHE_DIR = None
 
     CACHE_MAX_AGE = int(
         os.environ.get("STRUCTABLES_CACHE_MAX_AGE", 60 * 60 * 24 * 7)