compatibility with spec v3.0.1

Author: abhaasgoyal

meorg_client/cli.py

@@ -201,16 +201,21 @@ def file_delete(output_id: str, file_id: str):
 
 
 @click.command("start")
-@click.argument("id")
-def analysis_start(id: str):
+@click.argument("model_output_id")
+@click.argument("experiment_id")
+def analysis_start(model_output_id: str, experiment_id: str):
     """
-    Start the analysis for the model output id.
+    Start the analysis for the model output id, and an associated experiment ID.
 
     Prints the Analysis ID, which can be used in analysis-status.
     """
     client = _get_client()
 
-    response = _call(client.start_analysis, id=id)
+    response = _call(
+        client.start_analysis,
+        model_output_id=model_output_id,
+        experiment_id=experiment_id,
+    )
 
     if client.success():
         analysis_id = response.get("data").get("analysisId")
@@ -219,9 +224,8 @@ def analysis_start(id: str):
 
 @click.command("create")
 @click.argument("mod_prof_id")
-@click.argument("exp_id")
 @click.argument("name")
-def create_new_model_output(mod_prof_id: str, exp_id: str, name: str):
+def create_new_model_output(mod_prof_id: str, name: str):
     """
     Create a new model output profile.
 
@@ -241,9 +245,7 @@ def create_new_model_output(mod_prof_id: str, exp_id: str, name: str):
     """
     client = _get_client()
 
-    response = _call(
-        client.model_output_create, mod_prof_id=mod_prof_id, exp_id=exp_id, name=name
-    )
+    response = _call(client.model_output_create, mod_prof_id=mod_prof_id, name=name)
 
     if client.success():
         model_output_id = response.get("data").get("modeloutput")

meorg_client/client.py

@@ -433,7 +433,9 @@ def delete_all_files_from_model_output(self, id: str):
 
         return responses
 
-    def start_analysis(self, id: str) -> Union[dict, requests.Response]:
+    def start_analysis(
+        self, model_output_id: str, experiment_id: str
+    ) -> Union[dict, requests.Response]:
         """Start the analysis chain.
 
         Parameters
@@ -449,11 +451,11 @@ def start_analysis(self, id: str) -> Union[dict, requests.Response]:
         return self._make_request(
             method=mcc.HTTP_PUT,
             endpoint=endpoints.ANALYSIS_START,
-            url_path_fields=dict(id=id),
+            url_path_fields=dict(id=model_output_id, expid=experiment_id),
         )
 
     def model_output_create(
-        self, mod_prof_id: str, exp_id: str, name: str
+        self, mod_prof_id: str, name: str
     ) -> Union[dict, requests.Response]:
         """
         Create a new model output entity
@@ -474,7 +476,7 @@ def model_output_create(
         return self._make_request(
             method=mcc.HTTP_POST,
             endpoint=endpoints.MODEL_OUTPUT_CREATE,
-            data=dict(experiment=exp_id, model=mod_prof_id, name=name),
+            data=dict(model=mod_prof_id, name=name),
         )
 
     def model_output_query(self, model_id: str) -> Union[dict, requests.Response]: