Merge pull request #2119 from FedML-AI/alaydshah/run/logs

Fix run logs cli command

Author: chaoyanghe

python/fedml/api/modules/run.py

@@ -51,7 +51,7 @@ def start(platform: str, create_run_result: FedMLRunStartedModel, device_server:
 
     run_start_result = FedMLRunManager.get_instance().start_run(platform=platform, create_run_result=create_run_result,
                                                                 device_server=device_server, device_edges=device_edges,
-                                                                api_key=api_key,
+                                                                api_key=get_api_key(),
                                                                 feature_entry_point=feature_entry_point)
 
     return run_start_result
@@ -79,7 +79,7 @@ def status(run_name: Optional[str], run_id: str, platform: str, api_key: str) ->
     _authenticate_and_validate_platform(api_key, platform)
 
     run_status = None
-    run_list_obj = list_run(run_name=run_name, run_id=run_id, platform=platform, api_key=api_key)
+    run_list_obj = list_run(run_name=run_name, run_id=run_id, platform=platform, api_key=get_api_key())
 
     if run_list_obj is not None:
         if len(run_list_obj.run_list) > 1:
@@ -93,12 +93,13 @@ def status(run_name: Optional[str], run_id: str, platform: str, api_key: str) ->
 # input: run_id, page_num, page_size, need_all_logs, platform, api_key
 # return RunLogResult(run_status, total_log_lines, total_log_pages, log_line_list, run_logs)
 def logs(run_id: str, page_num: int, page_size: int, need_all_logs: bool, platform: str, api_key: str) -> RunLogResult:
-    _authenticate_and_validate_platform(api_key, platform)
+    api_key = authenticate(api_key)
+    validate_platform(platform)
 
     if run_id is None:
         raise Exception("Please specify run id.")
 
-    _, run_status = status(run_name=None, run_id=run_id, platform=platform, api_key=get_api_key())
+    _, run_status = status(run_name=None, run_id=run_id, platform=platform, api_key=api_key)
 
     total_log_nums, total_log_pages, log_line_list, run_logs = 0, 0, list(), None
 
@@ -110,7 +111,7 @@ def logs(run_id: str, page_num: int, page_size: int, need_all_logs: bool, platfo
                                                                user_api_key=api_key)
 
         if run_logs is not None:
-            total_log_pages, total_log_nums = run_logs.total_num, run_logs.total_pages
+            total_log_pages, total_log_nums = run_logs.total_pages, run_logs.total_num
             _parse_logs(log_line_list, run_logs)
 
         return RunLogResult(run_status=run_status, total_log_lines=total_log_nums, total_log_pages=total_log_pages,

python/fedml/cli/modules/run.py

@@ -184,21 +184,21 @@ def status(platform, run_name, run_id, api_key, version):
     "--page_num",
     "-pn",
     type=int,
-    default=0,
+    default=1,
     help="request page num for logs. --need_all_logs should be set to False if you want to use this option.",
 )
 @click.option(
     "--page_size",
     "-ps",
     type=int,
-    default=0,
+    default=10,
     help="request page size for logs, --need_all_logs should be set to False if you want to use this option.",
 )
 @click.option(
     "--need_all_logs",
     "-a",
     type=bool,
-    default=True,
+    default=False,
     help="boolean value representing if all logs are needed. Default to True",
 )
 def logs(platform, run_id, api_key, version, page_num, page_size, need_all_logs):
@@ -217,8 +217,8 @@ def logs(platform, run_id, api_key, version, page_num, page_size, need_all_logs)
         return
 
     # Show run log summary info
-    log_head_table = PrettyTable(['Run ID', 'Total Log Lines', 'Log URL'])
-    log_head_table.add_row([run_id, run_log_result.total_log_lines, run_logs.log_full_url])
+    log_head_table = PrettyTable(['Run ID', 'Printed Log Lines', 'Total Log Lines', 'Log URL'])
+    log_head_table.add_row([run_id, len(run_log_result.log_line_list), run_logs.total_num, run_logs.log_full_url])
     click.echo("\nLogs summary info is as follows.")
     print(log_head_table)
 
@@ -234,7 +234,7 @@ def logs(platform, run_id, api_key, version, page_num, page_size, need_all_logs)
     if len(run_log_result.log_line_list) > 0:
         click.echo("\nAll logs is as follows.")
         for log_line in run_log_result.log_line_list:
-            click.echo(log_line.rstrip('\n'))
+            click.echo(log_line)
 
 
 def _print_run_table(run_list_obj):

python/fedml/computing/scheduler/scheduler_entry/run_manager.py

@@ -162,10 +162,10 @@ def __init__(self, run_log_list_json):
         self.log_devices = list()
         for log_dev in log_devices_json:
             self.log_devices.append(FedMLRunLogDeviceModel(log_dev))
-        self.total_num = run_log_list_json.get("total_num", 0)
-        self.total_pages = run_log_list_json.get("total_pages", 0)
-        self.current_page = run_log_list_json.get("current_page", 0)
-        self.log_lines = run_log_list_json.get("logs", [])
+        self.total_num = run_log_list_json.get("totalSize", 0)
+        self.total_pages = run_log_list_json.get("totalPages", 0)
+        self.current_page = run_log_list_json.get("pageNum", 0)
+        self.log_lines = run_log_list_json.get("logList", [])
 
 
 class FedMLRunLogDeviceModel(object):
@@ -277,7 +277,6 @@ def get_run_logs(self, run_id: str, page_num: int, page_size: int, user_api_key:
         run_log_list_result = None
         run_logs_json = {
             "apiKey": user_api_key,
-            "edgeId": "-1",
             "pageNum": page_num,
             "pageSize": page_size,
             "runId": run_id,