Merge branch 'develop' into validate_prn

.env.example

@@ -7,8 +7,6 @@ DATABASE_URL=postgres://postgres:postgres@localhost:5433/care
 REDIS_URL=redis://localhost:6380
 CELERY_BROKER_URL=redis://localhost:6380/0
 
-FIDELIUS_URL=http://localhost:8092
-
 DJANGO_DEBUG=False
 
 BUCKET_REGION=ap-south-1

.github/CODEOWNERS

@@ -1,2 +1 @@
-* @ohcnetwork/care-developers
-*.yml @tomahawk-pilot
+* @ohcnetwork/care-backend-admins

.github/workflows/deploy.yml

@@ -102,6 +102,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           build-args: |
             APP_VERSION=${{ github.sha }}
+            ADDITIONAL_PLUGS=${{ env.ADDITIONAL_PLUGS }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
 

.github/workflows/docs.yml

@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
           cache: 'pipenv'
 
       - name: Install pipenv

.github/workflows/linter.yml

@@ -14,7 +14,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: actions/setup-python@v3
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
       - uses: pre-commit/action@v3.0.1
         with:
           extra_args: --color=always --from-ref ${{ github.event.pull_request.base.sha }} --to-ref ${{ github.event.pull_request.head.sha }}

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_stages: [commit]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: no-commit-to-branch
         args: [--branch, develop, --branch, staging, --branch, production]
@@ -17,7 +17,7 @@ repos:
       - id: check-toml
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.7
+    rev: v0.7.0
     hooks:
       - id: ruff
         args: [ --fix ]

Pipfile

@@ -6,17 +6,17 @@ name = "pypi"
 [packages]
 argon2-cffi = "==23.1.0"
 authlib = "==1.3.2"
-boto3 = "==1.35.29"
+boto3 = "==1.35.49"
 celery = "==5.4.0"
-django = "==5.1.1"
+django = "==5.1.2"
 django-environ = "==0.11.2"
-django-cors-headers = "==4.4.0"
+django-cors-headers = "==4.5.0"
 django-filter = "==24.3"
 django-maintenance-mode = "==0.21.1"
 django-queryset-csv = "==1.1.0"
 django-ratelimit = "==4.1.0"
 django-redis = "==5.4.0"
-django-rest-passwordreset = "==1.4.1"
+django-rest-passwordreset = "==1.4.2"
 django-simple-history = "==3.7.0"
 djangoql = "==0.18.1"
 djangorestframework = "==3.15.2"
@@ -28,44 +28,42 @@ drf-spectacular = "==0.27.2"
 gunicorn = "==23.0.0"
 healthy-django = "==0.1.0"
 jsonschema = "==4.23.0"
-jwcrypto = "==1.5.6"
-newrelic = "==10.0.0"
-pillow = "==10.4.0"
-psycopg = { extras = ["c"], version = "==3.2.2" }
-pycryptodome = "==3.20.0"
+newrelic = "==10.2.0"
+pillow = "==11.0.0"
+psycopg = { extras = ["c"], version = "==3.2.3" }
 pydantic = "==1.10.18" # fix for fhir.resources < 7.0.2
 pyjwt = "==2.9.0"
 python-slugify = "==8.0.4"
-pywebpush = "==2.0.0"
+pywebpush = "==2.0.1"
 redis = { extras = ["hiredis"], version = "==5.0.8" } # constraint for redis-om
 redis-om = "==0.3.1" # > 0.3.1 broken with pydantic < 2
 requests = "==2.32.3"
-sentry-sdk = "==2.14.0"
+sentry-sdk = "==2.17.0"
 whitenoise = "==6.7.0"
 
 [dev-packages]
-boto3-stubs = { extras = ["s3", "boto3"], version = "==1.35.29" }
-coverage = "==7.6.1"
-debugpy = "==1.8.6"
+boto3-stubs = { extras = ["s3", "boto3"], version = "==1.35.49" }
+coverage = "==7.6.4"
+debugpy = "==1.8.7"
 django-coverage-plugin = "==3.1.0"
 django-extensions = "==3.2.3"
 django-silk = "==5.2.0"
 djangorestframework-stubs = "==3.15.1"
 factory-boy = "==3.3.1"
 freezegun = "==1.5.1"
-ipython = "==8.27.0"
-mypy = "==1.11.2"
-pre-commit = "==3.8.0"
+ipython = "==8.28.0"
+mypy = "==1.12.1"
+pre-commit = "==4.0.1"
 requests-mock = "==1.12.1"
 tblib = "==3.0.0"
 watchdog = "==5.0.3"
-werkzeug = "==3.0.4"
-ruff = "==0.6.8"
+werkzeug = "==3.0.6"
+ruff = "==0.7.0"
 
 [docs]
 furo = "==2024.8.6"
 sphinx = "==8.0.2"
 myst-parser = "==4.0.0"
 
 [requires]
-python_version = "3.12"
+python_version = "3.13"

aws/backend.json

@@ -114,29 +114,21 @@
           "value": "True"
         },
         {
-          "name": "ENABLE_ABDM",
-          "value": "True"
-        },
-        {
-          "name": "ABDM_URL",
+          "name": "ABDM_GATEWAY_URL",
           "value": "https://dev.abdm.gov.in"
         },
         {
-          "name": "HEALTH_SERVICE_API_URL",
-          "value": "https://healthidsbx.abdm.gov.in/api"
+          "name": "ABDM_ABHA_URL",
+          "value": "https://abhasbx.abdm.gov.in"
         },
         {
           "name": "ABDM_FACILITY_URL",
           "value": "https://facilitysbx.abdm.gov.in"
         },
         {
-          "name": "X_CM_ID",
+          "name": "ABDM_CM_ID",
           "value": "sbx"
         },
