Merge remote-tracking branch 'origin/develop' into fix/rspy448-staging-jobs-wrong-id-handling

Author: alinbutu

services/common/rs_server_common/s3_storage_handler/s3_storage_handler.py

@@ -112,7 +112,12 @@ class CustomSessionRedirect(requests.Session):
     """
 
     def __init__(self, trusted_domains=list[str] | None):
-        """Initialize the CustomSession instance."""
+        """
+        Initialize the CustomSession instance.
+
+        Args:
+            trusted_domains (list): List of allowed hosts for redirection in case of change of protocol (HTTP <> HTTPS).
+        """
         super().__init__()
         self.trusted_domains: list[str] = trusted_domains or []  # List of allowed hosts for redirection
 
@@ -871,6 +876,7 @@ def s3_streaming_upload(  # pylint: disable=too-many-locals
 
         Args:
             stream_url (str): The URL of the file to be streamed and uploaded.
+            trusted_domains (list): List of allowed hosts for redirection in case of change of protocol (HTTP <> HTTPS).
             auth (Any): Authentication credentials for the HTTP request (if required).
             bucket (str): The name of the target S3 bucket.
             key (str): The S3 object key (file path) to store the streamed file.

services/staging/rs_server_staging/main.py

@@ -271,14 +271,12 @@ async def execute_process(req: Request, resource: str, data: ProcessMetadataMode
     processor_name = api.config["resources"][resource]["processor"]["name"]
     if processor_name in processors:
         processor = processors[processor_name]
-        status = await processor(
+        _, status = await processor(
             req,
-            data.inputs.items,
-            data.inputs.collection.id,
             data.outputs["result"].id,
             app.extra["process_manager"],
             app.extra["dask_cluster"],
-        ).execute()
+        ).execute(data.inputs.dict())
         return JSONResponse(status_code=HTTP_200_OK, content={"status": status})
 
     raise HTTPException(status_code=HTTP_404_NOT_FOUND, detail=f"Processor '{processor_name}' not found")