Remove store dependency in client

Author: abhaasgoyal

meorg_client/tests/test_client.py

@@ -4,11 +4,7 @@
 import pytest
 from meorg_client.client import Client
 import meorg_client.utilities as mu
-from conftest import store
-
-# from requests import RequestException
 import tempfile as tf
-import time
 
 
 def _get_authenticated_client() -> Client:
@@ -39,7 +35,7 @@ def _get_authenticated_client() -> Client:
     return client
 
 
-@pytest.fixture
+@pytest.fixture(scope="module")
 def client() -> Client:
     """Get an authenticated client.
 
@@ -84,7 +80,7 @@ def test_list_endpoints(client: Client):
 
 
 @pytest.fixture
-def model_output_generator(client: Client, model_profile_id):
+def model_output_generator(request, client: Client, model_profile_id: str):
     model_output_ids = []
 
     def _make_model_output(model_output_name):
@@ -95,20 +91,27 @@ def _make_model_output(model_output_name):
 
     yield _make_model_output
 
-    # TODO: Make tests more tight
-    # try:
-    #     for model_output_id in model_output_ids:
-    #         client.model_output_delete(model_output_id)
-    # except RequestException:
-    #     pass
+    # Used if already deleted
+    if hasattr(request.node, "skip_teardown"):
+        return
+
+    for model_output_id in model_output_ids:
+        client.model_output_delete(model_output_id)
 
 
 @pytest.fixture
-def model_output_id(client: Client, model_output_generator: str):
-    return model_output_generator("model_output_test")
+def model_output_id(model_output_generator: str):
+    """Generate fresh model output ID.
+
+    Parameters
+    ----------
+    model_output_generator: str
+        Model output generator function
+    """
+    return model_output_generator("base_model_output")
 
 
-class ModelOutput:
+class TestModelOutput:
 
     def test_create_model_output(
         self, client: Client, model_profile_id: str, model_output_name: str
@@ -120,13 +123,10 @@ 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)
-
         self.test_model_output_query(client, model_output_id)
 
     def test_model_output_query(self, client: Client, model_output_id: str):
         """Test Existing Model output."""
-        # response = client.model_output_query(store.get("model_output_id"))
         response = client.model_output_query(model_output_id)
         assert client.success()
 
@@ -136,6 +136,7 @@ def test_model_output_query(self, client: Client, model_output_id: str):
     def test_model_output_update(
         self,
         client: Client,
+        model_output_id: str,
         model_profile_id: str,
     ):
         """Test updation of model output."""
@@ -148,10 +149,11 @@ def test_model_output_update(
             "comments": "updated model output pytest",
             "is_bundle": False,
         }
-        _ = client.model_output_update(store.get("model_output_id"), update_data)
+        _ = client.model_output_update(model_output_id, update_data)
         assert client.success()
 
-    def test_model_output_delete(client: Client, model_output_id: str):
+    def test_model_output_delete(self, request, client: Client, model_output_id: str):
+        request.node.skip_teardown = True
         _ = client.model_output_delete(model_output_id)
         assert client.success()
 
@@ -163,37 +165,51 @@ class TestBenchmark:
     def model_output_id(
         self, client: Client, model_output_generator, experiment_id: str
     ):
-        id1 = model_output_generator("model_output_benchmark1")
-        id2 = model_output_generator("model_output_benchmark2")
+        id1 = model_output_generator("meorg_test_benchmark1")
+        id2 = model_output_generator("meorg_test_benchmark2")
         client.model_output_experiments_extend(id1, [experiment_id])
         client.model_output_experiments_extend(id2, [experiment_id])
         return id1
 
+    def _check_available_benchmarks(self, response, expected):
+        available_benchmarks = response.get("data").get("benchmarks")
+        assert type(available_benchmarks) is list
+        assert len(available_benchmarks) == 1
+        return available_benchmarks
+
+    def _check_current_benchmarks(self, response, expected):
+        current_benchmarks = response.get("data").get("current")
+        assert type(current_benchmarks) is list
+        assert len(current_benchmarks) == 0
+        return current_benchmarks
+
     def test_model_output_benchmarks_list(
         self, client: Client, model_output_id: str, experiment_id: str
     ):
 
         response = client.model_output_benchmarks_list(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"])
-
+        self._check_available_benchmarks(response, 1)
+        self._check_current_benchmarks(response, 0)
         assert client.success()
 
     def test_model_output_benchmarks_replace(
         self, client: Client, model_output_id: str, experiment_id: str
     ):
+        response = client.model_output_benchmarks_list(model_output_id, experiment_id)
+
+        available_benchmarks = self._check_available_benchmarks(response, 1)
+        self._check_current_benchmarks(response, 0)
+
         client.model_output_benchmarks_replace(
             model_output_id,
             experiment_id,
-            [store.get("sample_benchmark_id")],
+            [available_benchmarks[0]["id"]],
         )
         assert client.success()
 
+        self._check_available_benchmarks(response, 0)
+        self._check_current_benchmarks(response, 1)
+
 
 def test_model_output_experiments_extend(
     client: Client, model_output_id: str, experiment_id: str
@@ -229,9 +245,6 @@ def test_upload_file(client: Client, test_filepath: str, model_output_id: str):
     # Make sure it worked
     assert client.success()
 
-    # Store the response.
-    store.set("file_upload", response)
-
 
 def test_upload_file_multiple(client: Client, test_filepath: str, model_output_id: str):
     """Test the uploading of multiple files in sequence.
