Update to version 1.5.0

archived_files/Header/STJ/Header.js

@@ -8,7 +8,7 @@ import KeyboardArrowDownRoundedIcon from '@mui/icons-material/KeyboardArrowDownR
 import KeyboardArrowUpRoundedIcon from '@mui/icons-material/KeyboardArrowUpRounded';
 import DeleteForeverIcon from '@mui/icons-material/DeleteForever';
 
-import logoSTJ from '../../../static/logoSTJ.png';
+import logoApp from '../../../static/logoApp.png';
 import loadComponent from '../../../utils/loadComponents';
 const TooltipIcon = loadComponent('TooltipIcon', 'TooltipIcon');
 
@@ -70,7 +70,7 @@ export default class Header extends React.Component {
             }}>
                 <Box sx={{display: 'flex', flexDirection: 'row'}}>
                     <>
-                        <img src={logoSTJ} alt="logoSTJ" style={{marginRight:'2rem', height: '64px', width: 'auto'}}/>
+                        <img src={logoApp} alt="logoApp" style={{marginRight:'2rem', height: '64px', width: 'auto'}}/>
                         <Button
                             className="link"
                             sx={{

compose/nginx/Dockerfile

@@ -2,7 +2,7 @@ FROM node:lts AS builder
 
 COPY ./website/package* .
 
-RUN npm ci
+RUN npm install --legacy-peer-deps
 
 COPY ./website .
 

compose/worker/Dockerfile

@@ -103,6 +103,13 @@ ADD https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/eng
     https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/deu.traineddata \
     https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/fra.traineddata \
     https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/spa.traineddata \
+    https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/ara.traineddata \
+    https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/ind.traineddata \
+    https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/chi_sim.traineddata \
+    https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/chi_tra.traineddata \
+    https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/hin.traineddata \
+    https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/ita.traineddata \
+    https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/rus.traineddata \
     https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/equ.traineddata \
     https://raw.githubusercontent.com/tesseract-ocr/tessdata/refs/heads/main/osd.traineddata \
     /usr/share/tesseract-ocr/5/tessdata/

docker-compose.production.yml

@@ -1,125 +1,137 @@
 volumes:
-  # FIXME: uncomment when searching feature is improved and re-enabled
-  # elasticsearch_data: {}
-  files_data: {}
-  configs_data: {}
+    # FIXME: uncomment when searching feature is improved and re-enabled
+    # elasticsearch_data: {}
+    files_data: {}
+    configs_data: {}
 
 services:
-  server:
-    build:
-      context: ./server
-      dockerfile: ../compose/server/Dockerfile
-    image: ocr-server
-    env_file: "server/.env"
-    environment:
-      FLASK_APP: app
-      FLASK_ENV: production
-      FLASK_DEBUG: 0
-      PYTHONUNBUFFERED: true
-      PYTHONDONTWRITEBYTECODE : true
-    command: /app/start
-    expose:
-      - "5001"  # exposed only to other services
-    depends_on:
-      # FIXME: uncomment when searching feature is improved and re-enabled
-      # elasticsearch:
-      #   condition: service_healthy
-      #   restart: true
-      redis:
-        condition: service_healthy
-        restart: true
-    volumes:
-      - files_data:/app/_files
-      - configs_data:/app/_configs
-    restart: unless-stopped
-    networks:
-      - internal-network
+    server:
+        build:
+            context: ./server
+            dockerfile: ../compose/server/Dockerfile
+        image: ocr-server
+        env_file: "server/.env"
+        environment:
+            FLASK_APP: app
+            FLASK_ENV: production
+            FLASK_DEBUG: 0
+            PYTHONUNBUFFERED: true
+            PYTHONDONTWRITEBYTECODE : true
+        command: /app/start
+        expose:
+            - "5001"  # exposed only to other services
+        depends_on:
+            # FIXME: uncomment when searching feature is improved and re-enabled
+            # elasticsearch:
+            #   condition: service_healthy
+            #   restart: true
+            redis:
+                condition: service_healthy
+                restart: true
+        volumes:
+            - "${HOME}/Desktop/ocr-storage/files:/app/_files"
+            - "${HOME}/Desktop/ocr-storage/configs:/app/_configs"
+            - "${HOME}/Desktop/ocr-storage/inputs:/app/_inputs"
+            - "${HOME}/Desktop/ocr-storage/outputs:/app/_outputs"
+        restart: unless-stopped
+        networks:
+            - internal-network
 
-  worker:
-    build:
-      context: ./server
-      dockerfile: ../compose/worker/Dockerfile
-    image: ocr-worker
-    env_file: "server/.env"
-    hostname: "${HOSTNAME:-$COMPUTERNAME}"  # set same hostname as host machine; try UNIX, else Windows
-    environment:
-      C_FORCE_ROOT: true
-      PYTHONUNBUFFERED: true
-      PYTHONDONTWRITEBYTECODE : true
-    command: celery -A celery_app.celery worker --beat --scheduler redbeat.RedBeatScheduler --autoscale=16,8 --max-tasks-per-child=1 --loglevel=info --without-gossip --without-mingle -Ofair -E --hostname=worker1@%h -P prefork
-    healthcheck:
-        test: celery inspect ping -d worker1@$$HOSTNAME
-        interval: 10s
-        timeout: 10s
-        retries: 3
-        start_period: 10s
-    volumes:
-      - files_data:/app/_files
-      - configs_data:/app/_configs
-    depends_on:
-      redis:
-        condition: service_healthy
-        restart: true
-    restart: unless-stopped
-    networks:
-      - internal-network
-      - external-network
+    worker:
+        build:
+            context: ./server
+            dockerfile: ../compose/worker/Dockerfile
+        image: ocr-worker
+        env_file: "server/.env"
+        hostname: "${HOSTNAME:-$COMPUTERNAME}"  # set same hostname as host machine; try UNIX, else Windows
+        environment:
+            C_FORCE_ROOT: true
+            PYTHONUNBUFFERED: true
+            PYTHONDONTWRITEBYTECODE : true
+        command: celery -A celery_app.celery worker --beat --scheduler redbeat.RedBeatScheduler --autoscale=16,8 --max-tasks-per-child=1 --loglevel=info --without-gossip --without-mingle -Ofair -E --hostname=worker1@%h -P prefork
+        healthcheck:
+            test: celery inspect ping -d worker1@$$HOSTNAME
+            interval: 10s
+            timeout: 10s
+            retries: 3
+            start_period: 10s
+        deploy:
+            resources:
+                limits:
+                    memory: 8G  # Allow up to 8GB RAM for large TIFF compression
+                reservations:
+                    memory: 2G  # Reserve at least 2GB RAM
+        volumes:
+            - "${HOME}/Desktop/ocr-storage/files:/app/_files"
+            - "${HOME}/Desktop/ocr-storage/configs:/app/_configs"
+            - "${HOME}/Desktop/ocr-storage/inputs:/app/_inputs"
+            - "${HOME}/Desktop/ocr-storage/outputs:/app/_outputs"
+        depends_on:
+            redis:
+                condition: service_healthy
+                restart: true
+        restart: unless-stopped
+        networks:
+            - internal-network
+            - external-network
 
-  flower:
-    image: ocr-worker
-    env_file: "server/.env"
-    environment:
-      FLOWER_UNAUTHENTICATED_API: true  # authentication managed through Flask
-    command: bash -c "celery -A celery_app.celery flower --port=5050 --url_prefix=$$APP_BASENAME\"/admin/flower\" --enable_events=False"
-    expose:
-      - "5050"  # exposed only to other services
-    depends_on:
-      worker:
-        condition: service_healthy
-        restart: true
-      redis:
-        condition: service_healthy
-        restart: true
-    restart: unless-stopped
-    networks:
-      - internal-network
+    flower:
+        image: ocr-worker
+        env_file: "server/.env"
+        environment:
+            FLOWER_UNAUTHENTICATED_API: true  # authentication managed through Flask
+        command: bash -c "celery -A celery_app.celery flower --port=5050 --url_prefix=$$APP_BASENAME\"/admin/flower\" --enable_events=False"
+        expose:
+            - "5050"  # exposed only to other services
+        depends_on:
+            worker:
+                condition: service_healthy
+                restart: true
+            redis:
+                condition: service_healthy
+                restart: true
+        restart: unless-stopped
+        networks:
+            - internal-network
 
-  redis:
-    image: redis:8.2.1-alpine3.22
-    expose:
-      - "6379"  # exposed only to other services
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 10s
-      retries: 10
-      start_period: 10s
-    volumes:
-      - files_data:/app/_files
-    restart: unless-stopped
-    networks:
-      - internal-network
+    redis:
+        image: redis:8.2.1-alpine3.22
+        expose:
+            - "6379"  # exposed only to other services
+        healthcheck:
+            test: ["CMD", "redis-cli", "ping"]
+            interval: 10s
+            timeout: 10s
+            retries: 10
+            start_period: 10s
+        volumes:
+            - "${HOME}/Desktop/ocr-storage/files:/app/_files"
+            - "${HOME}/Desktop/ocr-storage/inputs:/app/_inputs"
+            - "${HOME}/Desktop/ocr-storage/outputs:/app/_outputs"
+        restart: unless-stopped
+        networks:
+            - internal-network
 
-  nginx:
-    build:
-      context: .
-      dockerfile: ./compose/nginx/Dockerfile
-    ports:
-      - "80:80"
-    depends_on:
-      - server
-    volumes:
-      - files_data:/usr/share/nginx/html/files
-    environment:
-      NGINX_ENVSUBST_OUTPUT_DIR: /etc/nginx
-      MAX_FILE_CHUNK_SIZE: 2G
-      MAX_API_FILE_SIZE: 2G
-      MAX_DOC_SEGMENTATION_SIZE: 100M
-      MAX_EDITED_RESULTS_SIZE: 100M
-    restart: unless-stopped
-    networks:
-      - internal-network
-      - external-network
+    nginx:
+        build:
+            context: .
+            dockerfile: ./compose/nginx/Dockerfile
+        ports:
+            - "80:80"
+        depends_on:
+            - server
+        volumes:
+            - "${HOME}/Desktop/ocr-storage/files:/usr/share/nginx/html/files"
+        environment:
+            NGINX_ENVSUBST_OUTPUT_DIR: /etc/nginx
+            MAX_FILE_CHUNK_SIZE: 2G
+            MAX_API_FILE_SIZE: 2G
+            MAX_DOC_SEGMENTATION_SIZE: 100M
+            MAX_EDITED_RESULTS_SIZE: 100M
+        restart: unless-stopped
+        networks:
+            - internal-network
+            - external-network
 
 # FIXME: uncomment when searching feature is improved and re-enabled
 #  elasticsearch:
@@ -144,8 +156,8 @@ services:
 #      - internal-network
 
 networks:
-  internal-network:
-    driver: bridge
-    internal: true
-  external-network:
-    driver: bridge
+    internal-network:
+        driver: bridge
+        internal: true
+    external-network:
+        driver: bridge