Merge pull request #46 from pavlushkin/add-app-to-request

Add app object to request and support for custom AidboxClient class

Author: ir4y

.github/workflows/build.yaml

@@ -30,6 +30,9 @@ jobs:
     - name: Run tests
       run: ./run_test.sh
       shell: bash
+    - name: Show logs
+      if: ${{ failure() }}
+      run: docker-compose logs
     # - name: Upload coverage to Codecov
     #   uses: codecov/codecov-action@v3
     #   with:

Dockerfile

@@ -8,9 +8,7 @@ WORKDIR /app
 COPY Pipfile Pipfile.lock ./
 RUN pipenv install --dev
 
-# SQLAlchemy vulnerability - https://pyup.io/v/51668/742
-# Remove ignore option once fix is released or upgrade to version 2
-RUN pipenv check -i 51668
+RUN pipenv check
 COPY . .
 
 EXPOSE 8081

Pipfile

@@ -5,7 +5,7 @@ name = "pypi"
 
 [packages]
 aiohttp = "~=3.8.3"
-sqlalchemy = "~=1.4.45"
+sqlalchemy = "~=2.0.5"
 fhirpy = "~=1.3.0"
 coloredlogs = "*"
 jsonschema = "~=4.17.3"

Pipfile.lock

@@ -1,5 +1,5 @@
 __title__ = "aidbox-python-sdk"
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 __author__ = "beda.software"
 __license__ = "None"
 __copyright__ = "Copyright 2023 beda.software"

aidbox_python_sdk/__init__.py

@@ -35,6 +35,7 @@ async def operation(request, data):
         logger.error("Operation handler `%s` was not found", data["handler"])
         raise web.HTTPNotFound()
     try:
+        data["request"]["app"] = request.app
         result = handler(data["operation"], data["request"])
         if asyncio.iscoroutine(result):
             try:

aidbox_python_sdk/handlers.py

@@ -51,12 +51,13 @@ async def register_app(sdk: SDK, client: AsyncAidboxClient):
 
 
 async def init_client(settings: Settings):
+    AidboxClient = settings.AIDBOX_CLIENT_CLASS
     basic_auth = BasicAuth(
         login=settings.APP_INIT_CLIENT_ID,
         password=settings.APP_INIT_CLIENT_SECRET,
     )
 
-    return AsyncAidboxClient(
+    return AidboxClient(
         "{}".format(settings.APP_INIT_URL), authorization=basic_auth.encode()
     )
 

aidbox_python_sdk/main.py

@@ -1,6 +1,8 @@
 import os
 from pathlib import Path
 
+from .aidboxpy import AsyncAidboxClient
+
 
 class Required:
     def __init__(self, v_type=None):
@@ -30,6 +32,7 @@ class Settings:
     APP_SECRET = Required(v_type=str)
     AIO_HOST = Required(v_type=str)
     AIO_PORT = Required(v_type=str)
+    AIDBOX_CLIENT_CLASS = AsyncAidboxClient
 
     def __init__(self, **custom_settings):
         """