structables 0.4.4__tar.gz → 0.4.5__tar.gz

{structables-0.4.4 → structables-0.4.5}/.dockerignore

@@ -1,7 +1,9 @@
 .env
+.git
 .vscode
 __pycache__/
 docker-compose.yml
+compose.yaml
 privacy.md
 privacy.txt
 *.pyc

{structables-0.4.4 → structables-0.4.5}/.forgejo/workflows/docker.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   docker:
-    name: Docker Build and Push to Docker Hub
+    name: Docker Build and Push to git.private.coffee
     runs-on: docker-privileged
     container:
       image: node:22-bookworm
@@ -23,15 +23,16 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
+      - name: Login to Forgejo
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push to Docker Hub
+          registry: git.private.coffee
+          username: ${{ secrets.FORGEJO_USER }}
+          password: ${{ secrets.FORGEJO_TOKEN }}
+      - name: Build and push to Forgejo
         uses: docker/build-push-action@v6
         with:
           push: true
           tags: |
-            privatecoffee/structables:latest
-            privatecoffee/structables:${{ github.ref_name }}
+            git.private.coffee/privatecoffee/structables:latest
+            git.private.coffee/privatecoffee/structables:${{ env.GITHUB_REF_NAME }}

{structables-0.4.4 → structables-0.4.5}/Dockerfile

@@ -11,10 +11,13 @@ COPY . /app
 
 RUN $APP_ENV/bin/pip install --no-cache-dir pip && \
   $APP_ENV/bin/pip install /app && \
-  adduser -S -D -H structables
+  adduser -S -D -H structables && \
+  mkdir -p /tmp/structables_cache && chown structables /tmp/structables_cache
 
 EXPOSE 8002
 
 USER structables
 
+STOPSIGNAL SIGQUIT
+
 ENTRYPOINT ["/app/entrypoint.sh"]

