Merge with head

.github/workflows/formatting_testing.yml

@@ -0,0 +1,41 @@
+name: Formatting check on pull requests
+
+on:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  pre_commit:
+    runs-on: ubuntu-latest
+    environment: 
+      name: testing
+
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v2
+
+    - name: set up Python
+      uses: actions/setup-python@v2
+
+    - name: install pre-commit
+      run: python -m pip install pre-commit
+      shell: bash
+
+    - name: pip freeze
+      run: python -m pip freeze --local
+      shell: bash
+
+    - name: Get changed files
+      id: changed-files
+      uses: tj-actions/changed-files@v44
+
+    - name: run pre-commit 
+      run: |
+          FILES="${{ steps.changed-files.outputs.all_changed_files }}"
+          if [ -n "$FILES" ]; then
+            echo "$FILES" | xargs pre-commit run --files
+          else
+            echo "No files to check."
+          fi
+      shell: bash

.github/workflows/publish_production.yml

@@ -5,6 +5,8 @@ on:
     # Publish `master` as Docker `prod` image.
     branches:
       - master
+
+  workflow_dispatch:
 
 env:
   IMAGE_NAME: wachterbot
@@ -61,24 +63,38 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           IMAGE_NAME: ${{ env.IMAGE_NAME }}
           ROOT_DIR: /home/${{ secrets.DO_USER }}/${{ env.PACKAGE_LABEL }}
-          POSTGRES_URL: ${{ secrets.POSTGRES_URL }}
+          DATABASE_URL: ${{ secrets.DATABASE_URL }}
+          DATABASE_USER: ${{ secrets.DATABASE_USER }}
+          DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
+          PERSISTENCE_DATABASE_URL: ${{ secrets.PERSISTENCE_DATABASE_URL }}
+          PERSISTENCE_DATABASE_USER: ${{ secrets.PERSISTENCE_DATABASE_USER }}
+          PERSISTENCE_DATABASE_PASSWORD: ${{ secrets.PERSISTENCE_DATABASE_PASSWORD }}
           TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
+          UPTRACE_DSN: ${{ secrets.UPTRACE_DSN }}
           TELEGRAM_ERROR_CHAT_ID: ${{ secrets.TELEGRAM_ERROR_CHAT_ID }}
+          TEAM_TELEGRAM_IDS: ${{ secrets.TEAM_TELEGRAM_IDS }}
         with:
           host: ${{ secrets.DO_HOST }}
           username: ${{ secrets.DO_USER }}
           passphrase: ${{ secrets.DO_SSH_KEY_PASSWORD }}
           key: ${{ secrets.DO_SSH_KEY }}
           port: ${{ secrets.DO_PORT }}
-          envs: GITHUB_USERNAME, GITHUB_TOKEN, ROOT_DIR, POSTGRES_URL, TELEGRAM_TOKEN
+          envs: GITHUB_USERNAME, GITHUB_TOKEN, ROOT_DIR, DATABASE_URL, PERSISTENCE_DATABASE_URL, TELEGRAM_TOKEN, TEAM_TELEGRAM_IDS, UPTRACE_DSN, DATABASE_USER, DATABASE_PASSWORD, PERSISTENCE_DATABASE_USER, PERSISTENCE_DATABASE_PASSWORD
           script: |
-            export CR_PAT=${{ secrets.GH_PAT_READ_PACKAGE }}
-            echo $CR_PAT | docker login  ghcr.io -u $GITHUB_USERNAME
+            echo "$GITHUB_TOKEN" | docker login ghcr.io -u "$GITHUB_USERNAME" --password-stdin || exit 1
             cd ${{ env.ROOT_DIR }}
             touch .env
-            echo POSTGRES_URL=${{ env.POSTGRES_URL }} >> .env
+            echo DATABASE_URL=${{ env.DATABASE_URL }} >> .env
+            echo DATABASE_USER=${{ env.DATABASE_USER }} >> .env
+            echo DATABASE_PASSWORD=${{ env.DATABASE_PASSWORD }} >> .env
+            echo PERSISTENCE_DATABASE_URL=${{ env.PERSISTENCE_DATABASE_URL }} >> .env
+            echo PERSISTENCE_DATABASE_USER=${{ env.PERSISTENCE_DATABASE_USER }} >> .env
+            echo PERSISTENCE_DATABASE_PASSWORD=${{ env.PERSISTENCE_DATABASE_PASSWORD }} >> .env
             echo TELEGRAM_TOKEN=${{ env.TELEGRAM_TOKEN }} >> .env
