Ws 965

apps/web/src/app/workspaces/components/active-capability-requests/components/manual-calibrate-observation/manual-calibrate-observation.component.ts

@@ -42,9 +42,7 @@ export class ManualCalibrateObservationComponent implements OnInit {
 
   launchCalibrationFromSdmIdOnClick(capabilityName: string): void {
     this.launchCapability(capabilityName, {
-      "logData" : {
-        fileset_id: this.sdmId
-      }
+      "sdmId" : this.sdmId
     })
   }
 
@@ -56,7 +54,7 @@ export class ManualCalibrateObservationComponent implements OnInit {
       },
     };
 
-    this.capabilityLauncher.launchCalibrationFromIngestionDetails(
+    this.capabilityLauncher.launchCalibrationFromSdmId(
       capabilityName, parameters
     ).subscribe(createRequestObserver)
   }

apps/web/src/app/workspaces/services/capability-launcher.service.ts

@@ -69,17 +69,14 @@ export class CapabilityLauncherService {
    * Launch calibration using the sdmId of a completed ingestion
    * @param: capabilityName  Name of capability to create request for
    * @param: parameters logData and sdmId
-   * example parameters:
-   * { "logData": {
-   *      "fileset_id": string
-   *    }
-   * }
+   * example parameters: { "sdmId": string }
+   * Now that calibration can be initiated by
    */
-  launchCalibrationFromIngestionDetails(
+  launchCalibrationFromSdmId(
     capabilityName: string,
     parameters: JsonObject,
   ): Observable<any> {
-    const url = this.endpoint + capabilityName + "/request/calibration-from-ingestion-details";
+    const url = this.endpoint + capabilityName + "/request/create-and-submit";
     return this.httpClient.post<any>(url, JSON.stringify(parameters));
   }
 }

services/capability/capability/routes.py

@@ -99,11 +99,6 @@ def capability_request_routes(config: Configurator):
         pattern="capability/{capability_name}/request/create-and-submit",
         request_method="POST",
     )
-    config.add_route(
-        name="launch_capability_request_from_ingestion_details",
-        pattern="capability/{capability_name}/request/calibration-from-ingestion-details",
-        request_method="POST",
-    )
 
     version_url = request_url + "/version/{version}"
     followon_pattern = f"{version_url}" + "/followon/{followon_type}"

services/capability/capability/views/capability_request.py

@@ -201,47 +201,6 @@ def create_and_submit_capability_request(request: Request) -> Response:
     return submit_capability_version(request)
 
 
-@view_config(route_name="launch_capability_request_from_ingestion_details", renderer="json")
-def launch_capability_request_from_ingestion_details(request: Request) -> Response:
-    """
-    Pyramid view that manually launches a std_calibration capability request from
-    user provided ingestion details
-    URL: capability/{capability_name}/request/calibration-from-ingestion-details
-
-    Example params:
-    { "logData": {
-            "fileset_id": string; required
-        }
-    }
-
-    :param request: POST request
-    :return: 200 OK response with JSON-formatted ingestion information: spl, execblock_id, sdm_id, project_code
-        or 404 response (HTTPNotFound) if no capability with given name or no parameters were provided
-    """
-    # TODO: Consider rethinking how this is done.
-    #  Currently uses archive service observation ingestion complete code.
-    expected_param = "logData"
-    expected_sub_parameter = "fileset_id"
-    capability_name = request.matchdict["capability_name"]
-    params = request.json_body
-
-    missing_params = []
-    if not params.get(expected_param):
-        missing_params.append(expected_param)
-    if not params.get(expected_param, {}).get(expected_sub_parameter):
-        missing_params.append(expected_sub_parameter)
-
-    if missing_params:
-        params_not_given_msg = f"Expected JSON parameters {missing_params}. Received only {params}."
-        return HTTPBadRequest(detail=params_not_given_msg)
-    elif not request.capability_info.lookup_capability(capability_name):
-        # Capability with given name does not exist; can't create a request for it
-        does_not_exist_msg = (f"Capability {capability_name} does not exist. Cannot create request.",)
-        return HTTPPreconditionFailed(detail=does_not_exist_msg)
-    else:
-        return request.archive_service.create_and_submit_from_sdm_id(params)
-
-
 @view_config(route_name="delete_capability_request", renderer="json")
 def delete_capability_request(request: Request) -> Response:
     """

services/capability/test/test_capability_routes.py

@@ -79,7 +79,6 @@ def capability_routes() -> RouteList:
         "get_execution_by_version",
         "get_execution_from_workflow_id",
         "home",
-        "launch_capability_request_from_ingestion_details",
         "pause_capability",
         "retrieve_available_qa_staff_in_group",
         "submit_capability_version",