Loris integration phase 2 pull develop da6e8cba73b4da8465224c85125b119ec15cbd62

.github/workflows/code_quality.yaml

@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v3
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       - name: Install git-secrets in the repository
         run: git secrets --install
       - name: Install git-secrets aws register in the repository

.github/workflows/run_build_deploy.yaml

@@ -5,9 +5,7 @@ on:
 #    branches:
 #      - develop
   workflow_dispatch: {}
-#  pull_request:
-#    types:
-#      - closed
+
 
 concurrency:
   cancel-in-progress: true
@@ -26,9 +24,12 @@ env:
   BUILD_NAME: ${{github.event_name}}
   BUILD_NUMBER: ${{github.run_id}}
   ECR_ADDRESS: 917902836630.dkr.ecr.us-east-1.amazonaws.com
+  DR_ECR_ADDRESS: 973422231492.dkr.ecr.us-west-2.amazonaws.com
   OUT_DIR: ./out
   AWS_REGION : "us-east-1"
+  DR_AWS_REGION : "us-west-2"
   ECR_REPO: 917902836630.dkr.ecr.us-east-1.amazonaws.com/api-server
+  DR_ECR_REPO: 973422231492.dkr.ecr.us-west-2.amazonaws.com/api-server
 
 
 jobs:
@@ -37,6 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       IMAGE_NAME: ${{ steps.sha.outputs.IMAGE_NAME }}
+      IMAGE_SHA: ${{ steps.sha.outputs.SHORT_SHA }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -77,6 +79,17 @@ jobs:
         run: |
           aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin ${{ env.ECR_ADDRESS }}
 
+      - name: configure aws DR credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: arn:aws:iam::973422231492:role/cmiml-dr-oidc-github-role
+          role-session-name: gha-oidc-runner
+          aws-region: ${{ env.DR_AWS_REGION }}
+
+      - name: Login to DR ECR
+        run: |
+          aws ecr get-login-password --region ${{ env.DR_AWS_REGION }} | docker login --username AWS --password-stdin ${{ env.DR_ECR_ADDRESS }}
+
       - name: Generate short sha
         id: sha
         run: |
@@ -94,7 +107,11 @@ jobs:
             PIPENV_EXTRA_ARGS=--dev
           cache-to: mode=max,image-manifest=true,oci-mediatypes=true,type=registry,ref=${{ env.ECR_REPO }}:cache
           cache-from: type=registry,ref=${{ env.ECR_REPO }}:cache
-          tags: ${{ steps.sha.outputs.IMAGE_NAME }},${{ env.ECR_REPO }}:latest
+          tags: |
+            ${{ env.ECR_REPO }}:latest
+            ${{ env.ECR_REPO }}:${{ steps.sha.outputs.SHORT_SHA }}
+            ${{ env.DR_ECR_REPO }}:latest
+            ${{ env.DR_ECR_REPO }}:${{ steps.sha.outputs.SHORT_SHA }}
           platforms: linux/amd64,linux/arm64
 
       - name: Upload artifacts

.github/workflows/run_deploy_dev.yaml

@@ -24,55 +24,6 @@ env:
   IMAGE_NAME: ${{ inputs.IMAGE_NAME }}
 
 jobs:
-#  run_migration:
-#    environment: dev
-#    name: Run Database Migrations
-#    runs-on: ubuntu-latest
-#    env:
-#      TASK_DEFINITION: migration
-#      ECS_SERVICE_NAME: migration
-#
-#    steps:
-#    - name: echo IMAGE_NAME
-#      run: |
-#        echo $IMAGE_NAME
-#
-#    - name: configure aws credentials
-#      uses: aws-actions/configure-aws-credentials@v3
-#      with:
-#        role-to-assume: arn:aws:iam::017925157769:role/cmiml-dev-oidc-github-role
-#        role-session-name: OIDC-GHA-session
-#        aws-region: ${{ env.AWS_REGION }}
-#
-#    - name: Download task definition
-#      run: |
-#        aws ecs describe-task-definition --task-definition ${{ env.TASK_DEFINITION }} --query taskDefinition > task-definition.json
-#
-#    - name: Render Amazon ECS task definition
-#      id: task-def
-#      uses: aws-actions/amazon-ecs-render-task-definition@v1
-#      with:
-#        task-definition: task-definition.json
-#        container-name: mind_logger
-#        image: ${{ inputs.IMAGE_NAME }}
-#
-#    - name: Update Task Definition
-#      uses: aws-actions/amazon-ecs-deploy-task-definition@v1
-#      with:
-#        task-definition: ${{ steps.task-def.outputs.task-definition }}
-#
-#    - name: Run migration container
-#      id: run-task
-#      uses: geekcell/github-action-aws-ecs-run-task@v4
-#      with:
-#        cluster: ${{ env.ECS_CLUSTER_NAME }}
-#        task-definition: ${{ env.TASK_DEFINITION }}
-#        subnet-ids: subnet-02b7cfd48947b31ef
-#        security-group-ids: sg-0976f7b2b2b5bf411
-#        override-container-command: |
-#          /bin/sh
-#          -c
-#          /fastapi-migrate all
 
   deploy_to_ecs:
     runs-on: ubuntu-latest

Pipfile

@@ -4,41 +4,27 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-redis = "==5.0.8"
-alembic = "==1.13.2"
+aio-pika = "==9.4.3"
+aiofiles = "==24.1.0"
+aiohttp = "==3.10.9"
+alembic = "==1.13.3"
 asyncpg = "==0.29.0"
+azure-storage-blob = "==12.22.0"
+bcrypt = "==4.2.0"
 boto3 = "==1.35.16"
 fastapi = "==0.110.3"
 # The latest version of the fastapi is not taken because of the issue
-# with fastapi-mail that requires 0.21 < starlette < 0.22
 # starlette version for those deps ==0.21.0
+# with fastapi-mail that requires 0.21 < starlette < 0.22
+
 fastapi-mail = "==1.2.9"
+firebase-admin = "==6.5.0"
 httpx = "==0.27.2"
 jinja2 = "==3.1.4"
-bcrypt = "==4.2.0"
-passlib = { version = "==1.7.4", extras = ["bcrypt"] }
-pyOpenSSL = "==24.2.1"
-pydantic = { extras = ["email"], version = "==1.10.18" }
-python-jose = { version = "==3.3.0", extras = ["cryptography"] }
-python-multipart = "==0.0.9"
-sentry-sdk = "~=2.13"
-sqlalchemy = { extras = ["asyncio"], version = "==1.4.53" }
-uvicorn = { extras = ["standard"], version = "==0.30.6" }
-taskiq = { extras = ["reload"], version = "==0.11.7" }
-aiohttp = "==3.10.5"
-firebase-admin = "==6.5.0"
-aio-pika = "==9.4.3"
-azure-storage-blob = "==12.22.0"
-taskiq-fastapi = "==0.3.2"
-taskiq-redis = "==1.0.0"
-taskiq-aio-pika = "==0.4.1"
-sqlalchemy-utils = "==0.41.2"
-typer = "==0.12.5"
-aiofiles = "==24.1.0"
+nh3 = "==0.2.18"
 opentelemetry-api = "==1.27.0"
-opentelemetry-sdk = "==1.27.0"
-opentelemetry-exporter-otlp = "==1.27.0"
 opentelemetry-distro = "==0.48b0"
+opentelemetry-exporter-otlp = "==1.27.0"
 opentelemetry-instrumentation = "==0.48b0"
 opentelemetry-instrumentation-asgi = "==0.48b0"
 opentelemetry-instrumentation-asyncio = "==0.48b0"
@@ -49,51 +35,57 @@ opentelemetry-instrumentation-sqlite3 = "==0.48b0"
 opentelemetry-instrumentation-tortoiseorm = "==0.48b0"
 opentelemetry-instrumentation-urllib = "==0.48b0"
 opentelemetry-instrumentation-wsgi = "==0.48b0"
+opentelemetry-propagator-aws-xray = "==1.0.2"
+opentelemetry-sdk = "==1.27.0"
+opentelemetry-sdk-extension-aws = "==2.0.2"
 opentelemetry-semantic-conventions = "==0.48b0"
 opentelemetry-test-utils = "==0.48b0"
 opentelemetry-util-http = "==0.48b0"
-opentelemetry-propagator-aws-xray = "==1.0.2"
-opentelemetry-sdk-extension-aws = "==2.0.2"
-nh3 = "==0.2.18"
+pyOpenSSL = "==24.2.1"
+pydantic = { extras = ["email"], version = "==1.10.18" }
 pymongo = "*"
+python-multipart = "==0.0.12"
+redis = "==5.1.0"
+sentry-sdk = "~=2.13"
+sqlalchemy = { extras = ["asyncio"], version = "==1.4.53" }
+sqlalchemy-utils = "==0.41.2"
+taskiq = { extras = ["reload"], version = "==0.11.7" }
+taskiq-aio-pika = "==0.4.1"
+taskiq-fastapi = "==0.3.2"
+taskiq-redis = "==1.0.2"
+typer = "==0.12.5"
+uvicorn = { extras = ["standard"], version = "==0.30.6" }
+pyjwt = "==2.9.0"
 
 [dev-packages]
-# Nobody knows for what its needed
 ipdb = "==0.13.13"
 pudb = "==2024.1.2"
-# Linters and Formatters
 pre-commit = "==3.8.0"
-ruff = "==0.6.4"
-# Tests
+ruff = "==0.6.8"
 allure-pytest = "==2.13.5"
 pydantic-factories = "==1.17.3"
 pytest = "==8.3.3"
 pytest-asyncio = "~=0.19"
 pytest-cov = "==5.0.0"
-pytest-env = "==1.1.4"
+pytest-env = "==1.1.5"
 pytest-lazy-fixtures = "==1.1.1"
 pytest-mock = "==3.14.0"
 nest-asyncio = "==1.6.0"
 gevent = "==24.2.1"
-# MyPy
 mypy = "==1.11.2"
-types-passlib = "==1.7.7.20240819"
 types-python-dateutil = "==2.9.0.20240906"
-types-python-jose = "==3.3.4.20240106"
 typing-extensions = "==4.12.2"
-types-requests = "==2.32.0.20240712"
-types-pytz = "==2024.1.0.20240417"
+types-requests = "==2.32.0.20240914"
+types-pytz = "==2024.2.0.20240913"
 types-aiofiles = "==24.1.0.20240626"
 types-cachetools = "==5.5.0.20240820"
-# https://github.com/sqlalchemy/sqlalchemy/issues/7714
 greenlet = "==3.1.0"
-# JSONLD deps only for dev
 reproschema = "*"
 cachetools = "==5.3.0"
 pyld = "==2.0.4"
 
 [requires]
-python_version = "3.10"
+python_version = "3.11"
 
 [scripts]
 cli = "python src/cli.py"