karabo.cpp 3.0.8__tar.gz → 3.0.9__tar.gz

{karabo_cpp-3.0.8 → karabo_cpp-3.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: karabo.cpp
-Version: 3.0.8
+Version: 3.0.9
 Summary: Karabo's C++ API and Python bindings thereof
 Keywords: Karabo,SCADA,async,control system
 Author-Email: European XFEL GmbH <opensource@xfel.eu>
@@ -13,7 +13,7 @@ Project-URL: Homepage, https://github.com/European-XFEL/Karabo
 Project-URL: Bug Reports, https://github.com/European-XFEL/Karabo/issues
 Project-URL: Source, https://github.com/European-XFEL/Karabo
 Requires-Python: ==3.12.*
-Requires-Dist: karabo-native==3.0.8
+Requires-Dist: karabo-native==3.0.9
 Description-Content-Type: text/markdown
 
 # Karabo SCADA Framework - C++ API and Service Devices

{karabo_cpp-3.0.8 → karabo_cpp-3.0.9}/extern/requirements-pre.txt

@@ -5,5 +5,5 @@ wheel==0.42.0
 setuptools==69.1.1
 setuptools-scm==8.0.4
 pip==24.0
-conan==2.16.1
+conan==2.21.0
 pyyaml==6.0.1

{karabo_cpp-3.0.8 → karabo_cpp-3.0.9}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["scikit-build-core"]
 build-backend = "scikit_build_core.build"
 
 [project]
-version = "3.0.8"
+version = "3.0.9"
 name = "karabo.cpp"
 description = "Karabo's C++ API and Python bindings thereof"
 readme = "README.md"
@@ -38,7 +38,7 @@ classifiers = [
 # For an analysis of this field vs pip's requirements files see:
 # https://packaging.python.org/discussions/install-requires-vs-requirements/
 dependencies = [
-  "karabo-native==3.0.8",
+  "karabo-native==3.0.9",
   ]
 
 
@@ -130,5 +130,5 @@ before-build = "pip3 install conan==2.21.0 && pip3 install numpy==2.0.1 && pytho
 
 test-requires = ["pytest"]
 # these are minimally required for a C++ server to start
-before-test = "mkdir /karabo && mkdir /karabo/var && mkdir /karabo/var/data && mkdir /karabo/plugins && pip install karabo.native==3.0.8 --index-url 'https://gitlab-ci-token:glcbt-64_ss7mXyAo4wEHTJpY4ynr@git.xfel.eu/api/v4/projects/5003/packages/pypi/simple' --extra-index-url https://pypi.org"
+before-test = "mkdir /karabo && mkdir /karabo/var && mkdir /karabo/var/data && mkdir /karabo/plugins && pip install karabo.native==3.0.9 --index-url 'https://gitlab-ci-token:glcbt-64_GbmzzsfDDNQWDakqqY2b@git.xfel.eu/api/v4/projects/5003/packages/pypi/simple' --extra-index-url https://pypi.org"
 test-command = "KARABO=/karabo KARABO_BROKER=amqp://xfel:karabo@exfl-broker-1:5672 pytest {project}/wheel_tests"

{karabo_cpp-3.0.8 → karabo_cpp-3.0.9}/src/karabind/PyCoreDeviceClient.cc

@@ -582,16 +582,15 @@ void exportPyCoreDeviceClient(py::module_& m) {
                           HandlerWrap<const std::string&, const Schema&>(handler, "schemaUpdate monitor"));
                 },
                 py::arg("callbackFunction"),
-                "registerSchemaUpdatedMonitor(handler): Register a callback handler \"handler\" to be "
+                "registerSchemaUpdatedMonitor(handler): Register a callback handler \"handler\" to\nbe "
                 "triggered if an instance receives a schema update from the distributed system\nThe "
                 "handler function should have the signature handler(instanceId, schema) where:\n"
                 "\"instanceId\" is a string containing name of the device which updated schema\n"
-                "\"schema\" is the updated schema\n\nNote: Currently, registering only a schema update "
-                "monitor with an instance\nof a DeviceClient is not enough to have the registered callback "
-                "activated.\nA workaround for this is to also register a property monitor with the\n"
-                "same instance of DeviceClient that has been used to register the schema\nupdate monitor.\n\n")
+                "\"schema\" is the updated schema\n\nNote: To have the handler reliably called, "
+                "for a given deviceId, one has\nto call 'registerDeviceForMonitoring(deviceId)' as well\n"
+                "(and 'unregisterDeviceFromMonitoring(deviceId)' if of no interest anymore).")
 
