bec-server 2.6.0__tar.gz → 2.7.0__tar.gz

{bec_server-2.6.0 → bec_server-2.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bec-server
-Version: 2.6.0
+Version: 2.7.0
 Summary: BEC server
 Project-URL: Bug Tracker, https://gitlab.psi.ch/bec/bec/issues
 Project-URL: Homepage, https://gitlab.psi.ch/bec/bec

{bec_server-2.6.0 → bec_server-2.7.0}/bec_server/bec_server_utils/subprocess_launch.py

@@ -11,14 +11,7 @@ def subprocess_start(bec_path: str, config_path: str, services: dict):
         cwd = os.path.abspath(os.path.join(service_path, ".."))
         if config_path:
             processes.append(
-                subprocess.Popen(
-                    (
-                        service_config["command"],
-                        "--config",
-                        config_path,
-                    ),
-                    cwd=cwd,
-                )
+                subprocess.Popen((service_config["command"], "--config", config_path), cwd=cwd)
             )
         else:
             processes.append(subprocess.Popen((service_config["command"],), cwd=cwd))

bec_server-2.7.0/bec_server/device_server/tests/utils.py

@@ -0,0 +1,55 @@
+from bec_lib.devicemanager import DeviceContainer
+from bec_lib.tests.utils import ConnectorMock
+
+
+# pylint: disable=missing-function-docstring
+# pylint: disable=protected-access
+class DeviceMock:
+    def __init__(self, name: str, value=None):
+        self.name = name
+        self.read_buffer = {self.name: {"value": value}} if value is not None else None
+        self._config = {"deviceConfig": {"limits": [-50, 50]}, "userParameter": None}
+        self._read_only = False
+        self._enabled = True
+
+    def read(self):
+        return self.read_buffer
+
+    def readback(self):
+        return self.read_buffer
+
+    @property
+    def obj(self):
+        return self
+
+    @property
+    def limits(self):
+        return self._config["deviceConfig"]["limits"]
+
+    @property
+    def read_only(self) -> bool:
+        return self._read_only
+
+    @read_only.setter
+    def read_only(self, val: bool):
+        self._read_only = val
+
+    @property
+    def enabled(self) -> bool:
+        return self._enabled
+
+    @enabled.setter
+    def enabled(self, val: bool):
+        self._enabled = val
+
+    @property
+    def user_parameter(self):
+        return self._config["userParameter"]
+
+
+class DMMock:
+    devices = DeviceContainer()
+    connector = ConnectorMock()
+
+    def add_device(self, name, value=None):
+        self.devices[name] = DeviceMock(name, value=value)

{bec_server-2.6.0 → bec_server-2.7.0}/bec_server/scan_server/scan_guard.py

@@ -26,9 +26,7 @@ class ScanGuard:
         self.connector = self.parent.connector
 
         self.connector.register(
-            MessageEndpoints.scan_queue_request(),
-            cb=self._scan_queue_request_callback,
-            parent=self,
+            MessageEndpoints.scan_queue_request(), cb=self._scan_queue_request_callback, parent=self
         )
 
         self.connector.register(
@@ -127,9 +125,7 @@ class ScanGuard:
         """
         sqrr = MessageEndpoints.scan_queue_request_response()
         rrm = messages.RequestResponseMessage(
-            accepted=scan_status.accepted,
-            message=scan_status.message,
-            metadata=metadata,
+            accepted=scan_status.accepted, message=scan_status.message, metadata=metadata
         )
         self.device_manager.connector.send(sqrr, rrm)
 

bec_server-2.7.0/bec_server/scan_server/scan_plugins/__init__.py

@@ -0,0 +1 @@
+from .otf_scan import OTFScan

bec_server-2.7.0/bec_server/scan_server/tests/fixtures.py

@@ -0,0 +1,14 @@
+import pytest
+
+from bec_lib.logger import bec_logger
+from bec_lib.tests.fixtures import dm_with_devices
+from bec_server.scan_server.tests.utils import ScanServerMock
+
+
+# pylint: disable=missing-function-docstring
+# pylint: disable=protected-access
+@pytest.fixture
+def scan_server_mock(dm_with_devices):
+    server = ScanServerMock(dm_with_devices)
+    yield server
+    bec_logger.logger.remove()

{bec_server-2.6.0/tests/tests_scan_server → bec_server-2.7.0/bec_server/scan_server/tests}/utils.py

@@ -1,8 +1,4 @@
-import pytest
-
 from bec_lib import ServiceConfig
-from bec_lib.devicemanager import DeviceContainer
-from bec_lib.logger import bec_logger
 from bec_lib.messages import BECStatus
 from bec_lib.tests.utils import ConnectorMock
 from bec_server.scan_server.scan_server import ScanServer
@@ -12,13 +8,6 @@ from bec_server.scan_server.scan_worker import InstructionQueueStatus
 # pylint: disable=protected-access
 
 
-@pytest.fixture
-def scan_server_mock(dm_with_devices):
-    server = ScanServerMock(dm_with_devices, dm_with_devices.connector)
-    yield server
-    bec_logger.logger.remove()
-
-
 class WorkerMock:
     def __init__(self) -> None:
         self.scan_id = None
@@ -30,7 +19,7 @@ class WorkerMock:
 
 
 class ScanServerMock(ScanServer):
-    def __init__(self, device_manager, connector) -> None:
+    def __init__(self, device_manager) -> None:
         self.device_manager = device_manager
         super().__init__(
             ServiceConfig(redis={"host": "dummy", "port": 6379}), connector_cls=ConnectorMock
@@ -69,50 +58,3 @@ class ScanServerMock(ScanServer):
     @dataset_number.setter
     def dataset_number(self, val: int):
         pass
-
-
-class DeviceMock:
-    def __init__(self, name: str):
-        self.name = name
-        self.read_buffer = None
-        self._config = {"deviceConfig": {"limits": [-50, 50]}, "userParameter": None}
-        self._read_only = False
-        self._enabled = True
-
-    def read(self):
-        return self.read_buffer
-
-    def readback(self):
-        return self.read_buffer
-
-    @property
-    def limits(self):
-        return self._config["deviceConfig"]["limits"]
-
-    @property
-    def read_only(self) -> bool:
-        return self._read_only
-
-    @read_only.setter
-    def read_only(self, val: bool):
-        self._read_only = val
-
-    @property
-    def enabled(self) -> bool:
-        return self._enabled
-
-    @enabled.setter
-    def enabled(self, val: bool):
-        self._enabled = val
-
-    @property
-    def user_parameter(self):
-        return self._config["userParameter"]
-
-
-class DMMock:
-    devices = DeviceContainer()
-    connector = ConnectorMock()
-
-    def add_device(self, name):
-        self.devices[name] = DeviceMock(name)

{bec_server-2.6.0 → bec_server-2.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bec-server"
-version = "2.6.0"
+version = "2.7.0"
 description = "BEC server"
 requires-python = ">=3.10"
 classifiers = [

{bec_server-2.6.0 → bec_server-2.7.0}/tests/tests_scan_server/test_scan_guard.py

@@ -1,11 +1,11 @@
 from unittest import mock
 
 import pytest
-from utils import scan_server_mock
 
 from bec_lib import MessageEndpoints, messages
 from bec_lib.redis_connector import MessageObject
 from bec_server.scan_server.scan_guard import ScanGuard, ScanRejection, ScanStatus
+from bec_server.scan_server.tests.fixtures import scan_server_mock
 
 
 @pytest.fixture

{bec_server-2.6.0 → bec_server-2.7.0}/tests/tests_scan_server/test_scan_server_queue.py

@@ -2,7 +2,6 @@ import uuid
 from unittest import mock
 
 import pytest
-from utils import scan_server_mock
 
 from bec_lib import Alarms, MessageEndpoints, messages
 from bec_lib.redis_connector import MessageObject
@@ -17,6 +16,7 @@ from bec_server.scan_server.scan_queue import (
     ScanQueueStatus,
 )
 from bec_server.scan_server.scan_worker import ScanWorker
+from bec_server.scan_server.tests.fixtures import scan_server_mock
 
 # pylint: disable=missing-function-docstring
 # pylint: disable=protected-access

{bec_server-2.6.0 → bec_server-2.7.0}/tests/tests_scan_server/test_scan_worker.py

@@ -3,7 +3,6 @@ import uuid
 from unittest import mock
 
 import pytest
-from utils import scan_server_mock
 
 from bec_lib import MessageEndpoints, messages
 from bec_lib.tests.utils import ConnectorMock
@@ -18,6 +17,7 @@ from bec_server.scan_server.scan_queue import (
     ScanQueue,
 )
 from bec_server.scan_server.scan_worker import ScanWorker
+from bec_server.scan_server.tests.fixtures import scan_server_mock
 
 
 @pytest.fixture