write tests for all endpoints

Author: abhaasgoyal

meorg_client/cli.py

@@ -397,78 +397,88 @@ def model_output_update(
         click.echo("Parameters of MO updated")
 
 
-@click.command("update")
+@click.command("list")
 @click.argument("model_output_id")
 @click.argument("exp_id")
-@click.argument("benchmarks", default="", callback=_parse_csv)
-def model_benchmark_update(model_output_id: str, exp_id: str, benchmarks: str):
-    """Update model benchmark
+def model_output_benchmarks_list(model_output_id: str, exp_id: str):
+    """List model benchmarks.
 
     Parameters
     ----------
     model_output_id : str
-        _description_
+        Model output ID
     exp_id : str
-        _description_
-    benchmarks : list[str]
-        _description_
+        Experiment ID
     """
     client = _get_client()
-    _ = _call(
-        client.model_output_replace_benchmarks,
+    response = _call(
+        client.model_output_benchmarks_list,
         model_id=model_output_id,
         exp_id=exp_id,
-        updated_benchmarks=benchmarks,
     )
 
     if client.success():
-        click.echo("Benchmark updated")
+        click.echo(
+            f"List of available benchmarks: {json.dumps(response.get("data").get("benchmarks"), indent=4)}"
+        )
+        click.echo(
+            f"List of linked benchmarks: {json.dumps(response.get("data").get("current"), indent=4)}"
+        )
 
+        return response.get("data")
 
-@click.command("list")
+
+@click.command("update")
 @click.argument("model_output_id")
 @click.argument("exp_id")
-def model_benchmark_list(model_output_id: str, exp_id: str):
-    """List model benchmarks
+@click.argument("benchmark_ids", default="", callback=_parse_csv)
+def model_output_benchmarks_replace(
+    model_output_id: str, exp_id: str, benchmark_ids: str
+):
+    """
+    Change benchmarks associated with Model output and Experiment.
 
     Parameters
     ----------
     model_output_id : str
-        _description_
+        Model output ID
     exp_id : str
-        _description_
+        Experiment ID
     benchmarks : list[str]
-        _description_
+        List of benchmarks IDs to fully replace existing
     """
     client = _get_client()
-    response = _call(
-        client.model_output_list_benchmarks,
+    _ = _call(
+        client.model_output_benchmarks_replace,
         model_id=model_output_id,
         exp_id=exp_id,
+        updated_benchmarks=benchmark_ids,
     )
 
     if client.success():
-        click.echo(response)
+        click.echo("Benchmark updated")
 
 
 @click.command("update")
 @click.argument("model_output_id")
-@click.argument("experiments", default="", callback=_parse_csv)
-def model_experiments_extend(model_output_id: str, experiments: str):
-    """Update experiment associated with model output
+@click.argument("exp_ids", default="", callback=_parse_csv)
+def model_output_experiments_extend(model_output_id: str, exp_ids: list[str]):
+    """
+    Extend existing set of experiment associations.
 
     Parameters
     ----------
     model_output_id : str
-        _description_
+        Model output ID
+
     experiments : list[str]
-        _description_
+        List of experiment IDs
     """
     client = _get_client()
     _ = _call(
-        client.model_output_extend_experiments,
+        client.model_output_experiments_extend,
         model_id=model_output_id,
-        updated_experiments=experiments,
+        updated_experiments=exp_ids,
     )
 
     if client.success():
@@ -478,23 +488,24 @@ def model_experiments_extend(model_output_id: str, experiments: str):
 @click.command("delete")
 @click.argument("model_output_id")
 @click.argument("exp_id")
-def model_experiment_delete(model_output_id: str, exp_id: str):
+def model_output_experiment_delete(model_output_id: str, exp_id: str):
     """Delete specific experiment associated with model output
 
     Parameters
     ----------
     model_output_id : str
-        _description_
-    experiment_id : str
-        _description_
+        Model output ID
+
+    experiment : str
+        Experiment IDs
     """
     client = _get_client()
     _ = _call(
-        client.model_output_delete_experiment, model_id=model_output_id, exp_id=exp_id
+        client.model_output_experiment_delete, model_id=model_output_id, exp_id=exp_id
     )
 
     if client.success():
-        click.echo("Experiments deleted")
+        click.echo(f"Experiment ID: {exp_id} deleted")
 
 
 @click.command("delete")
@@ -633,12 +644,12 @@ def cli_model_experiments():
 cli_model_output.add_command(model_output_delete)
 
 # Benchmarks command
-cli_model_benchmark.add_command(model_benchmark_list)
-cli_model_benchmark.add_command(model_benchmark_update)
+cli_model_benchmark.add_command(model_output_benchmarks_list)
+cli_model_benchmark.add_command(model_output_benchmarks_replace)
 
 # Experiments command
-cli_model_experiments.add_command(model_experiments_extend)
-cli_model_experiments.add_command(model_experiment_delete)
+cli_model_experiments.add_command(model_output_experiments_extend)
+cli_model_experiments.add_command(model_output_experiment_delete)
 
 # Add subparsers to the master
 cli.add_command(cli_endpoints)

meorg_client/client.py

@@ -523,7 +523,7 @@ def model_output_update(
             json=updated_fields,
         )
 
-    def model_output_list_benchmarks(
+    def model_output_benchmarks_list(
         self, model_id: str, exp_id: str
     ) -> Union[dict, requests.Response]:
         return self._make_request(
@@ -532,7 +532,7 @@ def model_output_list_benchmarks(
             url_path_fields=dict(id=model_id, expId=exp_id),
         )
 
-    def model_output_replace_benchmarks(
+    def model_output_benchmarks_replace(
         self, model_id: str, exp_id: str, updated_benchmarks: list[str]
     ) -> Union[dict, requests.Response]:
         """
@@ -559,7 +559,7 @@ def model_output_replace_benchmarks(
             json=dict(benchmarks=updated_benchmarks),
         )
 
-    def model_output_extend_experiments(
+    def model_output_experiments_extend(
         self, model_id: str, updated_experiments: list[str]
     ) -> Union[dict, requests.Response]:
         """
@@ -586,8 +586,8 @@ def model_output_extend_experiments(
             json=dict(experiments=updated_experiments),
         )
 
-    def model_output_delete_experiment(
-        self, model_id: str, exp_id
+    def model_output_experiment_delete(
+        self, model_id: str, exp_id: str
     ) -> Union[dict, requests.Response]:
         return self._make_request(
             method=mcc.HTTP_DELETE,

meorg_client/tests/test_cli.py

@@ -107,6 +107,46 @@ def test_model_output_update(
     assert result.exit_code == 0
 
 
+def test_model_output_experiments_extend(runner: CliRunner, experiment_id: str):
+    result = runner.invoke(
+        cli.model_output_experiments_extend,
+        [store.get("model_output_id"), experiment_id],
+    )
+    assert result.exit_code == 0
+
+
+def test_model_output_experiment_delete(runner: CliRunner, experiment_id: str):
+    result = runner.invoke(
+        cli.model_output_experiment_delete,
+        [store.get("model_output_id"), experiment_id],
+    )
+    assert result.exit_code == 0
+
+
+def test_model_output_benchmarks_list(runner: CliRunner, experiment_id: str):
+    test_model_output_experiments_extend(runner, experiment_id)
+    result = runner.invoke(
+        cli.model_output_benchmarks_list,
+        [store.get("model_output_id"), experiment_id],
+        standalone_mode=False,
+    )
+
+    benchmarks_list = result.return_value["benchmarks"]
+
+    assert len(benchmarks_list) > 0
+    store.set("sample_benchmark_id", benchmarks_list[0]["id"])
+
+    assert result.exit_code == 0
+
+
+def test_model_output_benchmarks_replace(runner: CliRunner, experiment_id: str):
+    result = runner.invoke(
+        cli.model_output_benchmarks_replace,
+        [store.get("model_output_id"), experiment_id, store.get("sample_benchmark_id")],
+    )
+    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

meorg_client/tests/test_client.py

@@ -134,6 +134,41 @@ def test_model_output_update(
     assert client.success()
 
 
+def test_model_output_benchmarks_list(client: Client, experiment_id: str):
+    test_model_output_experiments_extend(client, experiment_id)
+    response = client.model_output_benchmarks_list(
+        store.get("model_output_id"), experiment_id
+    )
+
+    benchmarks_list = response.get("data").get("benchmarks")
+
+    assert type(benchmarks_list) is list
+    assert len(benchmarks_list) > 0
+
+    store.set("sample_benchmark_id", benchmarks_list[0]["id"])
+
+    assert client.success()
+
+
+def test_model_output_benchmarks_replace(client: Client, experiment_id: str):
+    client.model_output_benchmarks_replace(
+        store.get("model_output_id"), experiment_id, [store.get("sample_benchmark_id")]
+    )
+    assert client.success()
+
+
+def test_model_output_experiments_extend(client: Client, experiment_id: str):
+    client.model_output_experiments_extend(
+        store.get("model_output_id"), [experiment_id]
+    )
+    assert client.success()
+
+
+def test_model_output_experiment_delete(client: Client, experiment_id: str):
+    client.model_output_experiment_delete(store.get("model_output_id"), experiment_id)
+    assert client.success()
+
+
 def test_model_output_delete(client: Client):
     _ = client.model_output_query(store.get("model_output_id"))
     assert client.success()