Revert "begin alignment with new API"

This reverts commit 6228c48.

alfalfa_client/alfalfa_client.py

@@ -26,7 +26,6 @@
 # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # ****************************************************************************************************
 
-import functools
 import json
 import os
 from collections import OrderedDict
@@ -49,7 +48,7 @@
 )
 
 ModelID = str
-RunID = str
+SiteID = str
 
 
 class AlfalfaClient:
@@ -70,7 +69,6 @@ def __init__(self, host: str = 'http://localhost', api_version: str = 'v2'):
 
         self.host = host
         self.api_version = api_version
-        self.point_translation_map = {}
 
     @property
     def url(self):
@@ -93,30 +91,30 @@ def _request(self, endpoint: str, method="POST", parameters=None) -> requests.Re
         return response
 
     @parallelize
-    def status(self, run_id: Union[RunID, List[RunID]]) -> str:
-        """Get status of run
+    def status(self, site_id: Union[SiteID, List[SiteID]]) -> str:
+        """Get status of site
 
-        :param run_id: id of run or list of ids
-        :returns: status of run
+        :param site_id: id of site or list of ids
+        :returns: status of site
         """
-        response = self._request(f"runs/{run_id}", method="GET").json()
-        return response["status"]
+        response = self._request(f"sites/{site_id}", method="GET").json()
+        return response["data"]["status"]
 
     @parallelize
-    def get_error_log(self, run_id: Union[RunID, List[RunID]]) -> str:
-        """Get error log from run
+    def get_error_log(self, site_id: Union[SiteID, List[SiteID]]) -> str:
+        """Get error log from site
 
-        :param run_id: id of run or list of ids
-        :returns: error log from run
+        :param site_id: id of site or list of ids
+        :returns: error log from site
         """
-        response = self._request(f"runs/{run_id}", method="GET").json()
-        return response["errorLog"]
+        response = self._request(f"sites/{site_id}", method="GET").json()
+        return response["data"]["errorLog"]
 
     @parallelize
-    def wait(self, run_id: Union[RunID, List[RunID]], desired_status: str, timeout: float = 600) -> None:
-        """Wait for a run to have a certain status or timeout with error
+    def wait(self, site_id: Union[SiteID, List[SiteID]], desired_status: str, timeout: float = 600) -> None:
+        """Wait for a site to have a certain status or timeout with error
 
-        :param run_id: id of run or list of ids
+        :param site_id: id of site or list of ids
         :param desired_status: status to wait for
         :param timeout: timeout length in seconds
         """
@@ -126,13 +124,13 @@ def wait(self, run_id: Union[RunID, List[RunID]], desired_status: str, timeout:
         current_status = None
         while time() - timeout < start_time:
             try:
-                current_status = self.status(run_id)
+                current_status = self.status(site_id)
             except HTTPError as e:
                 if e.response.status_code != 404:
                     raise e
 
             if current_status == "error":
-                error_log = self.get_error_log(run_id)
+                error_log = self.get_error_log(site_id)
                 raise AlfalfaException(error_log)
 
             if current_status != previous_status:
@@ -169,7 +167,7 @@ def upload_model(self, model_path: os.PathLike) -> ModelID:
 
         return model_id
 
-    def create_run_from_model(self, model_id: Union[ModelID, List[ModelID]], wait_for_status: bool = True) -> RunID:
+    def create_run_from_model(self, model_id: Union[ModelID, List[ModelID]], wait_for_status: bool = True) -> SiteID:
         """Create a run from a model
 
         :param model_id: id of model to create a run from or list of ids
