ramses-rf 0.52.3__tar.gz → 0.52.5__tar.gz

ramses_rf-0.52.5/.github/workflows/check-cov.yml

@@ -0,0 +1,131 @@
+name: Coverage
+# based on: https://github.com/marketplace/actions/code-coverage-summary
+
+on:
+  push:
+    branches: [ "master" ]
+    paths: [
+      ".github/workflows/check-cov.yml",
+      "pyproject.toml",
+      "requirements/**",
+      "src/**.py",
+      "tests/**",
+    ]
+
+  pull_request:
+    branches: [ "master" ]
+    paths: [
+      ".github/workflows/check-cov.yml",
+      "pyproject.toml",
+      "requirements/**",
+      "src/**.py",
+      "tests/**",
+    ]
+
+  pull_request_target:
+    branches: [ "master" ]
+    paths: [
+      ".github/workflows/check-cov.yml",
+      "pyproject.toml",
+      "requirements/**",
+      "src/**.py",
+      "tests/**",
+    ]
+
+  schedule:
+    - cron: "0 7 * * 5"
+
+  workflow_dispatch:
+
+permissions:
+  pull-requests: write
+
+jobs:
+  coverage:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.14"]
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements/requirements_dev.txt
+
+      - name: Install the package (and its dependencies)
+        run: pip install -e .
+
+      - name: Run coverage with pytest
+        run: coverage run -m pytest
+
+      - name: Debug - Check if .coverage exists
+        run: test -f .coverage && echo ".coverage exists" || echo ".coverage does NOT exist"
+
+      - name: Display coverage report
+        run: coverage report
+
+      - name: Create coverage xml
+        run: coverage xml
+
+      - name: Create Code Coverage Report
+        # from: https://github.com/marketplace/actions/code-coverage-summary
+        uses: irongut/CodeCoverageSummary@v1.3.0
+        with:
+          filename: coverage.xml
+          badge: true
+          fail_below_min: true
+          format: markdown
+          hide_branch_rate: false
+          hide_complexity: true
+          indicators: true
+          output: both
+          thresholds: '60 80'
+
+      - name: Add Coverage PR Comment
+        # from: https://github.com/marketplace/actions/comment-pull-request
+        if: github.event_name == 'pull_request_target'
+        uses: thollander/actions-comment-pull-request@v3
+        with:
+          file-path: code-coverage-results.md
+          comment-tag: code-coverage-results.md  # replaces existing by this name
+          mode: recreate
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # or: https://github.com/marketplace/actions/sticky-pull-request-comment
+        #        if: github.event_name == 'pull_request'
+        #        with:
+        #          recreate: true
+        #          path: code-coverage-results.md
+        # GITHUB_TOKEN is implicitly passed in
+
+#      - name: Create Coverage Badge
+#        # from: https://github.com/marketplace/actions/coverage-py-badge
+#        uses: tj-actions/coverage-badge-py@v2
+#        id: coverage-badge-py
+#        with:
+#            # Output path to write the
+#            # coverage badge.
+#            # Type: string
+#            # Default: "coverage.svg"
+#            output: 'misc/coverage-badge.svg'
+#
+#            # Overwrite an existing coverage badge.
+#            # Type: boolean
+#            # Default: "true"
+#            overwrite: ''
+#
+#            # Current working directory
+#            # Type: string
+#            # Default: "."
+#            working-directory: ''
+
+      - run: echo "🍏 This job's status is ${{ job.status }}."

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/.github/workflows/check-lint.yml

@@ -31,7 +31,7 @@ jobs:
         python-version: ["3.13"]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/.github/workflows/check-test.yml

@@ -31,7 +31,7 @@ jobs:
         python-version: ["3.11", "3.12", "3.13"]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/.github/workflows/check-type.yml

@@ -31,7 +31,7 @@ jobs:
         python-version: ["3.13"]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v6

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/.github/workflows/publish-hatch.yml

