🐛 fix deserialization issue of pages (#66)

* fix deserialization issue of pages

* add proper base url to async http client context manager

Author: bisgaard-itis

clients/python/client/osparc/_files_api.py

@@ -91,9 +91,10 @@ async def upload_file_async(self, file: Union[str, Path]) -> File:
 
         tasks: list = []
         async with AsyncHttpClient(
-            exception_request_type="post",
-            exception_url=links.abort_upload,
-            exception_auth=self._auth,
+            base_url=httpx.URL(self.api_client.configuration.host),
+            request_type="post",
+            url=links.abort_upload,
+            auth=self._auth,
         ) as session:
             async for chunck, size in _file_chunk_generator(file, chunk_size):
                 # following https://docs.python.org/3/library/asyncio-task.html#asyncio.create_task

clients/python/client/osparc/_http_client.py

@@ -9,18 +9,17 @@ class AsyncHttpClient:
 
     def __init__(
         self,
-        exception_request_type: Optional[str] = None,
-        exception_url: Optional[str] = None,
-        exception_auth: Optional[httpx.BasicAuth] = None,
+        *,
+        base_url: httpx.URL,
+        request_type: Optional[str] = None,
+        url: Optional[str] = None,
+        auth: Optional[httpx.BasicAuth] = None,
     ):
-        self._client = httpx.AsyncClient()
-        self._exc_callback = (
-            getattr(self._client, exception_request_type)
-            if exception_request_type
-            else None
+        self._client = httpx.AsyncClient(
+            base_url=base_url, auth=auth, follow_redirects=True
         )
-        self._exc_url = exception_url
-        self._exc_auth = exception_auth
+        self._callback = getattr(self._client, request_type) if request_type else None
+        self._url = url
 
     async def __aenter__(self) -> httpx.AsyncClient:
         return self._client
@@ -29,7 +28,7 @@ async def __aexit__(self, exc_type, exc_value, traceback) -> None:
         if exc_value is None:
             await self._client.aclose()
         else:  # exception raised: need to handle
-            if self._exc_callback is not None:
+            if self._callback is not None:
                 try:
                     async for attempt in tenacity.AsyncRetrying(
                         reraise=True,
@@ -38,9 +37,7 @@ async def __aexit__(self, exc_type, exc_value, traceback) -> None:
                         retry=tenacity.retry_if_exception_type(httpx.RequestError),
                     ):
                         with attempt:
-                            response = await self._exc_callback(
-                                self._exc_url, auth=self._exc_auth
-                            )
+                            response = await self._callback(self._url)
                             response.raise_for_status()
                 except Exception as err:
                     await self._client.aclose()

clients/python/client/osparc/_solvers_api.py

@@ -51,7 +51,8 @@ def pagination_method():
             )
 
         return PaginationGenerator(
-            pagination_method,
+            first_page_callback=pagination_method,
+            api_client=self.api_client,
             base_url=self.api_client.configuration.host,
             auth=self._auth,
         )

clients/python/client/osparc/_utils.py

@@ -4,6 +4,7 @@
 
 import httpx
 from osparc_client import (
+    ApiClient,
     File,
     Job,
     PageFile,
@@ -24,12 +25,16 @@ class PaginationGenerator:
     def __init__(
         self,
         first_page_callback: Callable[[], Page],
+        api_client: ApiClient,
         base_url: str,
         auth: Optional[httpx.BasicAuth],
     ):
         self._first_page_callback: Callable[[], Page] = first_page_callback
+        self._api_client: ApiClient = api_client
         self._next_page_url: Optional[str] = None
-        self._client: httpx.Client = httpx.Client(auth=auth, base_url=base_url)
+        self._client: httpx.Client = httpx.Client(
+            auth=auth, base_url=base_url, follow_redirects=True
+        )
 
     def __del__(self):
         self._client.close()
@@ -52,7 +57,7 @@ def __iter__(self) -> Generator[T, None, None]:
             if page.links.next is None:
                 break
             response: httpx.Response = self._client.get(page.links.next)
-            page = type(page)(**response.json())
+            page = self._api_client._ApiClient__deserialize(response.json(), type(page))
 
 
 async def _file_chunk_generator(