+            echo UPTRACE_DSN=${{ env.UPTRACE_DSN }} >> .env
             echo TELEGRAM_ERROR_CHAT_ID=${{ env.TELEGRAM_ERROR_CHAT_ID }} >> .env
+            echo DEBUG=False >> .env
+            echo TEAM_TELEGRAM_IDS=${{ env.TEAM_TELEGRAM_IDS }} >> .env
             docker-compose -f docker-compose.${{ env.PACKAGE_LABEL }}.yml stop
             docker-compose -f docker-compose.${{ env.PACKAGE_LABEL }}.yml pull
             docker-compose -f docker-compose.${{ env.PACKAGE_LABEL }}.yml up --force-recreate -d

.github/workflows/publish_testing.yml

@@ -6,6 +6,8 @@ on:
     branches:
       - dev
 
+  workflow_dispatch:
+
 env:
   IMAGE_NAME: wachterbot
   GITHUB_USERNAME: alexeyqu
@@ -61,24 +63,38 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           IMAGE_NAME: ${{ env.IMAGE_NAME }}
           ROOT_DIR: /home/${{ secrets.DO_USER }}/${{ env.PACKAGE_LABEL }}
-          POSTGRES_URL: ${{ secrets.POSTGRES_URL }}
+          DATABASE_URL: ${{ secrets.DATABASE_URL }}
+          DATABASE_USER: ${{ secrets.DATABASE_USER }}
+          DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
+          PERSISTENCE_DATABASE_URL: ${{ secrets.PERSISTENCE_DATABASE_URL }}
+          PERSISTENCE_DATABASE_USER: ${{ secrets.PERSISTENCE_DATABASE_USER }}
+          PERSISTENCE_DATABASE_PASSWORD: ${{ secrets.PERSISTENCE_DATABASE_PASSWORD }}
           TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
           TELEGRAM_ERROR_CHAT_ID: ${{ secrets.TELEGRAM_ERROR_CHAT_ID }}
+          TEAM_TELEGRAM_IDS: ${{ secrets.TEAM_TELEGRAM_IDS }}
+          UPTRACE_DSN: ${{ secrets.UPTRACE_DSN }}
         with:
           host: ${{ secrets.DO_HOST }}
           username: ${{ secrets.DO_USER }}
           passphrase: ${{ secrets.DO_SSH_KEY_PASSWORD }}
           key: ${{ secrets.DO_SSH_KEY }}
           port: ${{ secrets.DO_PORT }}
-          envs: GITHUB_USERNAME, GITHUB_TOKEN, ROOT_DIR, POSTGRES_URL, TELEGRAM_TOKEN
+          envs: GITHUB_USERNAME, GITHUB_TOKEN, ROOT_DIR, DATABASE_URL, PERSISTENCE_DATABASE_URL, TELEGRAM_TOKEN, TEAM_TELEGRAM_IDS, UPTRACE_DSN, DATABASE_USER, DATABASE_PASSWORD, PERSISTENCE_DATABASE_USER, PERSISTENCE_DATABASE_PASSWORD
           script: |
-            export CR_PAT=${{ secrets.GH_PAT_READ_PACKAGE }}
-            echo $CR_PAT | docker login  ghcr.io -u $GITHUB_USERNAME
+            echo "$GITHUB_TOKEN" | docker login ghcr.io -u "$GITHUB_USERNAME" --password-stdin || exit 1
             cd ${{ env.ROOT_DIR }}
             touch .env
-            echo POSTGRES_URL=${{ env.POSTGRES_URL }} >> .env
+            echo DATABASE_URL=${{ env.DATABASE_URL }} >> .env
+            echo DATABASE_USER=${{ env.DATABASE_USER }} >> .env
+            echo DATABASE_PASSWORD=${{ env.DATABASE_PASSWORD }} >> .env
+            echo PERSISTENCE_DATABASE_URL=${{ env.PERSISTENCE_DATABASE_URL }} >> .env
+            echo PERSISTENCE_DATABASE_USER=${{ env.PERSISTENCE_DATABASE_USER }} >> .env
+            echo PERSISTENCE_DATABASE_PASSWORD=${{ env.PERSISTENCE_DATABASE_PASSWORD }} >> .env
             echo TELEGRAM_TOKEN=${{ env.TELEGRAM_TOKEN }} >> .env
             echo TELEGRAM_ERROR_CHAT_ID=${{ env.TELEGRAM_ERROR_CHAT_ID }} >> .env
