aidbox-python-sdk 0.1.7__tar.gz → 0.1.9__tar.gz

{aidbox-python-sdk-0.1.7/aidbox_python_sdk.egg-info → aidbox_python_sdk-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aidbox-python-sdk
-Version: 0.1.7
+Version: 0.1.9
 Summary: Aidbox SDK for python
 Author-email: "beda.software" <aidbox-python-sdk@beda.software>
 License: MIT License
@@ -35,33 +35,43 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE.md
+Requires-Dist: aiohttp>=3.6.2
+Requires-Dist: SQLAlchemy>=1.3.10
+Requires-Dist: fhirpy>=1.3.0
+Requires-Dist: jsonschema>=4.4.0
 Provides-Extra: test
+Requires-Dist: pytest~=6.0.0; extra == "test"
+Requires-Dist: pytest-asyncio~=0.20.0; extra == "test"
+Requires-Dist: pytest-aiohttp~=1.0.4; extra == "test"
+Requires-Dist: pytest-cov~=4.0.0; extra == "test"
 Provides-Extra: dev
-License-File: LICENSE.md
+Requires-Dist: black; extra == "dev"
+Requires-Dist: autohooks; extra == "dev"
+Requires-Dist: autohooks-plugin-ruff; extra == "dev"
+Requires-Dist: autohooks-plugin-black; extra == "dev"
 
 [![build status](https://github.com/Aidbox/aidbox-python-sdk/actions/workflows/build.yaml/badge.svg)](https://github.com/Aidbox/aidbox-python-sdk/actions/workflows/build.yaml)
 [![pypi](https://img.shields.io/pypi/v/aidbox-python-sdk.svg)](https://pypi.org/project/aidbox-python-sdk/)
-[![Supported Python version](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/downloads/release/python-380/)
+[![Supported Python version](https://img.shields.io/badge/python-3.9+-blue.svg)](https://www.python.org/downloads/release/python-390/)
 
 # aidbox-python-sdk
 
-1. Create a python 3.8+ environment `pyenv `
+1. Create a python 3.9+ environment `pyenv `
 2. Set env variables and activate virtual environment `source activate_settings.sh`
 2. Install the required packages with `pipenv install --dev`
 3. Make sure the app's settings are configured correctly (see `activate_settings.sh` and `aidbox_python_sdk/settings.py`). You can also
  use environment variables to define sensitive settings, eg. DB connection variables (see example `.env-ptl`)
 4. You can then run example with `python example.py`.
 
-Add `APP_FAST_START_MODE=TRUE` to env_tests for fast start mode.
-
 # Getting started
 ## Minimal application
 ```Python

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/README.md

@@ -1,18 +1,16 @@
 [![build status](https://github.com/Aidbox/aidbox-python-sdk/actions/workflows/build.yaml/badge.svg)](https://github.com/Aidbox/aidbox-python-sdk/actions/workflows/build.yaml)
 [![pypi](https://img.shields.io/pypi/v/aidbox-python-sdk.svg)](https://pypi.org/project/aidbox-python-sdk/)
-[![Supported Python version](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/downloads/release/python-380/)
+[![Supported Python version](https://img.shields.io/badge/python-3.9+-blue.svg)](https://www.python.org/downloads/release/python-390/)
 
 # aidbox-python-sdk
 
-1. Create a python 3.8+ environment `pyenv `
+1. Create a python 3.9+ environment `pyenv `
 2. Set env variables and activate virtual environment `source activate_settings.sh`
 2. Install the required packages with `pipenv install --dev`
 3. Make sure the app's settings are configured correctly (see `activate_settings.sh` and `aidbox_python_sdk/settings.py`). You can also
  use environment variables to define sensitive settings, eg. DB connection variables (see example `.env-ptl`)
 4. You can then run example with `python example.py`.
 
-Add `APP_FAST_START_MODE=TRUE` to env_tests for fast start mode.
-
 # Getting started
 ## Minimal application
 ```Python

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/aidbox_python_sdk/__init__.py

@@ -1,8 +1,8 @@
 __title__ = "aidbox-python-sdk"
-__version__ = "0.1.7"
+__version__ = "0.1.9"
 __author__ = "beda.software"
 __license__ = "None"
-__copyright__ = "Copyright 2023 beda.software"
+__copyright__ = "Copyright 2024 beda.software"
 
 # Version synonym
 VERSION = __version__

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/aidbox_python_sdk/aidboxpy.py

@@ -1,16 +1,17 @@
+# type: ignore because fhir-py is not typed properly
 from abc import ABC
 
 from fhirpy.base import (
-    SyncClient,
     AsyncClient,
-    SyncSearchSet,
-    AsyncSearchSet,
-    SyncResource,
+    AsyncReference,
     AsyncResource,
+    AsyncSearchSet,
+    SyncClient,
     SyncReference,
-    AsyncReference,
+    SyncResource,
+    SyncSearchSet,
 )
-from fhirpy.base.resource import BaseResource, BaseReference
+from fhirpy.base.resource import BaseReference, BaseResource
 from fhirpy.base.searchset import AbstractSearchSet
 
 __title__ = "aidbox-py"
@@ -76,13 +77,14 @@ class BaseAidboxReference(BaseReference, ABC):
         Returns reference if local resource is saved
         """
         if self.is_local:
-            return "{0}/{1}".format(self.resource_type, self.id)
+            return f"{self.resource_type}/{self.id}"
         return self.get("url", None)
 
     @property
     def id(self):
         if self.is_local:
             return self.get("id", None)
+        return None
 
     @property
     def resource_type(self):
@@ -91,6 +93,7 @@ class BaseAidboxReference(BaseReference, ABC):
         """
         if self.is_local:
             return self.get("resourceType", None)
+        return None
 
     @property
     def is_local(self):
@@ -109,16 +112,14 @@ class SyncAidboxClient(SyncClient):
     searchset_class = SyncAidboxSearchSet
     resource_class = SyncAidboxResource
 
-    def reference(self, resource_type=None, id=None, reference=None, **kwargs):
+    def reference(self, resource_type=None, id=None, reference=None, **kwargs):  # noqa: A002
         resource_type = kwargs.pop("resourceType", resource_type)
         if reference:
             if reference.count("/") > 1:
                 return SyncAidboxReference(self, url=reference, **kwargs)
-            resource_type, id = reference.split("/")
+            resource_type, id = reference.split("/")  # noqa: A001
         if not resource_type and not id:
-            raise TypeError(
-                "Arguments `resource_type` and `id` or `reference`" "are required"
-            )
+            raise TypeError("Arguments `resource_type` and `id` or `reference`are required")
         return SyncAidboxReference(self, resourceType=resource_type, id=id, **kwargs)
 
 
@@ -126,14 +127,12 @@ class AsyncAidboxClient(AsyncClient):
     searchset_class = AsyncAidboxSearchSet
     resource_class = AsyncAidboxResource
 
-    def reference(self, resource_type=None, id=None, reference=None, **kwargs):
+    def reference(self, resource_type=None, id=None, reference=None, **kwargs):  # noqa: A002
         resource_type = kwargs.pop("resourceType", resource_type)
         if reference:
             if reference.count("/") > 1:
                 return AsyncAidboxReference(self, url=reference, **kwargs)
-            resource_type, id = reference.split("/")
+            resource_type, id = reference.split("/")  # noqa: A001
         if not resource_type and not id:
-            raise TypeError(
-                "Arguments `resource_type` and `id` or `reference`" "are required"
-            )
+            raise TypeError("Arguments `resource_type` and `id` or `reference`are required")
         return AsyncAidboxReference(self, resourceType=resource_type, id=id, **kwargs)

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/aidbox_python_sdk/db.py

@@ -1,5 +1,5 @@
-import logging
 import json
+import logging
 
 from aiohttp import BasicAuth, ClientSession
 from sqlalchemy import (
@@ -7,14 +7,17 @@ from sqlalchemy import (
     Column,
     DateTime,
     Enum,
+    MetaData,
+    Table,
     Text,
-    text,
     TypeDecorator,
-    Table,
-    MetaData,
+    text,
 )
+from sqlalchemy.dialects.postgresql import ARRAY, JSONB
+from sqlalchemy.dialects.postgresql import dialect as postgresql_dialect
 from sqlalchemy.sql.elements import ClauseElement
-from sqlalchemy.dialects.postgresql import JSONB, ARRAY, dialect as postgresql_dialect
+
+from aidbox_python_sdk.settings import Settings
 
 from .exceptions import AidboxDBException
 
@@ -34,11 +37,9 @@ class _JSONB(TypeDecorator):
     def process_literal_param(self, value, dialect):
         if isinstance(value, dict):
             return "'{}'".format(json.dumps(value).replace("'", "''"))
-        elif isinstance(value, str):
+        if isinstance(value, str):
             return value
-        raise ValueError(
-            "Don't know how to literal-quote " "value of type {}".format(type(value))
-        )
+        raise ValueError(f"Don't know how to literal-quote value of type {type(value)}")
 
 
 class _ARRAY(TypeDecorator):
@@ -46,12 +47,10 @@ class _ARRAY(TypeDecorator):
 
     def process_literal_param(self, value, dialect):
         if isinstance(value, list):
-            return "ARRAY{}".format(value)
-        elif isinstance(value, str):
+            return f"ARRAY{value}"
+        if isinstance(value, str):
             return value
-        raise ValueError(
-            "Don't know how to literal-quote value of type {}".format(type(value))
-        )
+        raise ValueError(f"Don't know how to literal-quote value of type {type(value)}")
 
 
 def create_table(table_name):
@@ -69,17 +68,18 @@ def create_table(table_name):
             nullable=False,
         ),
         Column("resource", _JSONB(astext_type=Text()), nullable=False, index=True),
-        extend_existing=True
+        extend_existing=True,
     )
 
 
-class DBProxy(object):
+class DBProxy:
     _client = None
     _settings = None
-    _table_cache = {}
+    _table_cache = None
 
-    def __init__(self, settings):
+    def __init__(self, settings: Settings):
         self._settings = settings
+        self._table_cache = {}
 
     async def initialize(self):
         basic_auth = BasicAuth(
@@ -103,19 +103,17 @@ class DBProxy(object):
         if not self._client:
             raise ValueError("Client not set")
         if not isinstance(sql_query, str):
-            ValueError("sql_query must be a str")
+            raise ValueError("sql_query must be a str")
         if not execute and sql_query.count(";") > 1:
-            logger.warning(
-                "Check that your query does not " "contain two queries separated by `;`"
-            )
-        query_url = "{}/$psql".format(self._settings.APP_INIT_URL)
+            logger.warning("Check that your query does not contain two queries separated by `;`")
+        query_url = f"{self._settings.APP_INIT_URL}/$psql"
         async with self._client.post(
             query_url,
             json={"query": sql_query},
             params={"execute": "true"} if execute else {},
             raise_for_status=True,
         ) as resp:
-            logger.debug("$psql answer {0}".format(await resp.text()))
+            logger.debug("$psql answer %s", await resp.text())
             results = await resp.json()
 
             if results[0]["status"] == "error":
@@ -132,16 +130,14 @@ class DBProxy(object):
 
     async def alchemy(self, statement, *, execute=False):
         if not isinstance(statement, ClauseElement):
-            ValueError("statement must be a sqlalchemy expression")
+            raise ValueError("statement must be a sqlalchemy expression")
         query = self.compile_statement(statement)
         logger.debug("Built query:\n%s", query)
         return await self.raw_sql(query, execute=execute)
 
     async def _get_all_entities_name(self):
         # TODO: refactor using sdk.client and fetch_all
-        query_url = "{}/Entity?type=resource&_elements=id&_count=999".format(
-            self._settings.APP_INIT_URL
-        )
+        query_url = f"{self._settings.APP_INIT_URL}/Entity?type=resource&_elements=id&_count=999"
         async with self._client.get(query_url, raise_for_status=True) as resp:
             json_resp = await resp.json()
             return [entry["resource"]["id"] for entry in json_resp["entry"]]
@@ -149,14 +145,9 @@ class DBProxy(object):
     async def _init_table_cache(self):
         table_names = await self._get_all_entities_name()
         self._table_cache = {
+            **{table_name: {"table_name": table_name.lower()} for table_name in table_names},
             **{
-                table_name: {"table_name": table_name.lower()}
-                for table_name in table_names
-            },
-            **{
-                "{}History".format(table_name): {
-                    "table_name": "{}_history".format(table_name.lower())
-                }
+                f"{table_name}History": {"table_name": f"{table_name.lower()}_history"}
                 for table_name in table_names
             },
         }

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/aidbox_python_sdk/exceptions.py

@@ -1,4 +1,4 @@
-class AidboxSDKException(Exception):
+class AidboxSDKException(Exception):  # noqa: N818
     pass
 
 

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/aidbox_python_sdk/handlers.py

@@ -1,6 +1,6 @@
-import logging
 import asyncio
-import os
+import logging
+
 from aiohttp import web
 from fhirpy.base.exceptions import OperationOutcome
 
@@ -9,13 +9,13 @@ routes = web.RouteTableDef()
 
 
 async def subscription(request, data):
-    logger.debug("Subscription handler: {}".format(data["handler"]))
+    logger.debug("Subscription handler: %s", data["handler"])
     if "handler" not in data or "event" not in data:
-        logger.error("`handler` and/or `event` param is missing, data: {}".format(data))
+        logger.error("`handler` and/or `event` param is missing, data: %s", data)
         raise web.HTTPBadRequest()
     handler = request.app["sdk"].get_subscription_handler(data["handler"])
     if not handler:
-        logger.error("Subscription handler `{}` was not found".format(data["handler"]))
+        logger.error("Subscription handler `%s` was not found", "handler")
         raise web.HTTPNotFound()
     result = handler(data["event"], request)
     if asyncio.iscoroutine(result):
@@ -26,9 +26,7 @@ async def subscription(request, data):
 async def operation(request, data):
     logger.debug("Operation handler: %s", data["operation"]["id"])
     if "operation" not in data or "id" not in data["operation"]:
-        logger.error(
-            "`operation` or `operation[id]` param is missing, data: %s", data
-        )
+        logger.error("`operation` or `operation[id]` param is missing, data: %s", data)
         raise web.HTTPBadRequest()
     handler = request.app["sdk"].get_operation_handler(data["operation"]["id"])
     if not handler:
@@ -57,10 +55,10 @@ TYPES = {
 
 @routes.post("/aidbox")
 async def dispatch(request):
-    logger.debug("Dispatch new request {} {}".format(request.method, request.url))
+    logger.debug("Dispatch new request %s %s", request.method, request.url)
     json = await request.json()
     if "type" in json and json["type"] in TYPES:
-        logger.debug("Dispatch to `{}` handler".format(json["type"]))
+        logger.debug("Dispatch to `%s` handler", json["type"])
         return await TYPES[json["type"]](request, json)
     req = {
         "method": request.method,

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/aidbox_python_sdk/main.py

@@ -1,19 +1,17 @@
-import asyncio
 import errno
 import json
 import logging
-import os
 import sys
 from pathlib import Path
 
 from aiohttp import BasicAuth, client_exceptions, web
+from fhirpy.base.exceptions import OperationOutcome
 
 from .aidboxpy import AsyncAidboxClient
 from .db import DBProxy
 from .handlers import routes
 from .sdk import SDK
 from .settings import Settings
-from fhirpy.base.exceptions import OperationOutcome
 
 logger = logging.getLogger("aidbox_sdk")
 THIS_DIR = Path(__file__).parent
@@ -26,48 +24,41 @@ def setup_routes(app):
 
 async def register_app(sdk: SDK, client: AsyncAidboxClient):
     app_manifest = sdk.build_manifest()
-    
+
     try:
         # We create app directly using execute to avoid conversion
-        await client.execute(
-            f"/App/{app_manifest['id']}", method="put", data=app_manifest)
-        
+        await client.execute(f"/App/{app_manifest['id']}", method="put", data=app_manifest)
+
         logger.info("Creating seeds and applying migrations")
         await sdk.create_seed_resources(client)
         await sdk.apply_migrations(client)
         logger.info("Aidbox app successfully registered")
     except OperationOutcome as error:
-        logger.error(
-            "Error during the App registration: %s", json.dumps(error, indent=2)
-        )
+        logger.error("Error during the App registration: %s", json.dumps(error, indent=2))
         sys.exit(errno.EINTR)
     except (
         client_exceptions.ServerDisconnectedError,
         client_exceptions.ClientConnectionError,
     ):
-        logger.error(
-            "Aidbox address is unreachable {}".format(sdk.settings.APP_INIT_URL)
-        )
+        logger.error("Aidbox address is unreachable %s", sdk.settings.APP_INIT_URL)
         sys.exit(errno.EINTR)
 
 
 async def init_client(settings: Settings):
-    AidboxClient = settings.AIDBOX_CLIENT_CLASS
+    aidbox_client_cls = settings.AIDBOX_CLIENT_CLASS
     basic_auth = BasicAuth(
         login=settings.APP_INIT_CLIENT_ID,
         password=settings.APP_INIT_CLIENT_SECRET,
     )
 
-    return AidboxClient(
-        "{}".format(settings.APP_INIT_URL), authorization=basic_auth.encode()
-    )
+    return aidbox_client_cls(f"{settings.APP_INIT_URL}", authorization=basic_auth.encode())
 
 
 async def init(app):
     app["client"] = await init_client(app["settings"])
     app["db"] = DBProxy(app["settings"])
-    await app["db"].initialize()
     await register_app(app["sdk"], app["client"])
+    await app["db"].initialize()
     yield
     await app["db"].deinitialize()
 

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/aidbox_python_sdk/pytest_plugin.py

@@ -1,27 +1,22 @@
-import asyncio
-import pytest_asyncio
-import pytest
 import os
+
+import pytest
+import pytest_asyncio
+from aiohttp import BasicAuth, ClientSession
 from yarl import URL
-from aiohttp import ClientSession, BasicAuth, hdrs
-from aiohttp.test_utils import TestServer, TestClient, BaseTestServer
-from aiohttp.web import Application
-from aiohttp.client import _RequestContextManager
 
 from main import create_app as _create_app
 
 
 async def start_app(aiohttp_client):
-    app = await aiohttp_client(
-        _create_app(), server_kwargs={"host": "0.0.0.0", "port": 8081}
-    )
+    app = await aiohttp_client(_create_app(), server_kwargs={"host": "0.0.0.0", "port": 8081})
     sdk = app.server.app["sdk"]
     sdk._test_start_txid = -1
 
     return app
 
 
-@pytest.fixture
+@pytest.fixture()
 def client(event_loop, aiohttp_client):
     """Instance of app's server and client"""
     return event_loop.run_until_complete(start_app(aiohttp_client))
@@ -29,7 +24,9 @@ def client(event_loop, aiohttp_client):
 
 class AidboxSession(ClientSession):
     def __init__(self, *args, base_url=None, **kwargs):
-        self.base_url = URL(base_url or os.environ.get("AIDBOX_BASE_URL"))
+        base_url_resolved = base_url or os.environ.get("AIDBOX_BASE_URL")
+        assert base_url_resolved, "Either base_url arg or AIDBOX_BASE_URL env var must be set"
+        self.base_url = URL(base_url_resolved)
         super().__init__(*args, **kwargs)
 
     def make_url(self, path):
@@ -71,18 +68,18 @@ async def safe_db(aidbox, client):
     sdk._test_start_txid = -1
     await aidbox.post(
         "/$psql",
-        json={"query": "select drop_before_all({});".format(txid)},
+        json={"query": f"select drop_before_all({txid});"},
         params={"execute": "true"},
         raise_for_status=True,
     )
 
 
-@pytest.fixture
+@pytest.fixture()
 def sdk(client):
     return client.server.app["sdk"]
 
 
-@pytest.fixture
+@pytest.fixture()
 def aidbox_client(client):
     return client.server.app["client"]
 

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/aidbox_python_sdk/sdk.py

@@ -1,6 +1,5 @@
 import asyncio
 import logging
-import os
 
 import jsonschema
 from fhirpy.base.exceptions import OperationOutcome
@@ -11,8 +10,8 @@ from .db_migrations import sdk_migrations
 logger = logging.getLogger("aidbox_sdk")
 
 
-class SDK(object):
-    def __init__(
+class SDK:
+    def __init__(  # noqa: PLR0913
         self,
         settings,
         *,
@@ -40,7 +39,7 @@ class SDK(object):
         self._entities = entities or {}
         self._seeds = seeds or {}
         self._migrations = migrations or []
-        self._app_endpoint_name = "{}-endpoint".format(settings.APP_ID)
+        self._app_endpoint_name = f"{settings.APP_ID}-endpoint"
         self._sub_triggered = {}
         self._test_start_txid = None
 
@@ -67,13 +66,11 @@ class SDK(object):
                         resource_id,
                         resource["id"],
                     )
-                entry = {
-                    "resource": {**resource, "id": resource_id, "resourceType": entity}
-                }
+                entry = {"resource": {**resource, "id": resource_id, "resourceType": entity}}
                 # Conditional create
                 entry["request"] = {
                     "method": "POST",
-                    "url": "/{0}?_id={1}".format(entity, resource_id),
+                    "url": f"/{entity}?_id={resource_id}",
                 }
                 entries.append(entry)
         bundle = client.resource("Bundle", type="transaction", entry=entries)
@@ -99,30 +96,27 @@ class SDK(object):
                 if self._test_start_txid is not None:
                     # Skip outside test
                     if self._test_start_txid == -1:
-                        return
+                        return None
 
                     # Skip inside another test
                     if int(event["tx"]["id"]) < self._test_start_txid:
-                        return
+                        return None
                 coro_or_result = func(event, request)
                 if asyncio.iscoroutine(coro_or_result):
                     result = await coro_or_result
                 else:
-                    logger.warning(
-                        "Synchronous subscription handler is deprecated: %s", path
-                    )
+                    logger.warning("Synchronous subscription handler is deprecated: %s", path)
                     result = coro_or_result
 
                 if entity in self._sub_triggered:
                     future, counter = self._sub_triggered[entity]
                     if counter > 1:
                         self._sub_triggered[entity] = (future, counter - 1)
+                    elif future.done():
+                        pass
+                        # logger.warning('Uncaught subscription for %s', entity)
                     else:
-                        if future.done():
-                            pass
-                            # logger.warning('Uncaught subscription for %s', entity)
-                        else:
-                            future.set_result(True)
+                        future.set_result(True)
 
                 return result
 
@@ -149,7 +143,7 @@ class SDK(object):
     def was_subscription_triggered(self, entity):
         return self.was_subscription_triggered_n_times(entity, 1)
 
-    def operation(
+    def operation(  # noqa: PLR0913
         self,
         methods,
         path,
@@ -158,10 +152,8 @@ class SDK(object):
         request_schema=None,
         timeout=None,
     ):
-        if public == True and access_policy is not None:
-            raise ValueError(
-                "Operation might be public or have access policy, not both"
-            )
+        if public and access_policy is not None:
+            raise ValueError("Operation might be public or have access policy, not both")
 
         request_validator = None
         if request_schema:
@@ -177,7 +169,6 @@ class SDK(object):
                 if isinstance(p, str):
                     _str_path.append(p)
                 elif isinstance(p, dict):
-
                     _str_path.append("__{}__".format(p["name"]))
 
             def wrapped_func(operation, request):

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/aidbox_python_sdk/settings.py

@@ -44,7 +44,7 @@ class Settings:
             # if not hasattr(self, name):
             #     raise TypeError('{} is not a valid setting name'.format(name))
             setattr(self, name, value)
-        setattr(self, "static_path", None)
+        self.static_path = None
 
     def substitute_environ(self):
         """
@@ -71,9 +71,9 @@ class Settings:
                 setattr(self, attr_name, env_var)
             elif is_required and attr_name not in self._custom_settings:
                 raise RuntimeError(
-                    'The required environment variable "{0}" is currently not set, '
+                    f'The required environment variable "{env_var_name}" is currently not set, '
                     "you'll need to run `source activate.settings.sh` "
                     "or you can set that single environment variable with "
-                    '`export {0}="<value>"` or pass variable in `custom_settings` '
-                    "argument".format(env_var_name)
+                    f'`export {env_var_name}="<value>"` or pass variable in `custom_settings` '
+                    "argument"
                 )

aidbox_python_sdk-0.1.9/aidbox_python_sdk/types.py

@@ -0,0 +1,16 @@
+from typing_extensions import TypedDict
+
+from aidbox_python_sdk.aidboxpy import AsyncAidboxClient
+from aidbox_python_sdk.db import DBProxy
+from aidbox_python_sdk.sdk import SDK
+
+
+class SDKOperationRequestApp(TypedDict):
+    client: AsyncAidboxClient
+    db: DBProxy
+    sdk: SDK
+
+
+SDKOperationRequest = TypedDict(
+    "SDKOperationRequest", {"app": SDKOperationRequestApp, "route-params": dict, "resource": dict}
+)

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9/aidbox_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aidbox-python-sdk
-Version: 0.1.7
+Version: 0.1.9
 Summary: Aidbox SDK for python
 Author-email: "beda.software" <aidbox-python-sdk@beda.software>
 License: MIT License
@@ -35,33 +35,43 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE.md
+Requires-Dist: aiohttp>=3.6.2
+Requires-Dist: SQLAlchemy>=1.3.10
+Requires-Dist: fhirpy>=1.3.0
+Requires-Dist: jsonschema>=4.4.0
 Provides-Extra: test
+Requires-Dist: pytest~=6.0.0; extra == "test"
+Requires-Dist: pytest-asyncio~=0.20.0; extra == "test"
+Requires-Dist: pytest-aiohttp~=1.0.4; extra == "test"
+Requires-Dist: pytest-cov~=4.0.0; extra == "test"
 Provides-Extra: dev
-License-File: LICENSE.md
+Requires-Dist: black; extra == "dev"
+Requires-Dist: autohooks; extra == "dev"
+Requires-Dist: autohooks-plugin-ruff; extra == "dev"
+Requires-Dist: autohooks-plugin-black; extra == "dev"
 
 [![build status](https://github.com/Aidbox/aidbox-python-sdk/actions/workflows/build.yaml/badge.svg)](https://github.com/Aidbox/aidbox-python-sdk/actions/workflows/build.yaml)
 [![pypi](https://img.shields.io/pypi/v/aidbox-python-sdk.svg)](https://pypi.org/project/aidbox-python-sdk/)
-[![Supported Python version](https://img.shields.io/badge/python-3.8+-blue.svg)](https://www.python.org/downloads/release/python-380/)
+[![Supported Python version](https://img.shields.io/badge/python-3.9+-blue.svg)](https://www.python.org/downloads/release/python-390/)
 
 # aidbox-python-sdk
 
-1. Create a python 3.8+ environment `pyenv `
+1. Create a python 3.9+ environment `pyenv `
 2. Set env variables and activate virtual environment `source activate_settings.sh`
 2. Install the required packages with `pipenv install --dev`
 3. Make sure the app's settings are configured correctly (see `activate_settings.sh` and `aidbox_python_sdk/settings.py`). You can also
  use environment variables to define sensitive settings, eg. DB connection variables (see example `.env-ptl`)
 4. You can then run example with `python example.py`.
 
-Add `APP_FAST_START_MODE=TRUE` to env_tests for fast start mode.
-
 # Getting started
 ## Minimal application
 ```Python

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/aidbox_python_sdk.egg-info/SOURCES.txt

@@ -7,12 +7,12 @@ aidbox_python_sdk/aidboxpy.py
 aidbox_python_sdk/db.py
 aidbox_python_sdk/db_migrations.py
 aidbox_python_sdk/exceptions.py
-aidbox_python_sdk/gunicorn.py
 aidbox_python_sdk/handlers.py
 aidbox_python_sdk/main.py
 aidbox_python_sdk/pytest_plugin.py
 aidbox_python_sdk/sdk.py
 aidbox_python_sdk/settings.py
+aidbox_python_sdk/types.py
 aidbox_python_sdk.egg-info/PKG-INFO
 aidbox_python_sdk.egg-info/SOURCES.txt
 aidbox_python_sdk.egg-info/dependency_links.txt

aidbox_python_sdk-0.1.9/aidbox_python_sdk.egg-info/requires.txt

@@ -0,0 +1,16 @@
+aiohttp>=3.6.2
+SQLAlchemy>=1.3.10
+fhirpy>=1.3.0
+jsonschema>=4.4.0
+
+[dev]
+black
+autohooks
+autohooks-plugin-ruff
+autohooks-plugin-black
+
+[test]
+pytest~=6.0.0
+pytest-asyncio~=0.20.0
+pytest-aiohttp~=1.0.4
+pytest-cov~=4.0.0

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/pyproject.toml

@@ -7,7 +7,7 @@ log_cli_level = "INFO"
 
 [tool.autohooks]
 mode = "pipenv"
-pre-commit = ["autohooks.plugins.black", "autohooks.plugins.isort"]
+pre-commit = ["autohooks.plugins.black", "autohooks.plugins.ruff"]
 
 [tool.black]
 line-length = 100
@@ -23,10 +23,23 @@ exclude = '''
 )
 '''
 
-[tool.isort]
-profile = "black"
-line_length = 100
-skip = [".gitignore"]
+[tool.ruff]
+target-version = "py311"
+line-length = 100
+extend-exclude = ["example"]
+
+[tool.ruff.lint]
+select = ["I", "E", "F", "N", "B", "C4", "PT", "UP", "I001", "A", "RET", "TID251", "RUF", "SIM", "PYI", "T20", "PIE", "G", "ISC", "PL"]
+# E501 is disabled because line limit is controlled by black
+# RUF005 is disabled because we use asyncio tasks without cancelling
+# RUF015 is disabled because index access is preferred way for us
+# RUF019 is disabled because it's needed for pyright
+# PIE804 is disabled because we often use FHIR like camelCase variables
+# SIM102 is disabled because nested if's are more readable
+# SIM117 is disabled because nested with's are more readable
+ignore = ["E501", "RUF006", "RUF015", "RUF019", "PIE804", "SIM102", "SIM117", "PLR2004"]
+unfixable = ["F401"]
+
 
 [tool.setuptools]
 zip-safe = false
@@ -50,11 +63,9 @@ authors = [
   { name = "beda.software", email = "aidbox-python-sdk@beda.software" },
 ]
 dependencies = [
-  "uvloop>=0.13.0",
   "aiohttp>=3.6.2",
   "SQLAlchemy>=1.3.10",
   "fhirpy>=1.3.0",
-  "coloredlogs",
   "jsonschema>=4.4.0",
 ]
 classifiers = [
@@ -64,10 +75,10 @@ classifiers = [
   "Operating System :: OS Independent",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Topic :: Internet :: WWW/HTTP",
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
@@ -75,16 +86,15 @@ requires-python = ">=3.8"
 
 [project.optional-dependencies]
 test = [
-  "pytest>=6.0.0",
-  "pytest-asyncio>=0.20.0",
-  "pytest-aiohttp>=1.0.4",
-  "pytest-cov>=4.0.0",
+  "pytest~=6.0.0",
+  "pytest-asyncio~=0.20.0",
+  "pytest-aiohttp~=1.0.4",
+  "pytest-cov~=4.0.0"
 ]
 dev = [
   "black",
-  "isort",
   "autohooks",
-  "autohooks-plugin-isort",
+  "autohooks-plugin-ruff",
   "autohooks-plugin-black",
 ]
 

{aidbox-python-sdk-0.1.7 → aidbox_python_sdk-0.1.9}/tests/test_sdk.py

@@ -1,13 +1,13 @@
 import asyncio
-import pytest
 import logging
-from aiohttp import web, ClientSession, BasicAuth
 from unittest import mock
 
+import pytest
+
 import main
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio()
 async def test_health_check(client):
     resp = await client.get("/health")
     assert resp.status == 200
@@ -15,7 +15,7 @@ async def test_health_check(client):
     assert json == {"status": "OK"}
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio()
 async def test_live_health_check(client):
     resp = await client.get("/live")
     assert resp.status == 200
@@ -23,7 +23,7 @@ async def test_live_health_check(client):
     assert json == {"status": "OK"}
 
 
-@pytest.mark.skip
+@pytest.mark.skip()
 async def test_signup_reg_op(client, aidbox):
     resp = await aidbox.post("signup/register/21.02.19/testvalue")
     assert resp.status == 200
@@ -34,7 +34,7 @@ async def test_signup_reg_op(client, aidbox):
     }
 
 
-@pytest.mark.skip
+@pytest.mark.skip()
 async def test_appointment_sub(client, aidbox):
     with mock.patch.object(main, "_appointment_sub") as appointment_sub:
         f = asyncio.Future()
@@ -65,7 +65,7 @@ async def test_appointment_sub(client, aidbox):
         assert expected["resource"].items() <= event["resource"].items()
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio()
 async def test_database_isolation__1(aidbox_client, safe_db):
     patients = await aidbox_client.resources("Patient").fetch_all()
     assert len(patients) == 2
@@ -77,7 +77,7 @@ async def test_database_isolation__1(aidbox_client, safe_db):
     assert len(patients) == 3
 
 
-@pytest.mark.asyncio
+@pytest.mark.asyncio()
 async def test_database_isolation__2(aidbox_client, safe_db):
     patients = await aidbox_client.resources("Patient").fetch_all()
     assert len(patients) == 2

aidbox-python-sdk-0.1.7/aidbox_python_sdk/gunicorn.py

@@ -1,20 +0,0 @@
-"""
-This file allows your to serve your application using gunicorn. gunicorn is not installed by default
-by the requirements file adev creates, you'll need to install it yourself and add it to requirements.txt.
-
-To run the aidbox_python_sdk using gunicorn, in the terminal run
-
-    pip install gunicorn
-    gunicorn aidbox_python_sdk.gunicorn:aidbox_python_sdk --worker-class aiohttp.worker.GunicornWebWorker
-
-You could use a variant of the above with heroku (in the `Procfile`) or with Docker in the ENTRYPOINT statement.
-"""
-import asyncio
-import uvloop
-
-from .main import create_app
-
-uvloop.install()
-loop = asyncio.get_event_loop()
-
-app = loop.run_until_complete(create_app())

aidbox-python-sdk-0.1.7/aidbox_python_sdk.egg-info/requires.txt

@@ -1,19 +0,0 @@
-uvloop>=0.13.0
-aiohttp>=3.6.2
-SQLAlchemy>=1.3.10
-fhirpy>=1.3.0
-coloredlogs
-jsonschema>=4.4.0
-
-[dev]
-black
-isort
-autohooks
-autohooks-plugin-isort
-autohooks-plugin-black
-
-[test]
-pytest>=6.0.0
-pytest-asyncio>=0.20.0
-pytest-aiohttp>=1.0.4
-pytest-cov>=4.0.0