From 3e72e25f9fa03bcffb7837da13ab6b5645884dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mose=20M=C3=BCller?= Date: Wed, 2 Aug 2023 12:06:22 +0200 Subject: [PATCH] changing utils module exports --- src/pyDataInterface/data_service/data_service.py | 8 ++++---- src/pyDataInterface/data_service/data_service_list.py | 2 +- src/pyDataInterface/data_service/task_manager.py | 2 +- src/pyDataInterface/utils/__init__.py | 7 ------- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/pyDataInterface/data_service/data_service.py b/src/pyDataInterface/data_service/data_service.py index d284ad6..8efb043 100644 --- a/src/pyDataInterface/data_service/data_service.py +++ b/src/pyDataInterface/data_service/data_service.py @@ -9,18 +9,18 @@ from typing import Any, Optional, cast, get_type_hints import rpyc from loguru import logger -from pyDataInterface.utils import ( - get_class_and_instance_attributes, - warn_if_instance_class_does_not_inherit_from_DataService, -) from pyDataInterface.utils.helpers import ( convert_arguments_to_hinted_types, generate_paths_from_DataService_dict, + get_class_and_instance_attributes, get_nested_value_by_path_and_key, get_object_attr_from_path, parse_list_attr_and_index, set_if_differs, ) +from pyDataInterface.utils.warnings import ( + warn_if_instance_class_does_not_inherit_from_DataService, +) from .data_service_list import DataServiceList from .task_manager import TaskManager diff --git a/src/pyDataInterface/data_service/data_service_list.py b/src/pyDataInterface/data_service/data_service_list.py index ac58e97..6152e3b 100644 --- a/src/pyDataInterface/data_service/data_service_list.py +++ b/src/pyDataInterface/data_service/data_service_list.py @@ -1,7 +1,7 @@ from collections.abc import Callable from typing import Any -from pyDataInterface.utils import ( +from pyDataInterface.utils.warnings import ( warn_if_instance_class_does_not_inherit_from_DataService, ) diff --git a/src/pyDataInterface/data_service/task_manager.py b/src/pyDataInterface/data_service/task_manager.py index f18fd61..f79b180 100644 --- a/src/pyDataInterface/data_service/task_manager.py +++ b/src/pyDataInterface/data_service/task_manager.py @@ -8,7 +8,7 @@ from typing import TypedDict from loguru import logger from tiqi_rpc import Any -from pyDataInterface.utils import get_class_and_instance_attributes +from pyDataInterface.utils.helpers import get_class_and_instance_attributes class TaskDict(TypedDict): diff --git a/src/pyDataInterface/utils/__init__.py b/src/pyDataInterface/utils/__init__.py index 852eba5..e69de29 100644 --- a/src/pyDataInterface/utils/__init__.py +++ b/src/pyDataInterface/utils/__init__.py @@ -1,7 +0,0 @@ -from .helpers import get_class_and_instance_attributes -from .warnings import warn_if_instance_class_does_not_inherit_from_DataService - -__all__ = [ - "warn_if_instance_class_does_not_inherit_from_DataService", - "get_class_and_instance_attributes", -]