+            echo UPTRACE_DSN=${{ env.UPTRACE_DSN }} >> .env
+            echo DEBUG=False >> .env
+            echo TEAM_TELEGRAM_IDS=${{ env.TEAM_TELEGRAM_IDS }} >> .env
             docker-compose -f docker-compose.${{ env.PACKAGE_LABEL }}.yml stop
             docker-compose -f docker-compose.${{ env.PACKAGE_LABEL }}.yml pull
             docker-compose -f docker-compose.${{ env.PACKAGE_LABEL }}.yml up --force-recreate -d

.github/workflows/testing.yml

@@ -0,0 +1,51 @@
+name: CI
+
+on:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9  # required by Pipfile
+
+    - name: Cache pipenv dependencies
+      uses: actions/cache@v2
+      with:
+        path: ~/.local/share/virtualenvs
+        key: ${{ runner.os }}-pipenv-${{ hashFiles('Pipfile.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-pipenv-
+
+    - name: Cache pip
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('Pipfile.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+
+    - name: Install pipenv
+      run: pip install pipenv
+
+    - name: Install dependencies
+      run: pipenv install 
+
+    - name: Install pytest explicitly (failes without)
+      run: pipenv run pip install pytest
+
+    - name: Install asyncio (we doing it in Dockerfile)
+      run: pipenv run pip install 'httpcore[asyncio]'
+
+    - name: Run tests
+      run: pipenv run python -m pytest ./test -x -s
+      shell: bash

.gitignore

@@ -5,3 +5,4 @@ __pycache__/
 .DS_Store
 .vscode
 data/
+persistent_storage.pickle

.pre-commit-config.yaml

@@ -1,14 +1,9 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
-
--   repo: local
+-   repo: https://github.com/psf/black
+    rev: 23.9.1
     hooks:
     -   id: black
-        name: black
-        entry: bash -c 'pipenv run black $@' --
-        language: system
-        types: [python]
-        args: []
         exclude: ^(.+)/migrations/.*\.py
-
+

Dockerfile

@@ -5,9 +5,12 @@ RUN pip install "setuptools<46" && pip install pipenv
 COPY Pipfile /Pipfile
 COPY Pipfile.lock /Pipfile.lock
 
-RUN pipenv install --system
+RUN pip install "httpcore[asyncio]"
+
+RUN pipenv install --deploy --system
 
 COPY . /app
 WORKDIR /app
 
-CMD alembic upgrade head && python -m app
+RUN ["chmod", "+x", "/app/entrypoint.sh"]
+ENTRYPOINT ["/app/entrypoint.sh"]

Pipfile

@@ -4,17 +4,29 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-"psycopg2-binary" = "*"
-python-telegram-bot = {version = "~=13.11"}
 sqlalchemy = "*"
 alembic = "*"
 pre-commit = "*"
 pylint = "*"
 black = "*"
-pyTelegramLogger = "*"
+python-telegram-handler = "*"
+pytest = "*"
+pytest-mock = "*"
+httpcore = {extras = ["asyncio"], version = "*"}
+asyncio = "*"
+asyncpg = "*"
+python-telegram-bot = {extras = ["job-queue"], version = "*"}
+ptbcontrib = {extras = ["ptb_jobstores_sqlalchemy"], git = "git+https://github.com/python-telegram-bot/ptbcontrib.git@main"}
+"psycopg2-binary" = "*"  # need for ptb_jobstores_sqlalchemy
+pytest-asyncio = "*"
+aiosqlite = "*"
+grpcio = "*"
+opentelemetry-sdk = "*"
+opentelemetry-exporter-otlp = "*"
+opentelemetry-api = "*"
 
 [dev-packages]
 "autopep8" = "*"
 
 [requires]
-python_version = "3.9"
+python_version = "3.9"