aidbox-python-sdk 0.2.0__tar.gz → 0.2.1__tar.gz

{aidbox_python_sdk-0.2.0/aidbox_python_sdk.egg-info → aidbox_python_sdk-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aidbox-python-sdk
-Version: 0.2.0
+Version: 0.2.1
 Summary: Aidbox SDK for python
 Author-email: "beda.software" <aidbox-python-sdk@beda.software>
 License: MIT License
@@ -251,13 +251,6 @@ In your project’s **`conftest.py`** (e.g. `tests/conftest.py`), register the p
 pytest_plugins = ["aidbox_python_sdk.pytest_plugin"]
 ```
 
-Alternatively you can configure it in **`pyproject.toml`**:
-
-```toml
-[tool.pytest.ini_options]
-pytest_plugins = ["aidbox_python_sdk.pytest_plugin"]
-```
-
 ### Configuring the app factory
 
 The plugin needs your app factory (the callable that returns the `web.Application`). You can set it in pytest ini:
@@ -265,7 +258,6 @@ The plugin needs your app factory (the callable that returns the `web.Applicatio
 **`pyproject.toml`**
 ```toml
 [tool.pytest.ini_options]
-pytest_plugins = ["aidbox_python_sdk.pytest_plugin"]
 aidbox_create_app = "main:create_app"
 ```
 
@@ -317,8 +309,9 @@ Example:
 ```python
 @pytest.mark.asyncio
 async def test_patient_subscription(aidbox_client, safe_db, sdk):
+    was_patient_sub_triggered = sdk.was_subscription_triggered("Patient")
     patient = await aidbox_client.resource("Patient", name=[{"family": "Test"}]).save()
-    await sdk.was_subscription_triggered("Patient")
+    await was_patient_sub_triggered
     # assertions...
 ```
 

{aidbox_python_sdk-0.2.0 → aidbox_python_sdk-0.2.1}/README.md

@@ -189,13 +189,6 @@ In your project’s **`conftest.py`** (e.g. `tests/conftest.py`), register the p
 pytest_plugins = ["aidbox_python_sdk.pytest_plugin"]
 ```
 
-Alternatively you can configure it in **`pyproject.toml`**:
-
-```toml
-[tool.pytest.ini_options]
-pytest_plugins = ["aidbox_python_sdk.pytest_plugin"]
-```
-
 ### Configuring the app factory
 
 The plugin needs your app factory (the callable that returns the `web.Application`). You can set it in pytest ini:
@@ -203,7 +196,6 @@ The plugin needs your app factory (the callable that returns the `web.Applicatio
 **`pyproject.toml`**
 ```toml
 [tool.pytest.ini_options]
-pytest_plugins = ["aidbox_python_sdk.pytest_plugin"]
 aidbox_create_app = "main:create_app"
 ```
 
@@ -255,8 +247,9 @@ Example:
 ```python
 @pytest.mark.asyncio
 async def test_patient_subscription(aidbox_client, safe_db, sdk):
+    was_patient_sub_triggered = sdk.was_subscription_triggered("Patient")
     patient = await aidbox_client.resource("Patient", name=[{"family": "Test"}]).save()
-    await sdk.was_subscription_triggered("Patient")
+    await was_patient_sub_triggered
     # assertions...
 ```
 

{aidbox_python_sdk-0.2.0 → aidbox_python_sdk-0.2.1}/aidbox_python_sdk/__init__.py

@@ -1,5 +1,5 @@
 __title__ = "aidbox-python-sdk"
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 __author__ = "beda.software"
 __license__ = "None"
 __copyright__ = "Copyright 2024 beda.software"

{aidbox_python_sdk-0.2.0 → aidbox_python_sdk-0.2.1}/aidbox_python_sdk/handlers.py

@@ -1,9 +1,10 @@
 import asyncio
+import json
 import logging
 from typing import Any
 
 from aiohttp import web
-from fhirpy.base.exceptions import OperationOutcome
+from fhirpy.base.exceptions import BaseFHIRError, OperationOutcome
 
 from . import app_keys as ak
 
@@ -48,6 +49,12 @@ async def operation(request: web.Request, data: dict[str, Any]):
         return result
     except OperationOutcome as exc:
         return web.json_response(exc.resource, status=422)
+    except BaseFHIRError as exc:
+        try:
+            payload = json.loads(str(exc))
+            return web.json_response(payload, status=422)
+        except (json.JSONDecodeError, TypeError):
+            return web.Response(text=str(exc), status=422, content_type="text/plain")
 
 
 TYPES = {
@@ -59,10 +66,10 @@ TYPES = {
 @routes.post("/aidbox")
 async def dispatch(request):
     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 `%s` handler", json["type"])
-        return await TYPES[json["type"]](request, json)
+    data = await request.json()
+    if "type" in data and data["type"] in TYPES:
+        logger.debug("Dispatch to `%s` handler", data["type"])
+        return await TYPES[data["type"]](request, data)
     req = {
         "method": request.method,
         "url": str(request.url),

{aidbox_python_sdk-0.2.0 → aidbox_python_sdk-0.2.1/aidbox_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aidbox-python-sdk
-Version: 0.2.0
+Version: 0.2.1
 Summary: Aidbox SDK for python
 Author-email: "beda.software" <aidbox-python-sdk@beda.software>
 License: MIT License
@@ -251,13 +251,6 @@ In your project’s **`conftest.py`** (e.g. `tests/conftest.py`), register the p
 pytest_plugins = ["aidbox_python_sdk.pytest_plugin"]
 ```
 
-Alternatively you can configure it in **`pyproject.toml`**:
-
-```toml
-[tool.pytest.ini_options]
-pytest_plugins = ["aidbox_python_sdk.pytest_plugin"]
-```
-
 ### Configuring the app factory
 
 The plugin needs your app factory (the callable that returns the `web.Application`). You can set it in pytest ini:
@@ -265,7 +258,6 @@ The plugin needs your app factory (the callable that returns the `web.Applicatio
 **`pyproject.toml`**
 ```toml
 [tool.pytest.ini_options]
-pytest_plugins = ["aidbox_python_sdk.pytest_plugin"]
 aidbox_create_app = "main:create_app"
 ```
 
@@ -317,8 +309,9 @@ Example:
 ```python
 @pytest.mark.asyncio
 async def test_patient_subscription(aidbox_client, safe_db, sdk):
+    was_patient_sub_triggered = sdk.was_subscription_triggered("Patient")
     patient = await aidbox_client.resource("Patient", name=[{"family": "Test"}]).save()
-    await sdk.was_subscription_triggered("Patient")
+    await was_patient_sub_triggered
     # assertions...
 ```
 

{aidbox_python_sdk-0.2.0 → aidbox_python_sdk-0.2.1}/tests/test_sdk.py

@@ -4,6 +4,7 @@ from unittest import mock
 
 import pytest
 from fhirpathpy import evaluate
+from fhirpy.base.exceptions import OperationOutcome
 
 import main
 from aidbox_python_sdk.db import DBProxy
@@ -182,10 +183,28 @@ async def test_aidbox_db_fixture(client, aidbox_db: DBProxy, safe_db):
     """
     Test that aidbox_db fixture works with isolated DB Proxy from app's instance
     """
-    response = await client.get("/db_tests")
+    response = await client.get("/db-tests")
     assert response.status == 200
     json = await response.json()
     assert json == [{"id": "app-test"}]
 
     app_ids = await main.get_app_ids(aidbox_db)
     assert app_ids == [{"id": "app-test"}]
+
+
+async def test_operation_base_fhir_error_json_test_op(aidbox_client):
+    with pytest.raises(OperationOutcome) as exc:
+        await aidbox_client.execute("/$base-fhir-error-json-test")
+    assert exc.value.resource.get("issue")[0].get("diagnostics") == "Resource Patient/id not found"
+
+
+async def test_operation_base_fhir_error_text_test_op(aidbox_client):
+    with pytest.raises(OperationOutcome) as exc:
+        await aidbox_client.execute("/$base-fhir-error-text-test")
+    assert exc.value.resource.get("issue")[0].get("diagnostics") == "plain"
+
+
+async def test_operation_outcome_test_op(aidbox_client):
+    with pytest.raises(OperationOutcome) as exc:
+        await aidbox_client.execute("/$operation-outcome-test")
+    assert exc.value.resource.get("issue")[0].get("diagnostics") == "test reason"