kalbio 0.2.2__py3-none-any.whl → 0.2.3__py3-none-any.whl

kalbio/activities.py

@@ -65,7 +65,7 @@ from kalbio.entity_fields import DataFieldTypeEnum
 from kalbio.programs import Program
 from kalbio.labels import Label
 from kalbio.workspace import WorkspaceUser, WorkspaceGroup
-from typing import Any, BinaryIO, List, Literal, Optional, Union
+from typing import Any, BinaryIO, List, Literal, Optional, TypeAlias, Union
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -153,7 +153,7 @@ class ActivityStatusEnum(str, Enum):
     DONE = "done"
 
 
-type ActivityType = Union[
+ActivityType: TypeAlias = Union[
     Literal["task"],
     Literal["experiment"],
     Literal["project"],
@@ -671,7 +671,7 @@ class Activity(_KaleidoscopeBaseModel):
             setattr(self, k, v)
 
 
-type ActivityIdentifier = Union[Activity, str]
+ActivityIdentifier: TypeAlias = Union[Activity, str]
 """Identifier class for Activity
 
 Activities are able to be identified by:
@@ -681,7 +681,7 @@ Activities are able to be identified by:
 * UUID
 """
 
-type DefinitionIdentifier = Union[ActivityDefinition, str]
+DefinitionIdentifier: TypeAlias = Union[ActivityDefinition, str]
 """Identifier class for ActivityDefinition
 
 ActivityDefinitions are able to be identified by:

kalbio/client.py

@@ -119,6 +119,7 @@ class KaleidoscopeClient:
 
     _client_id: str
     _client_secret: str
+    _additional_headers: dict
     _iap_client_id: Optional[str]
 
     _refresh_token: str = None
@@ -133,6 +134,7 @@ class KaleidoscopeClient:
         client_id: Optional[str] = _env_client_id,
         client_secret: Optional[str] = _env_client_secret,
         url: str = PROD_API_URL,
+        additional_headers: dict = {},
         iap_client_id: Optional[str] = None,
         verify_ssl: bool = True,
     ):
@@ -206,6 +208,7 @@ class KaleidoscopeClient:
 
         self._client_id = client_id
         self._client_secret = client_secret
+        self.additional_headers = additional_headers
         self._iap_client_id = iap_client_id
         self._verify_ssl = verify_ssl
 
@@ -258,7 +261,7 @@ class KaleidoscopeClient:
                 "client_id": self._client_id,
                 "client_secret": self._client_secret,
             },
-            headers=self._get_iap_headers(),
+            headers={**self._get_iap_headers(), **self.additional_headers},
             timeout=TIMEOUT_MAXIMUM,
             verify=self._verify_ssl,
         )
@@ -284,7 +287,7 @@ class KaleidoscopeClient:
                 "grant_type": "refresh_token",
                 "refresh_token": self._refresh_token,
             },
-            headers=self._get_iap_headers(),
+            headers={**self._get_iap_headers(), **self.additional_headers},
             timeout=TIMEOUT_MAXIMUM,
             verify=self._verify_ssl,
         )
@@ -327,6 +330,7 @@ class KaleidoscopeClient:
             "Content-Type": "application/json",
             "X-Kal-Authorization": f"Bearer {self._access_token}",
             **self._get_iap_headers(),
+            **self.additional_headers,
         }
 
         return headers

kalbio/dashboards.py

@@ -21,11 +21,11 @@ from functools import lru_cache
 from kalbio._kaleidoscope_model import _KaleidoscopeBaseModel
 from kalbio.client import KaleidoscopeClient
 from pydantic import TypeAdapter
-from typing import List, Literal, Union
+from typing import List, Literal, TypeAlias, Union
 
 _logger = logging.getLogger(__name__)
 
-type DashboardType = Union[
+DashboardType: TypeAlias = Union[
     Literal["decision"],
     Literal["data"],
     Literal["chart"],

kalbio/entity_fields.py

@@ -41,7 +41,7 @@ from functools import lru_cache
 from kalbio._kaleidoscope_model import _KaleidoscopeBaseModel
 from kalbio.client import KaleidoscopeClient
 from pydantic import TypeAdapter
-from typing import List, Optional, Union
+from typing import List, Optional, TypeAlias, Union
 
 _logger = logging.getLogger(__name__)
 
@@ -151,7 +151,7 @@ class EntityField(_KaleidoscopeBaseModel):
         return f"{self.field_name}"
 
 
-type EntityFieldIdentifier = Union[EntityField, str]
+EntityFieldIdentifier: TypeAlias = Union[EntityField, str]
 """An Identifier Type for Entity Fields.
 
 An EntityField should be able to be identified by:

kalbio/exports.py

@@ -119,7 +119,7 @@ class ExportsService:
         url = "/records/export/csv"
         file = self._client._get_file(
             url,
-            f"{download_path if download_path else "/tmp"}/{filename}",
+            f"{download_path if download_path else '/tmp'}/{filename}",
             params,
         )
 

kalbio/records.py

@@ -62,6 +62,7 @@ from typing import (
     Dict,
     List,
     Optional,
+    TypeAlias,
     TypedDict,
     Union,
     Unpack,
@@ -631,7 +632,7 @@ class Record(_KaleidoscopeBaseModel):
             setattr(self, k, v)
 
 
-type RecordIdentifier = Union[Record, str, dict[EntityFieldIdentifier, str]]
+RecordIdentifier: TypeAlias = Union[Record, str, dict[EntityFieldIdentifier, str]]
 """Identifier type for Record
 
 Record can be identified by:
@@ -1154,7 +1155,7 @@ class RecordsService:
         ]
         # fmt: on
 
-        resp = self._client._get(f"/records?record_ids={",".join(to_fetch)}") or []
+        resp = self._client._get(f"/records?record_ids={','.join(to_fetch)}") or []
         self._create_record_list(resp)
 
         ordered = [

{kalbio-0.2.2.dist-info → kalbio-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kalbio
-Version: 0.2.2
+Version: 0.2.3
 Summary: Python client for kaleidoscope.bio
 License: MIT
 Author: Ahmed Elnaiem

{kalbio-0.2.2.dist-info → kalbio-0.2.3.dist-info}/RECORD

@@ -1,19 +1,19 @@
 kalbio/__init__.py,sha256=6Po_T4MM5m2qNTYgLe4E89C57OVwDaRQ9pXTJTuJsM4,240
 kalbio/_kaleidoscope_model.py,sha256=UnSpiubaEkoyOLjAmKzQGZdXOUMthuP0HiYU1Lo2sFM,4465
-kalbio/activities.py,sha256=-nzP-ufCs4-R4JeuZHv7-5Mb539ObBb5vEYoq--oS8U,40625
-kalbio/client.py,sha256=VmBkqzf24YhPdT5W0AIL1dA62x0tMVVzuyDBod53TXg,20263
-kalbio/dashboards.py,sha256=0P8lNiTmyaQj0y8B7AKf1VWU0qHuTUGJ_4xDVtr9jXA,9334
-kalbio/entity_fields.py,sha256=HnvOSE9C_UB59ioY5mB5Sn_V3OwnfRuYZ_IJtEw2vUY,15184
+kalbio/activities.py,sha256=UBvQGvQpuOirkWNX_3MNxNAstfo500PgJ6oVBf7HTCA,40654
+kalbio/client.py,sha256=C6r-yuHqlk-dAq55Ur9y7FrowhLvGSR2qzb5YPvf09k,20486
+kalbio/dashboards.py,sha256=Hj3mFjIBIualk5FXC1CLyLFbfvqGdYYLfdpFeigk1jw,9351
+kalbio/entity_fields.py,sha256=mqE4VP2g1-XR2vLUt1TIvX9Drv71NCCYPKBh03f0zO0,15201
 kalbio/entity_types.py,sha256=THXGbIV9dFU2DvIuDd7Q29onmEs9KdeqsB_tq6ZXmR4,6527
-kalbio/exports.py,sha256=xFdNzajrGUlPZx6tNhgqiUg1lVnrayVQW12d-SmKWA4,5236
+kalbio/exports.py,sha256=IiAk4ZnjU59N4lrKeDRD60ZViOigR0QDd3XcNaWq5O0,5236
 kalbio/helpers.py,sha256=TBPVls1GzfUygDAwCldI5sXYTgBC2pEUSEU0OtrQi3I,1955
 kalbio/imports.py,sha256=s7LIETRQtT6MXEmsbIT2FwFJdE3eh25ujbs4ZFbWYns,3523
 kalbio/labels.py,sha256=Vy7PiZ8vFXIBbrCmdHyz7ANooO0-giTvTLH7WwU_Mo8,2704
 kalbio/programs.py,sha256=svYmZLhN2pwT9cAB8IfvyIbUmFnMVxcoUeeUxs_uESs,2951
 kalbio/property_fields.py,sha256=eCYzSnG-HQB6ECHFNpaGkpm3azHe-lDYVNJUpq5TOtc,2763
 kalbio/record_views.py,sha256=M3NEOhnN4JHA8ZO0I91L9pAVdVY0kmqSent3HehzFTI,7208
-kalbio/records.py,sha256=BXuFCA90ViSMp_TtnWJYfQnJgH9Hz-5u4iT0wF0B1UM,40480
+kalbio/records.py,sha256=sQiGnXQaiS6VNj0n2mn8tw7u8kquHLhcAI5fpHjYL8U,40501
 kalbio/workspace.py,sha256=YpeLtzo3o8um_CQLyTT8GnvkF6I195y43JhNN2GmM0M,11670
-kalbio-0.2.2.dist-info/METADATA,sha256=B5CIP8WiqNcESxiAW7Lp0Q2-CCkDMKfQ2EDn4M6TuEU,7993
-kalbio-0.2.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-kalbio-0.2.2.dist-info/RECORD,,
+kalbio-0.2.3.dist-info/METADATA,sha256=VK7xMMAwxXl-v6kOdNMRisHf2hv3t1rrt74XmSCJb6o,7993
+kalbio-0.2.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+kalbio-0.2.3.dist-info/RECORD,,