pybiolib 1.2.108__tar.gz → 1.2.110.dev1__tar.gz

{pybiolib-1.2.108 → pybiolib-1.2.110.dev1}/PKG-INFO

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

{pybiolib-1.2.108 → pybiolib-1.2.110.dev1}/biolib/_internal/push_application.py

@@ -78,6 +78,13 @@ def push_application(
     app_version_to_copy_images_from: Optional[str],
     is_dev_version: Optional[bool],
 ):
+    app_uri_parts = app_uri.split(':')
+    if len(app_uri_parts) > 2:
+        raise BioLibError('Invalid URI only a single colon allowed')
+
+    app_uri_to_fetch = app_uri_parts[0]
+    semantic_version = app_uri_parts[1] if len(app_uri_parts) == 2 else None
+
     app_path_absolute = Path(app_path).resolve()
 
     api_client = BiolibApiClient.get()
@@ -177,8 +184,6 @@ def push_application(
     source_files_zip_bytes = b''.join(byte_iterator)
     os.chdir(original_directory)
 
-    # TODO: Raise exception if app_uri contains version
-    app_uri_to_fetch = app_uri
     if app_version_to_copy_images_from and app_version_to_copy_images_from != 'active':
         # Get app with `app_version_to_copy_images_from` in app_uri_to_fetch to get the app version public id.
         app_uri_to_fetch += f':{app_version_to_copy_images_from}'
@@ -187,6 +192,7 @@ def push_application(
     app = app_response['app']
     # push new app version
     new_app_version_json = BiolibAppApi.push_app_version(
+        semantic_version=semantic_version,
         app_id=app['public_id'],
         app_name=app['name'],
         author=app['account_handle'],

{pybiolib-1.2.108 → pybiolib-1.2.110.dev1}/biolib/biolib_api_client/biolib_app_api.py

@@ -1,29 +1,29 @@
 import mimetypes
+import os
 import random
 import re
-import os
 import subprocess
 
 import biolib.api
 from biolib import biolib_errors
 from biolib._internal.http_client import HttpError
-from biolib.typing_utils import Optional
 from biolib.biolib_api_client import AppGetResponse
 from biolib.biolib_logging import logger
+from biolib.typing_utils import Optional
 
 
 def encode_multipart(data, files):
     boundary = f'----------{random.randint(0, 1000000000)}'
     line_array = []
 
-    for (key, value) in data.items():
-        if not value is None:
+    for key, value in data.items():
+        if value is not None:
             line_array.append(f'--{boundary}')
             line_array.append(f'Content-Disposition: form-data; name="{key}"')
             line_array.append('')
             line_array.append(value)
 
-    for (key, (filename, value)) in files.items():
+    for key, (filename, value) in files.items():
         line_array.append(f'--{boundary}')
         line_array.append(f'Content-Disposition: form-data; name="{key}"; filename="{filename}"')
         line_array.append(f'Content-Type: {mimetypes.guess_type(filename)[0] or "application/octet-stream"}')
@@ -63,7 +63,6 @@ def _get_git_repository_url() -> str:
 
 
 class BiolibAppApi:
-
     @staticmethod
     def get_by_uri(uri: str) -> AppGetResponse:
         # Replace protocol with @ (if supplied)
@@ -84,26 +83,31 @@ class BiolibAppApi:
 
     @staticmethod
     def push_app_version(
-            app_id,
-            zip_binary,
-            author,
-            app_name,
-            set_as_active,
-            app_version_id_to_copy_images_from: Optional[str],
+        app_id,
+        zip_binary,
+        author,
+        app_name,
+        set_as_active,
+        app_version_id_to_copy_images_from: Optional[str],
+        semantic_version: Optional[str],
     ):
         try:
+            data = {
+                'app': app_id,
+                'set_as_active': 'true' if set_as_active else 'false',
+                'state': 'published',
+                'app_version_id_to_copy_images_from': app_version_id_to_copy_images_from,
+                'git_branch_name': _get_git_branch_name(),
+                'git_repository_url': _get_git_repository_url(),
+            }
+            if semantic_version:
+                data['semantic_version'] = semantic_version
+
             content_type, data_encoded = encode_multipart(
-                data={
-                    'app': app_id,
-                    'set_as_active': 'true' if set_as_active else 'false',
-                    'state': 'published',
-                    'app_version_id_to_copy_images_from': app_version_id_to_copy_images_from,
-                    'git_branch_name': _get_git_branch_name(),
-                    'git_repository_url': _get_git_repository_url(),
-                },
+                data=data,
                 files={
                     'source_files_zip': ('source_files.zip', zip_binary),
-                }
+                },
             )
             response = biolib.api.client.post(
                 path='/app_versions/',

{pybiolib-1.2.108 → pybiolib-1.2.110.dev1}/pyproject.toml

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