{structables-0.4.4 → structables-0.4.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: structables
-Version: 0.4.4
+Version: 0.4.5
 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
@@ -675,6 +675,8 @@ Requires-Python: >=3.10
 Requires-Dist: beautifulsoup4
 Requires-Dist: flask
 Requires-Dist: markdown2[all]
+Provides-Extra: dev
+Requires-Dist: ruff; extra == 'dev'
 Description-Content-Type: text/markdown
 
 <img align="right" src="src/structables/static/img/logo.png">
@@ -699,7 +701,6 @@ An open source alternative front-end to Instructables. This is a fork of <a href
 | [structables.private.coffee](https://structables.private.coffee)           | [Private.coffee](https://private.coffee)       | Austria 🇦🇹 🇪🇺    | Main instance |
 | [structables.bloat.cat](https://structables.bloat.cat)                     | [Bloat.cat](https://bloat.cat)                 | Germany 🇩🇪 🇪🇺    |               |
 | [structables.darkness.services](https://structables.darkness.services)     | [Darkness.services](https://darkness.services) | United States 🇺🇸 |               |
-| [structables.franklyflawless.org](https://structables.franklyflawless.org) | [FranklyFlawless](https://franklyflawless.org) | Germany 🇩🇪 🇪🇺    |               |
 
 <!-- END_INSTANCE_LIST -->
 

{structables-0.4.4 → structables-0.4.5}/README.md

@@ -20,7 +20,6 @@ An open source alternative front-end to Instructables. This is a fork of <a href
 | [structables.private.coffee](https://structables.private.coffee)           | [Private.coffee](https://private.coffee)       | Austria 🇦🇹 🇪🇺    | Main instance |
 | [structables.bloat.cat](https://structables.bloat.cat)                     | [Bloat.cat](https://bloat.cat)                 | Germany 🇩🇪 🇪🇺    |               |
 | [structables.darkness.services](https://structables.darkness.services)     | [Darkness.services](https://darkness.services) | United States 🇺🇸 |               |
-| [structables.franklyflawless.org](https://structables.franklyflawless.org) | [FranklyFlawless](https://franklyflawless.org) | Germany 🇩🇪 🇪🇺    |               |
 
 <!-- END_INSTANCE_LIST -->
 

{structables-0.4.4 → structables-0.4.5}/instances.json

@@ -50,15 +50,5 @@
             "url": "https://darkness.services"
         },
         "location": "US"
-    },
-    {
-        "name": "structables.franklyflawless.org",
-        "url": "https://structables.franklyflawless.org",
-        "type": "clearnet",
-        "provider": {
-            "name": "FranklyFlawless",
-            "url": "https://franklyflawless.org"
-        },
-        "location": "DE"
     }
 ]

{structables-0.4.4 → structables-0.4.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "structables"
-version = "0.4.4"
+version = "0.4.5"
 authors = [
   { name="Private.coffee Team", email="support@private.coffee" },
 ]
@@ -23,6 +23,11 @@ dependencies = [
   "markdown2[all]",
 ]
 
+[project.optional-dependencies]
+dev = [
+    "ruff",
+]
+
 [project.scripts]
 structables = "structables.main:main"
 

structables-0.4.5/scripts/create_release.py

@@ -0,0 +1,153 @@
+#!/usr/bin/env python3
+
+import argparse
+import re
+import subprocess
+import sys
+from pathlib import Path
+
+VERSION_PATTERN = re.compile(
+    r'(?m)^(version\s*=\s*")(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(")$'
+)
+PRE_RELEASE_COMMANDS = (
+    ("-m", "ruff", "check", "src", "scripts"),
+    ("-m", "ruff", "format", "--check", "src", "scripts"),
+)
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(
+        description=(
+            "Bump the project version in pyproject.toml and create a release commit "
+            "and tag."
+        )
+    )
+    group = parser.add_mutually_exclusive_group(required=True)
+    group.add_argument(
+        "--major",
+        action="store_true",
+        help="Bump the major version and reset minor/patch.",
+    )
+    group.add_argument(
+        "--minor", action="store_true", help="Bump the minor version and reset patch."
+    )
+    group.add_argument("--patch", action="store_true", help="Bump the patch version.")
+    parser.add_argument(
+        "--skip-checks",
+        "--skip-lint",
+        dest="skip_checks",
+        action="store_true",
+        help="Skip the pre-release checks.",
+    )
+    return parser.parse_args()
+
+
+def run_git(*args: str, repo_root: Path) -> str:
+    result = subprocess.run(
+        ["git", *args],
+        cwd=repo_root,
+        check=True,
+        text=True,
+        capture_output=True,
+    )
+    return result.stdout.strip()
+
+
+def run_python(*args: str, repo_root: Path) -> None:
+    subprocess.run(
+        [sys.executable, *args],
+        cwd=repo_root,
+        check=True,
+    )
+
+
+def ensure_clean_worktree(repo_root: Path) -> None:
+    status = run_git("status", "--short", repo_root=repo_root)
+    if status:
+        raise SystemExit("Working tree is not clean. Commit or stash changes first.")
+
+
+def load_version(pyproject_path: Path) -> tuple[str, tuple[int, int, int]]:
+    content = pyproject_path.read_text(encoding="utf-8")
+    match = VERSION_PATTERN.search(content)
+    if not match:
+        raise SystemExit("Could not find [project] version in pyproject.toml.")
+    version = (
+        int(match.group("major")),
+        int(match.group("minor")),
+        int(match.group("patch")),
+    )
+    return content, version
+
+
+def bump_version(
+    version: tuple[int, int, int], args: argparse.Namespace
+) -> tuple[int, int, int]:
+    major, minor, patch = version
+    if args.major:
+        return major + 1, 0, 0
+    if args.minor:
+        return major, minor + 1, 0
+    return major, minor, patch + 1
+
+
+def write_version(
+    pyproject_path: Path, content: str, new_version: tuple[int, int, int]
+) -> str:
+    version_text = ".".join(str(part) for part in new_version)
+    updated = VERSION_PATTERN.sub(rf"\g<1>{version_text}\g<5>", content, count=1)
+    pyproject_path.write_text(updated, encoding="utf-8")
+    return version_text
+
+
+def ensure_tag_does_not_exist(repo_root: Path, tag_name: str) -> None:
+    if run_git("tag", "--list", tag_name, repo_root=repo_root):
+        raise SystemExit(f"Tag {tag_name} already exists.")
+
+
+def ensure_pre_release_checks_pass(repo_root: Path) -> None:
+    for command in PRE_RELEASE_COMMANDS:
+        try:
+            run_python(*command, repo_root=repo_root)
+        except subprocess.CalledProcessError as exc:
+            raise SystemExit(
+                "Pre-release checks failed. Fix the errors or re-run with --skip-checks."
+            ) from exc
+
+
+def create_release_commit(repo_root: Path, tag_name: str) -> None:
+    run_git("add", "pyproject.toml", repo_root=repo_root)
+    run_git("commit", "-m", f"Release {tag_name}", repo_root=repo_root)
+
+
+def create_tag(repo_root: Path, tag_name: str) -> None:
+    run_git("tag", "-m", f"Release {tag_name}", tag_name, repo_root=repo_root)
+
+
+def main() -> int:
+    args = parse_args()
+    repo_root = Path(__file__).resolve().parent.parent
+    pyproject_path = repo_root / "pyproject.toml"
+
+    ensure_clean_worktree(repo_root)
+    if not args.skip_checks:
+        ensure_pre_release_checks_pass(repo_root)
+    content, current_version = load_version(pyproject_path)
+    new_version = bump_version(current_version, args)
+    version_text = ".".join(str(part) for part in new_version)
+    tag_name = f"v{version_text}"
+    ensure_tag_does_not_exist(repo_root, tag_name)
+    write_version(pyproject_path, content, new_version)
+    create_release_commit(repo_root, tag_name)
+    create_tag(repo_root, tag_name)
+    print(f"Released {tag_name}")
+    return 0
+
+
+if __name__ == "__main__":
+    try:
+        raise SystemExit(main())
+    except subprocess.CalledProcessError as exc:
+        if exc.stderr:
+            print(exc.stderr.strip(), file=sys.stderr)
+        raise SystemExit(exc.returncode) from exc

{structables-0.4.4 → structables-0.4.5}/src/structables/routes/category.py

@@ -58,6 +58,10 @@ def init_category_routes(app):
         logger.debug("Rendering craft category page")
         return category_page(app, "Craft")
 
+    @app.route("/design/")
+    def route_design():
+        return category_page(app, "Design")
+
     @app.route("/cooking/")
     def route_cooking():
         logger.debug("Rendering cooking category page")

{structables-0.4.4 → structables-0.4.5}/src/structables/routes/contest.py

@@ -1,9 +1,8 @@
 from flask import render_template, request, abort, url_for
-from urllib.request import urlopen, Request
 from urllib.error import HTTPError
-from ..utils.helpers import proxy
-from bs4 import BeautifulSoup
-import json
+from urllib.parse import urlencode
+from ..utils.cache import get_cached_json
+from ..utils.helpers import proxy, thumbnail
 import logging
 
 logger = logging.getLogger(__name__)
@@ -20,11 +19,9 @@ def init_contest_routes(app):
         logger.debug(f"Fetching contest archive page {page} with limit {limit}")
 
         try:
-            # Fetch data using urlopen
             url = f"https://www.instructables.com/json-api/getClosedContests?limit={limit}&offset={offset}"
             logger.debug(f"Making request to {url}")
-            response = urlopen(url)
-            data = json.loads(response.read().decode())
+            data = get_cached_json(app, url)
             logger.debug(
                 f"Received contest archive data with {len(data.get('contests', []))} contests"
             )
@@ -85,9 +82,7 @@ def init_contest_routes(app):
             try:
                 url = f"{base_url}?q=*&filter_by=contestPath:{contest}&sort_by=contestEntryDate:desc&per_page={per_page}&page={page}"
                 logger.debug(f"Making request to {url} (page {page})")
-                request = Request(url, headers=headers)
-                response = urlopen(request)
-                data = json.loads(response.read().decode())
+                data = get_cached_json(app, url, headers=headers)
             except HTTPError as e:
                 logger.error(f"HTTP error fetching contest entries: {e.code}")
                 abort(e.code)
@@ -99,7 +94,7 @@ def init_contest_routes(app):
                 break
 
             all_entries.extend(hits)
-            if len(hits) < per_page:
+            if len(all_entries) >= data["found"]:
                 break
             page += 1
 
@@ -111,32 +106,20 @@ def init_contest_routes(app):
         logger.debug(f"Fetching contest page for: {contest}")
 
         try:
-            data = urlopen(f"https://www.instructables.com/contest/{contest}/")
-            html = data.read().decode()
-            soup = BeautifulSoup(html, "html.parser")
-
-            title_tag = soup.find("h1")
-            title = title_tag.get_text() if title_tag else "Contest"
+            data = get_cached_json(
+                app,
+                "https://www.instructables.com/json-api/contest?" + urlencode({"path": contest}),
+            )
+            title = data["title"]
             logger.debug(f"Contest title: {title}")
 
-            img_tag = soup.find("img", alt=lambda x: x and "Banner" in x)
-            img = img_tag.get("src") if img_tag else "default.jpg"
+            img = proxy(data["bannerUrl"])
 
             logger.debug(f"Fetching entries for contest: {contest}")
             entries = get_entries(contest)
-            entry_count = len(entries)
-            logger.debug(f"Found {entry_count} entries")
-
-            prizes_items = soup.select("article")
-            prizes = len(prizes_items) if prizes_items else 0
-            logger.debug(f"Found {prizes} prizes")
-
-            overview_section = soup.find("section", id="overview")
-            info = (
-                overview_section.decode_contents()
-                if overview_section
-                else "No Overview"
-            )
+            entry_count = data["numEntries"]
+            prizes = data["prizeCount"]
+            info = data.get("bodyFull", "")
 
         except HTTPError as e:
             logger.error(f"HTTP error fetching contest page: {e.code}")
@@ -147,11 +130,11 @@ def init_contest_routes(app):
             doc = entry["document"]
             entry_details = {
                 "link": url_for("route_article", article=doc["urlString"]),
-                "entry_img": doc["coverImageUrl"],
+                "entry_img": thumbnail(doc["coverImageUrl"]),
                 "entry_title": doc["title"],
                 "author": doc["screenName"],
                 "author_link": url_for("route_member", member=doc["screenName"]),
-                "channel": doc["channel"][0],
+                "channel": doc["channel"][0] if doc.get("channel") else "",
                 "channel_link": f"/{doc['primaryClassification']}",
                 "views": doc.get("views", 0),
             }
@@ -173,10 +156,9 @@ def init_contest_routes(app):
 
         try:
             # Fetch current contests from the JSON API
-            response = urlopen(
-                "https://www.instructables.com/json-api/getCurrentContests?limit=50&offset=0"
+            data = get_cached_json(
+                app, "https://www.instructables.com/json-api/getCurrentContests?limit=50&offset=0"
             )
-            data = json.loads(response.read().decode())
             logger.debug("Received current contests data")
         except HTTPError as e:
             logger.error(f"HTTP error fetching current contests: {e.code}")

{structables-0.4.4 → structables-0.4.5}/src/structables/routes/main.py

@@ -1,5 +1,4 @@
 from flask import render_template, abort, request
-from urllib.request import urlopen
 from urllib.error import HTTPError
 from bs4 import BeautifulSoup
 from urllib.parse import quote
@@ -8,11 +7,11 @@ from markdown2 import Markdown
 from traceback import print_exc
 
 import pathlib
-import json
 import logging
 
+from ..utils.cache import get_cached_json
 from ..utils.data import update_data
-from ..utils.helpers import explore_lists, proxy
+from ..utils.helpers import explore_lists, proxy, project_facets, projects_search, unslugify, thumbnail
 from .category import project_list
 from ..utils.data import maybe_update_data
 
@@ -26,21 +25,6 @@ def init_main_routes(app):
         maybe_update_data(app)
 
         try:
-            # Extract API endpoints from the JSON context data
-            logger.debug("Fetching data from instructables.com API")
-            data = urlopen("https://www.instructables.com/")
-            soup = BeautifulSoup(data.read().decode(), "html.parser")
-
-            # Try to extract JSON data from script tag
-            page_context = None
-            script_tag = soup.select("#js-page-context")
-            if script_tag:
-                try:
-                    page_context = json.loads(script_tag[0].string)
-                    logger.debug("Successfully extracted page context JSON")
-                except Exception as e:
-                    logger.error(f"Error parsing page context JSON: {str(e)}")
-
             # Use the API endpoints to fetch category data
             categories = [
                 "circuits",
@@ -62,8 +46,7 @@ def init_main_routes(app):
                         f"Fetching data for category {category} from {api_url}"
                     )
 
-                    category_data = urlopen(api_url)
-                    category_json = json.loads(category_data.read().decode())
+                    category_json = get_cached_json(app, api_url)
 
                     # Process category items
                     category_items = []
@@ -73,7 +56,7 @@ def init_main_routes(app):
                                 "title": item["title"],
                                 "link": item["url"],
                                 "img": (
-                                    proxy(item["downloadUrl"])
+                                    thumbnail(item["downloadUrl"])
                                     if "downloadUrl" in item
                                     else ""
                                 ),
@@ -132,50 +115,41 @@ def init_main_routes(app):
     def route_sitemap(path=""):
         logger.debug(f"Rendering sitemap for path: {path}")
 
+        parts = path.strip("/").split("/") if path.strip("/") else []
+        if len(parts) > 2:
+            abort(404)
+
         try:
-            logger.debug(
-                f"Fetching sitemap data from instructables.com for path: {path}"
-            )
-            data = urlopen("https://www.instructables.com/sitemap/" + path)
+            categories = project_facets(app)["category"]
+            if parts:
+                categories = [name for name in categories if name.lower() == parts[0].lower()]
+                if not categories:
+                    abort(404)
+
+            groups = []
+            for category in categories:
+                category_path = f"/{category.lower()}/"
+                if len(parts) == 2:
+                    for channel in unslugify(parts[1]):
+                        hits, _ = projects_search(app, category=category, channel=channel)
+                        if hits:
+                            break
+                    channels = [
+                        [hit["document"]["title"], f'/{hit["document"]["urlString"]}']
+                        for hit in hits
+                    ]
+                else:
+                    channels = [[f"All {category} Projects", category_path + "projects/"]]
+                    for channel in project_facets(app, category)["channel"]:
+                        slug = quote(channel.lower().replace(" ", "-"), safe="")
+                        channels.append([channel, f"{category_path}{slug}/projects/"])
+                groups.append([category, category_path, channels])
+            if not parts:
+                groups.append(["Teachers", "/teachers/", [["All Teachers Projects", "/teachers/projects/"]]])
         except HTTPError as e:
             logger.error(f"HTTP error fetching sitemap: {e.code}")
             abort(e.code)
 
-        soup = BeautifulSoup(data.read().decode(), "html.parser")
-
-        main = soup.select("div.sitemap-content")[0]
-
-        group_section = main.select("div.group-section")
-
-        if group_section:
-            logger.debug(f"Found {len(group_section)} group sections")
-            groups = []
-            for group in group_section:
-                category = group.select("h2 a")[0].text
-                category_link = group.select("h2 a")[0].get("href")
-                channels = []
-                for li in group.select("ul.sitemap-listing li"):
-                    channel = li.a.text
-                    channel_link = li.a["href"]
-                    channels.append([channel, channel_link])
-                groups.append([category, category_link, channels])
-                logger.debug(f"Added group {category} with {len(channels)} channels")
-
-        else:
-            logger.debug("No group sections found, using flat list")
-            groups = []
-            channels = []
-            for li in main.select("ul.sitemap-listing li"):
-                channel = li.a.text
-                channel_link = li.a["href"]
-
-                if channel_link.startswith("https://"):
-                    channel_link = f'/{"/".join(channel_link.split("/")[3:])}'
-
-                channels.append([channel, channel_link])
-            groups.append(["", "", channels])
-            logger.debug(f"Added flat list with {len(channels)} channels")
-
         return render_template("sitemap.html", title="Sitemap", groups=groups)
 
     @app.route("/<article>/")
@@ -185,10 +159,10 @@ def init_main_routes(app):
         try:
             logger.debug(f"Fetching article data from instructables.com for: {article}")
             article_path = quote(article)
-            data = urlopen(
-                f"https://www.instructables.com/json-api/showInstructableModel?urlString={article_path}"
+            data = get_cached_json(
+                app,
+                f"https://www.instructables.com/json-api/showInstructableModel?urlString={article_path}",
             )
-            data = json.loads(data.read().decode())
             logger.debug("Successfully fetched article data")
         except HTTPError as e:
             logger.error(f"HTTP error fetching article: {e.code}")
@@ -246,8 +220,10 @@ def init_main_routes(app):
                             if "embedType" not in "file":
                                 step_imgs.append(
                                     {
-                                        "src": proxy(file["downloadUrl"], file["name"]),
+                                        "src": thumbnail(file["downloadUrl"], 1024),
                                         "alt": file["name"],
+                                        "width": file.get("width"),
+                                        "height": file.get("height"),
                                     }
                                 )
                             if file["embedType"] == "VIDEO":
@@ -393,17 +369,17 @@ def init_main_routes(app):
                 # Collections
                 logger.debug("Article is a collection")
                 thumbnails = []
-                for thumbnail in data["instructables"]:
-                    text = thumbnail["title"]
-                    link = thumbnail["showUrl"]
-                    img = proxy(thumbnail["downloadUrl"])
-                    thumbnail_title = thumbnail["title"]
-                    thumbnail_author = thumbnail["author"]["screenName"]
+                for item in data["instructables"]:
+                    text = item["title"]
+                    link = item["showUrl"]
+                    img = thumbnail(item["downloadUrl"])
+                    thumbnail_title = item["title"]
+                    thumbnail_author = item["author"]["screenName"]
                     thumbnail_author_link = f"/member/{thumbnail_author}"
-                    thumbnail_channel = thumbnail["classifications"][0]["channels"][0][
+                    thumbnail_channel = item["classifications"][0]["channels"][0][
                         "title"
                     ]
-                    thumbnail_category = thumbnail["classifications"][0]["title"]
+                    thumbnail_category = item["classifications"][0]["title"]
                     thumbnail_channel_link = (
                         f"/{thumbnail_category}/{thumbnail_channel}"
                     )