pybiolib 1.1.1673__tar.gz → 1.1.1682__tar.gz

{pybiolib-1.1.1673 → pybiolib-1.1.1682}/PKG-INFO

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

{pybiolib-1.1.1673 → pybiolib-1.1.1682}/biolib/biolib_api_client/biolib_app_api.py

@@ -1,17 +1,42 @@
+import mimetypes
+import random
 import re
 import os
 import subprocess
 
-import requests
+from requests.exceptions import HTTPError
 
 import biolib.api
 from biolib import biolib_errors
 from biolib.typing_utils import Optional
-from biolib.biolib_api_client.auth import BearerAuth
-from biolib.biolib_api_client import BiolibApiClient, AppGetResponse
-from biolib.biolib_errors import BioLibError
+from biolib.biolib_api_client import AppGetResponse
 from biolib.biolib_logging import logger
 
+def encode_multipart(data, files):
+    boundary = f'----------{random.randint(0, 1000000000)}'
+    line_array = []
+
+    for (key, value) in data.items():
+        if not value is 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():
+        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"}')
+        line_array.append('')
+        line_array.append('')
+        line_array.append(value)
+
+    line_array.append(f'--{boundary}--')
+    line_array.append('')
+
+    data_encoded = b'\r\n'.join([line.encode() if isinstance(line, str) else line for line in line_array])
+    return 'multipart/form-data; boundary={}'.format(boundary), data_encoded
+
 
 def _get_git_branch_name() -> str:
     try:
@@ -51,7 +76,7 @@ class BiolibAppApi:
             app_response: AppGetResponse = response.json()
             return app_response
 
-        except requests.exceptions.HTTPError as error:
+        except HTTPError as error:
             if error.response.status_code == 404:
                 raise biolib_errors.NotFound(f'Application {uri} not found.') from None
 
@@ -69,24 +94,28 @@ class BiolibAppApi:
             set_as_active,
             app_version_id_to_copy_images_from: Optional[str],
     ):
-        response = requests.post(
-            f'{BiolibApiClient.get().base_url}/api/app_versions/',
-            files={
-                'source_files_zip': zip_binary,
-            },
-            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(),
-            },
-            auth=BearerAuth(BiolibApiClient.get().access_token)
-        )
-        if not response.ok:
+        try:
+            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(),
+                },
+                files={
+                    'source_files_zip': ('source_files.zip', zip_binary),
+                }
+            )
+            response = biolib.api.client.post(
+                path='/app_versions/',
+                data=data_encoded,
+                headers={'Content-Type': content_type},
+            )
+        except Exception as error:
             logger.error(f'Push failed for {author}/{app_name}:')
-            raise BioLibError(response.text)
+            raise error
 
         # TODO: When response includes the version number, print the URL for the new app version
         logger.info(f'Initialized new app version for {author}/{app_name}.')

{pybiolib-1.1.1673 → pybiolib-1.1.1682}/pyproject.toml

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