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

[CoreEngine] polish upgrading status texts to make it more clear.

Author: fedml-alex

python/fedml/__init__.py

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

python/fedml/cli/edge_deployment/client_runner.py

@@ -687,7 +687,7 @@ def ota_upgrade(self, payload, request_json):
 
             sys_utils.do_upgrade(self.version, upgrade_version)
 
-            raise Exception("Upgrading...")
+            raise Exception("Restarting after upgraded...")
 
     def callback_start_train(self, topic, payload):
         # Get training params
@@ -1111,8 +1111,8 @@ def start_agent_mqtt_loop(self):
         try:
             self.mqtt_mgr.loop_forever()
         except Exception as e:
-            if str(e) == "Upgrading...":
-                logging.info("Upgrading...")
+            if str(e) == "Restarting after upgraded...":
+                logging.info("Restarting after upgraded...")
             else:
                 logging.info("Client tracing: {}".format(traceback.format_exc()))
             self.mqtt_mgr.loop_stop()

python/fedml/cli/model_deployment/device_client_runner.py

@@ -544,7 +544,7 @@ def ota_upgrade(self, payload, request_json):
 
             sys_utils.do_upgrade(self.version, upgrade_version)
 
-            raise Exception("Upgrading...")
+            raise Exception("Restarting after upgraded...")
 
     def callback_start_deployment(self, topic, payload):
         """
@@ -981,8 +981,8 @@ def start_agent_mqtt_loop(self):
         try:
             self.mqtt_mgr.loop_forever()
         except Exception as e:
-            if str(e) == "Upgrading...":
-                logging.info("Upgrading...")
+            if str(e) == "Restarting after upgraded...":
+                logging.info("Restarting after upgraded...")
             else:
                 logging.info("Client tracing: {}".format(traceback.format_exc()))
             self.mqtt_mgr.loop_stop()

python/fedml/cli/model_deployment/device_server_runner.py

@@ -669,7 +669,7 @@ def ota_upgrade(self, payload, request_json):
 
             sys_utils.do_upgrade(self.version, upgrade_version)
 
-            raise Exception("Upgrading...")
+            raise Exception("Restarting after upgraded...")
 
     def callback_start_deployment(self, topic, payload):
         """
@@ -1453,8 +1453,8 @@ def start_agent_mqtt_loop(self):
         try:
             self.mqtt_mgr.loop_forever()
         except Exception as e:
-            if str(e) == "Upgrading...":
-                logging.info("Upgrading...")
+            if str(e) == "Restarting after upgraded...":
+                logging.info("Restarting after upgraded...")
             else:
                 logging.info("Server tracing: {}".format(traceback.format_exc()))
             self.mqtt_mgr.loop_stop()

python/fedml/cli/server_deployment/server_runner.py

@@ -667,7 +667,7 @@ def ota_upgrade(self, payload, request_json):
 
             sys_utils.do_upgrade(self.version, upgrade_version)
 
-            raise Exception("Upgrading...")
+            raise Exception("Restarting after upgraded...")
 
     def callback_start_train(self, topic=None, payload=None):
         logging.info("callback_start_train payload: {}".format(payload))
@@ -1504,8 +1504,8 @@ def start_agent_mqtt_loop(self):
         try:
             self.mqtt_mgr.loop_forever()
         except Exception as e:
-            if str(e) == "Upgrading...":
-                logging.info("Upgrading...")
+            if str(e) == "Restarting after upgraded...":
+                logging.info("Restarting after upgraded...")
             else:
                 logging.info("Server tracing: {}".format(traceback.format_exc()))
             self.mqtt_mgr.loop_stop()

python/fedml/cross_silo/server/fedml_server_manager.py

@@ -69,8 +69,7 @@ def send_init_msg(self):
             # and transfer when click "Create Model Card"
             model_input_url = mlops.log_training_model_input_info(list(input_shape), list(input_type))
         except Exception as e:
-            logging.info("exception when processing model net and model input info: {}".format(
-                traceback.format_exc()))
+            logging.info("Cannot get dummy input size or shape for model serving")
 
     def register_message_receive_handlers(self):
         logging.info("register_message_receive_handlers------")

python/setup.py

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