pybiolib 1.1.1691__py3-none-any.whl → 1.1.1708__py3-none-any.whl

biolib/__init__.py

@@ -1,5 +1,6 @@
 # Imports to hide
 import os
+from urllib.parse import urlparse as _urlparse
 
 from biolib import typing_utils as _typing_utils
 from biolib.app import BioLibApp as _BioLibApp
@@ -77,6 +78,7 @@ def logout() -> None:
 def set_api_base_url(api_base_url: str) -> None:
     _BioLibApiClient.initialize(base_url=api_base_url)
     biolib.utils.BIOLIB_BASE_URL = api_base_url
+    biolib.utils.BIOLIB_SITE_HOSTNAME = _urlparse(api_base_url).hostname
     biolib.utils.BASE_URL_IS_PUBLIC_BIOLIB = api_base_url.endswith('biolib.com') or (
             os.environ.get('BIOLIB_ENVIRONMENT_IS_PUBLIC_BIOLIB', '').upper() == 'TRUE'
     )
@@ -127,4 +129,4 @@ _logger.configure(default_log_level=_DEFAULT_LOG_LEVEL)
 _logger_no_user_data.configure(default_log_level=_DEFAULT_LOG_LEVEL)
 _configure_requests_certificates()
 
-set_api_base_url(biolib.utils.BIOLIB_BASE_URL)
+set_api_base_url(biolib.utils.load_base_url_from_env())

biolib/biolib_api_client/biolib_account_api.py

@@ -1,21 +1,8 @@
-import requests
-
-from biolib.biolib_api_client.auth import BearerAuth
-from biolib.biolib_api_client import BiolibApiClient
-from biolib.biolib_errors import BioLibError
-
+import biolib.api
 
 class BiolibAccountApi:
 
     @staticmethod
     def fetch_by_handle(account_handle):
-        response = requests.get(
-            f'{BiolibApiClient.get().base_url}/api/account/{account_handle}',
-            auth=BearerAuth(BiolibApiClient.get().access_token),
-            timeout=5
-        )
-
-        if not response.ok:
-            raise BioLibError(response.content.decode())
-
+        response = biolib.api.client.get(path=f'/api/account/{account_handle}')
         return response.json()

biolib/biolib_api_client/biolib_large_file_system_api.py

@@ -1,53 +1,34 @@
-import requests
-
-from biolib.biolib_api_client.auth import BearerAuth
-from biolib.biolib_api_client import BiolibApiClient
+import biolib.api
 from biolib.biolib_api_client.lfs_types import LargeFileSystemVersion, LargeFileSystem
-from biolib.biolib_errors import BioLibError
 
 
 class BiolibLargeFileSystemApi:
 
     @staticmethod
     def create(account_uuid: str, name: str) -> LargeFileSystem:
