Adding parameter in extend alternate format to avoid circular dep, removing todos and unused import

Author: Nazim-crim

weaver/datatype.py

@@ -1494,7 +1494,7 @@ def get_all_possible_formats_links(self, url, results):
             if media_type and media_type not in transform.EXCLUDED_TYPES:
                 id = get_field(result, "identifier", search_variations=True)
                 formats = [{"mediaType": media_type}]
-                extended_formats = extend_alternate_formats(formats)
+                extended_formats = extend_alternate_formats(formats, transform.CONVERSION_DICT)
                 links.extend([
                     {
                         "href": f"{url}/{id}?f={fmt['mediaType']}",
@@ -2886,7 +2886,7 @@ def offering(self, schema=ProcessSchema.OGC, request=None):
                 if io_type == "outputs":
                     formats = io_def.get("formats", [])
                     if formats:
-                        io_def["formats"] = extend_alternate_formats(formats)
+                        io_def["formats"] = extend_alternate_formats(formats, transform.CONVERSION_DICT)
                 io_schema = get_field(io_def, "schema", search_variations=False)
                 if not isinstance(io_schema, dict):
                     io_def["schema"] = json2oas_io(io_def)

weaver/processes/execution.py

@@ -1018,8 +1018,6 @@ def submit_job_dispatch_task(
                 _, _, sync_applied = parse_prefer_header_execute_mode(req_headers, [ExecuteControlOption.SYNC])
                 if sync_applied:
                     resp_headers.update(sync_applied)
-                    # TODO resolution de get job output, passer
-                    # modifier le request headers avec le bon type
                 return get_job_results_response(
                     job,
                     request_headers=req_headers,

weaver/transform/utils.py

@@ -9,8 +9,6 @@
 from PIL import Image
 from processes.convert import get_field
 
-from weaver.transform import transform
-
 LOGGER = get_task_logger(__name__)
 
 
@@ -134,13 +132,15 @@ def write_images(images: List[Image.Image], output_file: str, ext: str = "png")
             shutil.copy(img_paths[0], output_file)
 
 
-def extend_alternate_formats(formats):
+def extend_alternate_formats(formats, conversion_dict):
     """
     Extend a list of formats with missing alternate formats while preserving the original order.
 
     Args:
         formats (List[Dict[str, str]]): A list of format dictionaries containing
             the "mediaType" key.
+        conversion_dict (dict[str, list[str]]): A dictionary mapping media types
+            to their alternate formats.
 
     Returns:
         List[Dict[str, str]]: The extended list of formats with alternate formats
@@ -161,7 +161,7 @@ def extend_alternate_formats(formats):
     # Collect missing alternate formats while preserving original order
     missing_formats = []
     for media_type in existing_media_types:
-        for alt_format in transform.CONVERSION_DICT.get(media_type, []):
+        for alt_format in conversion_dict.get(media_type, []):
             if alt_format not in seen:
                 missing_formats.append({"mediaType": alt_format})
                 seen.add(alt_format)

weaver/wps_restapi/jobs/utils.py

@@ -755,7 +755,6 @@ def get_job_results_response(
         return get_job_results_multipart(job, results, headers=headers, settings=settings)
 
     # https://docs.ogc.org/is/18-062r2/18-062r2.html#req_core_process-execute-sync-raw-value-one
-    # TODO CHECK THIS
     res_id = out_vals[0][0]
     # check accept header
     req_fmt = (request_headers or {}).get("accept")