ITQC/pydase
24
0
Fork 0
mirror of https://github.com/tiqi-group/pydase.git synced 2025-04-21 00:40:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

removes _filename attribute from DataService (unless specified)

Browse Source
This commit is contained in:
Mose Müller 2023-11-06 17:30:17 +01:00
parent f38df58842
commit 76545b88de
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pydase/data_service/abstract_data_service.py
View File

@ -1,8 +1,7 @@
from __future__ import annotations from __future__ import annotations
from abc import ABC from abc import ABC
from pathlib import Path from typing import TYPE_CHECKING, Any
from typing import TYPE_CHECKING, Any, Optional
if TYPE_CHECKING: if TYPE_CHECKING:
from pydase.data_service.callback_manager import CallbackManager from pydase.data_service.callback_manager import CallbackManager
@ -15,4 +14,3 @@ class AbstractDataService(ABC):
_task_manager: TaskManager _task_manager: TaskManager
_callback_manager: CallbackManager _callback_manager: CallbackManager
_autostart_tasks: dict[str, tuple[Any]] _autostart_tasks: dict[str, tuple[Any]]
_filename: Optional[str | Path]

3
src/pydase/data_service/data_service.py
View File

@ -41,7 +41,6 @@ def process_callable_attribute(attr: Any, args: dict[str, Any]) -> Any:
class DataService(rpyc.Service, AbstractDataService): class DataService(rpyc.Service, AbstractDataService):
def __init__(self, **kwargs: Any) -> None: def __init__(self, **kwargs: Any) -> None:
self._filename: Optional[str | Path] = None
self._callback_manager: CallbackManager = CallbackManager(self) self._callback_manager: CallbackManager = CallbackManager(self)
self._task_manager = TaskManager(self) self._task_manager = TaskManager(self)
@ -60,7 +59,7 @@ class DataService(rpyc.Service, AbstractDataService):
DeprecationWarning, DeprecationWarning,
stacklevel=2, stacklevel=2,
) )
self._filename = filename self._filename: str | Path = filename
self._callback_manager.register_callbacks() self._callback_manager.register_callbacks()
self.__check_instance_classes() self.__check_instance_classes()

2
src/pydase/data_service/state_manager.py
View File

@ -58,7 +58,7 @@ class StateManager:
""" """
def __init__(self, service: "DataService", filename: Optional[str | Path] = None): 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 filename is not None:
if self.filename is not None: if self.filename is not None:

2
src/pydase/server/server.py
View File

@ -204,7 +204,7 @@ class Server:
**kwargs, **kwargs,
} }
self._state_manager = StateManager(self._service, filename) 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._service._state_manager = self._state_manager
self._state_manager.load_state() self._state_manager.load_state()