mirror of
https://github.com/tiqi-group/pydase.git
synced 2025-04-20 08:20:02 +02:00
removes _filename attribute from DataService (unless specified)
This commit is contained in:
parent
f38df58842
commit
76545b88de
@ -1,8 +1,7 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from abc import ABC
|
||||
from pathlib import Path
|
||||
from typing import TYPE_CHECKING, Any, Optional
|
||||
from typing import TYPE_CHECKING, Any
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from pydase.data_service.callback_manager import CallbackManager
|
||||
@ -15,4 +14,3 @@ class AbstractDataService(ABC):
|
||||
_task_manager: TaskManager
|
||||
_callback_manager: CallbackManager
|
||||
_autostart_tasks: dict[str, tuple[Any]]
|
||||
_filename: Optional[str | Path]
|
||||
|
@ -41,7 +41,6 @@ def process_callable_attribute(attr: Any, args: dict[str, Any]) -> Any:
|
||||
|
||||
class DataService(rpyc.Service, AbstractDataService):
|
||||
def __init__(self, **kwargs: Any) -> None:
|
||||
self._filename: Optional[str | Path] = None
|
||||
self._callback_manager: CallbackManager = CallbackManager(self)
|
||||
self._task_manager = TaskManager(self)
|
||||
|
||||
@ -60,7 +59,7 @@ class DataService(rpyc.Service, AbstractDataService):
|
||||
DeprecationWarning,
|
||||
stacklevel=2,
|
||||
)
|
||||
self._filename = filename
|
||||
self._filename: str | Path = filename
|
||||
|
||||
self._callback_manager.register_callbacks()
|
||||
self.__check_instance_classes()
|
||||
|
@ -58,7 +58,7 @@ class StateManager:
|
||||
"""
|
||||
|
||||
def __init__(self, service: "DataService", filename: Optional[str | Path] = None):
|
||||
self.filename = service._filename
|
||||
self.filename = getattr(service, "_filename", None)
|
||||
|
||||
if filename is not None:
|
||||
if self.filename is not None:
|
||||
|
@ -204,7 +204,7 @@ class Server:
|
||||
**kwargs,
|
||||
}
|
||||
self._state_manager = StateManager(self._service, filename)
|
||||
if self._service._filename is not None:
|
||||
if getattr(self._service, "_filename", None) is not None:
|
||||
self._service._state_manager = self._state_manager
|
||||
self._state_manager.load_state()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user