Merge pull request #54 from charslab/ptb-async

Upgrade to PTB V21.10

Author: carloalbertobarbano

.github/workflows/build_image.yml

@@ -0,0 +1,41 @@
+name: DockerBuildAndPush
+
+on:
+  push:
+    branches:
+      - master
+      - developement
+      - ptb-async
+
+env:
+  IMAGE_NAME: transcriberbot
+
+jobs:
+  push:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Login to ghcr registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
+
+      - name: Build image
+        run: docker build . --file Dockerfile --tag $IMAGE_NAME
+
+      - name: Push image
+        run: |
+          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+          # Strip "v" prefix from tag name
+          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "master" ] && VERSION=latest
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION

.gitignore

@@ -1,5 +1,4 @@
 # TranscriberBot-specific ignores
-config/
 media/
 
 # Generic data-related ignores

.python-version

@@ -0,0 +1 @@
+transcriber-bot-wonda

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim
+FROM python:3.12.0-slim
 
 # Set global configs
 WORKDIR /

dockerBuild.sh build.shdockerBuild.sh renamed to build.sh

@@ -49,12 +49,24 @@
     "webm"
   ],
 
+  "ocr": {
+    "tesseract_path": "/usr/share/tesseract-ocr/5/tessdata/"
+  },
+
   "antiflood": {
     "age_threshold": 10,
     "flood_ratio": 2,
     "max_flood_ratio": 6,
     "time_threshold_warning": 4,
     "time_threshold_flood": 5,
     "timeout": 10
+  },
+
+  "whisper": {
+    "api_endpoint": "http://127.0.0.1:8000"
+  },
+
+  "logging": {
+    "level": "APP"
   }
 }

config/app.json

@@ -0,0 +1,3 @@
+{
+  "dsn": "xxx"
+}

config/sentry.json

@@ -1,8 +1,9 @@
-python-telegram-bot==12.3.0
+python-telegram-bot
 coloredlogs
 pillow
 watchdog
 tesserocr
 pydub
 zbarlight
 requests
+sentry-sdk

dockerRun.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+docker pull ghcr.io/charslab/transcriberbot:ptb-async
+docker run \
+   -e LC_ALL=C \
+   -d --restart unless-stopped \
+   --name "transcriberbot-async" \
+   -v "$(pwd)"/data:/data \
+   -v "$(pwd)"/config:/config \
+   -v "$(pwd)"/values:/values \
+   -v "$(pwd)"/media:/media \
+   --cpus=4.0 \
+   --memory=3000m \
+   -u "$(id -u):1337" \
+   ghcr.io/charslab/transcriberbot:ptb-async