Merge pull request #2153 from FedML-AI/alaydshah/inference_gateway/hotfix

Hot fix to support local debugging

Author: Raphael-Jin

python/fedml/api/modules/device.py

@@ -7,6 +7,7 @@
 import fedml
 from fedml.api.modules.constants import ModuleConstants
 from fedml.computing.scheduler.comm_utils import sys_utils
+from fedml.computing.scheduler.comm_utils.constants import SchedulerConstants
 from fedml.computing.scheduler.comm_utils.run_process_utils import RunProcessUtils
 from fedml.computing.scheduler.master.server_constants import ServerConstants
 from fedml.computing.scheduler.master.server_login import logout as server_logout
@@ -23,11 +24,6 @@ def bind(
     device_id = "0"
     os_name = ""
     docker = None
-    docker_rank = 1
-    infer_host = "127.0.0.1"
-    redis_addr = "local"
-    redis_port = "6379"
-    redis_password = "fedml_default"
     role = ""
     is_client = computing
     is_server = server
@@ -47,26 +43,22 @@ def bind(
     _bind(
         userid, computing, server,
         api_key, role, runner_cmd, device_id, os_name,
-        docker, docker_rank, infer_host,
-        redis_addr, redis_port, redis_password
-    )
+        docker)
 
 
 def _bind(
         userid, computing, server,
         api_key, role, runner_cmd, device_id, os_name,
-        docker, docker_rank, infer_host,
-        redis_addr, redis_port, redis_password
-):
+        docker):
     fedml.load_env()
     if os.getenv(ModuleConstants.ENV_FEDML_INFER_HOST) is None:
-        fedml.set_env_kv(ModuleConstants.ENV_FEDML_INFER_HOST, infer_host)
+        fedml.set_env_kv(ModuleConstants.ENV_FEDML_INFER_HOST, SchedulerConstants.REDIS_INFER_HOST)
     if os.getenv(ModuleConstants.ENV_FEDML_INFER_REDIS_ADDR) is None:
-        fedml.set_env_kv(ModuleConstants.ENV_FEDML_INFER_REDIS_ADDR, redis_addr)
+        fedml.set_env_kv(ModuleConstants.ENV_FEDML_INFER_REDIS_ADDR, SchedulerConstants.REDIS_ADDR)
     if os.getenv(ModuleConstants.ENV_FEDML_INFER_REDIS_PORT) is None:
-        fedml.set_env_kv(ModuleConstants.ENV_FEDML_INFER_REDIS_PORT, redis_port)
+        fedml.set_env_kv(ModuleConstants.ENV_FEDML_INFER_REDIS_PORT, SchedulerConstants.REDIS_PORT)
     if os.getenv(ModuleConstants.ENV_FEDML_INFER_REDIS_PASSWORD) is None:
-        fedml.set_env_kv(ModuleConstants.ENV_FEDML_INFER_REDIS_PASSWORD, redis_password)
+        fedml.set_env_kv(ModuleConstants.ENV_FEDML_INFER_REDIS_PASSWORD, SchedulerConstants.REDIS_PASSWORD)
 
     url = fedml._get_backend_service()
     platform_name = platform.system()

python/fedml/computing/scheduler/comm_utils/constants.py

@@ -109,6 +109,12 @@ class SchedulerConstants:
     IMAGE_PULL_POLICY_IF_NOT_PRESENT = "IfNotPresent"
     IMAGE_PULL_POLICY_NEVER = "Never"
 
+    REDIS_INFER_HOST = "127.0.0.1"
+    REDIS_ADDR = "local"
+    REDIS_PORT = "6379"
+    REDIS_PASSWORD = "fedml_default"
+
+
     @staticmethod
     def get_log_source(run_json):
         run_config = run_json.get("run_config", {})

python/fedml/computing/scheduler/model_scheduler/device_model_inference.py

@@ -13,6 +13,7 @@
 
 import fedml
 from fedml.api.modules.constants import ModuleConstants
+from fedml.computing.scheduler.comm_utils.constants import SchedulerConstants
 from fedml.computing.scheduler.model_scheduler.device_client_constants import ClientConstants
 from fedml.computing.scheduler.model_scheduler.device_http_inference_protocol import FedMLHttpInference
 from fedml.computing.scheduler.model_scheduler.device_server_constants import ServerConstants
@@ -27,10 +28,10 @@
 class Settings:
     server_name = "DEVICE_INFERENCE_GATEWAY"
     fedml.load_env()
-    redis_addr = os.getenv(ModuleConstants.ENV_FEDML_INFER_REDIS_ADDR)
-    redis_port = os.getenv(ModuleConstants.ENV_FEDML_INFER_REDIS_PORT)
-    redis_password = os.getenv(ModuleConstants.ENV_FEDML_INFER_REDIS_PASSWORD)
-    model_infer_host = os.getenv(ModuleConstants.ENV_FEDML_INFER_HOST)
+    redis_addr = os.getenv(ModuleConstants.ENV_FEDML_INFER_REDIS_ADDR, SchedulerConstants.REDIS_ADDR)
+    redis_port = os.getenv(ModuleConstants.ENV_FEDML_INFER_REDIS_PORT, SchedulerConstants.REDIS_PORT)
+    redis_password = os.getenv(ModuleConstants.ENV_FEDML_INFER_REDIS_PASSWORD, SchedulerConstants.REDIS_PASSWORD)
+    model_infer_host = os.getenv(ModuleConstants.ENV_FEDML_INFER_HOST, SchedulerConstants.REDIS_INFER_HOST)
     version = fedml.get_env_version()
     mqtt_config = MLOpsConfigs.fetch_mqtt_config()