[2.5] Clean up to allow creation of nvflare light (#2573)

* clean up to allow creation of nvflare light

* move defs to cellnet

nvflare/client/ipc/ipc_agent.py

@@ -104,8 +104,13 @@ def __init__(
         self.cell.register_request_cb(channel=defs.CHANNEL, topic=defs.TOPIC_HEARTBEAT, cb=self._handle_heartbeat)
         self.cell.register_request_cb(channel=defs.CHANNEL, topic=defs.TOPIC_BYE, cb=self._handle_bye)
         self.cell.register_request_cb(channel=defs.CHANNEL, topic=defs.TOPIC_ABORT, cb=self._handle_abort_task)
-        self.cell.add_incoming_request_filter(
-            channel=defs.CHANNEL,
+        self.cell.core_cell.add_incoming_request_filter(
+            channel="*",
+            topic="*",
+            cb=self._msg_received,
+        )
+        self.cell.core_cell.add_incoming_reply_filter(
+            channel="*",
             topic="*",
             cb=self._msg_received,
         )

nvflare/fuel/f3/cellnet/cell.py

@@ -20,13 +20,12 @@
 from typing import Dict, List, Union
 
 from nvflare.fuel.f3.cellnet.core_cell import CoreCell, TargetMessage
-from nvflare.fuel.f3.cellnet.defs import MessageHeaderKey, MessageType, ReturnCode
+from nvflare.fuel.f3.cellnet.defs import CellChannel, MessageHeaderKey, MessageType, ReturnCode
 from nvflare.fuel.f3.cellnet.utils import decode_payload, encode_payload, make_reply
 from nvflare.fuel.f3.message import Message
 from nvflare.fuel.f3.stream_cell import StreamCell
 from nvflare.fuel.f3.streaming.stream_const import StreamHeaderKey
 from nvflare.fuel.f3.streaming.stream_types import StreamFuture
-from nvflare.private.defs import CellChannel
 from nvflare.security.logging import secure_format_exception
 
 CHANNELS_TO_EXCLUDE = (

nvflare/fuel/f3/cellnet/defs.py

@@ -135,3 +135,39 @@ class AbortRun(Exception):
 
 class InvalidRequest(Exception):
     pass
+
+
+class SSLConstants:
+    """hard coded names related to SSL."""
+
+    CERT = "ssl_cert"
+    PRIVATE_KEY = "ssl_private_key"
+    ROOT_CERT = "ssl_root_cert"
+
+
+class CellChannel:
+
+    CLIENT_MAIN = "admin"
+    AUX_COMMUNICATION = "aux_communication"
+    SERVER_MAIN = "task"
+    SERVER_COMMAND = "server_command"
+    SERVER_PARENT_LISTENER = "server_parent_listener"
+    CLIENT_COMMAND = "client_command"
+    CLIENT_SUB_WORKER_COMMAND = "client_sub_worker_command"
+    MULTI_PROCESS_EXECUTOR = "multi_process_executor"
+    SIMULATOR_RUNNER = "simulator_runner"
+    RETURN_ONLY = "return_only"
+
+
+class CellChannelTopic:
+
+    Register = "register"
+    Quit = "quit"
+    GET_TASK = "get_task"
+    SUBMIT_RESULT = "submit_result"
+    HEART_BEAT = "heart_beat"
+    EXECUTE_RESULT = "execute_result"
+    FIRE_EVENT = "fire_event"
+    REPORT_JOB_FAILURE = "report_job_failure"
+
+    SIMULATOR_WORKER_INIT = "simulator_worker_init"

nvflare/private/defs.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# this import is to let existing scripts import from nvflare.private.defs
+from nvflare.fuel.f3.cellnet.defs import CellChannel, CellChannelTopic, SSLConstants  # noqa: F401
 from nvflare.fuel.f3.message import Message
 from nvflare.fuel.hci.server.constants import ConnProps
 
@@ -128,42 +130,6 @@ class AppFolderConstants:
     CONFIG_ENV = "environment.json"
 
 
-class SSLConstants:
-    """hard coded names related to SSL."""
-
-    CERT = "ssl_cert"
-    PRIVATE_KEY = "ssl_private_key"
-    ROOT_CERT = "ssl_root_cert"
-
-
-class CellChannel:
-
-    CLIENT_MAIN = "admin"
-    AUX_COMMUNICATION = "aux_communication"
-    SERVER_MAIN = "task"
-    SERVER_COMMAND = "server_command"
-    SERVER_PARENT_LISTENER = "server_parent_listener"
-    CLIENT_COMMAND = "client_command"
-    CLIENT_SUB_WORKER_COMMAND = "client_sub_worker_command"
-    MULTI_PROCESS_EXECUTOR = "multi_process_executor"
-    SIMULATOR_RUNNER = "simulator_runner"
-    RETURN_ONLY = "return_only"
-
-
-class CellChannelTopic:
-
-    Register = "register"
-    Quit = "quit"
-    GET_TASK = "get_task"
-    SUBMIT_RESULT = "submit_result"
-    HEART_BEAT = "heart_beat"
-    EXECUTE_RESULT = "execute_result"
-    FIRE_EVENT = "fire_event"
-    REPORT_JOB_FAILURE = "report_job_failure"
-
-    SIMULATOR_WORKER_INIT = "simulator_worker_init"
-
-
 ERROR_MSG_PREFIX = "NVFLARE_ERROR"