From 6fcf1d2195a6a7907570411caca543d736665cc9 Mon Sep 17 00:00:00 2001 From: Jakub Kuszneruk Date: Fri, 4 Nov 2022 10:31:01 +0100 Subject: [PATCH] Move TestType to new.internal --- src/neptune/new/attributes/series/file_series.py | 2 +- .../new/internal/backends/neptune_backend_mock.py | 2 +- src/neptune/new/internal/operation.py | 2 +- src/neptune/new/internal/types/__init__.py | 15 +++++++++++++++ .../internal/types}/file_types.py | 0 src/neptune/new/types/atoms/file.py | 2 +- tests/neptune/new/attributes/atoms/test_file.py | 2 +- tests/neptune/new/types/atoms/test_file.py | 8 ++++---- 8 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 src/neptune/new/internal/types/__init__.py rename src/neptune/{internal => new/internal/types}/file_types.py (100%) diff --git a/src/neptune/new/attributes/series/file_series.py b/src/neptune/new/attributes/series/file_series.py index e8644cd6a..619860f9d 100644 --- a/src/neptune/new/attributes/series/file_series.py +++ b/src/neptune/new/attributes/series/file_series.py @@ -22,7 +22,6 @@ Optional, ) -from neptune.internal.file_types import FileType from neptune.new.attributes.series.series import Series from neptune.new.exceptions import ( FileNotFound, @@ -34,6 +33,7 @@ LogImages, Operation, ) +from neptune.new.internal.types.file_types import FileType from neptune.new.internal.utils import base64_encode from neptune.new.internal.utils.iteration import get_batches from neptune.new.internal.utils.limits import image_size_exceeds_limit_for_logging diff --git a/src/neptune/new/internal/backends/neptune_backend_mock.py b/src/neptune/new/internal/backends/neptune_backend_mock.py index e14c39632..10da55990 100644 --- a/src/neptune/new/internal/backends/neptune_backend_mock.py +++ b/src/neptune/new/internal/backends/neptune_backend_mock.py @@ -35,7 +35,6 @@ InternalClientError, NeptuneException, ) -from neptune.internal.file_types import FileType from neptune.new.exceptions import ( ContainerUUIDNotFound, MetadataInconsistency, @@ -105,6 +104,7 @@ UploadFileSet, ) from neptune.new.internal.operation_visitor import OperationVisitor +from neptune.new.internal.types.file_types import FileType from neptune.new.internal.utils import base64_decode from neptune.new.internal.utils.generic_attribute_mapper import NoValue from neptune.new.internal.utils.paths import path_to_str diff --git a/src/neptune/new/internal/operation.py b/src/neptune/new/internal/operation.py index 1f6c20bff..963e817db 100644 --- a/src/neptune/new/internal/operation.py +++ b/src/neptune/new/internal/operation.py @@ -30,9 +30,9 @@ ) from neptune.common.exceptions import InternalClientError -from neptune.internal.file_types import FileType from neptune.new.exceptions import MalformedOperation from neptune.new.internal.container_type import ContainerType +from neptune.new.internal.types.file_types import FileType from neptune.new.types.atoms.file import File if TYPE_CHECKING: diff --git a/src/neptune/new/internal/types/__init__.py b/src/neptune/new/internal/types/__init__.py new file mode 100644 index 000000000..b5e585d90 --- /dev/null +++ b/src/neptune/new/internal/types/__init__.py @@ -0,0 +1,15 @@ +# +# Copyright (c) 2022, Neptune Labs Sp. z o.o. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# diff --git a/src/neptune/internal/file_types.py b/src/neptune/new/internal/types/file_types.py similarity index 100% rename from src/neptune/internal/file_types.py rename to src/neptune/new/internal/types/file_types.py diff --git a/src/neptune/new/types/atoms/file.py b/src/neptune/new/types/atoms/file.py index 227751856..ef6161645 100644 --- a/src/neptune/new/types/atoms/file.py +++ b/src/neptune/new/types/atoms/file.py @@ -25,7 +25,7 @@ Union, ) -from neptune.internal.file_types import ( +from neptune.new.internal.types.file_types import ( FileComposite, InMemoryComposite, LocalFileComposite, diff --git a/tests/neptune/new/attributes/atoms/test_file.py b/tests/neptune/new/attributes/atoms/test_file.py index 59960b655..56984192b 100644 --- a/tests/neptune/new/attributes/atoms/test_file.py +++ b/tests/neptune/new/attributes/atoms/test_file.py @@ -26,7 +26,6 @@ from e2e_tests.utils import tmp_context from neptune.common.utils import IS_WINDOWS -from neptune.internal.file_types import FileType from neptune.new.attributes.atoms.file import ( File, FileVal, @@ -39,6 +38,7 @@ UploadFile, UploadFileSet, ) +from neptune.new.internal.types.file_types import FileType from tests.neptune.new.attributes.test_attribute_base import TestAttributeBase diff --git a/tests/neptune/new/types/atoms/test_file.py b/tests/neptune/new/types/atoms/test_file.py index a7c16992d..74fe99d9c 100644 --- a/tests/neptune/new/types/atoms/test_file.py +++ b/tests/neptune/new/types/atoms/test_file.py @@ -25,14 +25,14 @@ from PIL import Image from e2e_tests.utils import tmp_context -from neptune.internal.file_types import ( - FileType, - InMemoryComposite, -) from neptune.new.exceptions import ( NeptuneException, StreamAlreadyUsedException, ) +from neptune.new.internal.types.file_types import ( + FileType, + InMemoryComposite, +) from neptune.new.internal.utils.images import _get_pil_image_data from neptune.new.types import File from tests.neptune.new.attributes.test_attribute_base import TestAttributeBase