aidbox-python-sdk 0.1.16__tar.gz → 0.1.18__tar.gz

{aidbox_python_sdk-0.1.16/aidbox_python_sdk.egg-info → aidbox_python_sdk-0.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aidbox-python-sdk
-Version: 0.1.16
+Version: 0.1.18
 Summary: Aidbox SDK for python
 Author-email: "beda.software" <aidbox-python-sdk@beda.software>
 License: MIT License
@@ -44,15 +44,15 @@ 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: aiohttp>=3.11.0
 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"
+Requires-Dist: pytest~=8.4.1; extra == "test"
+Requires-Dist: pytest-asyncio~=1.1.0; extra == "test"
+Requires-Dist: pytest-aiohttp~=1.1.0; extra == "test"
+Requires-Dist: pytest-cov~=6.2.1; extra == "test"
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: autohooks; extra == "dev"

{aidbox_python_sdk-0.1.16 → aidbox_python_sdk-0.1.18}/aidbox_python_sdk/__init__.py

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

{aidbox_python_sdk-0.1.16 → aidbox_python_sdk-0.1.18}/aidbox_python_sdk/db.py

@@ -136,11 +136,21 @@ class DBProxy:
         return await self.raw_sql(query, execute=execute)
 
     async def _get_all_entities_name(self):
-        # TODO: refactor using StructureDefintion
+        result = None
+
+        #Support legacy instalations with entity attribute data structure
         query_url = f"{self._settings.APP_INIT_URL}/Entity?type=resource&_elements=id&_count=999"
         async with self._client.get(query_url) as resp:
             json_resp = await resp.json()
-            return [entry["resource"]["id"] for entry in json_resp.get("entry", [])]
+            result = [entry["resource"]["id"] for entry in json_resp.get("entry", [])]
+
+        if result is None or len(result) == 0:
+            # Load resource type from fhir schema
+            query_url = f"{self._settings.APP_INIT_URL}/$resource-types"
+            async with self._client.get(query_url) as resp:
+                json_resp = await resp.json()
+                result = list(json_resp.keys())
+        return result or []
 
     async def _init_table_cache(self):
         table_names = await self._get_all_entities_name()

{aidbox_python_sdk-0.1.16 → aidbox_python_sdk-0.1.18}/aidbox_python_sdk/pytest_plugin.py

@@ -2,7 +2,6 @@ import os
 from typing import cast
 
 import pytest
-import pytest_asyncio
 from aiohttp import BasicAuth, ClientSession, web
 from yarl import URL
 
@@ -19,10 +18,10 @@ async def start_app(aiohttp_client):
     return app
 
 
-@pytest.fixture()
-def client(event_loop, aiohttp_client):
+@pytest.fixture
+async def client(aiohttp_client):
     """Instance of app's server and client"""
-    return event_loop.run_until_complete(start_app(aiohttp_client))
+    return await start_app(aiohttp_client)
 
 
 class AidboxSession(ClientSession):
@@ -40,7 +39,7 @@ class AidboxSession(ClientSession):
         return await super()._request(method, url, *args, **kwargs)
 
 
-@pytest_asyncio.fixture
+@pytest.fixture
 async def aidbox(client):
     """HTTP client for making requests to Aidbox"""
     app = cast(web.Application, client.server.app)
@@ -53,7 +52,7 @@ async def aidbox(client):
     await session.close()
 
 
-@pytest_asyncio.fixture
+@pytest.fixture
 async def safe_db(aidbox, client, sdk):
     resp = await aidbox.post(
         "/$psql",
@@ -75,16 +74,16 @@ async def safe_db(aidbox, client, sdk):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def sdk(client):
     return cast(web.Application, client.server.app)[ak.sdk]
 
 
-@pytest.fixture()
+@pytest.fixture
 def aidbox_client(client):
     return cast(web.Application, client.server.app)[ak.client]
 
 
-@pytest.fixture()
+@pytest.fixture
 def aidbox_db(client):
     return cast(web.Application, client.server.app)[ak.db]

{aidbox_python_sdk-0.1.16 → aidbox_python_sdk-0.1.18/aidbox_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aidbox-python-sdk
-Version: 0.1.16
+Version: 0.1.18
 Summary: Aidbox SDK for python
 Author-email: "beda.software" <aidbox-python-sdk@beda.software>
 License: MIT License
@@ -44,15 +44,15 @@ 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: aiohttp>=3.11.0
 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"
+Requires-Dist: pytest~=8.4.1; extra == "test"
+Requires-Dist: pytest-asyncio~=1.1.0; extra == "test"
+Requires-Dist: pytest-aiohttp~=1.1.0; extra == "test"
+Requires-Dist: pytest-cov~=6.2.1; extra == "test"
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: autohooks; extra == "dev"

{aidbox_python_sdk-0.1.16 → aidbox_python_sdk-0.1.18}/aidbox_python_sdk.egg-info/requires.txt

@@ -1,4 +1,4 @@
-aiohttp>=3.6.2
+aiohttp>=3.11.0
 SQLAlchemy>=1.3.10
 fhirpy>=1.3.0
 jsonschema>=4.4.0
@@ -10,7 +10,7 @@ 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
+pytest~=8.4.1
+pytest-asyncio~=1.1.0
+pytest-aiohttp~=1.1.0
+pytest-cov~=6.2.1

{aidbox_python_sdk-0.1.16 → aidbox_python_sdk-0.1.18}/pyproject.toml

@@ -1,9 +1,10 @@
 [tool.pytest.ini_options]
-minversion = "6.0"
+minversion = "8.4"
 addopts = "-ra -q --color=yes"
 testpaths = ["tests"]
 log_cli = true
 log_cli_level = "INFO"
+asyncio_mode = "auto"
 
 [tool.autohooks]
 mode = "pipenv"
@@ -63,7 +64,7 @@ authors = [
   { name = "beda.software", email = "aidbox-python-sdk@beda.software" },
 ]
 dependencies = [
-  "aiohttp>=3.6.2",
+  "aiohttp>=3.11.0",
   "SQLAlchemy>=1.3.10",
   "fhirpy>=1.3.0",
   "jsonschema>=4.4.0",
@@ -86,10 +87,10 @@ 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~=8.4.1",
+  "pytest-asyncio~=1.1.0",
+  "pytest-aiohttp~=1.1.0",
+  "pytest-cov~=6.2.1"
 ]
 dev = [
   "black",