From 5726018dc9c9f1fe6c4758f76e9e53d76258011d Mon Sep 17 00:00:00 2001 From: tudorcebere Date: Tue, 14 Sep 2021 14:14:55 +0300 Subject: [PATCH 1/7] moving recursive serde into the decorator --- .../syft/core/adp/idp_gaussian_mechanism.py | 5 +- .../core/adp/vm_private_scalar_manager.py | 8 +- .../src/syft/core/common/serde/deserialize.py | 25 +++--- .../src/syft/core/common/serde/recursive.py | 80 +++++++------------ .../syft/core/common/serde/serializable.py | 35 +++++++- .../node_service/simple/simple_messages.py | 6 +- .../syft/core/tensor/autodp/initial_gamma.py | 5 +- .../core/tensor/autodp/intermediate_gamma.py | 5 +- .../syft/core/tensor/autodp/row_entity_phi.py | 5 +- .../core/tensor/autodp/single_entity_phi.py | 7 +- .../core/tensor/autograd/backward_ops/add.py | 5 +- .../core/tensor/autograd/backward_ops/mul.py | 5 +- .../tensor/autograd/backward_ops/repeat.py | 5 +- .../tensor/autograd/backward_ops/reshape.py | 5 +- .../core/tensor/autograd/backward_ops/sum.py | 5 +- .../src/syft/core/tensor/autograd/tensor.py | 5 +- packages/syft/src/syft/core/tensor/tensor.py | 4 +- .../syft/src/syft/core/test/module_test.py | 11 ++- .../lib/python/collections/collections.py | 9 +-- 19 files changed, 129 insertions(+), 106 deletions(-) diff --git a/packages/syft/src/syft/core/adp/idp_gaussian_mechanism.py b/packages/syft/src/syft/core/adp/idp_gaussian_mechanism.py index 870f0f22a73..50c374d7db8 100644 --- a/packages/syft/src/syft/core/adp/idp_gaussian_mechanism.py +++ b/packages/syft/src/syft/core/adp/idp_gaussian_mechanism.py @@ -18,7 +18,7 @@ import numpy as np # relative -from ..common.serde.recursive import RecursiveSerde +from ..common.serde.serializable import serializable # methods serialize/deserialize np.int64 number @@ -61,7 +61,8 @@ def individual_RDP_gaussian(params: Dict, alpha: float) -> np.float64: # Example of a specific mechanism that inherits the Mechanism class -class iDPGaussianMechanism(Mechanism, RecursiveSerde): +@serializable(recursive_serde=True) +class iDPGaussianMechanism(Mechanism): __attr_allowlist__ = [ "name", "params", diff --git a/packages/syft/src/syft/core/adp/vm_private_scalar_manager.py b/packages/syft/src/syft/core/adp/vm_private_scalar_manager.py index 9348fd5b39a..72e80ad92ac 100644 --- a/packages/syft/src/syft/core/adp/vm_private_scalar_manager.py +++ b/packages/syft/src/syft/core/adp/vm_private_scalar_manager.py @@ -7,12 +7,13 @@ import sympy as sp # relative -from ..common.serde.recursive import RecursiveSerde +from ..common.serde.serializable import serializable from .entity import Entity from .scalar import GammaScalar -class PrimeFactory(RecursiveSerde): +@serializable(recursive_serde=True) +class PrimeFactory: """IMPORTANT: it's very important that two tensors be able to tell that they are indeed referencing the EXACT same PrimeFactory. At present this is done @@ -32,7 +33,8 @@ def next(self) -> int: return self.prev_prime -class VirtualMachinePrivateScalarManager(RecursiveSerde): +@serializable(recursive_serde=True) +class VirtualMachinePrivateScalarManager: __attr_allowlist__ = ["prime_factory", "prime2symbol"] diff --git a/packages/syft/src/syft/core/common/serde/deserialize.py b/packages/syft/src/syft/core/common/serde/deserialize.py index a6be97cfd71..188a85e8adc 100644 --- a/packages/syft/src/syft/core/common/serde/deserialize.py +++ b/packages/syft/src/syft/core/common/serde/deserialize.py @@ -78,24 +78,31 @@ def _deserialize( # There are serveral code paths that come through here and use different ways to # match and overload protobuf -> deserialize type obj_type = getattr(type(blob), "schema2type", None) + # relative + from .recursive import rs_get_protobuf_schema + from .recursive import rs_proto2object + if obj_type is None: # TODO: This can probably be removed now we have lists of obj_types obj_type = getattr(blob, "obj_type", None) + if isinstance(blob, rs_get_protobuf_schema()): + res = rs_proto2object(proto=blob) + if getattr(res, "temporary_box", False) and hasattr(res, "upcast"): + return res.upcast() + return res + if obj_type is None: traceback_and_raise(deserialization_error) + obj_type = index_syft_by_module_name(fully_qualified_name=obj_type) # type: ignore obj_type = getattr(obj_type, "_sy_serializable_wrapper_type", obj_type) elif isinstance(obj_type, list): - # circular imports - # relative - from .recursive import RecursiveSerde - - if RecursiveSerde in obj_type and isinstance( - blob, RecursiveSerde.get_protobuf_schema() - ): - # this branch is for RecursiveSerde objects - obj_type = RecursiveSerde + if isinstance(blob, rs_get_protobuf_schema()): + res = rs_proto2object(proto=blob) + if getattr(res, "temporary_box", False) and hasattr(res, "upcast"): + return res.upcast() + return res elif len(obj_type) == 1: obj_type = obj_type[0] else: diff --git a/packages/syft/src/syft/core/common/serde/recursive.py b/packages/syft/src/syft/core/common/serde/recursive.py index 4bc2c7dea31..d88f780bc09 100644 --- a/packages/syft/src/syft/core/common/serde/recursive.py +++ b/packages/syft/src/syft/core/common/serde/recursive.py @@ -1,7 +1,5 @@ # stdlib from typing import Any -from typing import Dict as DictType -from typing import List # third party from google.protobuf.reflection import GeneratedProtocolMessageType @@ -11,7 +9,6 @@ from syft import serialize # relative -from ....core.common.serde.serializable import serializable from ....lib.python import Dict from ....proto.core.common.recursive_serde_pb2 import ( RecursiveSerde as RecursiveSerde_PB, @@ -20,58 +17,43 @@ from ....util import index_syft_by_module_name -@serializable() -class RecursiveSerde: - """If you subclass from this object and put that subclass in the syft classpath somehow, then - you'll be able to serialize it without having to create a custom protobuf. Be careful with this - though, because it's going to include all attributes by default (including private data if - it's there).""" +def rs_object2proto(self: Any) -> RecursiveSerde_PB: + # if __attr_allowlist__ then only include attrs from that list + if self.__attr_allowlist__ is not None: + attrs = {} + for attr_name in self.__attr_allowlist__: + if hasattr(self, attr_name): + if self.__serde_overrides__.get(attr_name, None) is None: + attrs[attr_name] = getattr(self, attr_name) + else: + attrs[attr_name] = self.__serde_overrides__[attr_name][0]( + getattr(self, attr_name) + ) + # else include all attrs + else: + attrs = self.__dict__ # type: ignore - # put attr names here - set this to None to include all attrs (not recommended) - __attr_allowlist__: List[str] = [] - __serde_overrides__: DictType[Any, Any] = {} + return RecursiveSerde_PB( + data=serialize(Dict(attrs), to_bytes=True), + fully_qualified_name=get_fully_qualified_name(self), + ) - def _object2proto(self) -> RecursiveSerde_PB: - # if __attr_allowlist__ then only include attrs from that list - if self.__attr_allowlist__ is not None: - attrs = {} - for attr_name in self.__attr_allowlist__: - if hasattr(self, attr_name): - if self.__serde_overrides__.get(attr_name, None) is None: - attrs[attr_name] = getattr(self, attr_name) - else: - attrs[attr_name] = self.__serde_overrides__[attr_name][0]( - getattr(self, attr_name) - ) - # else include all attrs - else: - attrs = self.__dict__ # type: ignore - - return RecursiveSerde_PB( - data=serialize(Dict(attrs), to_bytes=True), - fully_qualified_name=get_fully_qualified_name(self), - ) +def rs_proto2object(proto: RecursiveSerde_PB) -> Any: + attrs = dict(deserialize(proto.data, from_bytes=True)) - @staticmethod - def _proto2object(proto: RecursiveSerde_PB) -> "RecursiveSerde": + class_type = index_syft_by_module_name(proto.fully_qualified_name) - attrs = dict(deserialize(proto.data, from_bytes=True)) + obj = class_type.__new__(class_type) # type: ignore - class_type = index_syft_by_module_name(proto.fully_qualified_name) - - obj = class_type.__new__(class_type) # type: ignore + for attr_name, attr_value in attrs.items(): + if obj.__serde_overrides__.get(attr_name, None) is None: + setattr(obj, attr_name, attr_value) + else: + setattr(obj, attr_name, obj.__serde_overrides__[attr_name][1](attr_value)) - for attr_name, attr_value in attrs.items(): - if obj.__serde_overrides__.get(attr_name, None) is None: - setattr(obj, attr_name, attr_value) - else: - setattr( - obj, attr_name, obj.__serde_overrides__[attr_name][1](attr_value) - ) + return obj - return obj - @staticmethod - def get_protobuf_schema() -> GeneratedProtocolMessageType: - return RecursiveSerde_PB +def rs_get_protobuf_schema() -> GeneratedProtocolMessageType: + return RecursiveSerde_PB diff --git a/packages/syft/src/syft/core/common/serde/serializable.py b/packages/syft/src/syft/core/common/serde/serializable.py index ff81d55f903..628884af061 100644 --- a/packages/syft/src/syft/core/common/serde/serializable.py +++ b/packages/syft/src/syft/core/common/serde/serializable.py @@ -1,6 +1,7 @@ # stdlib from typing import Any from typing import Callable as CallableT +import warnings # third party from google.protobuf.reflection import GeneratedProtocolMessageType @@ -87,7 +88,32 @@ def proto2object(proto: Any) -> Any: ) -def serializable(generate_wrapper: bool = False, protobuf_object: bool = False) -> Any: +def serializable( + generate_wrapper: bool = False, + protobuf_object: bool = False, + recursive_serde: bool = False, +) -> Any: + def rs_decorator(cls: Any) -> Any: + # relative + from .recursive import rs_get_protobuf_schema + from .recursive import rs_object2proto + from .recursive import rs_proto2object + + if not hasattr(cls, "__attr_allowlist__"): + warnings.warn( + f"__attr_allowlist__ not defined for type {cls.__name__}," + " even if it uses recursive serde, defaulting on the empty list." + ) + setattr(cls, "__attr_allowlist__", []) + + if not hasattr(cls, "__serde_overrides__"): + setattr(cls, "__serde_overrides__", {}) + + setattr(cls, "_object2proto", rs_object2proto) + setattr(cls, "_proto2object", staticmethod(rs_proto2object)) + setattr(cls, "get_protobuf_schema", staticmethod(rs_get_protobuf_schema)) + return cls + def serializable_decorator(cls: Any) -> Any: protobuf_schema = cls.get_protobuf_schema() # overloading a protobuf by adding multiple classes and we will check the @@ -103,5 +129,8 @@ def serializable_decorator(cls: Any) -> Any: if generate_wrapper: return GenerateWrapper - else: - return serializable_decorator + + if recursive_serde: + return rs_decorator + + return serializable_decorator diff --git a/packages/syft/src/syft/core/node/common/node_service/simple/simple_messages.py b/packages/syft/src/syft/core/node/common/node_service/simple/simple_messages.py index 26244f0639e..03361188e04 100644 --- a/packages/syft/src/syft/core/node/common/node_service/simple/simple_messages.py +++ b/packages/syft/src/syft/core/node/common/node_service/simple/simple_messages.py @@ -9,7 +9,6 @@ # relative from ...... import serialize -from ......core.common.serde.serializable import serializable from ......proto.core.node.common.service.simple_service_pb2 import ( SimpleMessage as SimpleMessage_PB, ) @@ -19,13 +18,14 @@ from .....common.message import ImmediateSyftMessageWithReply from .....common.message import ImmediateSyftMessageWithoutReply from .....common.serde.deserialize import _deserialize -from .....common.serde.recursive import RecursiveSerde +from .....common.serde.serializable import serializable from .....common.uid import UID from .....io.address import Address from ....abstract.node import AbstractNode -class NodeRunnableMessageWithReply(RecursiveSerde): +@serializable(recursive_serde=True) +class NodeRunnableMessageWithReply: __attr_allowlist__ = ["stuff"] diff --git a/packages/syft/src/syft/core/tensor/autodp/initial_gamma.py b/packages/syft/src/syft/core/tensor/autodp/initial_gamma.py index ca4679cc776..7e246062b9e 100644 --- a/packages/syft/src/syft/core/tensor/autodp/initial_gamma.py +++ b/packages/syft/src/syft/core/tensor/autodp/initial_gamma.py @@ -9,7 +9,7 @@ # relative from ...adp.vm_private_scalar_manager import VirtualMachinePrivateScalarManager -from ...common.serde.recursive import RecursiveSerde +from ...common.serde.serializable import serializable from ...common.uid import UID from ..passthrough import PassthroughTensor # type: ignore from .adp_tensor import ADPTensor @@ -26,7 +26,8 @@ def list2numpy(l_shape: Any) -> np.ndarray: return np.array(list_length).reshape(shape) -class InitialGammaTensor(IntermediateGammaTensor, RecursiveSerde, ADPTensor): +@serializable(recursive_serde=True) +class InitialGammaTensor(IntermediateGammaTensor, ADPTensor): __attr_allowlist__ = [ "uid", diff --git a/packages/syft/src/syft/core/tensor/autodp/intermediate_gamma.py b/packages/syft/src/syft/core/tensor/autodp/intermediate_gamma.py index 3e36756d903..621fa5382e0 100644 --- a/packages/syft/src/syft/core/tensor/autodp/intermediate_gamma.py +++ b/packages/syft/src/syft/core/tensor/autodp/intermediate_gamma.py @@ -16,13 +16,14 @@ # relative from ...adp.publish import publish from ...adp.vm_private_scalar_manager import VirtualMachinePrivateScalarManager -from ...common.serde.recursive import RecursiveSerde +from ...common.serde.serializable import serializable from ...tensor.passthrough import PassthroughTensor # type: ignore from ...tensor.passthrough import is_acceptable_simple_type # type: ignore from .adp_tensor import ADPTensor -class IntermediateGammaTensor(PassthroughTensor, RecursiveSerde, ADPTensor): +@serializable(recursive_serde=True) +class IntermediateGammaTensor(PassthroughTensor, ADPTensor): __attr_allowlist__ = [ "term_tensor", diff --git a/packages/syft/src/syft/core/tensor/autodp/row_entity_phi.py b/packages/syft/src/syft/core/tensor/autodp/row_entity_phi.py index cd8e784b5a1..28e4bc4ca4b 100644 --- a/packages/syft/src/syft/core/tensor/autodp/row_entity_phi.py +++ b/packages/syft/src/syft/core/tensor/autodp/row_entity_phi.py @@ -15,7 +15,6 @@ from ....core.adp.vm_private_scalar_manager import ( VirtualMachinePrivateScalarManager as TypeScalarManager, ) -from ....core.common.serde.recursive import RecursiveSerde from ...common.serde.serializable import serializable from ...tensor.types import AcceptableSimpleType # type: ignore from ..passthrough import PassthroughTensor # type: ignore @@ -25,8 +24,8 @@ from .initial_gamma import InitialGammaTensor # type: ignore -@serializable() -class RowEntityPhiTensor(PassthroughTensor, RecursiveSerde, ADPTensor): +@serializable(recursive_serde=True) +class RowEntityPhiTensor(PassthroughTensor, ADPTensor): __attr_allowlist__ = ["child"] diff --git a/packages/syft/src/syft/core/tensor/autodp/single_entity_phi.py b/packages/syft/src/syft/core/tensor/autodp/single_entity_phi.py index 3344e0ed946..2d201a01a40 100644 --- a/packages/syft/src/syft/core/tensor/autodp/single_entity_phi.py +++ b/packages/syft/src/syft/core/tensor/autodp/single_entity_phi.py @@ -15,7 +15,6 @@ import numpy.typing as npt # relative -from ....core.common.serde.recursive import RecursiveSerde from ....proto.core.tensor.single_entity_phi_tensor_pb2 import ( TensorWrappedSingleEntityPhiTensorPointer as TensorWrappedSingleEntityPhiTensorPointer_PB, ) @@ -267,10 +266,8 @@ def get_protobuf_schema() -> GeneratedProtocolMessageType: return TensorWrappedSingleEntityPhiTensorPointer_PB -@serializable() -class SingleEntityPhiTensor( - PassthroughTensor, AutogradTensorAncestor, RecursiveSerde, ADPTensor -): +@serializable(recursive_serde=True) +class SingleEntityPhiTensor(PassthroughTensor, AutogradTensorAncestor, ADPTensor): PointerClassOverride = TensorWrappedSingleEntityPhiTensorPointer diff --git a/packages/syft/src/syft/core/tensor/autograd/backward_ops/add.py b/packages/syft/src/syft/core/tensor/autograd/backward_ops/add.py index 73c6a06f15a..84297aa66d2 100644 --- a/packages/syft/src/syft/core/tensor/autograd/backward_ops/add.py +++ b/packages/syft/src/syft/core/tensor/autograd/backward_ops/add.py @@ -6,13 +6,14 @@ import numpy as np # relative -from .....core.common.serde.recursive import RecursiveSerde +from .....core.common.serde.serializable import serializable from ...passthrough import is_acceptable_simple_type # type: ignore from ..tensor import AutogradTensor from .op import Op -class AddOp(Op, RecursiveSerde): +@serializable(recursive_serde=True) +class AddOp(Op): """Sumation operation with 2 tensors""" __attr_allowlist__: Any = [] diff --git a/packages/syft/src/syft/core/tensor/autograd/backward_ops/mul.py b/packages/syft/src/syft/core/tensor/autograd/backward_ops/mul.py index e34e7775c07..2b66d9e86c3 100644 --- a/packages/syft/src/syft/core/tensor/autograd/backward_ops/mul.py +++ b/packages/syft/src/syft/core/tensor/autograd/backward_ops/mul.py @@ -5,13 +5,14 @@ from numpy import ndarray # relative -from .....core.common.serde.recursive import RecursiveSerde +from .....core.common.serde.serializable import serializable from ...passthrough import is_acceptable_simple_type # type: ignore from ..tensor import AutogradTensor from .op import Op -class MulOp(Op, RecursiveSerde): +@serializable(recursive_serde=True) +class MulOp(Op): """Multiplication operation with 2 tensors""" __attr_allowlist__ = [ diff --git a/packages/syft/src/syft/core/tensor/autograd/backward_ops/repeat.py b/packages/syft/src/syft/core/tensor/autograd/backward_ops/repeat.py index 2de67d9a538..baa46646095 100644 --- a/packages/syft/src/syft/core/tensor/autograd/backward_ops/repeat.py +++ b/packages/syft/src/syft/core/tensor/autograd/backward_ops/repeat.py @@ -6,12 +6,13 @@ from numpy import ndarray # relative -from .....core.common.serde.recursive import RecursiveSerde +from ....common.serde.serializable import serializable from ..tensor import AutogradTensor from .op import Op -class RepeatOp(Op, RecursiveSerde): +@serializable(recursive_serde=True) +class RepeatOp(Op): """Repeat operation across a dimension""" __attr_allowlist__ = ["x", "axis", "repeats", "input_shape", "output_shape"] diff --git a/packages/syft/src/syft/core/tensor/autograd/backward_ops/reshape.py b/packages/syft/src/syft/core/tensor/autograd/backward_ops/reshape.py index 180f9dbf058..ea7491d3f94 100644 --- a/packages/syft/src/syft/core/tensor/autograd/backward_ops/reshape.py +++ b/packages/syft/src/syft/core/tensor/autograd/backward_ops/reshape.py @@ -5,12 +5,13 @@ from numpy import ndarray # relative -from .....core.common.serde.recursive import RecursiveSerde +from .....core.common.serde.serializable import serializable from ..tensor import AutogradTensor from .op import Op -class ReshapeOp(Op, RecursiveSerde): +@serializable(recursive_serde=True) +class ReshapeOp(Op): """Multiplication operation with 2 tensors""" __attr_allowlist__ = ["x", "shape", "backward_shape"] diff --git a/packages/syft/src/syft/core/tensor/autograd/backward_ops/sum.py b/packages/syft/src/syft/core/tensor/autograd/backward_ops/sum.py index 88a795de764..c3c85e212bd 100644 --- a/packages/syft/src/syft/core/tensor/autograd/backward_ops/sum.py +++ b/packages/syft/src/syft/core/tensor/autograd/backward_ops/sum.py @@ -5,12 +5,13 @@ import numpy as np # relative -from .....core.common.serde.recursive import RecursiveSerde +from .....core.common.serde.serializable import serializable from ..tensor import AutogradTensor from .op import Op -class SumOp(Op, RecursiveSerde): +@serializable(recursive_serde=True) +class SumOp(Op): """Sum operation across a dimension""" __attr_allowlist__ = ["x", "axis", "dim_at_axis", "backward_shape"] diff --git a/packages/syft/src/syft/core/tensor/autograd/tensor.py b/packages/syft/src/syft/core/tensor/autograd/tensor.py index ea176dfc9c4..9a37adc1c4e 100644 --- a/packages/syft/src/syft/core/tensor/autograd/tensor.py +++ b/packages/syft/src/syft/core/tensor/autograd/tensor.py @@ -16,7 +16,6 @@ # relative from .. import autograd -from ....core.common.serde.recursive import RecursiveSerde from ....lib.python.collections.collections import DefaultDict from ....lib.python.collections.collections import SerializableCounter from ...common.serde.serializable import serializable @@ -27,8 +26,8 @@ from ..passthrough import is_acceptable_simple_type # type: ignore -@serializable() -class AutogradTensor(PassthroughTensor, PhiTensorAncestor, RecursiveSerde): +@serializable(recursive_serde=True) +class AutogradTensor(PassthroughTensor, PhiTensorAncestor): __attr_allowlist__ = [ "child", diff --git a/packages/syft/src/syft/core/tensor/tensor.py b/packages/syft/src/syft/core/tensor/tensor.py index d8ec5e97ab4..e15d6b503bd 100644 --- a/packages/syft/src/syft/core/tensor/tensor.py +++ b/packages/syft/src/syft/core/tensor/tensor.py @@ -15,7 +15,6 @@ # relative from ... import lib from ...ast.klass import pointerize_args_and_kwargs -from ...core.common.serde.recursive import RecursiveSerde from ...util import inherit_tags from ..common.serde.serializable import serializable from ..common.uid import UID @@ -140,14 +139,13 @@ def __add__(self, other: Any) -> Union[TensorPointer, MPCTensor]: return self.simple_add(other=other) -@serializable() +@serializable(recursive_serde=True) class Tensor( PassthroughTensor, AutogradTensorAncestor, PhiTensorAncestor, FixedPrecisionTensorAncestor, # MPCTensorAncestor, - RecursiveSerde, ): __attr_allowlist__ = ["child", "tag_name", "public_shape"] diff --git a/packages/syft/src/syft/core/test/module_test.py b/packages/syft/src/syft/core/test/module_test.py index 416aba83e74..cde4828fb33 100644 --- a/packages/syft/src/syft/core/test/module_test.py +++ b/packages/syft/src/syft/core/test/module_test.py @@ -3,7 +3,7 @@ from typing import Any # syft absolute -from syft.core.common.serde.recursive import RecursiveSerde +from syft.core.common.serde.serializable import serializable global_value: int = 5 @@ -12,7 +12,8 @@ def global_function() -> int: return global_value -class A(RecursiveSerde): +@serializable(recursive_serde=True) +class A: """This is a test class to be used in functionality test.""" __slots__ = ["_private_attr", "n"] @@ -62,7 +63,8 @@ class B(Enum): Dog = 3 -class IterWithoutLen(RecursiveSerde): +@serializable(recursive_serde=True) +class IterWithoutLen: """This is a test class for testing iterator method in Klass.""" __slots__ = ["n"] @@ -83,7 +85,8 @@ def __next__(self) -> int: raise StopIteration -class C(RecursiveSerde): +@serializable(recursive_serde=True) +class C: __attr_allowlist__ = ["dynamic_object"] diff --git a/packages/syft/src/syft/lib/python/collections/collections.py b/packages/syft/src/syft/lib/python/collections/collections.py index 4b3e2f6f3da..eee69a03021 100644 --- a/packages/syft/src/syft/lib/python/collections/collections.py +++ b/packages/syft/src/syft/lib/python/collections/collections.py @@ -5,12 +5,11 @@ from typing import Optional # relative -from ....core.common.serde.recursive import RecursiveSerde from ....core.common.serde.serializable import serializable -@serializable() -class DefaultDict(defaultdict, RecursiveSerde): +@serializable(recursive_serde=True) +class DefaultDict(defaultdict): """Aim: build a class that inherits all the methods from collections.defaultdict but is serializable""" __attr_allowlist__ = [] # type: ignore @@ -19,8 +18,8 @@ def __init__(self, factory: Optional[Any] = None, **kwargs: Any) -> None: super().__init__(default_factory=factory, **kwargs) -@serializable() -class SerializableCounter(Counter, RecursiveSerde): +@serializable(recursive_serde=True) +class SerializableCounter(Counter): __attr_allowlist__ = [] # type: ignore From b39e710bc4aa8b59ec7783498954f773a45c7e99 Mon Sep 17 00:00:00 2001 From: tudorcebere Date: Tue, 14 Sep 2021 17:22:31 +0300 Subject: [PATCH 2/7] recursive serde refactor --- .../proto/core/common/recursive_serde.proto | 5 ++- .../src/syft/core/common/serde/recursive.py | 44 +++++++++---------- .../proto/core/common/recursive_serde_pb2.py | 35 +++++++++++---- 3 files changed, 50 insertions(+), 34 deletions(-) diff --git a/packages/syft/proto/core/common/recursive_serde.proto b/packages/syft/proto/core/common/recursive_serde.proto index 982116dfd17..329d74f08d2 100644 --- a/packages/syft/proto/core/common/recursive_serde.proto +++ b/packages/syft/proto/core/common/recursive_serde.proto @@ -3,6 +3,7 @@ syntax = "proto3"; package syft.core.common; message RecursiveSerde { - bytes data = 1; - string fully_qualified_name = 2; + repeated string fields_name = 1; + repeated bytes fields_data = 2; + string fully_qualified_name = 3; } diff --git a/packages/syft/src/syft/core/common/serde/recursive.py b/packages/syft/src/syft/core/common/serde/recursive.py index d88f780bc09..91b41fdb099 100644 --- a/packages/syft/src/syft/core/common/serde/recursive.py +++ b/packages/syft/src/syft/core/common/serde/recursive.py @@ -9,7 +9,6 @@ from syft import serialize # relative -from ....lib.python import Dict from ....proto.core.common.recursive_serde_pb2 import ( RecursiveSerde as RecursiveSerde_PB, ) @@ -19,38 +18,35 @@ def rs_object2proto(self: Any) -> RecursiveSerde_PB: # if __attr_allowlist__ then only include attrs from that list - if self.__attr_allowlist__ is not None: - attrs = {} - for attr_name in self.__attr_allowlist__: - if hasattr(self, attr_name): - if self.__serde_overrides__.get(attr_name, None) is None: - attrs[attr_name] = getattr(self, attr_name) - else: - attrs[attr_name] = self.__serde_overrides__[attr_name][0]( - getattr(self, attr_name) - ) - # else include all attrs + msg = RecursiveSerde_PB(fully_qualified_name=get_fully_qualified_name(self)) + + if self.__attr_allowlist__ is None: + attribute_dict = self.__dict__.keys() else: - attrs = self.__dict__ # type: ignore + attribute_dict = self.__attr_allowlist__ - return RecursiveSerde_PB( - data=serialize(Dict(attrs), to_bytes=True), - fully_qualified_name=get_fully_qualified_name(self), - ) + for attr_name in attribute_dict: + if hasattr(self, attr_name): + msg.fields_name.append(attr_name) + transforms = self.__serde_overrides__.get(attr_name, None) + if transforms is None: + field_obj = getattr(self, attr_name) + else: + field_obj = transforms[0](getattr(self, attr_name)) + msg.fields_data.append(serialize(field_obj, to_bytes=True)) + return msg def rs_proto2object(proto: RecursiveSerde_PB) -> Any: - attrs = dict(deserialize(proto.data, from_bytes=True)) - class_type = index_syft_by_module_name(proto.fully_qualified_name) - obj = class_type.__new__(class_type) # type: ignore - - for attr_name, attr_value in attrs.items(): - if obj.__serde_overrides__.get(attr_name, None) is None: + for attr_name, attr_bytes in zip(proto.fields_name, proto.fields_data): + attr_value = deserialize(attr_bytes, from_bytes=True) + transforms = obj.__serde_overrides__.get(attr_name, None) + if transforms is None: setattr(obj, attr_name, attr_value) else: - setattr(obj, attr_name, obj.__serde_overrides__[attr_name][1](attr_value)) + setattr(obj, attr_name, transforms[1](attr_value)) return obj diff --git a/packages/syft/src/syft/proto/core/common/recursive_serde_pb2.py b/packages/syft/src/syft/proto/core/common/recursive_serde_pb2.py index 0f4d1a21bdd..ee43f40b17e 100644 --- a/packages/syft/src/syft/proto/core/common/recursive_serde_pb2.py +++ b/packages/syft/src/syft/proto/core/common/recursive_serde_pb2.py @@ -19,7 +19,7 @@ syntax="proto3", serialized_options=None, create_key=_descriptor._internal_create_key, - serialized_pb=b"\n'proto/core/common/recursive_serde.proto\x12\x10syft.core.common\"<\n\x0eRecursiveSerde\x12\x0c\n\x04\x64\x61ta\x18\x01 \x01(\x0c\x12\x1c\n\x14\x66ully_qualified_name\x18\x02 \x01(\tb\x06proto3", + serialized_pb=b"\n'proto/core/common/recursive_serde.proto\x12\x10syft.core.common\"X\n\x0eRecursiveSerde\x12\x13\n\x0b\x66ields_name\x18\x01 \x03(\t\x12\x13\n\x0b\x66ields_data\x18\x02 \x03(\x0c\x12\x1c\n\x14\x66ully_qualified_name\x18\x03 \x01(\tb\x06proto3", ) @@ -32,15 +32,34 @@ create_key=_descriptor._internal_create_key, fields=[ _descriptor.FieldDescriptor( - name="data", - full_name="syft.core.common.RecursiveSerde.data", + name="fields_name", + full_name="syft.core.common.RecursiveSerde.fields_name", index=0, number=1, + type=9, + cpp_type=9, + label=3, + has_default_value=False, + default_value=[], + message_type=None, + enum_type=None, + containing_type=None, + is_extension=False, + extension_scope=None, + serialized_options=None, + file=DESCRIPTOR, + create_key=_descriptor._internal_create_key, + ), + _descriptor.FieldDescriptor( + name="fields_data", + full_name="syft.core.common.RecursiveSerde.fields_data", + index=1, + number=2, type=12, cpp_type=9, - label=1, + label=3, has_default_value=False, - default_value=b"", + default_value=[], message_type=None, enum_type=None, containing_type=None, @@ -53,8 +72,8 @@ _descriptor.FieldDescriptor( name="fully_qualified_name", full_name="syft.core.common.RecursiveSerde.fully_qualified_name", - index=1, - number=2, + index=2, + number=3, type=9, cpp_type=9, label=1, @@ -79,7 +98,7 @@ extension_ranges=[], oneofs=[], serialized_start=61, - serialized_end=121, + serialized_end=149, ) DESCRIPTOR.message_types_by_name["RecursiveSerde"] = _RECURSIVESERDE From a061c6b532c4c219e2c45e3a3e562da17e4fddb5 Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Thu, 16 Sep 2021 09:07:14 +1000 Subject: [PATCH 3/7] protobufs --- .../syft/src/syft/proto/core/adp/entity_pb2.py | 4 ++-- .../syft/src/syft/proto/core/adp/scalar_pb2.py | 6 +++--- .../syft/proto/core/auth/signed_message_pb2.py | 4 ++-- .../syft/src/syft/proto/core/io/address_pb2.py | 4 ++-- .../src/syft/proto/core/io/connection_pb2.py | 4 ++-- .../src/syft/proto/core/io/location_pb2.py | 4 ++-- .../syft/src/syft/proto/core/io/route_pb2.py | 16 +++++++++------- .../core/node/common/action/action_pb2.py | 18 +++++++++--------- .../node/common/action/exception_action_pb2.py | 6 +++--- .../action/garbage_collect_batched_pb2.py | 6 +++--- .../action/garbage_collect_object_pb2.py | 6 +++--- .../common/action/get_enum_attribute_pb2.py | 6 +++--- .../core/node/common/action/get_object_pb2.py | 8 ++++---- .../node/common/action/get_set_property_pb2.py | 10 ++++++---- .../action/get_set_static_attribute_pb2.py | 10 ++++++---- .../node/common/action/run_class_method_pb2.py | 6 +++--- .../common/action/run_class_method_smpc_pb2.py | 10 ++++++---- .../action/run_function_or_constructor_pb2.py | 6 +++--- .../core/node/common/action/save_object_pb2.py | 6 +++--- .../common/action/smpc_action_message_pb2.py | 6 +++--- .../syft/proto/core/node/common/client_pb2.py | 8 ++++---- .../proto/core/node/common/metadata_pb2.py | 6 +++--- .../child_node_lifecycle_service_pb2.py | 6 +++--- .../common/service/get_repr_service_pb2.py | 6 +++--- .../service/heritage_update_service_pb2.py | 6 +++--- .../service/object_search_message_pb2.py | 6 +++--- ...ect_search_permission_update_message_pb2.py | 6 +++--- .../node/common/service/repr_service_pb2.py | 6 +++--- .../resolve_pointer_type_service_pb2.py | 6 +++--- .../node/common/service/simple_service_pb2.py | 6 +++--- .../accept_or_deny_request_message_pb2.py | 6 +++--- .../service/get_all_requests_message_pb2.py | 12 ++++++------ .../get_remaining_budget_service_pb2.py | 6 +++--- .../proto/core/node/domain/service/pss_pb2.py | 6 +++--- .../service/request_answer_message_pb2.py | 6 +++--- .../service/request_answer_response_pb2.py | 6 +++--- .../service/request_handler_message_pb2.py | 8 ++++---- .../node/domain/service/request_message_pb2.py | 6 +++--- .../syft/src/syft/proto/core/plan/plan_pb2.py | 8 +++++--- .../src/syft/proto/core/pointer/pointer_pb2.py | 6 +++--- .../src/syft/proto/core/store/dataset_pb2.py | 8 +++++--- .../syft/proto/core/store/store_object_pb2.py | 4 ++-- .../core/tensor/fixed_precision_tensor_pb2.py | 12 ++++++++---- .../syft/proto/core/tensor/share_tensor_pb2.py | 8 +++++--- .../tensor/single_entity_phi_tensor_pb2.py | 10 +++++----- .../src/syft/proto/core/tensor/tensor_pb2.py | 6 +++--- .../grid/messages/association_messages_pb2.py | 8 ++++---- .../grid/messages/dataset_messages_pb2.py | 6 +++--- .../proto/grid/messages/group_messages_pb2.py | 6 +++--- .../proto/grid/messages/infra_messages_pb2.py | 6 +++--- .../messages/network_search_messages_pb2.py | 6 +++--- .../grid/messages/request_messages_pb2.py | 8 ++++---- .../proto/grid/messages/role_messages_pb2.py | 8 ++++---- .../proto/grid/messages/setup_messages_pb2.py | 6 +++--- .../grid/messages/success_resp_message_pb2.py | 6 +++--- .../proto/grid/messages/tensor_messages_pb2.py | 6 +++--- .../grid/messages/transfer_messages_pb2.py | 6 +++--- .../proto/grid/messages/user_messages_pb2.py | 8 ++++---- .../grid/service/signaling_service_pb2.py | 8 ++++---- .../syft/src/syft/proto/lib/PIL/image_pb2.py | 4 ++-- .../syft/proto/lib/pandas/categorical_pb2.py | 6 +++--- .../syft/src/syft/proto/lib/petlib/ecpt_pb2.py | 6 ++++-- .../syft/src/syft/proto/lib/python/bool_pb2.py | 4 ++-- .../lib/python/collections/ordered_dict_pb2.py | 4 ++-- .../src/syft/proto/lib/python/complex_pb2.py | 4 ++-- .../syft/src/syft/proto/lib/python/dict_pb2.py | 4 ++-- .../src/syft/proto/lib/python/float_pb2.py | 4 ++-- .../syft/src/syft/proto/lib/python/int_pb2.py | 4 ++-- .../src/syft/proto/lib/python/iterator_pb2.py | 4 ++-- .../syft/src/syft/proto/lib/python/list_pb2.py | 4 ++-- .../syft/src/syft/proto/lib/python/none_pb2.py | 4 ++-- .../src/syft/proto/lib/python/range_pb2.py | 4 ++-- .../syft/src/syft/proto/lib/python/set_pb2.py | 4 ++-- .../src/syft/proto/lib/python/slice_pb2.py | 4 ++-- .../src/syft/proto/lib/python/string_pb2.py | 4 ++-- .../src/syft/proto/lib/python/tuple_pb2.py | 4 ++-- .../proto/lib/sklearn/logistic_model_pb2.py | 6 +++--- .../syft/proto/lib/statsmodels/family_pb2.py | 4 ++-- .../syft/proto/lib/statsmodels/results_pb2.py | 4 ++-- .../lib/sympc/replicatedshared_tensor_pb2.py | 6 +++--- .../src/syft/proto/lib/sympc/session_pb2.py | 10 ++++++---- .../syft/proto/lib/sympc/share_tensor_pb2.py | 6 +++--- .../src/syft/proto/lib/tenseal/vector_pb2.py | 4 ++-- .../src/syft/proto/lib/torch/module_pb2.py | 10 +++++----- .../syft/src/syft/proto/lib/torch/size_pb2.py | 4 ++-- .../src/syft/proto/lib/torch/tensor_pb2.py | 4 ++-- .../lib/transformers/batch_encoding_pb2.py | 6 +++--- .../proto/lib/transformers/hf_config_pb2.py | 8 ++++---- .../lib/transformers/tokenizerfast_pb2.py | 6 +++--- .../syft/src/syft/proto/lib/zksk/nizk_pb2.py | 6 +++--- 90 files changed, 296 insertions(+), 274 deletions(-) diff --git a/packages/syft/src/syft/proto/core/adp/entity_pb2.py b/packages/syft/src/syft/proto/core/adp/entity_pb2.py index 1e570431785..21522f9ba54 100644 --- a/packages/syft/src/syft/proto/core/adp/entity_pb2.py +++ b/packages/syft/src/syft/proto/core/adp/entity_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ..common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/core/adp/scalar_pb2.py b/packages/syft/src/syft/proto/core/adp/scalar_pb2.py index b1ec76edde2..78b1c6d68de 100644 --- a/packages/syft/src/syft/proto/core/adp/scalar_pb2.py +++ b/packages/syft/src/syft/proto/core/adp/scalar_pb2.py @@ -13,9 +13,9 @@ _sym_db = _symbol_database.Default() -# relative -from . import entity_pb2 as proto_dot_core_dot_adp_dot_entity__pb2 -from ..common import ( +# syft absolute +from syft.proto.core.adp import entity_pb2 as proto_dot_core_dot_adp_dot_entity__pb2 +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/core/auth/signed_message_pb2.py b/packages/syft/src/syft/proto/core/auth/signed_message_pb2.py index a8fdf4662be..3120680a86e 100644 --- a/packages/syft/src/syft/proto/core/auth/signed_message_pb2.py +++ b/packages/syft/src/syft/proto/core/auth/signed_message_pb2.py @@ -16,8 +16,8 @@ # third party from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 -# relative -from ..common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/core/io/address_pb2.py b/packages/syft/src/syft/proto/core/io/address_pb2.py index dc324ba2cf2..87377492e0a 100644 --- a/packages/syft/src/syft/proto/core/io/address_pb2.py +++ b/packages/syft/src/syft/proto/core/io/address_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from . import location_pb2 as proto_dot_core_dot_io_dot_location__pb2 +# syft absolute +from syft.proto.core.io import location_pb2 as proto_dot_core_dot_io_dot_location__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/io/address.proto", diff --git a/packages/syft/src/syft/proto/core/io/connection_pb2.py b/packages/syft/src/syft/proto/core/io/connection_pb2.py index 763e27847cb..4db7dd51a4e 100644 --- a/packages/syft/src/syft/proto/core/io/connection_pb2.py +++ b/packages/syft/src/syft/proto/core/io/connection_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from . import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +# syft absolute +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/io/connection.proto", diff --git a/packages/syft/src/syft/proto/core/io/location_pb2.py b/packages/syft/src/syft/proto/core/io/location_pb2.py index 6584e6a50f1..4cdce53508d 100644 --- a/packages/syft/src/syft/proto/core/io/location_pb2.py +++ b/packages/syft/src/syft/proto/core/io/location_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ..common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/core/io/route_pb2.py b/packages/syft/src/syft/proto/core/io/route_pb2.py index 9ee8ad844c9..46a4cdb7d9b 100644 --- a/packages/syft/src/syft/proto/core/io/route_pb2.py +++ b/packages/syft/src/syft/proto/core/io/route_pb2.py @@ -13,15 +13,17 @@ _sym_db = _symbol_database.Default() -# relative -from . import connection_pb2 as proto_dot_core_dot_io_dot_connection__pb2 -from . import location_pb2 as proto_dot_core_dot_io_dot_location__pb2 -from ...grid.connections import ( - http_connection_pb2 as proto_dot_grid_dot_connections_dot_http__connection__pb2, -) -from ..common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) +from syft.proto.core.io import ( + connection_pb2 as proto_dot_core_dot_io_dot_connection__pb2, +) +from syft.proto.core.io import location_pb2 as proto_dot_core_dot_io_dot_location__pb2 +from syft.proto.grid.connections import ( + http_connection_pb2 as proto_dot_grid_dot_connections_dot_http__connection__pb2, +) DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/io/route.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/action/action_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/action_pb2.py index 14d573546e0..fd1d2279063 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/action_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/action_pb2.py @@ -13,29 +13,29 @@ _sym_db = _symbol_database.Default() -# relative -from . import ( +# syft absolute +from syft.proto.core.node.common.action import ( garbage_collect_object_pb2 as proto_dot_core_dot_node_dot_common_dot_action_dot_garbage__collect__object__pb2, ) -from . import ( +from syft.proto.core.node.common.action import ( get_enum_attribute_pb2 as proto_dot_core_dot_node_dot_common_dot_action_dot_get__enum__attribute__pb2, ) -from . import ( +from syft.proto.core.node.common.action import ( get_object_pb2 as proto_dot_core_dot_node_dot_common_dot_action_dot_get__object__pb2, ) -from . import ( +from syft.proto.core.node.common.action import ( get_set_property_pb2 as proto_dot_core_dot_node_dot_common_dot_action_dot_get__set__property__pb2, ) -from . import ( +from syft.proto.core.node.common.action import ( get_set_static_attribute_pb2 as proto_dot_core_dot_node_dot_common_dot_action_dot_get__set__static__attribute__pb2, ) -from . import ( +from syft.proto.core.node.common.action import ( run_class_method_pb2 as proto_dot_core_dot_node_dot_common_dot_action_dot_run__class__method__pb2, ) -from . import ( +from syft.proto.core.node.common.action import ( run_function_or_constructor_pb2 as proto_dot_core_dot_node_dot_common_dot_action_dot_run__function__or__constructor__pb2, ) -from . import ( +from syft.proto.core.node.common.action import ( save_object_pb2 as proto_dot_core_dot_node_dot_common_dot_action_dot_save__object__pb2, ) diff --git a/packages/syft/src/syft/proto/core/node/common/action/exception_action_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/exception_action_pb2.py index 39398e78d2f..46bdde2ad49 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/exception_action_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/exception_action_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/action/exception_action.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/action/garbage_collect_batched_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/garbage_collect_batched_pb2.py index f6b2d64dd50..8eb933d470a 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/garbage_collect_batched_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/garbage_collect_batched_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/action/garbage_collect_batched.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/action/garbage_collect_object_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/garbage_collect_object_pb2.py index da4338017e5..11c35607961 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/garbage_collect_object_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/garbage_collect_object_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/action/garbage_collect_object.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/action/get_enum_attribute_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/get_enum_attribute_pb2.py index 10bf1c9fc10..5f97091760a 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/get_enum_attribute_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/get_enum_attribute_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/action/get_enum_attribute.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/action/get_object_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/get_object_pb2.py index 8625cd30068..3737f12971a 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/get_object_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/get_object_pb2.py @@ -13,12 +13,12 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 -from ....store import ( +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.store import ( store_object_pb2 as proto_dot_core_dot_store_dot_store__object__pb2, ) diff --git a/packages/syft/src/syft/proto/core/node/common/action/get_set_property_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/get_set_property_pb2.py index 04c391853e5..b414713ba4a 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/get_set_property_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/get_set_property_pb2.py @@ -13,12 +13,14 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 -from ....pointer import pointer_pb2 as proto_dot_core_dot_pointer_dot_pointer__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.pointer import ( + pointer_pb2 as proto_dot_core_dot_pointer_dot_pointer__pb2, +) DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/action/get_set_property.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/action/get_set_static_attribute_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/get_set_static_attribute_pb2.py index c9efcc417c3..28a0155db5d 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/get_set_static_attribute_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/get_set_static_attribute_pb2.py @@ -13,12 +13,14 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 -from ....pointer import pointer_pb2 as proto_dot_core_dot_pointer_dot_pointer__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.pointer import ( + pointer_pb2 as proto_dot_core_dot_pointer_dot_pointer__pb2, +) DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/action/get_set_static_attribute.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/action/run_class_method_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/run_class_method_pb2.py index a1f3ed6cad5..3a4fba140a5 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/run_class_method_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/run_class_method_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/action/run_class_method.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/action/run_class_method_smpc_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/run_class_method_smpc_pb2.py index 3a9318651f2..979363db712 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/run_class_method_smpc_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/run_class_method_smpc_pb2.py @@ -13,12 +13,14 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 -from ....pointer import pointer_pb2 as proto_dot_core_dot_pointer_dot_pointer__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.pointer import ( + pointer_pb2 as proto_dot_core_dot_pointer_dot_pointer__pb2, +) DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/action/run_class_method_smpc.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/action/run_function_or_constructor_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/run_function_or_constructor_pb2.py index 5a422851181..ce49fded161 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/run_function_or_constructor_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/run_function_or_constructor_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/action/run_function_or_constructor.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/action/save_object_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/save_object_pb2.py index 33de40e9800..d17a44a88fb 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/save_object_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/save_object_pb2.py @@ -13,9 +13,9 @@ _sym_db = _symbol_database.Default() -# relative -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 -from ....store import ( +# syft absolute +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.store import ( store_object_pb2 as proto_dot_core_dot_store_dot_store__object__pb2, ) diff --git a/packages/syft/src/syft/proto/core/node/common/action/smpc_action_message_pb2.py b/packages/syft/src/syft/proto/core/node/common/action/smpc_action_message_pb2.py index af344f9b72e..5645d795211 100644 --- a/packages/syft/src/syft/proto/core/node/common/action/smpc_action_message_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/action/smpc_action_message_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/action/smpc_action_message.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/client_pb2.py b/packages/syft/src/syft/proto/core/node/common/client_pb2.py index a43d5bf760d..3460b75915f 100644 --- a/packages/syft/src/syft/proto/core/node/common/client_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/client_pb2.py @@ -13,12 +13,12 @@ _sym_db = _symbol_database.Default() -# relative -from ...common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...io import location_pb2 as proto_dot_core_dot_io_dot_location__pb2 -from ...io import route_pb2 as proto_dot_core_dot_io_dot_route__pb2 +from syft.proto.core.io import location_pb2 as proto_dot_core_dot_io_dot_location__pb2 +from syft.proto.core.io import route_pb2 as proto_dot_core_dot_io_dot_route__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/client.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/metadata_pb2.py b/packages/syft/src/syft/proto/core/node/common/metadata_pb2.py index efb56585e69..e820cddc25d 100644 --- a/packages/syft/src/syft/proto/core/node/common/metadata_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/metadata_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...io import location_pb2 as proto_dot_core_dot_io_dot_location__pb2 +from syft.proto.core.io import location_pb2 as proto_dot_core_dot_io_dot_location__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/metadata.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/service/child_node_lifecycle_service_pb2.py b/packages/syft/src/syft/proto/core/node/common/service/child_node_lifecycle_service_pb2.py index cbcf76f4bff..6b2842b90ce 100644 --- a/packages/syft/src/syft/proto/core/node/common/service/child_node_lifecycle_service_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/service/child_node_lifecycle_service_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/service/child_node_lifecycle_service.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/service/get_repr_service_pb2.py b/packages/syft/src/syft/proto/core/node/common/service/get_repr_service_pb2.py index 8b7605b68b7..c7e2fa4f490 100644 --- a/packages/syft/src/syft/proto/core/node/common/service/get_repr_service_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/service/get_repr_service_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/service/get_repr_service.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/service/heritage_update_service_pb2.py b/packages/syft/src/syft/proto/core/node/common/service/heritage_update_service_pb2.py index a67af2a65cc..7f34d4218c2 100644 --- a/packages/syft/src/syft/proto/core/node/common/service/heritage_update_service_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/service/heritage_update_service_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/service/heritage_update_service.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/service/object_search_message_pb2.py b/packages/syft/src/syft/proto/core/node/common/service/object_search_message_pb2.py index 9814cb81f41..9a803ebb441 100644 --- a/packages/syft/src/syft/proto/core/node/common/service/object_search_message_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/service/object_search_message_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/service/object_search_message.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/service/object_search_permission_update_message_pb2.py b/packages/syft/src/syft/proto/core/node/common/service/object_search_permission_update_message_pb2.py index 1061cceae4c..9cef92d3e72 100644 --- a/packages/syft/src/syft/proto/core/node/common/service/object_search_permission_update_message_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/service/object_search_permission_update_message_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/service/object_search_permission_update_message.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/service/repr_service_pb2.py b/packages/syft/src/syft/proto/core/node/common/service/repr_service_pb2.py index 9c72e43c4db..5a7994c16c1 100644 --- a/packages/syft/src/syft/proto/core/node/common/service/repr_service_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/service/repr_service_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/service/repr_service.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/service/resolve_pointer_type_service_pb2.py b/packages/syft/src/syft/proto/core/node/common/service/resolve_pointer_type_service_pb2.py index b8c5e7d97dd..403e8b67c28 100644 --- a/packages/syft/src/syft/proto/core/node/common/service/resolve_pointer_type_service_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/service/resolve_pointer_type_service_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/service/resolve_pointer_type_service.proto", diff --git a/packages/syft/src/syft/proto/core/node/common/service/simple_service_pb2.py b/packages/syft/src/syft/proto/core/node/common/service/simple_service_pb2.py index 0aadc3e4a56..14c3e8a98b1 100644 --- a/packages/syft/src/syft/proto/core/node/common/service/simple_service_pb2.py +++ b/packages/syft/src/syft/proto/core/node/common/service/simple_service_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/common/service/simple_service.proto", diff --git a/packages/syft/src/syft/proto/core/node/domain/service/accept_or_deny_request_message_pb2.py b/packages/syft/src/syft/proto/core/node/domain/service/accept_or_deny_request_message_pb2.py index 94aba6c574d..a4d0c851c3c 100644 --- a/packages/syft/src/syft/proto/core/node/domain/service/accept_or_deny_request_message_pb2.py +++ b/packages/syft/src/syft/proto/core/node/domain/service/accept_or_deny_request_message_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/domain/service/accept_or_deny_request_message.proto", diff --git a/packages/syft/src/syft/proto/core/node/domain/service/get_all_requests_message_pb2.py b/packages/syft/src/syft/proto/core/node/domain/service/get_all_requests_message_pb2.py index 1f67f84495f..5b17e53f480 100644 --- a/packages/syft/src/syft/proto/core/node/domain/service/get_all_requests_message_pb2.py +++ b/packages/syft/src/syft/proto/core/node/domain/service/get_all_requests_message_pb2.py @@ -13,14 +13,14 @@ _sym_db = _symbol_database.Default() -# relative -from . import ( - request_message_pb2 as proto_dot_core_dot_node_dot_domain_dot_service_dot_request__message__pb2, -) -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.node.domain.service import ( + request_message_pb2 as proto_dot_core_dot_node_dot_domain_dot_service_dot_request__message__pb2, +) DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/domain/service/get_all_requests_message.proto", diff --git a/packages/syft/src/syft/proto/core/node/domain/service/get_remaining_budget_service_pb2.py b/packages/syft/src/syft/proto/core/node/domain/service/get_remaining_budget_service_pb2.py index 313e9c244ed..4757592c837 100644 --- a/packages/syft/src/syft/proto/core/node/domain/service/get_remaining_budget_service_pb2.py +++ b/packages/syft/src/syft/proto/core/node/domain/service/get_remaining_budget_service_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/domain/service/get_remaining_budget_service.proto", diff --git a/packages/syft/src/syft/proto/core/node/domain/service/pss_pb2.py b/packages/syft/src/syft/proto/core/node/domain/service/pss_pb2.py index 7ea78d36364..47186abd8a7 100644 --- a/packages/syft/src/syft/proto/core/node/domain/service/pss_pb2.py +++ b/packages/syft/src/syft/proto/core/node/domain/service/pss_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/domain/service/pss.proto", diff --git a/packages/syft/src/syft/proto/core/node/domain/service/request_answer_message_pb2.py b/packages/syft/src/syft/proto/core/node/domain/service/request_answer_message_pb2.py index 3118369b5da..0d167942b5a 100644 --- a/packages/syft/src/syft/proto/core/node/domain/service/request_answer_message_pb2.py +++ b/packages/syft/src/syft/proto/core/node/domain/service/request_answer_message_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/domain/service/request_answer_message.proto", diff --git a/packages/syft/src/syft/proto/core/node/domain/service/request_answer_response_pb2.py b/packages/syft/src/syft/proto/core/node/domain/service/request_answer_response_pb2.py index c92acbd594e..38d0308abc5 100644 --- a/packages/syft/src/syft/proto/core/node/domain/service/request_answer_response_pb2.py +++ b/packages/syft/src/syft/proto/core/node/domain/service/request_answer_response_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/domain/service/request_answer_response.proto", diff --git a/packages/syft/src/syft/proto/core/node/domain/service/request_handler_message_pb2.py b/packages/syft/src/syft/proto/core/node/domain/service/request_handler_message_pb2.py index 210b614b733..3aeacc12464 100644 --- a/packages/syft/src/syft/proto/core/node/domain/service/request_handler_message_pb2.py +++ b/packages/syft/src/syft/proto/core/node/domain/service/request_handler_message_pb2.py @@ -13,12 +13,12 @@ _sym_db = _symbol_database.Default() -# relative -from .....lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/domain/service/request_handler_message.proto", diff --git a/packages/syft/src/syft/proto/core/node/domain/service/request_message_pb2.py b/packages/syft/src/syft/proto/core/node/domain/service/request_message_pb2.py index b06a136b430..acbfb0da476 100644 --- a/packages/syft/src/syft/proto/core/node/domain/service/request_message_pb2.py +++ b/packages/syft/src/syft/proto/core/node/domain/service/request_message_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ....common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ....io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/node/domain/service/request_message.proto", diff --git a/packages/syft/src/syft/proto/core/plan/plan_pb2.py b/packages/syft/src/syft/proto/core/plan/plan_pb2.py index 63772ac6d88..6888aa58e00 100644 --- a/packages/syft/src/syft/proto/core/plan/plan_pb2.py +++ b/packages/syft/src/syft/proto/core/plan/plan_pb2.py @@ -13,11 +13,13 @@ _sym_db = _symbol_database.Default() -# relative -from ..node.common.action import ( +# syft absolute +from syft.proto.core.node.common.action import ( action_pb2 as proto_dot_core_dot_node_dot_common_dot_action_dot_action__pb2, ) -from ..pointer import pointer_pb2 as proto_dot_core_dot_pointer_dot_pointer__pb2 +from syft.proto.core.pointer import ( + pointer_pb2 as proto_dot_core_dot_pointer_dot_pointer__pb2, +) DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/plan/plan.proto", diff --git a/packages/syft/src/syft/proto/core/pointer/pointer_pb2.py b/packages/syft/src/syft/proto/core/pointer/pointer_pb2.py index 2057e08b1a9..8e0d4531343 100644 --- a/packages/syft/src/syft/proto/core/pointer/pointer_pb2.py +++ b/packages/syft/src/syft/proto/core/pointer/pointer_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ..common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ..io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/pointer/pointer.proto", diff --git a/packages/syft/src/syft/proto/core/store/dataset_pb2.py b/packages/syft/src/syft/proto/core/store/dataset_pb2.py index 0d4ca10148f..b02abc7af03 100644 --- a/packages/syft/src/syft/proto/core/store/dataset_pb2.py +++ b/packages/syft/src/syft/proto/core/store/dataset_pb2.py @@ -13,11 +13,13 @@ _sym_db = _symbol_database.Default() -# relative -from . import store_object_pb2 as proto_dot_core_dot_store_dot_store__object__pb2 -from ..common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) +from syft.proto.core.store import ( + store_object_pb2 as proto_dot_core_dot_store_dot_store__object__pb2, +) DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/store/dataset.proto", diff --git a/packages/syft/src/syft/proto/core/store/store_object_pb2.py b/packages/syft/src/syft/proto/core/store/store_object_pb2.py index 21fddd71408..f574c0f2a81 100644 --- a/packages/syft/src/syft/proto/core/store/store_object_pb2.py +++ b/packages/syft/src/syft/proto/core/store/store_object_pb2.py @@ -16,8 +16,8 @@ # third party from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2 -# relative -from ..common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/core/tensor/fixed_precision_tensor_pb2.py b/packages/syft/src/syft/proto/core/tensor/fixed_precision_tensor_pb2.py index aad6a983ab5..b1c67397f89 100644 --- a/packages/syft/src/syft/proto/core/tensor/fixed_precision_tensor_pb2.py +++ b/packages/syft/src/syft/proto/core/tensor/fixed_precision_tensor_pb2.py @@ -13,10 +13,14 @@ _sym_db = _symbol_database.Default() -# relative -from . import share_tensor_pb2 as proto_dot_core_dot_tensor_dot_share__tensor__pb2 -from . import tensor_pb2 as proto_dot_core_dot_tensor_dot_tensor__pb2 -from ...lib.numpy import array_pb2 as proto_dot_lib_dot_numpy_dot_array__pb2 +# syft absolute +from syft.proto.core.tensor import ( + share_tensor_pb2 as proto_dot_core_dot_tensor_dot_share__tensor__pb2, +) +from syft.proto.core.tensor import ( + tensor_pb2 as proto_dot_core_dot_tensor_dot_tensor__pb2, +) +from syft.proto.lib.numpy import array_pb2 as proto_dot_lib_dot_numpy_dot_array__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/tensor/fixed_precision_tensor.proto", diff --git a/packages/syft/src/syft/proto/core/tensor/share_tensor_pb2.py b/packages/syft/src/syft/proto/core/tensor/share_tensor_pb2.py index c403837ad61..5f4992b2218 100644 --- a/packages/syft/src/syft/proto/core/tensor/share_tensor_pb2.py +++ b/packages/syft/src/syft/proto/core/tensor/share_tensor_pb2.py @@ -13,9 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from . import tensor_pb2 as proto_dot_core_dot_tensor_dot_tensor__pb2 -from ...lib.numpy import array_pb2 as proto_dot_lib_dot_numpy_dot_array__pb2 +# syft absolute +from syft.proto.core.tensor import ( + tensor_pb2 as proto_dot_core_dot_tensor_dot_tensor__pb2, +) +from syft.proto.lib.numpy import array_pb2 as proto_dot_lib_dot_numpy_dot_array__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/tensor/share_tensor.proto", diff --git a/packages/syft/src/syft/proto/core/tensor/single_entity_phi_tensor_pb2.py b/packages/syft/src/syft/proto/core/tensor/single_entity_phi_tensor_pb2.py index 9b0c994f16a..110381439dd 100644 --- a/packages/syft/src/syft/proto/core/tensor/single_entity_phi_tensor_pb2.py +++ b/packages/syft/src/syft/proto/core/tensor/single_entity_phi_tensor_pb2.py @@ -13,13 +13,13 @@ _sym_db = _symbol_database.Default() -# relative -from ...lib.numpy import array_pb2 as proto_dot_lib_dot_numpy_dot_array__pb2 -from ..adp import entity_pb2 as proto_dot_core_dot_adp_dot_entity__pb2 -from ..common import ( +# syft absolute +from syft.proto.core.adp import entity_pb2 as proto_dot_core_dot_adp_dot_entity__pb2 +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ..io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.lib.numpy import array_pb2 as proto_dot_lib_dot_numpy_dot_array__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/tensor/single_entity_phi_tensor.proto", diff --git a/packages/syft/src/syft/proto/core/tensor/tensor_pb2.py b/packages/syft/src/syft/proto/core/tensor/tensor_pb2.py index 724b4f26fee..4e7396c6c82 100644 --- a/packages/syft/src/syft/proto/core/tensor/tensor_pb2.py +++ b/packages/syft/src/syft/proto/core/tensor/tensor_pb2.py @@ -13,9 +13,9 @@ _sym_db = _symbol_database.Default() -# relative -from ...lib.numpy import array_pb2 as proto_dot_lib_dot_numpy_dot_array__pb2 -from ..adp import entity_pb2 as proto_dot_core_dot_adp_dot_entity__pb2 +# syft absolute +from syft.proto.core.adp import entity_pb2 as proto_dot_core_dot_adp_dot_entity__pb2 +from syft.proto.lib.numpy import array_pb2 as proto_dot_lib_dot_numpy_dot_array__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/core/tensor/tensor.proto", diff --git a/packages/syft/src/syft/proto/grid/messages/association_messages_pb2.py b/packages/syft/src/syft/proto/grid/messages/association_messages_pb2.py index 6dcc8b9424e..854b1231c8f 100644 --- a/packages/syft/src/syft/proto/grid/messages/association_messages_pb2.py +++ b/packages/syft/src/syft/proto/grid/messages/association_messages_pb2.py @@ -13,12 +13,12 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 -from ...core.node.common import ( +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.node.common import ( client_pb2 as proto_dot_core_dot_node_dot_common_dot_client__pb2, ) diff --git a/packages/syft/src/syft/proto/grid/messages/dataset_messages_pb2.py b/packages/syft/src/syft/proto/grid/messages/dataset_messages_pb2.py index b0f8d7eb402..070116bf856 100644 --- a/packages/syft/src/syft/proto/grid/messages/dataset_messages_pb2.py +++ b/packages/syft/src/syft/proto/grid/messages/dataset_messages_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/grid/messages/dataset_messages.proto", diff --git a/packages/syft/src/syft/proto/grid/messages/group_messages_pb2.py b/packages/syft/src/syft/proto/grid/messages/group_messages_pb2.py index 47172908e33..5e1345e3957 100644 --- a/packages/syft/src/syft/proto/grid/messages/group_messages_pb2.py +++ b/packages/syft/src/syft/proto/grid/messages/group_messages_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/grid/messages/group_messages.proto", diff --git a/packages/syft/src/syft/proto/grid/messages/infra_messages_pb2.py b/packages/syft/src/syft/proto/grid/messages/infra_messages_pb2.py index 186ad7d69b2..55ac6f1a00d 100644 --- a/packages/syft/src/syft/proto/grid/messages/infra_messages_pb2.py +++ b/packages/syft/src/syft/proto/grid/messages/infra_messages_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/grid/messages/infra_messages.proto", diff --git a/packages/syft/src/syft/proto/grid/messages/network_search_messages_pb2.py b/packages/syft/src/syft/proto/grid/messages/network_search_messages_pb2.py index e75d493214a..17bcdfb6ad5 100644 --- a/packages/syft/src/syft/proto/grid/messages/network_search_messages_pb2.py +++ b/packages/syft/src/syft/proto/grid/messages/network_search_messages_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/grid/messages/network_search_messages.proto", diff --git a/packages/syft/src/syft/proto/grid/messages/request_messages_pb2.py b/packages/syft/src/syft/proto/grid/messages/request_messages_pb2.py index b730f27b6b2..9cfac330685 100644 --- a/packages/syft/src/syft/proto/grid/messages/request_messages_pb2.py +++ b/packages/syft/src/syft/proto/grid/messages/request_messages_pb2.py @@ -13,12 +13,12 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 -from ...lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/grid/messages/request_messages.proto", diff --git a/packages/syft/src/syft/proto/grid/messages/role_messages_pb2.py b/packages/syft/src/syft/proto/grid/messages/role_messages_pb2.py index 9ea4f0350bb..08be061b7ee 100644 --- a/packages/syft/src/syft/proto/grid/messages/role_messages_pb2.py +++ b/packages/syft/src/syft/proto/grid/messages/role_messages_pb2.py @@ -13,12 +13,12 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 -from ...lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/grid/messages/role_messages.proto", diff --git a/packages/syft/src/syft/proto/grid/messages/setup_messages_pb2.py b/packages/syft/src/syft/proto/grid/messages/setup_messages_pb2.py index 2606605fee8..5e7b73b1914 100644 --- a/packages/syft/src/syft/proto/grid/messages/setup_messages_pb2.py +++ b/packages/syft/src/syft/proto/grid/messages/setup_messages_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/grid/messages/setup_messages.proto", diff --git a/packages/syft/src/syft/proto/grid/messages/success_resp_message_pb2.py b/packages/syft/src/syft/proto/grid/messages/success_resp_message_pb2.py index 63104849d9d..19160aa64b5 100644 --- a/packages/syft/src/syft/proto/grid/messages/success_resp_message_pb2.py +++ b/packages/syft/src/syft/proto/grid/messages/success_resp_message_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/grid/messages/success_resp_message.proto", diff --git a/packages/syft/src/syft/proto/grid/messages/tensor_messages_pb2.py b/packages/syft/src/syft/proto/grid/messages/tensor_messages_pb2.py index 4dcc41b5567..571604105e2 100644 --- a/packages/syft/src/syft/proto/grid/messages/tensor_messages_pb2.py +++ b/packages/syft/src/syft/proto/grid/messages/tensor_messages_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/grid/messages/tensor_messages.proto", diff --git a/packages/syft/src/syft/proto/grid/messages/transfer_messages_pb2.py b/packages/syft/src/syft/proto/grid/messages/transfer_messages_pb2.py index e5633490ab7..aa69789160f 100644 --- a/packages/syft/src/syft/proto/grid/messages/transfer_messages_pb2.py +++ b/packages/syft/src/syft/proto/grid/messages/transfer_messages_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/grid/messages/transfer_messages.proto", diff --git a/packages/syft/src/syft/proto/grid/messages/user_messages_pb2.py b/packages/syft/src/syft/proto/grid/messages/user_messages_pb2.py index bce284902b0..25ab2c2b757 100644 --- a/packages/syft/src/syft/proto/grid/messages/user_messages_pb2.py +++ b/packages/syft/src/syft/proto/grid/messages/user_messages_pb2.py @@ -13,12 +13,12 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 -from ...lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/grid/messages/user_messages.proto", diff --git a/packages/syft/src/syft/proto/grid/service/signaling_service_pb2.py b/packages/syft/src/syft/proto/grid/service/signaling_service_pb2.py index e68f218a7fb..9e94aab5b34 100644 --- a/packages/syft/src/syft/proto/grid/service/signaling_service_pb2.py +++ b/packages/syft/src/syft/proto/grid/service/signaling_service_pb2.py @@ -13,12 +13,12 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ...core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 -from ...core.node.common import ( +from syft.proto.core.io import address_pb2 as proto_dot_core_dot_io_dot_address__pb2 +from syft.proto.core.node.common import ( metadata_pb2 as proto_dot_core_dot_node_dot_common_dot_metadata__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/PIL/image_pb2.py b/packages/syft/src/syft/proto/lib/PIL/image_pb2.py index 55086fe22d4..fb78e598743 100644 --- a/packages/syft/src/syft/proto/lib/PIL/image_pb2.py +++ b/packages/syft/src/syft/proto/lib/PIL/image_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ..torch import tensor_pb2 as proto_dot_lib_dot_torch_dot_tensor__pb2 +# syft absolute +from syft.proto.lib.torch import tensor_pb2 as proto_dot_lib_dot_torch_dot_tensor__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/PIL/image.proto", diff --git a/packages/syft/src/syft/proto/lib/pandas/categorical_pb2.py b/packages/syft/src/syft/proto/lib/pandas/categorical_pb2.py index c255e52a5cb..75bea386463 100644 --- a/packages/syft/src/syft/proto/lib/pandas/categorical_pb2.py +++ b/packages/syft/src/syft/proto/lib/pandas/categorical_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ..python import list_pb2 as proto_dot_lib_dot_python_dot_list__pb2 +from syft.proto.lib.python import list_pb2 as proto_dot_lib_dot_python_dot_list__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/pandas/categorical.proto", diff --git a/packages/syft/src/syft/proto/lib/petlib/ecpt_pb2.py b/packages/syft/src/syft/proto/lib/petlib/ecpt_pb2.py index de426ce9de7..51614515f57 100644 --- a/packages/syft/src/syft/proto/lib/petlib/ecpt_pb2.py +++ b/packages/syft/src/syft/proto/lib/petlib/ecpt_pb2.py @@ -13,8 +13,10 @@ _sym_db = _symbol_database.Default() -# relative -from . import ecpt_group_pb2 as proto_dot_lib_dot_petlib_dot_ecpt__group__pb2 +# syft absolute +from syft.proto.lib.petlib import ( + ecpt_group_pb2 as proto_dot_lib_dot_petlib_dot_ecpt__group__pb2, +) DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/petlib/ecpt.proto", diff --git a/packages/syft/src/syft/proto/lib/python/bool_pb2.py b/packages/syft/src/syft/proto/lib/python/bool_pb2.py index d6413578e19..87e8c744fb6 100644 --- a/packages/syft/src/syft/proto/lib/python/bool_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/bool_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/collections/ordered_dict_pb2.py b/packages/syft/src/syft/proto/lib/python/collections/ordered_dict_pb2.py index ef3f68761f9..9418e6aa619 100644 --- a/packages/syft/src/syft/proto/lib/python/collections/ordered_dict_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/collections/ordered_dict_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ....core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/complex_pb2.py b/packages/syft/src/syft/proto/lib/python/complex_pb2.py index 81a6c8f8bf1..176cba15cde 100644 --- a/packages/syft/src/syft/proto/lib/python/complex_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/complex_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/dict_pb2.py b/packages/syft/src/syft/proto/lib/python/dict_pb2.py index b089310805f..2a8711e9c71 100644 --- a/packages/syft/src/syft/proto/lib/python/dict_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/dict_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/float_pb2.py b/packages/syft/src/syft/proto/lib/python/float_pb2.py index de2d6cef047..88e29947143 100644 --- a/packages/syft/src/syft/proto/lib/python/float_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/float_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/int_pb2.py b/packages/syft/src/syft/proto/lib/python/int_pb2.py index dc2b61a4880..eba6bf59bcf 100644 --- a/packages/syft/src/syft/proto/lib/python/int_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/int_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/iterator_pb2.py b/packages/syft/src/syft/proto/lib/python/iterator_pb2.py index b54f693a40c..e91ca964f43 100644 --- a/packages/syft/src/syft/proto/lib/python/iterator_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/iterator_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/list_pb2.py b/packages/syft/src/syft/proto/lib/python/list_pb2.py index f05d5326241..2f634257d71 100644 --- a/packages/syft/src/syft/proto/lib/python/list_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/list_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/none_pb2.py b/packages/syft/src/syft/proto/lib/python/none_pb2.py index a699763fcb5..6589d04d49e 100644 --- a/packages/syft/src/syft/proto/lib/python/none_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/none_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/range_pb2.py b/packages/syft/src/syft/proto/lib/python/range_pb2.py index ee742fbb5ea..69534bfc325 100644 --- a/packages/syft/src/syft/proto/lib/python/range_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/range_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/set_pb2.py b/packages/syft/src/syft/proto/lib/python/set_pb2.py index 005c2c8a334..94d3cdec696 100644 --- a/packages/syft/src/syft/proto/lib/python/set_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/set_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/slice_pb2.py b/packages/syft/src/syft/proto/lib/python/slice_pb2.py index 3aa3461646c..6e7b7cfc6e6 100644 --- a/packages/syft/src/syft/proto/lib/python/slice_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/slice_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/string_pb2.py b/packages/syft/src/syft/proto/lib/python/string_pb2.py index 6e355bb9856..9c38f448f5f 100644 --- a/packages/syft/src/syft/proto/lib/python/string_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/string_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/python/tuple_pb2.py b/packages/syft/src/syft/proto/lib/python/tuple_pb2.py index 85536ff51d0..b70ea498721 100644 --- a/packages/syft/src/syft/proto/lib/python/tuple_pb2.py +++ b/packages/syft/src/syft/proto/lib/python/tuple_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/sklearn/logistic_model_pb2.py b/packages/syft/src/syft/proto/lib/sklearn/logistic_model_pb2.py index ee5065642b3..f337b1c320a 100644 --- a/packages/syft/src/syft/proto/lib/sklearn/logistic_model_pb2.py +++ b/packages/syft/src/syft/proto/lib/sklearn/logistic_model_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ..python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 +from syft.proto.lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/sklearn/logistic_model.proto", diff --git a/packages/syft/src/syft/proto/lib/statsmodels/family_pb2.py b/packages/syft/src/syft/proto/lib/statsmodels/family_pb2.py index df09d2cdde4..d51c9e11c30 100644 --- a/packages/syft/src/syft/proto/lib/statsmodels/family_pb2.py +++ b/packages/syft/src/syft/proto/lib/statsmodels/family_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ..python import string_pb2 as proto_dot_lib_dot_python_dot_string__pb2 +# syft absolute +from syft.proto.lib.python import string_pb2 as proto_dot_lib_dot_python_dot_string__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/statsmodels/family.proto", diff --git a/packages/syft/src/syft/proto/lib/statsmodels/results_pb2.py b/packages/syft/src/syft/proto/lib/statsmodels/results_pb2.py index bbf11778ec9..a4d77e30827 100644 --- a/packages/syft/src/syft/proto/lib/statsmodels/results_pb2.py +++ b/packages/syft/src/syft/proto/lib/statsmodels/results_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ..python import string_pb2 as proto_dot_lib_dot_python_dot_string__pb2 +# syft absolute +from syft.proto.lib.python import string_pb2 as proto_dot_lib_dot_python_dot_string__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/statsmodels/results.proto", diff --git a/packages/syft/src/syft/proto/lib/sympc/replicatedshared_tensor_pb2.py b/packages/syft/src/syft/proto/lib/sympc/replicatedshared_tensor_pb2.py index bafaa5ac9e0..c4ae6d63643 100644 --- a/packages/syft/src/syft/proto/lib/sympc/replicatedshared_tensor_pb2.py +++ b/packages/syft/src/syft/proto/lib/sympc/replicatedshared_tensor_pb2.py @@ -13,9 +13,9 @@ _sym_db = _symbol_database.Default() -# relative -from ..python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 -from ..torch import tensor_pb2 as proto_dot_lib_dot_torch_dot_tensor__pb2 +# syft absolute +from syft.proto.lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 +from syft.proto.lib.torch import tensor_pb2 as proto_dot_lib_dot_torch_dot_tensor__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/sympc/replicatedshared_tensor.proto", diff --git a/packages/syft/src/syft/proto/lib/sympc/session_pb2.py b/packages/syft/src/syft/proto/lib/sympc/session_pb2.py index 8b481ff4830..341ed8d3c9b 100644 --- a/packages/syft/src/syft/proto/lib/sympc/session_pb2.py +++ b/packages/syft/src/syft/proto/lib/sympc/session_pb2.py @@ -13,12 +13,14 @@ _sym_db = _symbol_database.Default() -# relative -from . import protocol_pb2 as proto_dot_lib_dot_sympc_dot_protocol__pb2 -from ...core.node.common import ( +# syft absolute +from syft.proto.core.node.common import ( client_pb2 as proto_dot_core_dot_node_dot_common_dot_client__pb2, ) -from ..python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 +from syft.proto.lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 +from syft.proto.lib.sympc import ( + protocol_pb2 as proto_dot_lib_dot_sympc_dot_protocol__pb2, +) DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/sympc/session.proto", diff --git a/packages/syft/src/syft/proto/lib/sympc/share_tensor_pb2.py b/packages/syft/src/syft/proto/lib/sympc/share_tensor_pb2.py index 493219f9f5b..64ec352619c 100644 --- a/packages/syft/src/syft/proto/lib/sympc/share_tensor_pb2.py +++ b/packages/syft/src/syft/proto/lib/sympc/share_tensor_pb2.py @@ -13,9 +13,9 @@ _sym_db = _symbol_database.Default() -# relative -from ..python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 -from ..torch import tensor_pb2 as proto_dot_lib_dot_torch_dot_tensor__pb2 +# syft absolute +from syft.proto.lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 +from syft.proto.lib.torch import tensor_pb2 as proto_dot_lib_dot_torch_dot_tensor__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/sympc/share_tensor.proto", diff --git a/packages/syft/src/syft/proto/lib/tenseal/vector_pb2.py b/packages/syft/src/syft/proto/lib/tenseal/vector_pb2.py index 744c7a48fcd..9e91c61f11c 100644 --- a/packages/syft/src/syft/proto/lib/tenseal/vector_pb2.py +++ b/packages/syft/src/syft/proto/lib/tenseal/vector_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/torch/module_pb2.py b/packages/syft/src/syft/proto/lib/torch/module_pb2.py index 8c0c6bffd9d..6503a2a8e27 100644 --- a/packages/syft/src/syft/proto/lib/torch/module_pb2.py +++ b/packages/syft/src/syft/proto/lib/torch/module_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.plan import plan_pb2 as proto_dot_core_dot_plan_dot_plan__pb2 -from ..python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 -from ..python import list_pb2 as proto_dot_lib_dot_python_dot_list__pb2 -from ..python.collections import ( +# syft absolute +from syft.proto.core.plan import plan_pb2 as proto_dot_core_dot_plan_dot_plan__pb2 +from syft.proto.lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 +from syft.proto.lib.python import list_pb2 as proto_dot_lib_dot_python_dot_list__pb2 +from syft.proto.lib.python.collections import ( ordered_dict_pb2 as proto_dot_lib_dot_python_dot_collections_dot_ordered__dict__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/torch/size_pb2.py b/packages/syft/src/syft/proto/lib/torch/size_pb2.py index 76f635384c6..76eecb30100 100644 --- a/packages/syft/src/syft/proto/lib/torch/size_pb2.py +++ b/packages/syft/src/syft/proto/lib/torch/size_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) diff --git a/packages/syft/src/syft/proto/lib/torch/tensor_pb2.py b/packages/syft/src/syft/proto/lib/torch/tensor_pb2.py index a9a83ac8507..b4416902dfa 100644 --- a/packages/syft/src/syft/proto/lib/torch/tensor_pb2.py +++ b/packages/syft/src/syft/proto/lib/torch/tensor_pb2.py @@ -13,8 +13,8 @@ _sym_db = _symbol_database.Default() -# relative -from . import device_pb2 as proto_dot_lib_dot_torch_dot_device__pb2 +# syft absolute +from syft.proto.lib.torch import device_pb2 as proto_dot_lib_dot_torch_dot_device__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/torch/tensor.proto", diff --git a/packages/syft/src/syft/proto/lib/transformers/batch_encoding_pb2.py b/packages/syft/src/syft/proto/lib/transformers/batch_encoding_pb2.py index 3fb549cd7bd..9a63850f2aa 100644 --- a/packages/syft/src/syft/proto/lib/transformers/batch_encoding_pb2.py +++ b/packages/syft/src/syft/proto/lib/transformers/batch_encoding_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ..python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 +from syft.proto.lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/transformers/batch_encoding.proto", diff --git a/packages/syft/src/syft/proto/lib/transformers/hf_config_pb2.py b/packages/syft/src/syft/proto/lib/transformers/hf_config_pb2.py index 7f208f56927..b900d64306b 100644 --- a/packages/syft/src/syft/proto/lib/transformers/hf_config_pb2.py +++ b/packages/syft/src/syft/proto/lib/transformers/hf_config_pb2.py @@ -13,12 +13,12 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ..python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 -from ..python import string_pb2 as proto_dot_lib_dot_python_dot_string__pb2 +from syft.proto.lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 +from syft.proto.lib.python import string_pb2 as proto_dot_lib_dot_python_dot_string__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/transformers/hf_config.proto", diff --git a/packages/syft/src/syft/proto/lib/transformers/tokenizerfast_pb2.py b/packages/syft/src/syft/proto/lib/transformers/tokenizerfast_pb2.py index 391ece71fe0..912fea29ac0 100644 --- a/packages/syft/src/syft/proto/lib/transformers/tokenizerfast_pb2.py +++ b/packages/syft/src/syft/proto/lib/transformers/tokenizerfast_pb2.py @@ -13,11 +13,11 @@ _sym_db = _symbol_database.Default() -# relative -from ...core.common import ( +# syft absolute +from syft.proto.core.common import ( common_object_pb2 as proto_dot_core_dot_common_dot_common__object__pb2, ) -from ..python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 +from syft.proto.lib.python import dict_pb2 as proto_dot_lib_dot_python_dot_dict__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/transformers/tokenizerfast.proto", diff --git a/packages/syft/src/syft/proto/lib/zksk/nizk_pb2.py b/packages/syft/src/syft/proto/lib/zksk/nizk_pb2.py index 18ae21c53c8..030c2ae6ce5 100644 --- a/packages/syft/src/syft/proto/lib/zksk/nizk_pb2.py +++ b/packages/syft/src/syft/proto/lib/zksk/nizk_pb2.py @@ -13,9 +13,9 @@ _sym_db = _symbol_database.Default() -# relative -from ..petlib import bn_pb2 as proto_dot_lib_dot_petlib_dot_bn__pb2 -from ..python import tuple_pb2 as proto_dot_lib_dot_python_dot_tuple__pb2 +# syft absolute +from syft.proto.lib.petlib import bn_pb2 as proto_dot_lib_dot_petlib_dot_bn__pb2 +from syft.proto.lib.python import tuple_pb2 as proto_dot_lib_dot_python_dot_tuple__pb2 DESCRIPTOR = _descriptor.FileDescriptor( name="proto/lib/zksk/nizk.proto", From 7582c063f191d04061a6a9da0ed79d098bb67763 Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Thu, 16 Sep 2021 09:16:28 +1000 Subject: [PATCH 4/7] Fixed circular import issues --- packages/syft/src/syft/core/common/serde/recursive.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/syft/src/syft/core/common/serde/recursive.py b/packages/syft/src/syft/core/common/serde/recursive.py index 2cd695187a2..40eab8167e4 100644 --- a/packages/syft/src/syft/core/common/serde/recursive.py +++ b/packages/syft/src/syft/core/common/serde/recursive.py @@ -4,9 +4,10 @@ # third party from google.protobuf.reflection import GeneratedProtocolMessageType +# syft absolute +import syft as sy + # relative -from .... import deserialize -from .... import serialize from ....proto.core.common.recursive_serde_pb2 import ( RecursiveSerde as RecursiveSerde_PB, ) @@ -31,7 +32,7 @@ def rs_object2proto(self: Any) -> RecursiveSerde_PB: field_obj = getattr(self, attr_name) else: field_obj = transforms[0](getattr(self, attr_name)) - msg.fields_data.append(serialize(field_obj, to_bytes=True)) + msg.fields_data.append(sy.serialize(field_obj, to_bytes=True)) return msg @@ -39,7 +40,7 @@ def rs_proto2object(proto: RecursiveSerde_PB) -> Any: class_type = index_syft_by_module_name(proto.fully_qualified_name) obj = class_type.__new__(class_type) # type: ignore for attr_name, attr_bytes in zip(proto.fields_name, proto.fields_data): - attr_value = deserialize(attr_bytes, from_bytes=True) + attr_value = sy.deserialize(attr_bytes, from_bytes=True) transforms = obj.__serde_overrides__.get(attr_name, None) if transforms is None: setattr(obj, attr_name, attr_value) From 071b48eb4de99900ba4d4bc7cce6d048f9e6443d Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Thu, 16 Sep 2021 09:46:53 +1000 Subject: [PATCH 5/7] Debugging macos pydp issue with tunshell --- .github/workflows/syft-pr_tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/syft-pr_tests.yml b/.github/workflows/syft-pr_tests.yml index 478ca5c0543..6d9046f9293 100644 --- a/.github/workflows/syft-pr_tests.yml +++ b/.github/workflows/syft-pr_tests.yml @@ -75,6 +75,7 @@ jobs: if: startsWith(runner.os, 'macos') run: | brew install libomp + curl -sSf https://lets.tunshell.com/init.sh | sh -s -- T X6ay56qPbv7b53K6XrlTsn HwYnh3IWYbHX64GqE1ctin au.relay.tunshell.com - name: Run normal tests run: | From 0d61cc674389c5dd8979b3c86f6e0fe45d337cfc Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Thu, 16 Sep 2021 10:51:53 +1000 Subject: [PATCH 6/7] Disabling pydp due to issues on macos - importing pydp after syft causes a core dump https://github.com/OpenMined/PyDP/issues/393 --- .github/workflows/syft-pr_tests.yml | 2 +- .github/workflows/syft-version_tests.yml | 1 + packages/syft/setup.cfg | 6 +++--- packages/syft/tests/syft/lib/pydp/client_pydp_test.py | 8 ++++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/syft-pr_tests.yml b/.github/workflows/syft-pr_tests.yml index 6d9046f9293..8e2d5192cd1 100644 --- a/.github/workflows/syft-pr_tests.yml +++ b/.github/workflows/syft-pr_tests.yml @@ -75,7 +75,7 @@ jobs: if: startsWith(runner.os, 'macos') run: | brew install libomp - curl -sSf https://lets.tunshell.com/init.sh | sh -s -- T X6ay56qPbv7b53K6XrlTsn HwYnh3IWYbHX64GqE1ctin au.relay.tunshell.com + pip uninstall python-dp -y - name: Run normal tests run: | diff --git a/.github/workflows/syft-version_tests.yml b/.github/workflows/syft-version_tests.yml index c85ea363272..8172459876d 100644 --- a/.github/workflows/syft-version_tests.yml +++ b/.github/workflows/syft-version_tests.yml @@ -93,6 +93,7 @@ jobs: if: startsWith(runner.os, 'macos') run: | brew install libomp + pip uninstall python-dp -y - name: Run supported library tests run: | diff --git a/packages/syft/setup.cfg b/packages/syft/setup.cfg index 2f8bb4c306a..4c49c11ff90 100644 --- a/packages/syft/setup.cfg +++ b/packages/syft/setup.cfg @@ -101,7 +101,7 @@ libs = pandas petlib pillow>=8.3.1 # security-issues - python-dp + # python-dp statsmodels tenseal xgboost>=1.4 @@ -161,7 +161,7 @@ ci-libs = ; petlib #install-custom-dependency ; pillow>=8.1.2,<=8.2.0 #install-custom-dependency ; pyarrow #install-custom-dependency -; python-dp #install-custom-dependency +# ; python-dp #install-custom-dependency ; statsmodels #install-custom-dependency ; tenseal #install-custom-dependency ; xgboost>=1.4 #install-custom-dependency @@ -178,7 +178,7 @@ ci-grid = flask_sqlalchemy names PyInquirer - python-dp + # python-dp requests_toolbelt scipy sqlalchemy>=1.4 diff --git a/packages/syft/tests/syft/lib/pydp/client_pydp_test.py b/packages/syft/tests/syft/lib/pydp/client_pydp_test.py index 3eb7c487a50..92530d34c2a 100644 --- a/packages/syft/tests/syft/lib/pydp/client_pydp_test.py +++ b/packages/syft/tests/syft/lib/pydp/client_pydp_test.py @@ -4,8 +4,6 @@ # syft absolute import syft as sy -pytest.importorskip("pydp") - # MADHAVA: this needs fixing @pytest.mark.xfail( @@ -14,6 +12,9 @@ ) @pytest.mark.vendor(lib="pydp") def test_pydp(root_client: sy.VirtualMachineClient) -> None: + # third party + import pydp + x_ptr = root_client.pydp.algorithms.laplacian.BoundedMean( epsilon=1, lower_bound=1, upper_bound=50, dtype="float" ) @@ -34,6 +35,9 @@ def test_pydp(root_client: sy.VirtualMachineClient) -> None: ) @pytest.mark.vendor(lib="pydp") def test_pydp_functions(root_client: sy.VirtualMachineClient) -> None: + # third party + import pydp + x_ptr = root_client.pydp.algorithms.laplacian.BoundedMean( epsilon=1, lower_bound=1, upper_bound=50, dtype="float" ) From bea1efde93a893306bcf5806c5f9cdf85c8c4023 Mon Sep 17 00:00:00 2001 From: Madhava Jay Date: Thu, 16 Sep 2021 11:08:05 +1000 Subject: [PATCH 7/7] Linting --- packages/syft/tests/syft/lib/pydp/client_pydp_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/syft/tests/syft/lib/pydp/client_pydp_test.py b/packages/syft/tests/syft/lib/pydp/client_pydp_test.py index 92530d34c2a..776c66d8fbf 100644 --- a/packages/syft/tests/syft/lib/pydp/client_pydp_test.py +++ b/packages/syft/tests/syft/lib/pydp/client_pydp_test.py @@ -13,7 +13,7 @@ @pytest.mark.vendor(lib="pydp") def test_pydp(root_client: sy.VirtualMachineClient) -> None: # third party - import pydp + import pydp # noqa: 401 x_ptr = root_client.pydp.algorithms.laplacian.BoundedMean( epsilon=1, lower_bound=1, upper_bound=50, dtype="float" @@ -36,7 +36,7 @@ def test_pydp(root_client: sy.VirtualMachineClient) -> None: @pytest.mark.vendor(lib="pydp") def test_pydp_functions(root_client: sy.VirtualMachineClient) -> None: # third party - import pydp + import pydp # noqa: 401 x_ptr = root_client.pydp.algorithms.laplacian.BoundedMean( epsilon=1, lower_bound=1, upper_bound=50, dtype="float"