Merge upstream features: extra-field filter/sort, 3D Filament Profiles import, weight-delta events

.dockerignore

@@ -5,3 +5,19 @@ client/node_modules
 *.pyc
 *.swp
 __pycache__
+
+# Version control and editor/IDE metadata
+.git
+.github
+.vscode
+.idea
+
+# Test artifacts and suites (not needed for the image build)
+.pytest_cache
+tests
+tests_integration
+
+# Environment files (keep the example for reference)
+.env
+.env.*
+!.env.example

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "npm"
+    directory: "/client"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

@@ -53,6 +53,64 @@ jobs:
       - name: Run pre-commit
         run: uv run lefthook run ci
   #
+  # Fast (non-Docker) Python unit tests + coverage
+  #
+  unit-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          version: "0.9.26"
+
+      - name: "Set up Python"
+        uses: actions/setup-python@v6
+        with:
+          python-version-file: "pyproject.toml"
+
+      - name: Run unit tests
+        run: uv run pytest tests/ --cov=spoolman --cov-report=term-missing
+  #
+  # Static analysis with CodeQL
+  #
+  codeql:
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ["python", "javascript-typescript"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{ matrix.language }}"
+  #
+  # Lint the Dockerfile with hadolint
+  #
+  hadolint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Lint Dockerfile
+        uses: hadolint/hadolint-action@v3.1.0
+        with:
+          dockerfile: ./Dockerfile
+  #
   # Build the Spoolman client for baking into the docker images
   # This is done on native hardware to speed things up, vite is very slow on emulated hardware
   #

.hadolint.yaml

@@ -0,0 +1,11 @@
+# hadolint configuration
+#
+# DL3008 (pin apt package versions) and DL3013 (pin pip package versions) are
+# ignored on purpose. The image is built on the rolling `python:3.x-slim-bookworm`
+# base, whose apt package index moves over time; pinning exact apt/pip versions
+# would break the build as soon as those versions are superseded in the index.
+# Real Python dependencies are already locked via uv.lock, so reproducibility is
+# handled there rather than by pinning the build-time toolchain packages.
+ignored:
+  - DL3008
+  - DL3013

Dockerfile

@@ -6,7 +6,7 @@ ENV UV_NO_DEV=1
 ENV UV_PYTHON_DOWNLOADS=0
 
 # Install system dependencies
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     g++ \
     python3-dev \
     libpq-dev \
@@ -38,7 +38,7 @@ LABEL org.opencontainers.image.description="Keep track of your inventory of 3D-p
 LABEL org.opencontainers.image.licenses=MIT
 
 # Install gosu for privilege dropping
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --no-install-recommends \
     gosu \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
@@ -74,4 +74,13 @@ RUN echo "GIT_COMMIT=${GIT_COMMIT}" > build.txt \
 
 # Run command
 EXPOSE 8000
+
+# Add healthcheck to verify the API is responsive using the internal Python interpreter
+HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \
+  CMD python3 -c "import os, urllib.request; \
+    port = os.getenv('SPOOLMAN_PORT', '8000'); \
+    base = os.getenv('SPOOLMAN_BASE_PATH', '').strip('/'); \
+    path = f'/{base}/api/v1/health'.replace('//', '/'); \
+    urllib.request.urlopen(f'http://localhost:{port}{path}', timeout=5)" || exit 1
+
 ENTRYPOINT ["/home/app/spoolman/entrypoint.sh"]

README.md

@@ -32,6 +32,7 @@ Spoolman is a self-hosted web service designed to help you efficiently manage yo
   * [OctoPrint](https://github.com/mdziekon/octoprint-spoolman)
   * [OctoEverywhere](https://octoeverywhere.com/spoolman?source=github_spoolman)
   * [Home Assistant](https://github.com/Disane87/spoolman-homeassistant)
+  * [MCP Server](https://github.com/Disane87/spoolman-mcp) - Manage your filament inventory through AI assistants like Claude using the Model Context Protocol
 
 **Web client preview:**
 ![image](https://github.com/Donkie/Spoolman/assets/2332094/33928d5e-440f-4445-aca9-456c4370ad0d)

client/.gitignore

@@ -18,6 +18,7 @@
 .env.development.local
 .env.test.local
 .env.production.local
+.env.production
 
 npm-debug.log*
 yarn-debug.log*