Allow for filtering experiments list with multiple project handles

Author: BartoszCki

paperspace/cli.py

@@ -271,11 +271,11 @@ def stop(experiment_handle):
     commands.stop_experiment(experiment_handle)
 
 
-@click.option("--projectHandle", "project_handle")
+@click.option("--projectHandle", "-p", "project_handles", multiple=True)
 @experiments.command("list")
-def list_experiments(project_handle):
+def list_experiments(project_handles):
     command = commands.ListExperimentsCommand()
-    command.execute(project_handle)
+    command.execute(project_handles)
 
 
 @experiments.command("details")

paperspace/client.py

@@ -15,24 +15,24 @@ def get_path(self, url):
 
     def post(self, url, json=None, params=None):
         path = self.get_path(url)
-        logger.debug("Sending POST: {}\nto: {}\nwith headers: {}".format(json, path, self.headers))
         response = requests.post(path, json=json, params=params, headers=self.headers)
+        logger.debug("POST request sent to: {} with headers: {}".format(response.url, self.headers))
         logger.debug("Response status code: {}".format(response.status_code))
         logger.debug("Response content: {}".format(response.content))
         return response
 
     def put(self, url):
         path = self.get_path(url)
-        logger.debug("Sending PUT to {}\nwith headers: {}".format(path, self.headers))
         response = requests.put(path, headers=self.headers)
+        logger.debug("PUT request sent to: {} with headers: {}".format(response.url, self.headers))
         logger.debug("Response status code: {}".format(response.status_code))
         logger.debug("Response content: {}".format(response.content))
         return response
 
     def get(self, url, params=None):
         path = self.get_path(url)
-        logger.debug("Sending GET to {}\nwith headers: {}".format(path, self.headers))
         response = requests.get(path, params=params, headers=self.headers)
+        logger.debug("GET request sent to: {} with headers: {}".format(response.url, self.headers))
         logger.debug("Response status code: {}".format(response.status_code))
         logger.debug("Response content: {}".format(response.content))
         return response

paperspace/commands.py

@@ -69,20 +69,28 @@ class ListExperimentsCommand(object):
     def __init__(self, api=experiments_api):
         self.api = api
 
-    def execute(self, project_handle=None):
-        # TODO: change to limit: -1 when PS-9535 is deployed to production
-        params = {"limit": 1000000}  # to list all experiments
-        if project_handle:
-            params["projectHandle[0]"] = project_handle
+    def execute(self, project_handles=None):
+        params = self._get_query_params(project_handles)
         response = self.api.get("/experiments/", params=params)
 
         try:
-            experiments = self._get_experiments_list(response, bool(project_handle))
+            experiments = self._get_experiments_list(response, bool(project_handles))
         except (ValueError, KeyError) as e:
-            logger.log("Error while parsing response data")
+            logger.log("Error while parsing response data: {}".format(e))
         else:
             self._log_experiments_list(experiments)
 
+    @staticmethod
+    def _get_query_params(project_handles):
+        # TODO: change to limit: -1 when PS-9535 is deployed to production
+        # to list all experiments
+        params = {"limit": 1000000}
+        for i, handle in enumerate(project_handles):
+            key = "projectHandle[{}]".format(i)
+            params[key] = handle
+
+        return params
+
     @staticmethod
     def _make_experiments_list_table(experiments):
         data = [("Name", "Handle", "Status")]
@@ -103,11 +111,14 @@ def _get_experiments_list(response, filtered=False):
         if not response.ok:
             raise ValueError("Unknown error")
 
-        experiments = response.json()["data"]
-        if not filtered:  # If filtering by projectHandle response data has different format
-            return experiments
+        data = response.json()["data"]
+        if not filtered:  # If filtering by projectHandle response data has different format...
+            return data
 
-        experiments = [experiment for experiment in experiments[0]["data"]]
+        experiments = []
+        for project_experiments in data:
+            for experiment in project_experiments["data"]:
+                experiments.append(experiment)
         return experiments
 
     def _log_experiments_list(self, experiments):