-        response = requests.post(
-            f'{BiolibApiClient.get().base_url}/api/lfs/',
-            auth=BearerAuth(BiolibApiClient.get().access_token),
-            timeout=5,
-            json={'account_uuid': account_uuid, 'name': name}
+        response = biolib.api.client.post(
+            path='/api/lfs/',
+            data={'account_uuid': account_uuid, 'name': name},
         )
 
-        if not response.ok:
-            raise BioLibError(response.content.decode())
-
         lfs: LargeFileSystem = response.json()
         return lfs
 
     @staticmethod
     def fetch_version(lfs_version_uuid: str) -> LargeFileSystemVersion:
-        response = requests.get(
-            f'{BiolibApiClient.get().base_url}/api/lfs/versions/{lfs_version_uuid}/',
-            auth=BearerAuth(BiolibApiClient.get().access_token),
-            timeout=5,
+        response = biolib.api.client.get(
+            path=f'/api/lfs/versions/{lfs_version_uuid}/',
         )
 
-        if not response.ok:
-            raise BioLibError(response.content.decode())
-
         lfs_version: LargeFileSystemVersion = response.json()
         return lfs_version
 
     @staticmethod
     def create_version(resource_uuid: str) -> LargeFileSystemVersion:
-        response = requests.post(
-            f'{BiolibApiClient.get().base_url}/api/lfs/versions/',
-            auth=BearerAuth(BiolibApiClient.get().access_token),
-            json={'resource_uuid': resource_uuid},
-            timeout=5,
+        response = biolib.api.client.post(
+            path='/api/lfs/versions/',
+            data={'resource_uuid': resource_uuid},
         )
 
-        if not response.ok:
-            raise BioLibError(response.content.decode())
-
         lfs_version: LargeFileSystemVersion = response.json()
         return lfs_version

biolib/utils/__init__.py

@@ -4,8 +4,8 @@ import os
 import time
 import socket
 import sys
-from urllib.parse import urlparse
 
+from typing import Optional
 import requests
 from importlib_metadata import version, PackageNotFoundError
 
@@ -25,7 +25,7 @@ except PackageNotFoundError:
 IS_DEV = os.getenv('BIOLIB_DEV', '').upper() == 'TRUE'
 
 
-def _get_base_url() -> str:
+def load_base_url_from_env() -> str:
     base_url = os.getenv('BIOLIB_BASE_URL')
     if base_url:
         return base_url.lower().rstrip('/')
@@ -53,8 +53,8 @@ def _get_base_url() -> str:
     return 'https://biolib.com'
 
 
-BIOLIB_BASE_URL = _get_base_url()
-BIOLIB_SITE_HOSTNAME = urlparse(BIOLIB_BASE_URL).hostname
+BIOLIB_BASE_URL: Optional[str] = None
+BIOLIB_SITE_HOSTNAME: Optional[str] = None
 
 BIOLIB_CLOUD_BASE_URL = os.getenv('BIOLIB_CLOUD_BASE_URL', '').lower()
 
@@ -66,8 +66,7 @@ BIOLIB_SECRETS_TMPFS_PATH = os.environ.get('BIOLIB_SECRETS_TMPFS_PATH')
 
 IS_RUNNING_IN_CLOUD = BIOLIB_CLOUD_ENVIRONMENT == 'non-enclave'
 
-BASE_URL_IS_PUBLIC_BIOLIB = BIOLIB_BASE_URL.endswith('biolib.com') or \
-                            os.environ.get('BIOLIB_ENVIRONMENT_IS_PUBLIC_BIOLIB', '').upper() == 'TRUE'
+BASE_URL_IS_PUBLIC_BIOLIB: Optional[bool] = None
 
 # sys.stdout is an instance of OutStream in Jupyter and Colab which does not have .buffer
 if not hasattr(sys.stdout, 'buffer'):

{pybiolib-1.1.1691.dist-info → pybiolib-1.1.1708.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pybiolib
-Version: 1.1.1691
+Version: 1.1.1708
 Summary: BioLib Python Client
 Home-page: https://github.com/biolib
 License: MIT

{pybiolib-1.1.1691.dist-info → pybiolib-1.1.1708.dist-info}/RECORD

@@ -1,6 +1,6 @@
 LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
 README.md,sha256=_IH7pxFiqy2bIAmaVeA-iVTyUwWRjMIlfgtUbYTtmls,368
-biolib/__init__.py,sha256=_ydjlp3Kyqr4iWkT63ZdiiwTbqtHjPS2S51EdU0UTk4,3690
+biolib/__init__.py,sha256=ImZ0G02v6kpvzfyz8lPrLp2TdTKobhbaHZXvf8LV8Bg,3819
 biolib/_internal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 biolib/_internal/http_client.py,sha256=CEskk-iJ8J41OllVU-_nPB-Rx8AyZgXELr3MPhGxteE,3906
 biolib/_internal/push_application.py,sha256=NXQNLPucqkq7eKbNCJQA8OYx4CXYHRJ1CG1ViPAJJH4,10680
@@ -13,10 +13,10 @@ biolib/biolib_api_client/__init__.py,sha256=E5EMa19wJoblwSdQPYrxc_BtIeRsAuO0L_jQ
 biolib/biolib_api_client/api_client.py,sha256=oaLqTb208TLRVW4-h_va734TrVDRD3kLpFJ93cwQTxk,7130
 biolib/biolib_api_client/app_types.py,sha256=vEjkpMwaMfz8MxBBZQfWCkxqT7NXxWocB_Oe9WHjJ_g,2425
 biolib/biolib_api_client/auth.py,sha256=BAXtic6DdaA2QjoDVglnO3PFPoBETQbSraTpIwsZbFc,1267
-biolib/biolib_api_client/biolib_account_api.py,sha256=2Mc6SbmjBSsz8lF2H3iiaZHEm47LyI0B4rjmvzxKHt4,580
+biolib/biolib_api_client/biolib_account_api.py,sha256=vRa3bbVfpiAQwpLGAif_PRFydZITlFTYsmDaw1Pg1I8,214
 biolib/biolib_api_client/biolib_app_api.py,sha256=pr52ARrDeB5ioEA7NAjMdmBYb9V2FPy0_URCwdCRZ0A,4397
 biolib/biolib_api_client/biolib_job_api.py,sha256=AvNvflEeCBjG2ZTaFcwvRU-61GdNodFCZQNe50491RM,7823
-biolib/biolib_api_client/biolib_large_file_system_api.py,sha256=5q4UlRw-OB2bRu7CeB14fy-azz2YeSgem5DbvMSaS44,1777
+biolib/biolib_api_client/biolib_large_file_system_api.py,sha256=4haEb38xMMXczXrmdbPca4jISarPtYZYVBNi30rbbTo,1050
 biolib/biolib_api_client/common_types.py,sha256=RH-1KNHqUF-EkTpfPOSTt5Mq1GPdfju_cqXDesscO1I,123
 biolib/biolib_api_client/job_types.py,sha256=XlDIxijxymLoJcClXhl91h1E4b2fT3pszO9wjlssD4A,1284
 biolib/biolib_api_client/lfs_types.py,sha256=xaGjE-yUyNVM3LyKdslJn5ZXWp6_kVCd4o-ch8Czfm4,227
@@ -95,14 +95,14 @@ biolib/templates/example_app.py,sha256=EB3E3RT4SeO_ii5nVQqJpi5KDGNE_huF1ub-e5ZFv
 biolib/typing_utils.py,sha256=krMhxB3SedVQA3HXIrC7DBXWpHKWN5JNmXGcSrrysOc,263
 biolib/user/__init__.py,sha256=Db5wtxLfFz3ID9TULSSTo77csw9tO6RtxMRvV5cqKEE,39
 biolib/user/sign_in.py,sha256=CvHBgoYjg5d5CL9etVopns_g1pImgW8mQH3zAjpe1Ik,2061
-biolib/utils/__init__.py,sha256=RxXoO8sLfmv5UIdkYAX7p5K03UUIUzss_A5vtb8CLlw,6897
+biolib/utils/__init__.py,sha256=diF_v5Xrxa7Ve4Q0kmUhb1RmnX6F8mGXTeRh2YAQ52w,6762
 biolib/utils/app_uri.py,sha256=hOFsTQfA7QbyQyg9ItGdD8VDWBJw0vYMqzLdSiJXmqQ,1857
 biolib/utils/cache_state.py,sha256=BFrZlV4XZIueIFzAFiPidX4hmwADKY5Y5ZuqlerF5l0,3060
 biolib/utils/multipart_uploader.py,sha256=PEorMsTNg5f72e3Y-KA3LrI-F6EAnsD9vENV-5EuiX0,9896
 biolib/utils/seq_util.py,sha256=gLnqCr_mcLcxakO44vGBqUn76VI7kLHgXKqyManjd24,4292
 biolib/utils/zip/remote_zip.py,sha256=NCdUnVbGCv7SfXCI-yVU-is_OnyWmLAnVpIdSvo-W4k,23500
-pybiolib-1.1.1691.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
-pybiolib-1.1.1691.dist-info/METADATA,sha256=xmp6cZ0W-LFN9wtGNm-PSlY9S4k_fTVTvdz_EdNVcCE,1543
-pybiolib-1.1.1691.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-pybiolib-1.1.1691.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
-pybiolib-1.1.1691.dist-info/RECORD,,
+pybiolib-1.1.1708.dist-info/LICENSE,sha256=F2h7gf8i0agDIeWoBPXDMYScvQOz02pAWkKhTGOHaaw,1067
+pybiolib-1.1.1708.dist-info/METADATA,sha256=lXmNxRrcCqwKsLlhwfNA9o3rIXcTgwWOFiZ8Re9frhM,1543
+pybiolib-1.1.1708.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+pybiolib-1.1.1708.dist-info/entry_points.txt,sha256=p6DyaP_2kctxegTX23WBznnrDi4mz6gx04O5uKtRDXg,42
+pybiolib-1.1.1708.dist-info/RECORD,,