tweak: Incorporate feedback from @kossak.

Author: colin-welch

paperspace/cli/experiments.py

@@ -273,7 +273,7 @@ def create_and_start_multi_node(ctx, api_key, show_logs, **kwargs):
     experiments_api = client.API(config.CONFIG_EXPERIMENTS_HOST, api_key=api_key)
     command = experiments_commands.CreateAndStartExperimentCommand(api=experiments_api)
     experiment = command.execute(kwargs)
-    if experiment is not None and show_logs is True:
+    if experiment and show_logs:
         ctx.invoke(list_logs, experiment_id=experiment["handle"], line=0, limit=100, follow=True, api_key=api_key)
 
 
@@ -288,7 +288,7 @@ def create_and_start_single_node(ctx, api_key, show_logs, **kwargs):
     experiments_api = client.API(config.CONFIG_EXPERIMENTS_HOST, api_key=api_key)
     command = experiments_commands.CreateAndStartExperimentCommand(api=experiments_api)
     experiment = command.execute(kwargs)
-    if experiment is not None and show_logs is True:
+    if experiment and show_logs:
         ctx.invoke(list_logs, experiment_id=experiment["handle"], line=0, limit=100, follow=True, api_key=api_key)
 
 
@@ -300,7 +300,7 @@ def create_and_start_single_node(ctx, api_key, show_logs, **kwargs):
 def start_experiment(ctx, experiment_id, show_logs, api_key):
     experiments_api = client.API(config.CONFIG_EXPERIMENTS_HOST, api_key=api_key)
     experiments_commands.start_experiment(experiment_id, api=experiments_api)
-    if show_logs is True:
+    if show_logs:
         ctx.invoke(list_logs, experiment_id=experiment_id, line=0, limit=100, follow=True, api_key=api_key)
 
 

paperspace/commands/experiments.py

@@ -221,23 +221,23 @@ def _get_logs(self, experiment_id, line, limit):
 
     def _log_logs_list(self, data, table, table_data, follow):
         if not data:
-            self.logger.log("No Logs found")
+            self.logger.log("No logs found")
+            return
+        if follow:
+            # TODO track number of jobs seen to look for PSEOF
+            if data[-1].get("message") == "PSEOF":
+                self.is_logs_complete = True
+            else:
+                self.last_line_number = data[-1].get("line")
+            for log in data:
+                log_str = "{}\t{}\t{}"
+                self.logger.log(log_str.format(style(fg="blue", text=str(log.get("jobId"))), style(fg="red", text=str(log.get("line"))), log.get("message")))
         else:
-            if follow:
-                # TODO track number of jobs seen to look for PSEOF
-                if data[-1].get("message") == "PSEOF":
-                    self.is_logs_complete = True
-                else:
-                    self.last_line_number = data[-1].get("line")
-                for log in data:
-                    log_str = "{}\t{}\t{}"
-                    self.logger.log(log_str.format(style(fg="blue", text=str(log.get("jobId"))), style(fg="red", text=str(log.get("line"))), log.get("message")))
+            table_str = self._make_table(data, table, table_data)
+            if len(table_str.splitlines()) > get_terminal_lines():
+                pydoc.pager(table_str)
             else:
-                table_str = self._make_table(data, table, table_data)
-                if len(table_str.splitlines()) > get_terminal_lines():
-                    pydoc.pager(table_str)
-                else:
-                    self.logger.log(table_str)
+                self.logger.log(table_str)
 
     def _make_table(self, logs, table, table_data):
         if logs[-1].get("message") == "PSEOF":

paperspace/commands/jobs.py

@@ -115,21 +115,21 @@ def _get_logs(self, job_id, line, limit):
     def _log_logs_list(self, data, table, table_data, follow):
         if not data:
             self.logger.log("No Logs found")
+            return
+        if follow:
+            if data[-1].get("message") == "PSEOF":
+                self.is_logs_complete = True
+            else:
+                self.last_line_number = data[-1].get("line")
+            for log in data:
+                log_str = "{}\t{}\t{}"
+                self.logger.log(log_str.format(style(fg="blue", text=str(log.get("jobId"))), style(fg="red", text=str(log.get("line"))), log.get("message")))
         else:
-            if follow:
-                if data[-1].get("message") == "PSEOF":
-                    self.is_logs_complete = True
-                else:
-                    self.last_line_number = data[-1].get("line")
-                for log in data:
-                    log_str = "{}\t{}\t{}"
-                    self.logger.log(log_str.format(style(fg="blue", text=str(log.get("jobId"))), style(fg="red", text=str(log.get("line"))), log.get("message")))
+            table_str = self._make_table(data, table, table_data)
+            if len(table_str.splitlines()) > get_terminal_lines():
+                pydoc.pager(table_str)
             else:
-                table_str = self._make_table(data, table, table_data)
-                if len(table_str.splitlines()) > get_terminal_lines():
-                    pydoc.pager(table_str)
-                else:
-                    self.logger.log(table_str)
+                self.logger.log(table_str)
 
     def _make_table(self, logs, table, table_data):
         if logs[-1].get("message") == "PSEOF":