mirror of
https://github.com/tiqi-group/pydase.git
synced 2025-04-20 08:20:02 +02:00
fixing circular import
This commit is contained in:
parent
fa35fa53e2
commit
d1d2ac2614
@ -1,7 +1,7 @@
|
||||
import asyncio
|
||||
|
||||
import pydase.data_service
|
||||
import pydase.task
|
||||
import pydase.task.decorator
|
||||
|
||||
|
||||
class DeviceConnection(pydase.data_service.DataService):
|
||||
@ -70,7 +70,7 @@ class DeviceConnection(pydase.data_service.DataService):
|
||||
"""
|
||||
return self._connected
|
||||
|
||||
@pydase.task.task(autostart=True)
|
||||
@pydase.task.decorator.task(autostart=True)
|
||||
async def _handle_connection(self) -> None:
|
||||
"""Automatically tries reconnecting to the device if it is not connected.
|
||||
This method leverages the `connect` method and the `connected` property to
|
||||
|
@ -1,3 +0,0 @@
|
||||
from pydase.task.decorator import task
|
||||
|
||||
__all__ = ["task"]
|
@ -3,7 +3,6 @@ import inspect
|
||||
import logging
|
||||
import sys
|
||||
from collections.abc import Callable, Coroutine
|
||||
from enum import Enum
|
||||
from typing import (
|
||||
Any,
|
||||
Generic,
|
||||
@ -12,6 +11,8 @@ from typing import (
|
||||
|
||||
from typing_extensions import TypeIs
|
||||
|
||||
from pydase.task.task_status import TaskStatus
|
||||
|
||||
if sys.version_info < (3, 11):
|
||||
from typing_extensions import Self
|
||||
else:
|
||||
@ -34,11 +35,6 @@ def is_bound_method(
|
||||
return inspect.ismethod(method)
|
||||
|
||||
|
||||
class TaskStatus(Enum):
|
||||
RUNNING = "running"
|
||||
NOT_RUNNING = "not_running"
|
||||
|
||||
|
||||
class Task(pydase.data_service.data_service.DataService, Generic[R]):
|
||||
def __init__(
|
||||
self,
|
||||
|
6
src/pydase/task/task_status.py
Normal file
6
src/pydase/task/task_status.py
Normal file
@ -0,0 +1,6 @@
|
||||
import enum
|
||||
|
||||
|
||||
class TaskStatus(enum.Enum):
|
||||
RUNNING = "running"
|
||||
NOT_RUNNING = "not_running"
|
@ -9,7 +9,7 @@ from typing import TYPE_CHECKING, Any, Literal, cast
|
||||
|
||||
import pydase.units as u
|
||||
from pydase.data_service.abstract_data_service import AbstractDataService
|
||||
from pydase.task.task import TaskStatus
|
||||
from pydase.task.task_status import TaskStatus
|
||||
from pydase.utils.decorators import render_in_frontend
|
||||
from pydase.utils.helpers import (
|
||||
get_attribute_doc,
|
||||
@ -310,10 +310,6 @@ class Serializer:
|
||||
path = f"{access_path}.{key}" if access_path else key
|
||||
serialized_object = cls.serialize_object(val, access_path=path)
|
||||
|
||||
# If there's a running task for this method
|
||||
if serialized_object["type"] == "method" and key in obj._task_manager.tasks:
|
||||
serialized_object["value"] = TaskStatus.RUNNING.name
|
||||
|
||||
value[key] = serialized_object
|
||||
|
||||
# If the DataService attribute is a property
|
||||
|
Loading…
x
Reference in New Issue
Block a user