pybiolib 1.2.1022__tar.gz → 1.2.1030__tar.gz

{pybiolib-1.2.1022 → pybiolib-1.2.1030}/PKG-INFO

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

{pybiolib-1.2.1022 → pybiolib-1.2.1030}/biolib/_internal/templates/gui_template/Dockerfile

@@ -23,4 +23,4 @@ COPY run.py .
 
 RUN mkdir output
 
-COPY --from=gui_builder /home/biolib/dist/index.html gui.html
+COPY --from=gui_builder /home/biolib/dist/index.html result.html

{pybiolib-1.2.1022 → pybiolib-1.2.1030}/biolib/_internal/templates/init_template/.biolib/config.yml

@@ -10,6 +10,7 @@ modules:
         output_files:
             - COPY /home/biolib/output/ /
 
+BIOLIB_REPLACE_GUI_CONFIG
 arguments:
     -
         key: --input

{pybiolib-1.2.1022 → pybiolib-1.2.1030}/biolib/_internal/templates/init_template/run.sh

@@ -1,3 +1,4 @@
 #!/bin/bash
 set -e
+BIOLIB_REPLACE_GUI_MV_COMMAND
 python3 run.py "$@"

{pybiolib-1.2.1022 → pybiolib-1.2.1030}/biolib/biolib_api_client/app_types.py

@@ -68,6 +68,12 @@ class LargeFileSystemMapping(TypedDict):
     uuid: str
 
 
+class PortMapping(TypedDict):
+    from_port: int
+    to_port: int
+    mapping_priority: int
+
+
 class _Module(TypedDict):
     command: str
     environment: Literal['biolib-app', 'biolib-custom', 'biolib-ecr']
@@ -78,6 +84,7 @@ class _Module(TypedDict):
     large_file_systems: List[LargeFileSystemMapping]
     name: str
     output_files_mappings: List[FilesMapping]
+    port_mappings: List[PortMapping]
     source_files_mappings: List[FilesMapping]
     working_directory: str
 

{pybiolib-1.2.1022 → pybiolib-1.2.1030}/biolib/cli/init.py

@@ -98,6 +98,12 @@ def init() -> None:
                         )
                         new_content = new_content.replace('BIOLIB_REPLACE_APP_NAME', replace_app_name)
 
+                        gui_config = "main_output_file: '/result.html'\n" if include_gui else ''
+                        new_content = new_content.replace('BIOLIB_REPLACE_GUI_CONFIG\n', gui_config)
+
+                        gui_mv_command = 'mv result.html output/result.html\n' if include_gui else ''
+                        new_content = new_content.replace('BIOLIB_REPLACE_GUI_MV_COMMAND\n', gui_mv_command)
+
                         with open(destination_file, 'w') as f:
                             f.write(new_content)
                     except UnicodeDecodeError:

{pybiolib-1.2.1022 → pybiolib-1.2.1030}/biolib/compute_node/job_worker/job_worker.py

@@ -250,6 +250,13 @@ class JobWorker:
         job = job_wrapper['job']
         self._jobs[job['public_id']] = job
 
+        app_version = job['app_version']
+        modules = app_version.get('modules', [])
+        port_mappings = []
+        for module in modules:
+            port_mappings.extend(module.get('port_mappings', []))
+        logger_no_user_data.debug(f"Port mappings for job {job['public_id']}: {port_mappings}")
+
         if job['app_version'].get('modules') is not None and BiolibDockerClient.is_docker_running():
             self._start_network_and_remote_host_proxies(job)
 

{pybiolib-1.2.1022 → pybiolib-1.2.1030}/pyproject.toml

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