aidbox-python-sdk 0.1.13__tar.gz → 0.1.15__tar.gz

{aidbox_python_sdk-0.1.13/aidbox_python_sdk.egg-info → aidbox_python_sdk-0.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: aidbox-python-sdk
-Version: 0.1.13
+Version: 0.1.15
 Summary: Aidbox SDK for python
 Author-email: "beda.software" <aidbox-python-sdk@beda.software>
 License: MIT License
@@ -58,6 +58,7 @@ Requires-Dist: black; extra == "dev"
 Requires-Dist: autohooks; extra == "dev"
 Requires-Dist: autohooks-plugin-ruff; extra == "dev"
 Requires-Dist: autohooks-plugin-black; extra == "dev"
+Dynamic: license-file
 
 [![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/)

{aidbox_python_sdk-0.1.13 → aidbox_python_sdk-0.1.15}/aidbox_python_sdk/__init__.py

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

{aidbox_python_sdk-0.1.13 → aidbox_python_sdk-0.1.15}/aidbox_python_sdk/db.py

@@ -140,7 +140,7 @@ class DBProxy:
         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"]]
+            return [entry["resource"]["id"] for entry in json_resp.get("entry", [])]
 
     async def _init_table_cache(self):
         table_names = await self._get_all_entities_name()

{aidbox_python_sdk-0.1.13 → aidbox_python_sdk-0.1.15}/aidbox_python_sdk/sdk.py

@@ -1,11 +1,13 @@
 import asyncio
 import logging
+from typing import Optional
 
 import jsonschema
 from fhirpy.base.exceptions import OperationOutcome
 
 from .aidboxpy import AsyncAidboxClient
 from .db_migrations import sdk_migrations
+from .types import Compliance
 
 logger = logging.getLogger("aidbox_sdk")
 
@@ -151,6 +153,7 @@ class SDK:
         access_policy=None,
         request_schema=None,
         timeout=None,
+        compliance: Optional[Compliance] = None,
     ):
         if public and access_policy is not None:
             raise ValueError("Operation might be public or have access policy, not both")
@@ -184,6 +187,7 @@ class SDK:
                     "method": method,
                     "path": path,
                     **({"timeout": timeout} if timeout else {}),
+                    **(compliance if compliance else {}),
                 }
                 self._operation_handlers[operation_id] = wrapped_func
                 if public is True:

{aidbox_python_sdk-0.1.13 → aidbox_python_sdk-0.1.15}/aidbox_python_sdk/types.py

@@ -1,8 +1,13 @@
-from typing import Any
+from typing import Any, List
 
 from aiohttp import web
 from typing_extensions import TypedDict
 
+class Compliance(TypedDict, total=True):
+    fhirUrl: str
+    fhirCode: str
+    fhirResource: List[str]
+
 SDKOperationRequest = TypedDict(
     "SDKOperationRequest",
     {"app": web.Application, "params": dict, "route-params": dict, "headers": dict, "resource": Any},

{aidbox_python_sdk-0.1.13 → aidbox_python_sdk-0.1.15/aidbox_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: aidbox-python-sdk
-Version: 0.1.13
+Version: 0.1.15
 Summary: Aidbox SDK for python
 Author-email: "beda.software" <aidbox-python-sdk@beda.software>
 License: MIT License
@@ -58,6 +58,7 @@ Requires-Dist: black; extra == "dev"
 Requires-Dist: autohooks; extra == "dev"
 Requires-Dist: autohooks-plugin-ruff; extra == "dev"
 Requires-Dist: autohooks-plugin-black; extra == "dev"
+Dynamic: license-file
 
 [![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/)

{aidbox_python_sdk-0.1.13 → aidbox_python_sdk-0.1.15}/tests/test_sdk.py

@@ -3,10 +3,38 @@ import logging
 from unittest import mock
 
 import pytest
+from fhirpathpy import evaluate
 
 import main
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("expression", "expected"),
+    [
+        (
+            "CapabilityStatement.rest.operation.where(definition='http://test.com').count()",
+            1,
+        ),
+        (
+            "CapabilityStatement.rest.operation.where(definition='http://test.com').first().name",
+            "observation-custom-op",
+        ),
+        (
+            "CapabilityStatement.rest.resource.where(type='Observation').operation.where(definition='http://test.com').count()",
+            1,
+        ),
+        (
+            "CapabilityStatement.rest.resource.where(type='Observation').operation.where(definition='http://test.com').first().name",
+            "observation-custom-op",
+        ),
+    ],
+)
+async def test_operation_with_compliance_params(aidbox_client, expression, expected):
+    response = await aidbox_client.execute("fhir/metadata", method="GET")
+    assert evaluate(response, expression, {})[0] == expected
+
+
 @pytest.mark.asyncio()
 async def test_health_check(client):
     resp = await client.get("/health")