pybiolib 1.2.1166__tar.gz → 1.2.1173__tar.gz

{pybiolib-1.2.1166 → pybiolib-1.2.1173}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pybiolib
-Version: 1.2.1166
+Version: 1.2.1173
 Summary: BioLib Python Client
 License: MIT
 Keywords: biolib

{pybiolib-1.2.1166 → pybiolib-1.2.1173}/biolib/_internal/push_application.py

@@ -240,17 +240,23 @@ def push_application(
         with open(config_yml_path) as config_yml_file:
             config = yaml.safe_load(config_yml_file.read())
 
-        app_data = config.get('app_data')
+        app_data = config.get('app_data') or config.get('assets')
         if app_data:
+            if config.get('app_data') and config.get('assets'):
+                raise BioLibError(
+                    'In .biolib/config.yml you cannot specify both "app_data" and "assets" fields. Please use only one.'
+                )
+
+            field_name = 'app_data' if 'app_data' in config else 'assets'
             if not isinstance(app_data, str):
                 raise BioLibError(
-                    f'In .biolib/config.yml the value of "app_data" must be a string but got {type(app_data)}'
+                    f'In .biolib/config.yml the value of "{field_name}" must be a string but got {type(app_data)}'
                 )
 
             app_data_path = app_path_absolute.joinpath(app_data).resolve()
             if not app_data_path.is_dir():
                 raise BioLibError(
-                    'In .biolib/config.yml the value of "app_data" must be a path to a directory '
+                    f'In .biolib/config.yml the value of "{field_name}" must be a path to a directory '
                     'in the application directory'
                 )
 
@@ -321,7 +327,7 @@ def push_application(
     app_response = BiolibAppApi.get_by_uri(app_uri_to_fetch)
     app = app_response['app']
 
-    if app_data and not app['allow_client_side_execution']:
+    if app_data and not app['allow_client_side_execution'] and 'app_data' in config:
         raise BioLibError(
             'To push a version with app_data the app must be set to "Allow Client-Side Source Code Access"'
         )

pybiolib-1.2.1173/biolib/_session/session.py

@@ -0,0 +1,42 @@
+from biolib import utils
+from biolib._internal.types import Optional
+from biolib.api.client import ApiClient, ApiClientInitDict
+from biolib.app import BioLibApp
+
+
+class Session:
+    def __init__(self, _init_dict: ApiClientInitDict) -> None:
+        self._api = ApiClient(_init_dict=_init_dict)
+
+    @staticmethod
+    def get_session(refresh_token: str, base_url: Optional[str] = None, client_type: Optional[str] = None) -> 'Session':
+        return Session(
+            _init_dict=ApiClientInitDict(
+                refresh_token=refresh_token,
+                base_url=base_url or utils.load_base_url_from_env(),
+                client_type=client_type,
+            )
+        )
+
+    def load(self, uri: str, suppress_version_warning: bool = False) -> BioLibApp:
+        r"""Load a BioLib application by its URI or website URL.
+
+        Args:
+            uri (str): The URI or website URL of the application to load. Can be either:
+                - App URI (e.g., 'biolib/myapp:1.0.0')
+                - Website URL (e.g., 'https://biolib.com/biolib/myapp/')
+            suppress_version_warning (bool): If True, don't print a warning when no version is specified.
+                Defaults to False.
+
+        Returns:
+            BioLibApp: The loaded application object
+
+        Example::
+
+            >>> # Load by URI
+            >>> app = biolib.load('biolib/myapp:1.0.0')
+            >>> # Load by website URL
+            >>> app = biolib.load('https://biolib.com/biolib/myapp/')
+            >>> result = app.cli('--help')
+        """
+        return BioLibApp(uri=uri, _api_client=self._api, suppress_version_warning=suppress_version_warning)

{pybiolib-1.2.1166 → pybiolib-1.2.1173}/biolib/sdk/__init__.py

@@ -12,20 +12,8 @@ from biolib.app import BioLibApp as _BioLibApp
 Runtime = _Runtime
 
 
-def get_session(
-    refresh_token: Optional[str] = None,
-    base_url: Optional[str] = None,
-    client_type: Optional[str] = None,
-    username: Optional[str] = None,
-    password: Optional[str] = None,
-) -> _Session:
-    return _Session.get_session(
-        refresh_token=refresh_token,
-        base_url=base_url,
-        client_type=client_type,
-        username=username,
-        password=password,
-    )
+def get_session(refresh_token: str, base_url: Optional[str] = None, client_type: Optional[str] = None) -> _Session:
+    return _Session.get_session(refresh_token=refresh_token, base_url=base_url, client_type=client_type)
 
 
 def push_app_version(uri: str, path: str) -> _BioLibApp:

{pybiolib-1.2.1166 → pybiolib-1.2.1173}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pybiolib"
-version = "1.2.1166"
+version = "1.2.1173"
 description = "BioLib Python Client"
 readme = "PYPI_README.md"
 license = "MIT"

pybiolib-1.2.1166/biolib/_internal/auth_utils.py

@@ -1,27 +0,0 @@
-from typing import Dict
-
-from biolib._internal.http_client import HttpClient
-from biolib.biolib_logging import logger
-
-
-def exchange_username_password_for_tokens(username: str, password: str, base_url: str) -> Dict[str, str]:
-    try:
-        response = HttpClient.request(
-            method='POST',
-            url=f'{base_url}/api/user/token/',
-            data={'username': username, 'password': password},
-        )
-    except Exception as exception:
-        logger.error('Sign in with username/password failed')
-        raise exception
-
-    try:
-        response_dict = response.json()
-    except Exception as error:
-        logger.error('Could not decode response from server as JSON')
-        raise Exception(response.text) from error
-
-    if 'access' not in response_dict or 'refresh' not in response_dict:
-        raise Exception('Invalid response: missing access or refresh token')
-
-    return {'access': response_dict['access'], 'refresh': response_dict['refresh']}

pybiolib-1.2.1166/biolib/_session/session.py

@@ -1,68 +0,0 @@
-from biolib import utils
-from biolib._internal.types import Optional
-from biolib.api.client import ApiClient, ApiClientInitDict
-from biolib._internal.auth_utils import exchange_username_password_for_tokens
-from biolib.app import BioLibApp
-
-
-class Session:
-    def __init__(self, _init_dict: ApiClientInitDict) -> None:
-        self._api = ApiClient(_init_dict=_init_dict)
-
-    @staticmethod
-    def get_session(
-        refresh_token: Optional[str] = None, 
-        base_url: Optional[str] = None, 
-        client_type: Optional[str] = None,
-        username: Optional[str] = None,
-        password: Optional[str] = None
-    ) -> 'Session':
-        if refresh_token and (username or password):
-            raise ValueError("Cannot specify both refresh_token and username/password authentication")
-        
-        if (username and not password) or (password and not username):
-            raise ValueError("Both username and password must be provided for username/password authentication")
-        
-        if not refresh_token and not (username and password):
-            raise ValueError("Must provide either refresh_token or username/password for authentication")
-
-        base_url_resolved = base_url or utils.load_base_url_from_env()
-        
-        if username and password:
-            tokens = exchange_username_password_for_tokens(
-                username,
-                password,
-                base_url_resolved,
-            )
-            refresh_token = tokens['refresh']
-
-        init_dict = ApiClientInitDict(
-            refresh_token=str(refresh_token),
-            base_url=base_url_resolved,
-            client_type=client_type,
-        )
-            
-        return Session(_init_dict=init_dict)
-
-    def load(self, uri: str, suppress_version_warning: bool = False) -> BioLibApp:
-        r"""Load a BioLib application by its URI or website URL.
-
-        Args:
-            uri (str): The URI or website URL of the application to load. Can be either:
-                - App URI (e.g., 'biolib/myapp:1.0.0')
-                - Website URL (e.g., 'https://biolib.com/biolib/myapp/')
-            suppress_version_warning (bool): If True, don't print a warning when no version is specified.
-                Defaults to False.
-
-        Returns:
-            BioLibApp: The loaded application object
-
-        Example::
-
-            >>> # Load by URI
-            >>> app = biolib.load('biolib/myapp:1.0.0')
-            >>> # Load by website URL
-            >>> app = biolib.load('https://biolib.com/biolib/myapp/')
-            >>> result = app.cli('--help')
-        """
-        return BioLibApp(uri=uri, _api_client=self._api, suppress_version_warning=suppress_version_warning)