@@ -185,7 +183,7 @@ def create_run_from_model(self, model_id: Union[ModelID, List[ModelID]], wait_fo
         return run_id
 
     @parallelize
-    def submit(self, model_path: Union[str, List[str]], wait_for_status: bool = True) -> RunID:
+    def submit(self, model_path: Union[str, List[str]], wait_for_status: bool = True) -> SiteID:
         """Submit a model to alfalfa
 
         :param model_path: path to the model to upload or list of paths
@@ -196,17 +194,17 @@ def submit(self, model_path: Union[str, List[str]], wait_for_status: bool = True
 
         model_id = self.upload_model(model_path)
 
-        # After the file has been uploaded, then tell BOPTEST to process the run
+        # After the file has been uploaded, then tell BOPTEST to process the site
         # This is done not via the haystack api, but through a REST api
         run_id = self.create_run_from_model(model_id, wait_for_status=wait_for_status)
 
         return run_id
 
     @parallelize
-    def start(self, run_id: Union[RunID, List[RunID]], start_datetime: Union[Number, datetime], end_datetime: Union[Number, datetime], timescale: int = 5, external_clock: bool = False, realtime: bool = False, wait_for_status: bool = True):
+    def start(self, site_id: Union[SiteID, List[SiteID]], start_datetime: Union[Number, datetime], end_datetime: Union[Number, datetime], timescale: int = 5, external_clock: bool = False, realtime: bool = False, wait_for_status: bool = True):
         """Start one run from a model.
 
-        :param run_id: id of run or list of ids
+        :param site_id: id of site or list of ids
         :param start_datetime: time to start the model from
         :param end_datetime: time to stop the model at (may not be honored for external_clock=True)
         :param timescale: multiple of real time to run model at (for external_clock=False)
@@ -222,120 +220,100 @@ def start(self, run_id: Union[RunID, List[RunID]], start_datetime: Union[Number,
             'realtime': realtime
         }
 
-        response = self._request(f"runs/{run_id}/start", parameters=parameters)
+        response = self._request(f"sites/{site_id}/start", parameters=parameters)
 
         assert response.status_code == 204, "Got wrong status_code from alfalfa"
 
         if wait_for_status:
-            self.wait(run_id, "running")
+            self.wait(site_id, "running")
 
     @parallelize
-    def stop(self, run_id: Union[RunID, List[RunID]], wait_for_status: bool = True):
+    def stop(self, site_id: Union[SiteID, List[SiteID]], wait_for_status: bool = True):
         """Stop a run
 
-        :param run_id: id of the run or list of ids
-        :param wait_for_status: wait for the run to be "complete" before returning
+        :param site_id: id of the site or list of ids
+        :param wait_for_status: wait for the site to be "complete" before returning
         """
 
-        response = self._request(f"runs/{run_id}/stop")
+        response = self._request(f"sites/{site_id}/stop")
 
         assert response.status_code == 204, "Got wrong status_code from alfalfa"
 
         if wait_for_status:
-            self.wait(run_id, "complete")
+            self.wait(site_id, "complete")
 
     @parallelize
-    def advance(self, run_id: Union[RunID, List[RunID]]) -> None:
-        """Advance a run 1 timestep
+    def advance(self, site_id: Union[SiteID, List[SiteID]]) -> None:
+        """Advance a site 1 timestep
 
-        :param run_id: id of run or list of ids"""
-        self._request(f"runs/{run_id}/advance")
+        :param site_id: id of site or list of ids"""
+        self._request(f"sites/{site_id}/advance")
 
-    def get_inputs(self, run_id: str) -> List[str]:
-        """Get inputs of run
+    def get_inputs(self, site_id: str) -> List[str]:
+        """Get inputs of site
 
-        :param run_id: id of run
+        :param site_id: id of site
         :returns: list of input names"""
 
-        response = self._request(f"runs/{run_id}/points", method="POST",
-                                 parameters={ "pointTypes": ["INPUT", "BIDIRECTIONAL"]})
+        response = self._request(f"sites/{site_id}/points/inputs", method="GET")
         response_body = response.json()
         inputs = []
-        for point in response_body:
+        for point in response_body["data"]:
             if point["name"] != "":
                 inputs.append(point["name"])
         return inputs
 
-    def set_inputs(self, run_id: str, inputs: dict) -> None:
-        """Set inputs of run
+    def set_inputs(self, site_id: str, inputs: dict) -> None:
+        """Set inputs of site
 
-        :param run_id: id of run
+        :param site_id: id of site
         :param inputs: dictionary of point names and input values"""
         point_writes = []
         for name, value in inputs.items():
-            id = self._get_point_translation(run_id, name)
-            if id:
-                point_writes.append({'id': id, 'value': value})
-        self._request(f"runs/{run_id}/points/values", method="PUT", parameters={'points': point_writes})
+            point_writes.append({'name': name, 'value': value})
+        self._request(f"sites/{site_id}/points/inputs", method="PUT", parameters={'points': point_writes})
 
-    def get_outputs(self, run_id: str) -> dict:
-        """Get outputs of run
+    def get_outputs(self, site_id: str) -> dict:
+        """Get outputs of site
 
-        :param run_id: id of run
+        :param site_id: id of site
         :returns: dictionary of output names and values"""
-        response = self._request(f"runs/{run_id}/points/values", method="POST",
-                                 parameters={ "pointTypes": ["OUTPUT", "BIDIRECTIONAL"]})
+        response = self._request(f"sites/{site_id}/points/outputs", method="GET")
         response_body = response.json()
         outputs = {}
-        for point in response_body:
-            name = self._get_point_translation(run_id, point["id"])
+        for point in response_body["data"]:
             if "value" in point.keys():
-                outputs[name] = point["value"]
+                outputs[point["name"]] = point["value"]
             else:
-                outputs[name] = None
+                outputs[point["name"]] = None
 
         return outputs
 
     @parallelize
-    def get_sim_time(self, run_id: Union[RunID, List[RunID]]) -> datetime:
-        """Get sim_time of run
+    def get_sim_time(self, site_id: Union[SiteID, List[SiteID]]) -> datetime:
+        """Get sim_time of site
 
-        :param run_id: id of site or list of ids
+        :param site_id: id of site or list of ids
         :returns: datetime of site
         """
-        response = self._request(f"runs/{run_id}/time", method="GET")
+        response = self._request(f"sites/{site_id}/time", method="GET")
         response_body = response.json()
         return datetime.strptime(response_body["time"], '%Y-%m-%d %H:%M:%S')
 
-    def set_alias(self, alias: str, run_id: RunID) -> None:
-        """Set alias to point to a run_id
+    def set_alias(self, alias: str, site_id: SiteID) -> None:
+        """Set alias to point to a site_id
 
-        :param run_id: id of run to point alias to
+        :param site_id: id of site to point alias to
         :param alias: alias to use"""
 
-        self._request(f"aliases/{alias}", method="PUT", parameters={"runId": run_id})
+        self._request(f"aliases/{alias}", method="PUT", parameters={"siteId": site_id})
 
-    def get_alias(self, alias: str) -> RunID:
-        """Get run_id from alias
+    def get_alias(self, alias: str) -> SiteID:
+        """Get site_id from alias
 
         :param alias: alias
-        :returns: Id of run associated with alias"""
+        :returns: Id of site associated with alias"""
 
         response = self._request(f"aliases/{alias}", method="GET")
         response_body = response.json()
         return response_body
-
-    def _get_point_translation(self, *args):
-        if args in self.point_translation_map:
-            return self.point_translation_map[args]
-        if args not in self.point_translation_map:
-            self._fetch_points(args[0])
-        if args in self.point_translation_map:
-            return self.point_translation_map[args]
-        return None
-
-    def _fetch_points(self, run_id):
-        response = self._request(f"runs/{run_id}/points", method = "GET")
-        for point in response.json():
-            self.point_translation_map[(run_id, point["name"])] = point["id"]
-            self.point_translation_map[(run_id, point["id"])] = point["name"]