diff --git a/packages/syft/src/syft/protocol/data_protocol.py b/packages/syft/src/syft/protocol/data_protocol.py index f7bab2226ee..fff188df7a6 100644 --- a/packages/syft/src/syft/protocol/data_protocol.py +++ b/packages/syft/src/syft/protocol/data_protocol.py @@ -23,8 +23,8 @@ from ..service.response import SyftError from ..service.response import SyftException from ..service.response import SyftSuccess +from ..types.dicttuple import DictTuple from ..types.syft_object import SyftBaseObject -from ..types.tupledict import DictTuple PROTOCOL_STATE_FILENAME = "protocol_version.json" PROTOCOL_TYPE = Union[str, int] diff --git a/packages/syft/src/syft/protocol/protocol_version.json b/packages/syft/src/syft/protocol/protocol_version.json index 75812a98db0..e6af980a18a 100644 --- a/packages/syft/src/syft/protocol/protocol_version.json +++ b/packages/syft/src/syft/protocol/protocol_version.json @@ -345,7 +345,7 @@ "DatasetPageView": { "1": { "version": 1, - "hash": "1c7042b2980c9c91b6cb1bbdc99417b1b7bc88b1030223107d15a8e0f60183d6", + "hash": "6741bd16dc6089d9deea37b1bd4e895152d1a0c163b8bdfe45280b9bfc4a1354", "action": "add" } }, diff --git a/packages/syft/src/syft/serde/third_party.py b/packages/syft/src/syft/serde/third_party.py index a88eb172030..1abfe2d9cdc 100644 --- a/packages/syft/src/syft/serde/third_party.py +++ b/packages/syft/src/syft/serde/third_party.py @@ -27,8 +27,8 @@ import zmq.green as zmq # relative -from ..types.tupledict import DictTuple -from ..types.tupledict import _Meta as _DictTupleMetaClass +from ..types.dicttuple import DictTuple +from ..types.dicttuple import _Meta as _DictTupleMetaClass from .deserialize import _deserialize as deserialize from .recursive_primitives import _serialize_kv_pairs from .recursive_primitives import deserialize_kv diff --git a/packages/syft/src/syft/service/dataset/dataset.py b/packages/syft/src/syft/service/dataset/dataset.py index fea9699af6c..f482e4ba67e 100644 --- a/packages/syft/src/syft/service/dataset/dataset.py +++ b/packages/syft/src/syft/service/dataset/dataset.py @@ -26,13 +26,13 @@ from ...serde.serializable import serializable from ...store.document_store import PartitionKey from ...types.datetime import DateTime +from ...types.dicttuple import DictTuple from ...types.syft_object import SYFT_OBJECT_VERSION_1 from ...types.syft_object import SyftObject from ...types.transforms import TransformContext from ...types.transforms import generate_id from ...types.transforms import transform from ...types.transforms import validate_url -from ...types.tupledict import DictTuple from ...types.uid import UID from ...util import options from ...util.colors import ON_SURFACE_HIGHEST diff --git a/packages/syft/src/syft/service/dataset/dataset_service.py b/packages/syft/src/syft/service/dataset/dataset_service.py index 54d5f51702e..2bce6a10ea4 100644 --- a/packages/syft/src/syft/service/dataset/dataset_service.py +++ b/packages/syft/src/syft/service/dataset/dataset_service.py @@ -7,7 +7,7 @@ # relative from ...serde.serializable import serializable from ...store.document_store import DocumentStore -from ...types.tupledict import DictTuple +from ...types.dicttuple import DictTuple from ...types.uid import UID from ...util.telemetry import instrument from ..action.action_permissions import ActionObjectPermission diff --git a/packages/syft/src/syft/types/tupledict.py b/packages/syft/src/syft/types/dicttuple.py similarity index 100% rename from packages/syft/src/syft/types/tupledict.py rename to packages/syft/src/syft/types/dicttuple.py diff --git a/packages/syft/src/syft/types/syft_object.py b/packages/syft/src/syft/types/syft_object.py index 456c55231f1..65efe81e832 100644 --- a/packages/syft/src/syft/types/syft_object.py +++ b/packages/syft/src/syft/types/syft_object.py @@ -34,13 +34,13 @@ from ..node.credentials import SyftVerifyKey from ..serde.recursive_primitives import recursive_serde_register_type from ..serde.serialize import _serialize as serialize -from ..types.tupledict import DictTuple from ..util.autoreload import autoreload_enabled from ..util.markdown import as_markdown_python_code from ..util.notebook_ui.notebook_addons import create_table_template from ..util.util import aggressive_set_attr from ..util.util import full_name_with_qualname from ..util.util import get_qualname_for +from .dicttuple import DictTuple from .syft_metaclass import Empty from .syft_metaclass import PartialModelMetaclass from .uid import UID diff --git a/packages/syft/tests/syft/types/dicttuple_test.py b/packages/syft/tests/syft/types/dicttuple_test.py index d134fc52d1b..000f9f20b27 100644 --- a/packages/syft/tests/syft/types/dicttuple_test.py +++ b/packages/syft/tests/syft/types/dicttuple_test.py @@ -2,7 +2,7 @@ import pytest # syft absolute -from syft.types.tupledict import DictTuple +from syft.types.dicttuple import DictTuple # different ways to create a DictTuple TEST_CASES = [