Make services stateful; remove circular dep

docs/api/syft.rst

@@ -13,6 +13,7 @@ Subpackages
    :maxdepth: 4
 
    syft.ast
+   syft.common
    syft.core
    syft.lib
    syft.typecheck

src/syft/core/worker/service/__init__.py

@@ -1,6 +1,6 @@
-# from . import delete_object_service
-# from . import get_object_service
-# from . import run_class_service
-# from . import run_function_or_constructor_service
-# from . import save_object_service
-# from . import worker_service
+from . import delete_object_service
+from . import get_object_service
+from . import run_class_service
+from . import run_function_or_constructor_service
+from . import save_object_service
+from . import worker_service

src/syft/core/worker/service/delete_object_service.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 from .... import type_hints
 from .worker_service import WorkerService
-from .. import message_service_mapping
 from ...message import DeleteObjectMessage
 from ....common import AbstractWorker
 
@@ -17,10 +16,3 @@ def process(worker: AbstractWorker, msg: DeleteObjectMessage) -> None:
     def message_type_handler() -> type:
         return DeleteObjectMessage
 
-    @staticmethod
-    @type_hints
-    def register_service() -> None:
-        message_service_mapping[DeleteObjectMessage] = DeleteObjectService
-
-
-DeleteObjectService.register_service()

src/syft/core/worker/service/get_object_service.py

@@ -2,7 +2,6 @@
 
 from .... import type_hints
 from .worker_service import WorkerService
-from .. import message_service_mapping
 from ...message import GetObjectMessage
 from ....common import AbstractWorker
 
@@ -17,11 +16,3 @@ def process(worker: AbstractWorker, msg: GetObjectMessage) -> object: #TODO: ret
     @type_hints
     def message_type_handler() -> type:
         return GetObjectMessage
-
-    @staticmethod
-    @type_hints
-    def register_service() -> None:
-        message_service_mapping[GetObjectMessage] = GetObjectService
-
-
-GetObjectService.register_service()

src/syft/core/worker/service/run_class_service.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from .worker_service import WorkerService
-from .. import message_service_mapping
 from ...message import RunClassMethodMessage
 from .... import type_hints
 from ...pointer.pointer import Pointer
@@ -60,11 +59,3 @@ def process(worker: AbstractWorker, msg: RunClassMethodMessage) -> None:
     @type_hints
     def message_type_handler() -> type:
         return RunClassMethodMessage
-
-    @staticmethod
-    @type_hints
-    def register_service() -> None:
-        message_service_mapping[RunClassMethodMessage] = RunClassMethodService
-
-
-RunClassMethodService.register_service()

src/syft/core/worker/service/run_function_or_constructor_service.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from .worker_service import WorkerService
-from .. import message_service_mapping
 from ...message import RunFunctionOrConstructorMessage
 from .... import type_hints
 from ....common import AbstractWorker
@@ -15,14 +14,4 @@ def process(worker: AbstractWorker, msg: RunFunctionOrConstructorMessage) -> Non
     @staticmethod
     @type_hints
     def message_type_handler() -> type:
-        return RunFunctionOrConstructorMessage
-
-    @staticmethod
-    @type_hints
-    def register_service() -> None:
-        message_service_mapping[
-            RunFunctionOrConstructorMessage
-        ] = RunFunctionOrConstructorService
-
-
-RunFunctionOrConstructorService.register_service()
+        return RunFunctionOrConstructorMessage

src/syft/core/worker/service/save_object_service.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from .worker_service import WorkerService
-from .. import message_service_mapping
 from ...message import SaveObjectMessage
 
 from .... import type_hints
@@ -20,11 +19,3 @@ def process(worker: AbstractWorker, msg: SaveObjectMessage) -> None:
     @type_hints
     def message_type_handler() -> type:
         return SaveObjectMessage
-
-    @staticmethod
-    @type_hints
-    def register_service() -> None:
-        message_service_mapping[SaveObjectMessage] = SaveObjectService
-
-
-SaveObjectService.register_service()

src/syft/core/worker/service/worker_service.py

@@ -14,9 +14,4 @@ def process(worker: AbstractWorker, msg: SyftMessage) -> object:
     @staticmethod
     @type_hints
     def message_type_handler() -> SyftMessage:
-        raise NotImplementedError
-
-    @staticmethod
-    @type_hints
-    def register_service() -> None:
-        raise NotImplementedError
+        raise NotImplementedError

src/syft/core/worker/virtual/virtual_worker.py

@@ -1,7 +1,7 @@
 from ..worker import Worker
 from ..virtual.virtual_client import VirtualClient
 from typing import final
-
+from .. import service
 
 
 class VirtualWorker(Worker):
@@ -15,3 +15,14 @@ def _recv_msg(self, msg):
     def get_client(self, verbose=False):
         self.client.verbose = verbose
         return self.client
+
+    def _register_services(self) -> None:
+        services = list()
+        services.append(service.get_object_service.GetObjectService)
+        services.append(service.save_object_service.SaveObjectService)
+        services.append(service.run_class_service.RunClassMethodService)
+        services.append(service.delete_object_service.DeleteObjectService)
+        services.append(service.run_function_or_constructor_service.RunFunctionOrConstructorService)
+
+        for s in services:
+            self.msg_router[s.message_type_handler()] = s()

src/syft/core/worker/worker.py

@@ -45,11 +45,13 @@ def __init__(self, id: str, debug: bool = False, supported_frameworks: list = []
                     )
                 self.frameworks.attrs[name] = ast
 
-        self.msg_router = worker.message_service_mapping
+        self.msg_router = {}
 
         if debug:
             self.worker_stats = WorkerStats()
 
+        self._register_services()
+
     @type_hints
     def recv_msg(self, msg: SyftMessage) -> object:
         return self.msg_router[type(msg)].process(worker=self, msg=msg)
@@ -62,6 +64,10 @@ def _send_msg(self) -> None:
     def _recv_msg(self) -> None:
         raise NotImplementedError
 
+    @type_hints
+    def _register_services(self) -> None:
+        raise NotImplementedError
+
     def __repr__(self):
         if self.worker_stats:
             return f"Worker: {self.id}\n{self.worker_stats}"