pybiolib 1.2.230__tar.gz → 1.2.243__tar.gz

{pybiolib-1.2.230 → pybiolib-1.2.243}/PKG-INFO

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

{pybiolib-1.2.230 → pybiolib-1.2.243}/biolib/biolib_api_client/biolib_app_api.py

@@ -3,6 +3,7 @@ import os
 import random
 import re
 import subprocess
+import urllib.parse
 
 import biolib.api
 from biolib import biolib_errors
@@ -10,6 +11,7 @@ from biolib._internal.http_client import HttpError
 from biolib.biolib_api_client import AppGetResponse
 from biolib.biolib_logging import logger
 from biolib.typing_utils import Optional
+from biolib.utils import load_base_url_from_env
 
 
 def encode_multipart(data, files):
@@ -61,15 +63,29 @@ def _get_git_repository_url() -> str:
     except BaseException:
         return ''
 
+def _get_app_uri_from_str(input_str: str) -> str:
+    parsed_base_url = urllib.parse.urlparse(load_base_url_from_env())
+    parsed_uri = urllib.parse.urlparse(input_str)
+    if parsed_uri.netloc != '' and parsed_base_url.netloc != parsed_uri.netloc:
+        raise biolib_errors.ValidationError(
+            f'Invalid URI. The hostname "{parsed_base_url.netloc}" is not recognized.'
+        )
+    elif parsed_uri.netloc != '' and parsed_uri.path[1] != '@':
+        uri = f'@{parsed_uri.netloc}{parsed_uri.path}'
+    elif parsed_uri.netloc == '' and parsed_uri.path.startswith (parsed_base_url.netloc):
+        uri = f'@{parsed_uri.path}'
+    else:
+        uri = parsed_uri.path
+    uri = uri.strip('/')
+    # Replace frontend version path with app_uri compatible version (if supplied)
+    uri = re.sub(r'/version/(?P<version>(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*))(/)?$', r':\g<version>', uri)
+    return uri
+
 
 class BiolibAppApi:
     @staticmethod
     def get_by_uri(uri: str) -> AppGetResponse:
-        # Replace protocol with @ (if supplied)
-        uri = re.sub(r'^http(s)?://', '@', uri)
-        # Replace frontend version path with app_uri compatible version (if supplied)
-        uri = re.sub(r'/version/(?P<version>(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*))(/)?$', r':\g<version>', uri)
-
+        uri = _get_app_uri_from_str(uri)
         try:
             response = biolib.api.client.get(path='/app/', params={'uri': uri})
             app_response: AppGetResponse = response.json()

{pybiolib-1.2.230 → pybiolib-1.2.243}/biolib/biolib_errors.py

@@ -7,6 +7,9 @@ class BioLibError(Exception):
         super().__init__(message)
         self.message = message
 
+class ValidationError(BioLibError):
+    def __init__(self, message: Optional[str] = None):
+        super().__init__(message=message or 'Invalid input.')
 
 class NotFound(BioLibError):
 

{pybiolib-1.2.230 → pybiolib-1.2.243}/pyproject.toml

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