-        {
-          "name": "FIDELIUS_URL",
-          "value": "https://fidelius.ohc.network"
-        },
         {
           "name": "SENTRY_TRACES_SAMPLE_RATE",
           "value": "1.0"

aws/celery.json

@@ -11,9 +11,7 @@
         }
       },
       "portMappings": [],
-      "command": [
-        "/app/celery_beat-ecs.sh"
-      ],
+      "command": ["/app/celery_beat-ecs.sh"],
       "cpu": 128,
       "environment": [
         {
@@ -97,29 +95,21 @@
           "value": "True"
         },
         {
-          "name": "ENABLE_ABDM",
-          "value": "True"
-        },
-        {
-          "name": "ABDM_URL",
+          "name": "ABDM_GATEWAY_URL",
           "value": "https://dev.abdm.gov.in"
         },
         {
-          "name": "HEALTH_SERVICE_API_URL",
-          "value": "https://healthidsbx.abdm.gov.in/api"
+          "name": "ABDM_ABHA_URL",
+          "value": "https://abhasbx.abdm.gov.in"
         },
         {
           "name": "ABDM_FACILITY_URL",
           "value": "https://facilitysbx.abdm.gov.in"
         },
         {
-          "name": "X_CM_ID",
+          "name": "ABDM_CM_ID",
           "value": "sbx"
         },
-        {
-          "name": "FIDELIUS_URL",
-          "value": "https://fidelius.ohc.network"
-        },
         {
           "name": "SENTRY_TRACES_SAMPLE_RATE",
           "value": "1.0"
@@ -296,9 +286,7 @@
           "awslogs-stream-prefix": "ecs"
         }
       },
-      "command": [
-        "/app/celery_worker-ecs.sh"
-      ],
+      "command": ["/app/celery_worker-ecs.sh"],
       "cpu": 384,
       "memory": 1536,
       "memoryReservation": 1536,
@@ -384,24 +372,20 @@
           "value": "True"
         },
         {
-          "name": "ENABLE_ABDM",
-          "value": "True"
-        },
-        {
-          "name": "ABDM_URL",
+          "name": "ABDM_GATEWAY_URL",
           "value": "https://dev.abdm.gov.in"
         },
         {
-          "name": "HEALTH_SERVICE_API_URL",
-          "value": "https://healthidsbx.abdm.gov.in/api"
+          "name": "ABDM_ABHA_URL",
+          "value": "https://abhasbx.abdm.gov.in"
         },
         {
-          "name": "X_CM_ID",
-          "value": "sbx"
+          "name": "ABDM_FACILITY_URL",
+          "value": "https://facilitysbx.abdm.gov.in"
         },
         {
-          "name": "FIDELIUS_URL",
-          "value": "https://fidelius.ohc.network"
+          "name": "ABDM_CM_ID",
+          "value": "sbx"
         },
         {
           "name": "SENTRY_TRACES_SAMPLE_RATE",