Merge pull request #927 from fedml-alex/dev/v0.7.0

[CoreEngine] attach the logs to new run id when starting a new run or model deployment.

Author: fedml-alex

python/fedml/__init__.py

@@ -23,7 +23,7 @@
 _global_training_type = None
 _global_comm_backend = None
 
-__version__ = "0.8.3a19"
+__version__ = "0.8.3a21"
 
 
 def init(args=None):

python/fedml/cli/edge_deployment/client_runner.py

@@ -722,6 +722,8 @@ def callback_start_train(self, topic, payload):
 
         # Start log processor for current run
         self.args.run_id = run_id
+        self.args.edge_id = self.edge_id
+        MLOpsRuntimeLog.get_instance(self.args).init_logs(show_stdout_log=True)
         logging.info("start the log processor")
         MLOpsRuntimeLogDaemon.get_instance(self.args).start_log_processor(run_id, self.edge_id)
 

python/fedml/cli/model_deployment/device_client_runner.py

@@ -576,6 +576,8 @@ def callback_start_deployment(self, topic, payload):
         # Start log processor for current run
         run_id = inference_end_point_id
         self.args.run_id = run_id
+        self.args.edge_id = self.edge_id
+        MLOpsRuntimeLog.get_instance(self.args).init_logs(show_stdout_log=True)
         MLOpsRuntimeLogDaemon.get_instance(self.args).set_log_source(
             ClientConstants.FEDML_LOG_SOURCE_TYPE_MODEL_END_POINT)
         MLOpsRuntimeLogDaemon.get_instance(self.args).start_log_processor(run_id, self.edge_id)

python/fedml/cli/model_deployment/device_server_runner.py

@@ -698,10 +698,12 @@ def callback_start_deployment(self, topic, payload):
         inference_end_point_id = run_id
 
         # Start log processor for current run
+        self.args.run_id = run_id
+        self.args.edge_id = self.edge_id
+        MLOpsRuntimeLog.get_instance(self.args).init_logs(show_stdout_log=True)
         MLOpsRuntimeLogDaemon.get_instance(self.args).set_log_source(
             ServerConstants.FEDML_LOG_SOURCE_TYPE_MODEL_END_POINT)
         MLOpsRuntimeLogDaemon.get_instance(self.args).start_log_processor(run_id, self.edge_id)
-        self.args.run_id = run_id
 
         self.ota_upgrade(payload, request_json)
 

python/fedml/cli/server_deployment/server_runner.py

@@ -688,6 +688,9 @@ def callback_start_train(self, topic=None, payload=None):
         if self.run_as_edge_server_and_agent:
             # Start log processor for current run
             logging.info("start the log processor.")
+            self.args.run_id = run_id
+            self.args.edge_id = self.edge_id
+            MLOpsRuntimeLog.get_instance(self.args).init_logs(show_stdout_log=True)
             MLOpsRuntimeLogDaemon.get_instance(self.args).start_log_processor(run_id, self.edge_id)
 
         if not self.run_as_cloud_agent and not self.run_as_cloud_server:

python/fedml/core/mlops/mlops_runtime_log.py

@@ -128,6 +128,7 @@ def log_ntp_time(sec, what):
         else:
             stdout_handle.setLevel(logging.CRITICAL)
             self.logger.setLevel(logging.CRITICAL)
+        self.logger.handlers.clear()
         self.logger.addHandler(stdout_handle)
         if hasattr(self, "should_write_log_file") and self.should_write_log_file:
             when = 'D'

python/setup.py

@@ -89,7 +89,7 @@ def finalize_options(self):
 
 setup(
     name="fedml",
-    version="0.8.3a19",
+    version="0.8.3a21",
     author="FedML Team",
     author_email="[email protected]",
     description="A research and production integrated edge-cloud library for "