Merge branch 'main' into main

.dockerignore

@@ -7,3 +7,5 @@ __pycache__
 ocrs
 models/*
 test/testdata/bboxes
+/venv
+.git

.github/workflows/ci.yml

@@ -1,46 +1,47 @@
-name: CI
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - '.github/workflows/ci.yml'
-      - 'manga_translator/**'
-      - 'test/**'
-      - 'pyproject.toml'
-      - 'poetry.lock'
-  pull_request:
-    branches: [main]
-    paths:
-      - '.github/workflows/ci.yml'
-      - 'manga_translator/**'
-      - 'test/**'
-      - 'pyproject.toml'
-      - 'poetry.lock'
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.10", "3.11"]
-        poetry-version: [1.6.1]
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install Poetry ${{ matrix.poetry-version }}
-      uses: abatilo/[email protected]
-      with:
-        poetry-version: ${{ matrix.poetry-version }}
-    - name: Install dependencies
-      run: |
-        poetry install --only main,test
-        
-    - name: Lint *.py files
-      run: |
-        poetry run pylint $(git ls-files '*.py')
-    # - name: Test
-    #   run: |
-    #     poetry run pytest test
+name: CI
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - '.github/workflows/ci.yml'
+      - 'manga_translator/**'
+      - 'test/**'
+      - 'pyproject.toml'
+      - 'requirements.txt'
+      - 'requirements-dev.txt'
+  pull_request:
+    branches: [main]
+    paths:
+      - '.github/workflows/ci.yml'
+      - 'manga_translator/**'
+      - 'test/**'
+      - 'pyproject.toml'
+      - 'requirements.txt'
+      - 'requirements-dev.txt'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.10", "3.11"]
+      fail-fast: false
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python3 -mvenv venv
+        venv/bin/pip install -r requirements.txt -r requirements-dev.txt
+    - name: Test
+      run: |
+        venv/bin/pytest test
+      timeout-minutes: 5
+    - name: Lint *.py files
+      run: |
+        venv/bin/pylint $(git ls-files '*.py')
+      if: always()
+      continue-on-error: true # to not fail CI on lint errors

.github/workflows/release.yml

@@ -12,27 +12,28 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v3
-      
+
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
+        if: github.repository == 'zyddnys/manga-image-translator'
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-      
+
       - name: Extract metadata
         id: meta
         uses: docker/metadata-action@v2
         with:
           images: zyddnys/manga-image-translator
-      
+
       - name: Build and push Docker image
         uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-      
+
       - name: Docker Hub Description
         uses: peter-evans/dockerhub-description@v3
         with:

.gitignore

@@ -38,3 +38,9 @@ share/python-wheels/
 .installed.cfg
 *.egg
 MANIFEST
+.history
+/venv
+
+# Input and Output
+/input/
+/input-translated/

Dockerfile

@@ -1,33 +1,30 @@
-FROM pytorch/pytorch:latest
+FROM pytorch/pytorch:2.5.1-cuda11.8-cudnn9-runtime
 
-WORKDIR /app
+# not apt update: most effective code in pytorch base image is in /opt/conda
 
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata
-# Assume root to install required dependencies
-RUN apt-get install -y git g++ ffmpeg libsm6 libxext6 libvulkan-dev && \
-    pip install git+https://github.com/kodalli/pydensecrf.git
+WORKDIR /app
 
 # Install pip dependencies
 
 COPY requirements.txt /app/requirements.txt
 
-RUN pip install -r /app/requirements.txt
-RUN pip install torchvision --force-reinstall
-
-RUN apt-get remove -y g++ && \
-    apt-get autoremove -y
+RUN export TZ=Etc/UTC ; \
+        apt update --yes \
+        && apt install g++ ffmpeg libsm6 libxext6 --yes \
+        && pip install -r /app/requirements.txt \
+        && apt remove g++ --yes \
+        && apt autoremove --yes \
+        && rm -rf /var/cache/apt
 
-# Copy app
 COPY . /app
 
 # Prepare models
-RUN python -u docker_prepare.py
+RUN python -u docker_prepare.py --continue-on-error
 
 RUN rm -rf /tmp
 
 # Add /app to Python module path
-ENV PYTHONPATH="${PYTHONPATH}:/app"
+ENV PYTHONPATH="/app"
 
 WORKDIR /app
 

Makefile

@@ -8,6 +8,6 @@ run-web-server:
 		--manga2eng \
 		--verbose \
 		--mode=web \
-		--use-cuda \ 
+		--use-gpu \ 
 		--host=0.0.0.0 \
 		--port=5003