mirror of
https://github.com/guillaumemeyer/watermarks-remover.git
synced 2026-08-22 13:11:57 +02:00
Guillaume Meyer (The Opinionated Man)andGitHub
55d4bdc9fc
* feat: split skill from service, add HTTP API and Docker distribution The agent skill (skills/remove-ai-marks/) is now a code-free remote client: all implementation moved to service/scripts/ and runs behind a stdlib HTTP service (server.py) with /health, /capabilities, /inspect, /clean and a dynamically generated OpenAPI 3.0.3 spec at /openapi.json. - Move scripts/ and the backend Dockerfiles under service/ - server.py: JSON/base64 HTTP entrypoint with size caps, binary guard, atomic writes, loopback default, optional bearer auth - Core Dockerfile (exiftool/qpdf/c2patool preinstalled) and a GHCR publish workflow for the core/markllm/markdiffusion images - compose.yaml (wr-* services, harness/heavy profiles) + compose-check.sh to validate the running stack (exit code only) - Fix markllm image build (tokenizers 0.22.2, CPU-only torch) and ctrlregen build (python:3.11 base for the 2023-era research pins) - Fix markllm/markdiffusion harness images missing common.py at runtime * docs: add .env.example and service configuration guide * fix: disable chain-of-thought for openai-compatible Layer B rewrites deepseek-v4-flash is a reasoning model: a one-line paraphrase burned 9,894 reasoning tokens (~100s) and hit the default timeout. Send reasoning_effort=none by default for the openai-compatible backend (--reasoning-effort / WATERMARKS_REWRITE_REASONING_EFFORT; 'off' omits the parameter), cutting the same rewrite to ~1s / 12 tokens. Tested end-to-end against api.deepseek.com. * fix: sanitize client-supplied filename in HTTP service CodeQL 'uncontrolled data in path expression' (server.py): a name like '../../x' flowed into Path(tmpdir) / name, letting an upload escape the request temp dir on write. Sanitize name to its basename in _decode_input (_safe_name) and refuse any joined path whose parent is not the tmpdir at the write sites (_tmp_path). Tests cover traversal names. * chore: gitignore .env (contains local rewrite credentials) * chore: deny-by-default gitignore and dockerignore; document compose env config .gitignore and service/.dockerignore now exclude everything by default and explicitly allow only what is publishable/needed: tracked source, docs, tests, .github, and (for images) the service/scripts/ tree that every Dockerfile COPYs. Root .dockerignore documents that all builds use service/ as context. README Configuration section now covers .env setup for docker compose, host-side export for CLI runs, and the full variable table.
67 lines
2.7 KiB
Docker
67 lines
2.7 KiB
Docker
# Optional local Docker image for the CtrlRegen pixel-watermark remover.
|
|
#
|
|
# Build from the repository root (build context = service/):
|
|
# docker build -f service/Dockerfile.ctrlregen -t watermarks-remover-ctrlregen service/
|
|
#
|
|
# The upstream code is fetched from source at build time and is NOT
|
|
# redistributed by this repository. mertizci/noai-watermark ships no LICENSE
|
|
# file, so it is treated as all-rights-reserved; review its terms before use.
|
|
#
|
|
# Vendored fork hardening:
|
|
# - base image pinned by digest (no moving tag drift)
|
|
# - upstream checkout pinned to a commit SHA (no moving branch)
|
|
# - deps pinned exactly in requirements-ctrlregen.txt
|
|
# - pip itself pinned (no unpinned bootstrap step)
|
|
# - runs as an unprivileged user (a crafted image can no longer write
|
|
# files as root inside the container)
|
|
|
|
# Pinned upstream commit (2026-08-13). Keep in sync with setup_ctrlregen.sh.
|
|
ARG NOAI_WATERMARK_REF=b642ae45d20eded52c96d570985eb4e3e427aac8
|
|
|
|
# python:3.11-slim (multi-arch manifest digest). The pinned ML deps below are
|
|
# 2023-era research pins (safetensors 0.4.3, transformers 4.37.2 ->
|
|
# tokenizers<0.19) that ship no Python 3.14 wheels; 3.11 is the newest base
|
|
# with prebuilt wheels for all of them.
|
|
FROM python:3.11-slim@sha256:a630a63cdb314e2d138a2fca3e375e319e8568346ffafac5b980f888630ac4f1
|
|
|
|
ARG NOAI_WATERMARK_REF
|
|
|
|
RUN apt-get update \
|
|
&& apt-get install -y --no-install-recommends \
|
|
git \
|
|
libgl1 \
|
|
libglib2.0-0 \
|
|
passwd \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
RUN git clone --depth 1 --filter=blob:none --sparse \
|
|
https://github.com/mertizci/noai-watermark.git /opt/noai-watermark \
|
|
&& cd /opt/noai-watermark \
|
|
&& git fetch --depth 1 origin "${NOAI_WATERMARK_REF}" \
|
|
&& git checkout --detach "${NOAI_WATERMARK_REF}" \
|
|
&& git sparse-checkout set --no-cone '/src/'
|
|
|
|
COPY scripts/requirements-ctrlregen.txt /app/requirements-ctrlregen.txt
|
|
COPY scripts/clean_ctrlregen.py /app/clean_ctrlregen.py
|
|
COPY scripts/common.py /app/common.py
|
|
|
|
# torch is installed first (CPU wheels on linux) so the pinned ML deps can
|
|
# resolve against it. Model weights are downloaded at runtime, not build time.
|
|
RUN python3 -m pip install --no-cache-dir "pip==26.2.1" \
|
|
&& python3 -m pip install --no-cache-dir torch \
|
|
&& python3 -m pip install --no-cache-dir -r /app/requirements-ctrlregen.txt
|
|
|
|
# Unprivileged runtime user. The remover reads input files from a mounted
|
|
# volume and writes the output next to them, so nothing under /opt or /app
|
|
# needs root.
|
|
RUN useradd --create-home --uid 10001 --shell /usr/sbin/nologin remover
|
|
USER remover
|
|
|
|
ENV NOAI_WATERMARK_DIR=/opt/noai-watermark \
|
|
HOME=/home/remover \
|
|
PYTHONUNBUFFERED=1 \
|
|
PYTHONDONTWRITEBYTECODE=1
|
|
|
|
WORKDIR /app
|
|
ENTRYPOINT ["python3", "/app/clean_ctrlregen.py"]
|