-          .def("registerPropertyMonitor", &DeviceClientWrap::registerPropertyMonitor, py::arg("instanceId"),
+          .def("registerPropertyMonitor", &DeviceClientWrap::registerPropertyMonitor, py::arg("deviceId"),
                py::arg("key"), py::arg("callbackFunction"))
 
           .def(
@@ -608,7 +607,7 @@ void exportPyCoreDeviceClient(py::module_& m) {
                               userData);
                     }
                 },
-                py::arg("instanceId"), py::arg("callbackFunction"), py::arg("userData") = py::none())
+                py::arg("deviceId"), py::arg("callbackFunction"), py::arg("userData") = py::none())
 
           .def(
                 "setDeviceMonitorInterval",
@@ -618,11 +617,15 @@ void exportPyCoreDeviceClient(py::module_& m) {
                 },
                 py::arg("milliseconds"))
 
-          .def("unregisterPropertyMonitor", &DeviceClientWrap::unregisterPropertyMonitor, py::arg("instanceId"),
+          .def("unregisterPropertyMonitor", &DeviceClientWrap::unregisterPropertyMonitor, py::arg("deviceId"),
                py::arg("key"))
 
           .def("unregisterDeviceMonitor", &DeviceClientWrap::unregisterDeviceMonitor, py::arg("instanceId"))
 
+          .def("registerDeviceForMonitoring", &DeviceClient::registerDeviceForMonitoring, py::arg("deviceId"))
+
+          .def("unregisterDeviceFromMonitoring", &DeviceClient::unregisterDeviceFromMonitoring, py::arg("deviceId"))
+
           .def(
                 "registerChannelMonitor",
                 [](const DeviceClientWrap::Pointer& self, const std::string& channelName, const py::object& dataHandler,

{karabo_cpp-3.0.8 → karabo_cpp-3.0.9}/src/karabo/CMakeLists.txt

@@ -66,10 +66,10 @@ endif()
 # Extracts KARABO_VERSION from the appropriate Git tag, writes to
 # a file to be used by the Karabo Framework at build time.
 message(STATUS "Resolving Karabo Version from Git repository")
-set(KARABO_VERSION "3.0.8")
+set(KARABO_VERSION "3.0.9")
 set(KARABO_VERSION_MAJOR "3")
 set(KARABO_VERSION_MINOR "0")
-set(KARABO_VERSION_PATCH "8")
+set(KARABO_VERSION_PATCH "9")
 message(STATUS "Karabo Version: ${KARABO_VERSION}")
 message(STATUS "Karabo Version Major: ${KARABO_VERSION_MAJOR}")
 message(STATUS "Karabo Version Minor: ${KARABO_VERSION_MINOR}")

{karabo_cpp-3.0.8 → karabo_cpp-3.0.9}/src/karabo/core/DeviceClient.hh

@@ -982,7 +982,7 @@ namespace karabo {
                   const std::function<void(const std::string&, const karabo::data::Hash&)>& callbackFunction);
 
             /**
-             * Registers a device to have its configurations changes monitored.
+             * Registers a device to have its configuration or schema changes monitored.
              *
              * @param deviceId of the device to be added to the set of monitored devices.
              *