@@ -17,7 +17,7 @@ jobs:
     name: Build release to /dist
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Install hatch
         run: pipx install hatch
@@ -26,7 +26,7 @@ jobs:
         run: hatch build
 
       - name: Upload dist
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: dist
           path: dist/
@@ -40,7 +40,7 @@ jobs:
       url: https://pypi.org/project/ramses_rf
     steps:
       - name: Download dist
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: dist
           path: dist/

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramses_rf
-Version: 0.52.3
+Version: 0.52.5
 Summary: A stateful RAMSES-II protocol decoder & analyser.
 Project-URL: Homepage, https://github.com/ramses-rf/ramses_rf
 Project-URL: Bug Tracker, https://github.com/ramses-rf/ramses_rf/issues
@@ -22,6 +22,7 @@ Description-Content-Type: text/markdown
 ![Linting](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-lint.yml/badge.svg)
 ![Typing](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-type.yml/badge.svg)
 ![Testing](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-test.yml/badge.svg)
+[![Coverage](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-cov.yml/badge.svg?event=push)](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-cov.yml)
 
 ## Overview
 

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/README.md

@@ -1,6 +1,7 @@
 ![Linting](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-lint.yml/badge.svg)
 ![Typing](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-type.yml/badge.svg)
 ![Testing](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-test.yml/badge.svg)
