diff --git a/alab_management/_default/devices/default_device.py b/alab_management/_default/devices/default_device.py index 73472e0b..614cccf4 100644 --- a/alab_management/_default/devices/default_device.py +++ b/alab_management/_default/devices/default_device.py @@ -1,6 +1,7 @@ from typing import ClassVar -from alab_management import BaseDevice, SamplePosition +from alab_management.device_view import BaseDevice +from alab_management.sample_view import SamplePosition class DefaultDevice(BaseDevice): diff --git a/alab_management/builders/utils.py b/alab_management/builders/utils.py index b6f8b8d7..821bad51 100644 --- a/alab_management/builders/utils.py +++ b/alab_management/builders/utils.py @@ -8,7 +8,7 @@ from .samplebuilder import SampleBuilder if TYPE_CHECKING: - from alab_management import BaseTask + from alab_management.task_view import BaseTask def append_task( diff --git a/alab_management/task_manager/task_manager.py b/alab_management/task_manager/task_manager.py index 0f4ab276..832b27dc 100644 --- a/alab_management/task_manager/task_manager.py +++ b/alab_management/task_manager/task_manager.py @@ -15,8 +15,7 @@ from bson import ObjectId from dramatiq_abort import abort -from alab_management import BaseDevice -from alab_management.device_view import get_all_devices +from alab_management.device_view import BaseDevice, get_all_devices from alab_management.device_view.device_view import DeviceView from alab_management.lab_view import LabView from alab_management.logger import DBLogger, LoggingLevel diff --git a/docs/source/conf.py b/docs/source/conf.py index a7d3c3c4..1d4fa4cb 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -30,7 +30,7 @@ author = "Alab Project Team" # The full version, including alpha/beta/rc tags -from alab_management import __version__ # noqa +from alab_management.__init__ import __version__ # noqa release = __version__ diff --git a/examples/fake_lab/__init__.py b/examples/fake_lab/__init__.py index 3edb5611..15431605 100644 --- a/examples/fake_lab/__init__.py +++ b/examples/fake_lab/__init__.py @@ -1,9 +1,6 @@ -from alab_management import ( - SamplePosition, - add_device, - add_standalone_sample_position, - add_task, -) +from alab_management.device_view import add_device +from alab_management.sample_view import SamplePosition, add_standalone_sample_position +from alab_management.task_view import add_task from .devices.furnace import Furnace from .devices.robot_arm import RobotArm diff --git a/examples/fake_lab/devices/furnace.py b/examples/fake_lab/devices/furnace.py index 2323c4cc..16e2f8cf 100644 --- a/examples/fake_lab/devices/furnace.py +++ b/examples/fake_lab/devices/furnace.py @@ -1,7 +1,8 @@ from threading import Timer from typing import ClassVar -from alab_management import BaseDevice, SamplePosition +from alab_management.device_view import BaseDevice +from alab_management.sample_view import SamplePosition class Furnace(BaseDevice): diff --git a/examples/fake_lab/devices/robot_arm.py b/examples/fake_lab/devices/robot_arm.py index 977d30fb..48e5cf03 100644 --- a/examples/fake_lab/devices/robot_arm.py +++ b/examples/fake_lab/devices/robot_arm.py @@ -1,6 +1,7 @@ from typing import ClassVar -from alab_management import BaseDevice, SamplePosition +from alab_management.device_view import BaseDevice +from alab_management.sample_view import SamplePosition class RobotArm(BaseDevice): diff --git a/examples/fake_lab/tasks/heating.py b/examples/fake_lab/tasks/heating.py index 66f5a541..c953b668 100644 --- a/examples/fake_lab/tasks/heating.py +++ b/examples/fake_lab/tasks/heating.py @@ -2,7 +2,7 @@ from bson import ObjectId -from alab_management import BaseTask +from alab_management.task_view import BaseTask from fake_lab.devices.furnace import Furnace from .moving import Moving diff --git a/tests/fake_lab/__init__.py b/tests/fake_lab/__init__.py index 3edb5611..15431605 100644 --- a/tests/fake_lab/__init__.py +++ b/tests/fake_lab/__init__.py @@ -1,9 +1,6 @@ -from alab_management import ( - SamplePosition, - add_device, - add_standalone_sample_position, - add_task, -) +from alab_management.device_view import add_device +from alab_management.sample_view import SamplePosition, add_standalone_sample_position +from alab_management.task_view import add_task from .devices.furnace import Furnace from .devices.robot_arm import RobotArm diff --git a/tests/fake_lab/devices/furnace.py b/tests/fake_lab/devices/furnace.py index 2323c4cc..16e2f8cf 100644 --- a/tests/fake_lab/devices/furnace.py +++ b/tests/fake_lab/devices/furnace.py @@ -1,7 +1,8 @@ from threading import Timer from typing import ClassVar -from alab_management import BaseDevice, SamplePosition +from alab_management.device_view import BaseDevice +from alab_management.sample_view import SamplePosition class Furnace(BaseDevice): diff --git a/tests/fake_lab/devices/robot_arm.py b/tests/fake_lab/devices/robot_arm.py index 977d30fb..48e5cf03 100644 --- a/tests/fake_lab/devices/robot_arm.py +++ b/tests/fake_lab/devices/robot_arm.py @@ -1,6 +1,7 @@ from typing import ClassVar -from alab_management import BaseDevice, SamplePosition +from alab_management.device_view import BaseDevice +from alab_management.sample_view import SamplePosition class RobotArm(BaseDevice): diff --git a/tests/fake_lab/tasks/heating.py b/tests/fake_lab/tasks/heating.py index e80d1935..d30fbbb7 100644 --- a/tests/fake_lab/tasks/heating.py +++ b/tests/fake_lab/tasks/heating.py @@ -2,7 +2,7 @@ from bson import ObjectId -from alab_management import BaseTask +from alab_management.task_view import BaseTask from ..devices.furnace import Furnace # noqa from .moving import Moving