Merge pull request #1693 from ChildMindInstitute/release/1.9.5

Release/1.9.5 [main]

.dockerignore

@@ -7,3 +7,5 @@ docker-compose.yaml
 *.md
 *.rst
 venv*/
+allure-results
+.git

.env.default

@@ -94,4 +94,9 @@ OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=
 # OTEL_TRACES_EXPORTER
 # OTEL_EXPORTER_OTLP_CERTIFICATE
 
-MULTI_INFORMANT__TEMP_RELATION_EXPIRY_SECS=86400
+MULTI_INFORMANT__TEMP_RELATION_EXPIRY_SECS=86400
+
+# False for local dev
+DD_TRACE_ENABLED=false
+DD_LOGS_ENABLED=false
+LOG_JSON_FORMAT=false

.github/workflows/pr-open.yml

@@ -49,6 +49,7 @@ jobs:
     permissions:
       issues: write
       pull-requests: write
+      discussions: write
     needs: [ run-unit-tests ]
     steps:
       - name: Post the link to the report

.github/workflows/run_build_deploy.yaml

@@ -2,8 +2,8 @@
 name: Build and Deploy
 on: 
   push:
-#    branches:
-#      - develop
+    branches:
+      - develop
   workflow_dispatch: {}
 
 

.github/workflows/update-jira-tickets.yaml

@@ -103,6 +103,8 @@ jobs:
           echo "tickets=${jiraTickets}" >> $GITHUB_OUTPUT
 
       - name: Periodically ping Jenkins for current tag build status
+        env:
+          REPO_URL: "${{ github.server_url }}/${{ github.repository }}"
         run: |
           repoName=${GITHUB_REPOSITORY##*/}
           currentTag="${{ steps.get-tag.outputs.tag }}"
@@ -124,7 +126,7 @@ jobs:
             if [[ "$result" == "SUCCESS" ]]; then
               echo "Build successful! Submitting ticket numbers to Jira"
               tickets="${{ steps.jira-tickets.outputs.tickets }}"
-              json="{ \"issues\": $(echo "${tickets}" | jq -R -s -c 'split(" ")[:-1]') }"
+              json="{ \"issues\": $(echo "${tickets}" | jq -R -s -c 'split(" ")[:-1]'), \"data\": { \"tag\": \"${currentTag}\", \"repository\": \"${REPO_URL}\" } }"
               curl -X POST -H 'Content-Type: application/json' --url "${JIRA_WEBHOOK_URL}" --data "$json"
               break
             elif [[ "$result" != "null" ]]; then

.gitignore

@@ -62,3 +62,4 @@ venv/
 
 # MacOS
 .DS_Store
+

Pipfile

@@ -4,24 +4,21 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-aio-pika = "==9.4.3"
+aio-pika = "==9.5.3"
 aiofiles = "==24.1.0"
-aiohttp = "==3.10.10"
-alembic = "==1.13.3"
+aiohttp = "==3.11.9"
+alembic = "==1.14.0"
 asyncpg = "==0.30.0"
-azure-storage-blob = "==12.23.1"
-bcrypt = "==4.2.0"
-boto3 = "==1.35.47"
-fastapi = "==0.115.3"
-# The latest version of the fastapi is not taken because of the issue
-# starlette version for those deps ==0.21.0
-# with fastapi-mail that requires 0.21 < starlette < 0.22
-
+azure-storage-blob = "==12.24.0"
+bcrypt = "==4.2.1"
+boto3 = "==1.35.77"
+fastapi = "==0.115.6"
 fastapi-mail = "==1.2.9"
 firebase-admin = "==6.5.0"
-httpx = "==0.27.2"
+httpx = "==0.28.0"
 jinja2 = "==3.1.4"
-nh3 = "==0.2.18"
+more-itertools = "==10.5.0"
+nh3 = "==0.2.19"
 opentelemetry-api = "==1.27.0"
 opentelemetry-distro = "==0.48b0"
 opentelemetry-exporter-otlp = "==1.27.0"
@@ -41,11 +38,12 @@ opentelemetry-sdk-extension-aws = "==2.0.2"
 opentelemetry-semantic-conventions = "==0.48b0"
 opentelemetry-test-utils = "==0.48b0"
 opentelemetry-util-http = "==0.48b0"
-pyOpenSSL = "==24.2.1"
 pydantic = { extras = ["email"], version = "==1.10.18" }
-pymongo = "*"
-python-multipart = "==0.0.12"
-redis = "==5.1.1"
+pyjwt = "==2.10.1"
+pymongo = "==4.10.1"
+pyOpenSSL = "==24.2.1"
+python-multipart = "==0.0.19"
+redis = "==5.2.0"
 sentry-sdk = "~=2.13"
 sqlalchemy = { extras = ["asyncio"], version = "==1.4.53" }
 sqlalchemy-utils = "==0.41.2"
@@ -55,34 +53,38 @@ taskiq-fastapi = "==0.3.2"
 taskiq-redis = "==1.0.2"
 typer = "==0.12.5"
 uvicorn = { extras = ["standard"], version = "==0.32.0" }
-pyjwt = "==2.9.0"
+ddtrace = "==2.17.2"
+bytecode = "==0.16.0"
+structlog = "==24.4.0"
+asgi-correlation-id = "==4.3.4"
+
 
 [dev-packages]
+allure-pytest = "==2.13.5"
+cachetools = "==5.3.0"
+gevent = "==24.2.1"
+greenlet = "==3.1.0"
 ipdb = "==0.13.13"
-pudb = "==2024.1.3"
+mypy = "==1.13.0"
+nest-asyncio = "==1.6.0"
 pre-commit = "==4.0.1"
-ruff = "==0.7.0"
-allure-pytest = "==2.13.5"
+pudb = "==2024.1.3"
 pydantic-factories = "==1.17.3"
-pytest = "==8.3.3"
+pyld = "==2.0.4"
+pytest = "==8.3.4"
 pytest-asyncio = "~=0.19"
-pytest-cov = "==5.0.0"
+pytest-cov = "==6.0.0"
 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 = "==1.13.0"
-types-python-dateutil = "==2.9.0.20241003"
-typing-extensions = "==4.12.2"
-types-requests = "==2.32.0.20241016"
-types-pytz = "==2024.2.0.20241003"
+reproschema = "==0.6.2"
+ruff = "==0.8.2"
 types-aiofiles = "==24.1.0.20240626"
 types-cachetools = "==5.5.0.20240820"
-greenlet = "==3.1.0"
-reproschema = "*"
-cachetools = "==5.3.0"
-pyld = "==2.0.4"
+types-python-dateutil = "==2.9.0.20241206   "
+types-pytz = "==2024.2.0.20241003"
+types-requests = "==2.32.0.20241016"
+typing-extensions = "==4.12.2"
 
 [requires]
 python_version = "3.11"