Write tests

Author: abhaasgoyal

meorg_client/cli.py

@@ -285,6 +285,11 @@ def model_output_query(model_id: str):
             click.echo(f"Model Output Name: {name}")
 
 
+def _parse_benchmarks(ctx, param, value):
+    if value is not None:
+        return value.split(",")
+
+
 @click.command("update")
 @click.argument("model_output_id")
 @click.option(
@@ -332,6 +337,7 @@ def model_output_query(model_id: str):
     is_flag=True,
     default=[],
     help="",
+    callback=_parse_benchmarks,
 )
 def model_output_update(
     model_output_id: str,

meorg_client/client.py

@@ -519,10 +519,9 @@ def model_output_update(
         return self._make_request(
             method=mcc.HTTP_PATCH,
             endpoint=endpoints.MODEL_OUTPUT_UPDATE,
-            url_params=dict(id=model_id),
+            url_path_fields=dict(id=model_id),
             data=updated_fields,
         )
-        pass
 
     def model_output_delete(self, model_id: str) -> Union[dict, requests.Response]:
         """

meorg_client/data/openapi.json

@@ -97,7 +97,7 @@
         },
         "/modeloutput": {
             "get": {
-                "summary": "Retieve JSON representation from id or unique name",
+                "summary": "Retrieve JSON representation using id or unique name",
                 "description": "Query by MO by id or by unique MO name",
                 "tags": [
                     "Model Outputs"
@@ -519,7 +519,8 @@
                 }
             },
             "patch": {
-                "summary": "Replace benchmarks entirely with new list. Up to a max of 3 benchmarks",
+                "summary": "Change benchmarks associated with MO-EXP",
+                "decription": "Replace benchmarks entirely with new list. Up to a max of 3 benchmarks",
                 "tags": [
                     "Model Outputs"
                 ],
@@ -602,8 +603,8 @@
         },
         "/modeloutput/{id}/available-experiments": {
             "patch": {
-                "summary": "Add experiments to extend existing set of experiment associations",
-                "description": "User must have access to the workspace that the experiment is contained",
+                "summary": "Extend existing set of experiment associations",
+                "description": "Links a list of new experiments to model output. User must have access to the workspace of the cloned experiment",
                 "tags": [
                     "Model Outputs"
                 ],
@@ -673,7 +674,8 @@
                 }
             },
             "delete": {
-                "summary": "Remove an experiment from a MO",
+                "summary": "Remove an experiment association from a MO",
+                "description": "Removes an experiment association from MO. Only owners of the MO, or users with admin roles can do so.",
                 "tags": [
                     "Model Outputs"
                 ],

meorg_client/tests/test_cli.py

@@ -65,10 +65,14 @@ def test_create_model_output(runner: CliRunner, model_profile_id, model_output_n
     )
 
     assert result.exit_code == 0
-    assert type(result.return_value) is str  # The new model output
+    model_output_id = result.return_value
+    assert type(model_output_id) is str  # The new model output
+
+    # Used in deletion later
+    store.set("model_output_id", model_output_id)
 
     # Test newly created model_output_id
-    test_model_output_query(runner, result.return_value)
+    test_model_output_query(runner, model_output_id)
 
 
 def test_model_output_query(runner: CliRunner, model_output_id: str):
@@ -80,6 +84,33 @@ def test_model_output_query(runner: CliRunner, model_output_id: str):
     assert result.exit_code == 0
 
 
+def test_model_output_update(
+    runner: CliRunner,
+    model_output_name: str,
+    model_profile_id: str,
+):
+    """Test Existing Model output."""
+    result = runner.invoke(
+        cli.model_output_update,
+        [
+            store.get("model_output_id"),
+            model_output_name,
+            model_profile_id,
+            "default",
+            "automated",
+            "meorg test model output",
+            False,
+            [],
+        ],
+    )
+    assert result.exit_code == 0
+
+
+def test_model_output_delete(runner: CliRunner):
+    result = runner.invoke(cli.model_output_delete, [store.get("model_output_id")])
+    assert result.exit_code == 0
+
+
 def test_file_upload(runner: CliRunner, test_filepath: str, model_output_id: str):
     """Test file-upload via CLI.
 

meorg_client/tests/test_client.py

@@ -103,6 +103,7 @@ def test_create_model_output(
     model_output_id = response.get("data").get("modeloutput")
     assert model_output_id is not None
 
+    store.set("model_output_id", model_output_id)
     test_model_output_query(client, model_output_id)
 
 
@@ -115,6 +116,30 @@ def test_model_output_query(client: Client, model_output_id: str):
     assert response_model_output_data.get("id") == model_output_id
 
 
+def test_model_output_update(
+    client: Client,
+    model_profile_id: str,
+):
+    """Test updation of model output."""
+
+    update_data = {
+        "name": "temp_name",
+        "model": model_profile_id,
+        "state_selection": "default model initialisation",
+        "parameter_selection": "automated calibration",
+        "comments": "default model initialisation",
+        "is_bundle": False,
+        "benchmarks": [],
+    }
+    _ = client.model_output_update(store.get("model_output_id"), update_data)
+    assert client.success()
+
+
+def test_model_output_delete(client: Client):
+    _ = client.model_output_query(store.get("model_output_id"))
+    assert client.success()
+
+
 def test_upload_file(client: Client, test_filepath: str, model_output_id: str):
     """Test the uploading of a file.