Updates to support new driver topic devices/<device>/multi

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "volttron-lib-base-historian"
-version = "0.2.0-rc"
+version = "2.0.0rc0"
 description = "A base library with extension points for using with the VOLTTRON platform."
 authors = ["VOLTTRON Team <[email protected]>"]
 license = "Apache License 2.0"
@@ -12,8 +12,8 @@ packages = [ { include = "historian", from = "src" }, { include = "historian", f
 
 [tool.poetry.dependencies]
 python = ">=3.10,<4.0"
-volttron = ">=10.0.3a9,<11.0"
-
+#volttron-core = { path="../volttron-core", develop = true}
+volttron-core =">=2.0.0rc"
 ply = "^3.11"
 
 [tool.poetry.group.dev.dependencies]
@@ -30,7 +30,7 @@ coverage = "^6.3.2"
 pytest-cov = "^3.0.0"
 Sphinx = "^6.0.0"
 sphinx-rtd-theme = "^1.2.0"
-volttron-testing = "^0.4.0rc3"
+#volttron-testing = "^0.4.0rc3"
 
 [tool.yapfignore]
 ignore_patterns = [

src/historian/base/base_historian.py

@@ -260,7 +260,6 @@ def loads(data_string):
 time_parser = None
 
 ACTUATOR_TOPIC_PREFIX_PARTS = len(topics.ACTUATOR_VALUE.split('/'))
-ALL_REX = re.compile('.*/all$')
 
 # Register a better datetime parser in sqlite3.
 fix_sqlite3_datetime()
@@ -353,6 +352,7 @@ def __init__(self,
                  time_tolerance=None,
                  time_tolerance_topics=None,
                  cache_only_enabled=False,
+                 devices_topic_suffix="multi",
                  **kwargs):
 
         super(BaseHistorianAgent, self).__init__(**kwargs)
@@ -417,6 +417,9 @@ def __init__(self,
         else:
             raise ValueError(f"cache_only_enabled should be either True or False")
 
+        self._devices_topic_suffix = devices_topic_suffix
+
+        self._all_multi_regex = re.compile(f'.*/{self._devices_topic_suffix}$')
         self._default_config = {
                                 "retry_period":self._retry_period,
                                 "submit_size_limit": self._submit_size_limit,
@@ -438,7 +441,8 @@ def __init__(self,
                                 "all_platforms": self._all_platforms,
                                 "time_tolerance": self._time_tolerance,
                                 "time_tolerance_topics": self._time_tolerance_topics,
-                                "cache_only_enabled": self._cache_only_enabled
+                                "cache_only_enabled": self._cache_only_enabled,
+                                "devices_topic_suffix": self._devices_topic_suffix
                                }
 
         self.vip.config.set_default("config", self._default_config)
@@ -586,7 +590,8 @@ def _configure(self, config_name, action, contents):
         self._message_publish_count = message_publish_count
         self._time_tolerance = time_tolerance
         self._time_tolerance_topics = time_tolerance_topics
-
+        self._devices_topic_suffix = config.get("devices_topic_suffix", "multi")
+        self._all_multi_regex = re.compile(f'.*/{self._devices_topic_suffix}$')
         custom_topics_list = []
         for handler, topic_list in config.get("custom_topics", {}).items():
             if handler == "capture_device_data":
@@ -851,10 +856,10 @@ def _capture_device_data(self, peer, sender, bus, topic, headers,
                              message):
         """Capture device data and submit it to be published by a historian.
 
-        Filter out only the */all topics for publishing to the historian.
+        Filter out only the */all or */multi topics for publishing to the historian.
         """
 
-        if not ALL_REX.match(topic):
+        if not self._all_multi_regex.match(topic):
             return
 
         # Anon the topic if necessary.

tests/test_base_historian.py

@@ -22,11 +22,8 @@
 # ===----------------------------------------------------------------------===
 # }}}
 
-from datetime import datetime
 from time import sleep
 
-from volttron.utils import format_timestamp
-
 from historian.base import BaseHistorianAgent
 
 
@@ -56,7 +53,7 @@
     #     header_mod.DATE: now,
     #     header_mod.TIMESTAMP: now
     # }
     agent = ConcreteHistorianAgent(cache_only_enabled=True)
     assert agent is not None
     device = "devices/testcampus/testbuilding/testdevice"
     agent._capture_data(peer="foo",

tests/test_base_historian_unit.py

@@ -30,8 +30,6 @@
 import pytest
 from pytz import UTC
 
-from volttrontesting.server_mock import TestServer
-from volttron.client import Agent
 
 from historian.base import BaseHistorianAgent