@@ -253,9 +266,6 @@ def test_upload_file_multiple(client: Client, test_filepath: str, model_output_i
         [response.get("data").get("files")[0].get("id") for response in responses]
     )
 
-    # Store the response.
-    store.set("file_upload_multiple", responses)
-
 
 def test_file_list(client: Client, model_output_id: str):
     """Test the listing of files for a model output.
@@ -270,7 +280,6 @@ def test_file_list(client: Client, model_output_id: str):
     response = client.list_files(model_output_id)
     assert client.success()
     assert isinstance(response.get("data").get("files"), list)
-    store.set("file_list", response)
 
 
 class TestAnalysis:
@@ -283,11 +292,18 @@ def model_output_id_analysis(
         experiment_id: str,
         model_output_generator,
     ):
-        model_output_id = model_output_generator("model_output_analysis_test")
+        model_output_id = model_output_generator("meorg_test_analysis")
         client.model_output_experiments_extend(model_output_id, [experiment_id])
         client.upload_files([test_filepath, test_filepath], model_output_id)
         return model_output_id
 
+    @pytest.fixture
+    def analysis_id(
+        self, client: Client, model_output_id_analysis: str, experiment_id: str
+    ):
+        response = client.start_analysis(model_output_id_analysis, experiment_id)
+        return response.get("data").get("analysisId")
+
     def test_start_analysis(
         self, client: Client, model_output_id_analysis: str, experiment_id: str
     ):
@@ -300,24 +316,17 @@ def test_start_analysis(
         model_output_id : str
             Model output ID.
         """
-        # Wait 5s for data to move from cache to store (otherwise analysis will fail, still might)
-        time.sleep(5)
-        response = client.start_analysis(model_output_id_analysis, experiment_id)
+        _ = client.start_analysis(model_output_id_analysis, experiment_id)
         assert client.success()
 
-        # Store result for status check below
-        store.set("start_analysis", response)
-
-    def test_get_analysis_status(self, client: Client):
+    def test_get_analysis_status(self, client: Client, analysis_id: str):
         """Test getting the analysis status.
 
         Parameters
         ----------
         client : Client
             Client.
         """
-        # Get the analysis id from the store
-        analysis_id = store.get("start_analysis").get("data").get("analysisId")
         _ = client.get_analysis_status(analysis_id)
         assert client.success()
 
@@ -402,7 +411,9 @@ def test_upload_file_parallel_no_progress(
     )
 
 
-def test_delete_file_from_model_output(client: Client, model_output_id: str):
+def test_delete_file_from_model_output(
+    client: Client, test_filepath: str, model_output_id: str
+):
     """Test deleting a file from a model output.
 
     Parameters
@@ -412,12 +423,13 @@ def test_delete_file_from_model_output(client: Client, model_output_id: str):
     model_output_id : str
         Model output ID.
     """
+    file_upload = client.upload_files(test_filepath, id=model_output_id)[0]
 
     # Retrieve the uploaded file ID from earlier.
-    file_id = store.get("file_upload").get("data").get("files")[0].get("id")
+    file_id = file_upload.get("data").get("files")[0].get("id")
 
     # Retieve the file list from earlier.
-    files = store.get("file_list")
+    files = client.list_files(model_output_id)
 
     # Convert to a list of JUST the IDs, none of the extra attributes.
     file_ids = [f.get("id") for f in files.get("data").get("files")]
@@ -438,7 +450,9 @@ def test_delete_file_from_model_output(client: Client, model_output_id: str):
     assert file_id not in file_ids
 
 
-def test_delete_all_files_from_model_output(client: Client, model_output_id: str):
+def test_delete_all_files_from_model_output(
+    client: Client, test_filepath: str, model_output_id: str
+):
     """Test deleting all files from a model output.
 
     Parameters
@@ -449,8 +463,11 @@ def test_delete_all_files_from_model_output(client: Client, model_output_id: str
         Model output ID.
     """
 
+    # Upload a list of files
+    client.upload_files([test_filepath, test_filepath], model_output_id)
+
     # Get the list of files and unpack to list
-    files = store.get("file_list")
+    files = client.list_files(model_output_id)
     file_ids = [f.get("id") for f in files.get("data").get("files")]
 
     # Make sure the list is more than 2 items long.