+[![Coverage](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-cov.yml/badge.svg?event=push)](https://github.com/ramses-rf/ramses_rf/actions/workflows/check-cov.yml)
 
 ## Overview
 

ramses_rf-0.52.3/docs/source/binding_process_diagram.md → ramses_rf-0.52.5/docs/source/binding_process.md

@@ -1,4 +1,4 @@
-# RAMSES RF Binding Process Diagram
+# RAMSES RF Binding Process
 
 ## Overview
 This diagram shows the binding finite state machine (FSM) for RAMSES RF devices, illustrating the complete process from initial state to binding completion.
@@ -38,8 +38,8 @@ stateDiagram-v2
         RespHasBoundAsRespondent
     end
 
-    classDef supplicant fill:#006400,stroke:#ffffff,stroke-width:2px
-    classDef respondent fill:#00008B,stroke:#ffffff,stroke-width:2px
+    classDef supplicant fill:#ff64dd,stroke:#ffffff,stroke-width:2px
+    classDef respondent fill:#55bb8B,stroke:#ffffff,stroke-width:2px
 
     class SuppSendOfferWaitForAccept,OfferSent,SuppIsReadyToSendConfirm,SuppHasBoundAsSupplicant supplicant
     class RespIsWaitingForOffer,OfferReceived,RespSendAcceptWaitForConfirm,RespHasBoundAsRespondent respondent

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/docs/source/index.rst

@@ -11,7 +11,7 @@ ramses_rf
 
    usage
    glossary
-   binding_process_diagram
+   binding_process
 
 .. toctree::
    :maxdepth: 2

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/pyproject.toml

@@ -81,8 +81,46 @@
   asyncio_default_fixture_loop_scope = "function"
   asyncio_mode = "auto"
 
+  testpaths = [
+    "tests/"
+  ]
   norecursedirs = "deprecated/*"
 
+  # pytest-cov slows down our tests to 10 mins, so leave off.
+  # We run coverage in a separate workflow on python 3.13 only (fastest)
+  # pytest-cov coverage reporting. open htmlcov/index.html in a browser for details
+  # addopts = ["--cov=src", "--cov-fail-under=50", "--cov-report=xml", "--cov-report=term"]
+  # to create an interactive local HTML report, add: --cov-report=html
+  # to report missed lines during test writing, add: --cov-report=term-missing
+  # PyCharm might not hit a breakpoint. For debugging, disable -cov by adding:
+  # –no-cov"
+  # cov_report_term = "term-missing:skip-covered"
+
+#
+### coverage #########################################################################
+
+[tool.coverage.run]
+  core = "sysmon"  # essential setting for speed on GitHub < 11 secs instead of >12 mins
+  branch = false  # true takes a lot longer and can't be combined with sysmon
+#  patch = ["subprocess"]
+  source = [
+    "src",
+    "tests"
+  ]
+
+[tool.coverage.report]
+  # Regexes for lines to exclude from consideration
+  exclude_also = [
+    # Don't complain if tests don't hit defensive assertion code:
+    "raise AssertionError",
+    "raise NotImplementedError",
+  ]
+  format = "text"
+  fail_under = 75
+  ignore_errors = true
+
+[tool.coverage.html]
+  directory = "coverage_html"
 
 #
 ### mypy #############################################################################

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/ramses_cli/client.py

@@ -588,6 +588,7 @@ def main() -> None:
         print(" - event_loop_policy set for win32")  # do before asyncio.run()
         asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
 
+    profile = None
     try:
         if _PROFILE_LIBRARY:
             profile = cProfile.Profile()

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/ramses_cli/debug.py

@@ -9,7 +9,7 @@ DEBUG_PORT = 5678
 
 
 def start_debugging(wait_for_client: bool) -> None:
-    import debugpy  # type: ignore[import-untyped]
+    import debugpy
 
     debugpy.listen(address=(DEBUG_ADDR, DEBUG_PORT))
     print(f" - Debugging is enabled, listening on: {DEBUG_ADDR}:{DEBUG_PORT}")

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/ramses_cli/utils/convert.py

@@ -17,7 +17,7 @@ parser.add_argument("-i", "--input-file", type=argparse.FileType("r"), default="
 args = parser.parse_args()
 
 
-def convert_json_to_yaml(data: dict) -> str:
+def convert_json_to_yaml(data: dict) -> None:
     """Convert from json (client.py -C config.json) to yaml (HA configuration.yaml)."""
     (config, schema, include, exclude) = load_config("/dev/ttyMOCK", None, **data)
 
@@ -37,7 +37,7 @@ def convert_json_to_yaml(data: dict) -> str:
     print(yaml.dump({"ramses_cc": result}, sort_keys=False))
 
 
-def convert_yaml_to_json(data: dict) -> str:
+def convert_yaml_to_json(data: dict) -> None:
     """Convert from yaml (HA configuration.yaml) to json (client.py -C config.json)."""
 
     result = data["ramses_cc"]

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/ramses_rf/database.py

@@ -30,7 +30,7 @@ from collections import OrderedDict
 from datetime import datetime as dt, timedelta as td
 from typing import TYPE_CHECKING, Any, NewType
 
-from ramses_tx import CODES_SCHEMA, Code, Message
+from ramses_tx import CODES_SCHEMA, RQ, Code, Message, Packet
 
 if TYPE_CHECKING:
     DtmStrT = NewType("DtmStrT", str)
@@ -130,11 +130,15 @@ class MessageIndex:
     def stop(self) -> None:
         """Stop the housekeeper loop."""
 
-        if self._housekeeping_task and (not self._housekeeping_task.done()):
+        if (
+            self.maintain
+            and self._housekeeping_task
+            and (not self._housekeeping_task.done())
+        ):
             self._housekeeping_task.cancel()  # stop the housekeeper
 
         self._cx.commit()  # just in case
-        # self._cx.close()  # may still need to do queries after engine has stopped?
+        self._cx.close()  # may still need to do queries after engine has stopped?
 
     @property
     def msgs(self) -> MsgDdT:
@@ -151,7 +155,7 @@ class MessageIndex:
             - verb " I", "RQ" etc.
             - src  message origin address
             - dst  message destination address
-            - code packet code aka command class e.g. _0005, _31DA
+            - code packet code aka command class e.g. 0005, 31DA
             - ctx  message context, created from payload as index + extra markers (Heat)
             - hdr  packet header e.g. 000C|RP|01:223036|0208 (see: src/ramses_tx/frame.py)
             - plk the keys stored in the parsed payload, separated by the | char
@@ -183,7 +187,7 @@ class MessageIndex:
 
     async def _housekeeping_loop(self) -> None:
         """Periodically remove stale messages from the index,
-        unless `self.maintain` is False."""
+        unless `self.maintain` is False - as in (most) tests."""
 
         async def housekeeping(dt_now: dt, _cutoff: td = td(days=1)) -> None:
             """
@@ -191,9 +195,10 @@ class MessageIndex:
             :param dt_now: current timestamp
             :param _cutoff: the oldest timestamp to retain, default is 24 hours ago
             """
-            dtm = dt_now - _cutoff  # .isoformat(timespec="microseconds") < needed?
+            msgs = None
+            dtm = dt_now - _cutoff
 
-            self._cu.execute("SELECT dtm FROM messages WHERE dtm => ?", (dtm,))
+            self._cu.execute("SELECT dtm FROM messages WHERE dtm >= ?", (dtm,))
             rows = self._cu.fetchall()  # fetch dtm of current messages to retain
 
             try:  # make this operation atomic, i.e. update self._msgs only on success
@@ -208,6 +213,10 @@ class MessageIndex:
                 self._msgs = msgs
             finally:
                 self._lock.release()
+                if msgs:
+                    _LOGGER.debug(
+                        "MessageIndex size was: %d, now: %d", len(rows), len(msgs)
+                    )
 
         while True:
             self._last_housekeeping = dt.now()
@@ -242,13 +251,17 @@ class MessageIndex:
         else:
             # _msgs dict requires a timestamp reformat
             dtm: DtmStrT = msg.dtm.isoformat(timespec="microseconds")  # type: ignore[assignment]
+            # add msg to self._msgs dict
             self._msgs[dtm] = msg
 
         finally:
             pass  # self._lock.release()
 
         if (
-            dup and msg.src is not msg.dst and not msg.dst.id.startswith("18:")  # HGI
+            dup
+            and (msg.src is not msg.dst)
+            and not msg.dst.id.startswith("18:")  # HGI
+            and msg.verb != RQ  # these may come very quickly
         ):  # when src==dst, expect to add duplicate, don't warn
             _LOGGER.debug(
                 "Overwrote dtm (%s) for %s: %s (contrived log?)",
@@ -256,8 +269,6 @@ class MessageIndex:
                 msg._pkt._hdr,
                 dup[0]._pkt,
             )
-        if old is not None:
-            _LOGGER.debug("Old msg replaced: %s", old)
 
         return old
 
@@ -270,7 +281,8 @@ class MessageIndex:
         :param verb: two letter verb str to use
         """
         # Used by OtbGateway init, via entity_base.py
-        dtm: DtmStrT = dt.strftime(dt.now(), "%Y-%m-%dT%H:%M:%S")  # type: ignore[assignment]
+        _now: dt = dt.now()
+        dtm: DtmStrT = _now.isoformat(timespec="microseconds")  # type: ignore[assignment]
         hdr = f"{code}|{verb}|{src}|00"  # dummy record has no contents
 
         dup = self._delete_from(hdr=hdr)
@@ -283,7 +295,7 @@ class MessageIndex:
             self._cu.execute(
                 sql,
                 (
-                    dtm,
+                    _now,
                     verb,
                     src,
                     src,
@@ -295,6 +307,14 @@ class MessageIndex:
             )
         except sqlite3.Error:
             self._cx.rollback()
+        else:
+            # also add dummy 3220 msg to self._msgs dict to allow maintenance loop
+            msg: Message = Message._from_pkt(
+                Packet(
+                    _now, f"... {verb} --- {src} --:------ {src} {code} 005 0000000000"
+                )
+            )
+            self._msgs[dtm] = msg
 
         if dup:  # expected when more than one heat system in schema
             _LOGGER.debug("Replaced record with same hdr: %s", hdr)
@@ -355,7 +375,7 @@ class MessageIndex:
         if not bool(msg) ^ bool(kwargs):
             raise ValueError("Either a Message or kwargs should be provided, not both")
         if msg:
-            kwargs["dtm"] = msg.dtm  # .isoformat(timespec="microseconds")
+            kwargs["dtm"] = msg.dtm
 
         msgs = None
         try:  # make this operation atomic, i.e. update self._msgs only on success
@@ -406,7 +426,7 @@ class MessageIndex:
             raise ValueError("Either a Message or kwargs should be provided, not both")
 
         if msg:
-            kwargs["dtm"] = msg.dtm  # .isoformat(timespec="microseconds")
+            kwargs["dtm"] = msg.dtm
 
         return self._select_from(**kwargs)
 
@@ -428,10 +448,15 @@ class MessageIndex:
         :returns: a tuple of qualifying messages
         """
 
-        return tuple(
-            self._msgs[row[0].isoformat(timespec="microseconds")]
-            for row in self.qry_dtms(**kwargs)
-        )
+        # CHANGE: Use a list comprehension with a check to avoid KeyError
+        res: list[Message] = []
+        for row in self.qry_dtms(**kwargs):
+            ts: DtmStrT = row[0].isoformat(timespec="microseconds")
+            if ts in self._msgs:
+                res.append(self._msgs[ts])
+            else:
+                _LOGGER.debug("MessageIndex timestamp %s not in device messages", ts)
+        return tuple(res)
 
     def qry_dtms(self, **kwargs: bool | dt | str) -> list[Any]:
         """
@@ -483,6 +508,7 @@ class MessageIndex:
             # _msgs stamp format: 2022-09-08T13:40:52.447364
             if ts in self._msgs:
                 lst.append(self._msgs[ts])
+                # _LOGGER.debug("MessageIndex ts %s added to qry.lst", ts)  # too frequent
             else:  # happens in tests with artificial msg from heat
                 _LOGGER.info("MessageIndex timestamp %s not in device messages", ts)
         return tuple(lst)
@@ -546,8 +572,9 @@ class MessageIndex:
             if ts in self._msgs:
                 # if include_expired or not self._msgs[ts].HAS_EXPIRED:  # not working
                 lst.append(self._msgs[ts])
-            else:  # happens in tests with dummy msg from heat init
-                _LOGGER.info("MessageIndex ts %s not in device messages", ts)
+                _LOGGER.debug("MessageIndex ts %s added to all.lst", ts)
+            else:  # happens in tests and real evohome setups with dummy msg from heat init
+                _LOGGER.debug("MessageIndex ts %s not in device messages", ts)
         return tuple(lst)
 
     def clr(self) -> None:

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/ramses_rf/device/base.py

@@ -87,9 +87,10 @@ class DeviceBase(Entity):
         return self.id < other.id  # type: ignore[no-any-return]
 
     def _update_traits(self, **traits: Any) -> None:
-        """Update a device with new schema attrs.
+        """Update a device with new schema attributes.
 
-        Raise an exception if the new schema is not a superset of the existing schema.
+        :param traits: The traits to apply (e.g., alias, class, faked)
+        :raises TypeError: If the device is not fakeable but 'faked' is set.
         """
 
         traits = shrink(SCH_TRAITS(traits))
@@ -342,7 +343,17 @@ class Fakeable(DeviceBase):
         idx: IndexT = "00",
         require_ratify: bool = False,
     ) -> tuple[Packet, Packet, Packet, Packet | None]:
-        """Listen for a binding and return the Offer, or raise an exception."""
+        """Listen for a binding and return the Offer packets.
+
+        :param accept_codes: The codes allowed for this binding
+        :type accept_codes: Iterable[Code]
+        :param idx: The index to bind to, defaults to "00"
+        :type idx: IndexT
+        :param require_ratify: Whether a ratification step is required, defaults to False
+        :type require_ratify: bool
+        :return: A tuple of the four binding transaction packets
+        :rtype: tuple[Packet, Packet, Packet, Packet | None]
+        """
 
         if not self._bind_context:
             raise TypeError(f"{self}: Faking not enabled")

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/ramses_rf/device/heat.py

@@ -450,7 +450,7 @@ class UfhController(Parent, DeviceHeat):  # UFC (02):
                 #     )
                 #     self._send_cmd(cmd)
 
-        elif msg.code == Code._0008:  # relay_demand, TODO: use msgIndex DB?
+        elif msg.code == Code._0008:  # relay_demand
             if msg.payload.get(SZ_DOMAIN_ID) == FC:
                 self._relay_demand = msg
             else:  # FA
@@ -669,7 +669,7 @@ class OtbGateway(Actuator, HeatDemand):  # OTB (10): 3220 (22D9, others)
 
         # TODO(eb): cleanup
         if self._gwy.msg_db:
-            self._add_record(address=self.addr, code=Code._3220, verb="RP")
+            self._add_record(id=self.id, code=Code._3220, verb="RP")
         # adds a "sim" RP opentherm_msg to the SQLite MessageIndex with code _3220
         # causes exc when fetching ALL, when no "real" msg was added to _msgs_. We skip those.
         else:

{ramses_rf-0.52.3 → ramses_rf-0.52.5}/ramses_rf/device/hvac.py

@@ -921,27 +921,30 @@ class HvacVentilator(FilterChange):  # FAN: RP/31DA, I/31D[9A], 2411
 
         :return: string describing fan mode, speed
         """
-        if self._gwy.msg_db:
-            # Use SQLite query on MessageIndex. res_rate/res_mode not exposed yet
-            sql = f"""
-                SELECT code from messages WHERE verb in (' I', 'RP')
-                AND (src = ? OR dst = ?)
-                AND (plk LIKE '%{SZ_FAN_MODE}%')
-            """
-            res_mode: list = self._msg_qry(sql)
-            # SQLite query on MessageIndex
-            _LOGGER.debug(f"{res_mode} # FAN_MODE FETCHED from MessageIndex")
-
-            sql = f"""
-                SELECT code from messages WHERE verb in (' I', 'RP')
-                AND (src = ? OR dst = ?)
-                AND (plk LIKE '%{SZ_FAN_RATE}%')
-            """
-            res_rate: list = self._msg_qry(sql)
-            # SQLite query on MessageIndex
-            _LOGGER.debug(
-                f"{res_rate} # FAN_RATE FETCHED from MessageIndex"
-            )  # DEBUG always empty?
+        # if self._gwy.msg_db:
+        # Use SQLite query on MessageIndex. res_rate/res_mode not exposed yet
+        # working fine in 0.52.4, no need to specify code, only payload key
+        # sql = f"""
+        #     SELECT code from messages WHERE verb in (' I', 'RP')
+        #     AND (src = ? OR dst = ?)
+        #     AND (plk LIKE '%{SZ_FAN_MODE}%')
+        # """
+        # res_mode: list = self._msg_qry(sql)
+        # # SQLite query on MessageIndex
+        # _LOGGER.debug(
+        #     f"# Fetched FAN_MODE for {self.id} from MessageIndex: {res_mode}"
+        # )
+
+        # sql = f"""
+        #     SELECT code from messages WHERE verb in (' I', 'RP')
+        #     AND (src = ? OR dst = ?)
+        #     AND (plk LIKE '%{SZ_FAN_RATE}%')
+        # """
+        # res_rate: list = self._msg_qry(sql)
+        # # SQLite query on MessageIndex
+        # _LOGGER.debug(
+        #     f"# Fetched FAN_RATE for {self.id} from MessageIndex: {res_rate}"
+        # )
 
         if Code._31D9 in self._msgs:
             # was a dict by Code