Skip to content
Snippets Groups Projects
Commit d32f2726 authored by Charlotte Hausman's avatar Charlotte Hausman
Browse files

fixing initial weblog ingestion

parent 97c325e6
No related branches found
No related tags found
1 merge request!1130fixing initial weblog ingestion
Pipeline #7254 passed
Pipeline: workspaces

#7255

    ......@@ -81,10 +81,18 @@ class Solicitor:
    current_execution_url = f"{self.capability_url}/capability/request/execution/{wf_id}"
    current_execution = requests.get(current_execution_url)
    initial_execution_url = (
    f"{self.capability_url}/capability/request/"
    f"{current_execution.json()['capability_request_id']}/version/1/execution"
    capability_req_id = current_execution.json()["capability_request_id"]
    current_version_number = current_execution.json()["version_number"]
    current_version_url = (
    f"{self.capability_url}/capability/request/{capability_req_id}/version/{current_version_number}"
    )
    current_version = requests.get(current_version_url)
    # UI only updates the *current* version parameters, not the workflow arguments or other versions.
    # pull srdp status from current version
    srdp_status = current_version.json()["parameters"]["metadata"]["is_srdp"]
    initial_execution_url = f"{self.capability_url}/capability/request/{capability_req_id}/version/1/execution"
    initial_execution = requests.get(initial_execution_url)
    wf_request_url = (
    ......@@ -93,23 +101,22 @@ class Solicitor:
    )
    wf_request = requests.get(wf_request_url)
    if self.verify_valid_initial_version(wf_request.json()):
    if self.verify_valid_initial_version(wf_request.json(), srdp_status):
    initial_path = pathlib.Path(wf_request.json()["results_dir"])
    return initial_path.stem
    else:
    self.logger.error("Error: Invalid initial version! No weblog found. Running Single Version Ingestion...")
    return INVALID_INITIAL_VERSION
    def verify_valid_initial_version(self, wf_request: dict) -> bool:
    def verify_valid_initial_version(self, wf_request: dict, srdp_flag: bool) -> bool:
    """
    Ping the weblog display endpoint to verify the existence of an initial version weblog
    * Ingestion fails if this is unavailable
    :param wf_request: the initial workflow request to verify
    :param srdp_flag: Is this request SRDP?
    :return: True if weblog exists, False otherwise
    """
    srdp_flag = wf_request["argument"]["metadata"]["is_srdp"]
    # only run ingestion with initial version weblog if this is SRDP
    if srdp_flag is True:
    # if this is SRDP, verify the initial weblog exists
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment