1.7 (#31)

Author: spacemanspiff2007

.pre-commit-config.yaml

@@ -14,7 +14,7 @@ repos:
 
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.2
+    rev: v0.11.2
     hooks:
       - id: ruff
         name: ruff unused imports

.ruff.toml

@@ -34,8 +34,6 @@ ignore = [
     "UP038",    # Use X | Y in {} call instead of (X, Y)
 
     # https://docs.astral.sh/ruff/rules/#flake8-annotations-ann
-    "ANN101",   # Missing type annotation for {name} in method
-    "ANN102",   # Missing type annotation for {name} in classmethod
     "ANN401",   # Dynamically typed expressions (typing.Any) are disallowed in {name}
 
     # https://docs.astral.sh/ruff/rules/#flake8-blind-except-ble
@@ -59,6 +57,9 @@ ignore = [
 
     # https://docs.astral.sh/ruff/rules/#ruff-specific-rules-ruf
     "RUF005",  # Consider {expression} instead of concatenation
+
+    # https://docs.astral.sh/ruff/rules/#flake8-pytest-style-pt
+    "PT007",  # Wrong values type in @pytest.mark.parametrize expected {values} of {row}
 ]
 
 

src/smllib/__version__.py

@@ -1 +1 @@
-__version__ = '1.6'
+__version__ = '1.7'

src/smllib/reader.py

@@ -18,7 +18,8 @@ def __init__(self, build_ctx: Optional[CTX_HINT] = None, crc: Literal['kermit',
             self.crc_func: Callable[[Union[memoryview, bytes]], int] = getattr(crc_module, crc).get_crc
         except AttributeError:
             available = [f'"{n:s}"' for n in dir(crc_module) if not n.startswith('_')]
-            raise ValueError(f'Unsupported CRC "{crc}"! Available: {", ".join(available):s}')
+            msg = f'Unsupported CRC "{crc}"! Available: {", ".join(available):s}'
+            raise ValueError(msg) from None
 
     def add(self, _bytes: bytes) -> None:
         self.bytes += _bytes

src/smllib/sml/_base_obj.py

@@ -8,17 +8,17 @@
 class SmlBaseObj:
     __sml__: typing.ClassVar[dict]
 
-    def format_msg(self, indent: int = 0):
+    def format_msg(self, indent: int = 0) -> str:
         indent += 1
         r = f'<{self.__class__.__name__}>\n'
         w = max(map(len, self.__dict__), default=0)
         for k, v in self.__dict__.items():
             if isinstance(v, SmlBaseObj):
-                r += f'{INDENT * indent}{k!s:s} {v.format_msg(indent)}'
+                r += f'{INDENT * indent}{k!s:s} {v.format_msg(indent):s}'
             elif isinstance(v, (tuple, list)):
                 r += f'{INDENT * indent}{k!s:s}:\n'
                 for e in v:
-                    r += f'{INDENT * (indent + 1)}{e.format_msg(indent + 1)}'
+                    r += f'{INDENT * (indent + 1)}{e.format_msg(indent + 1):s}'
             else:
                 r += f'{INDENT * indent}{k!s:{w}s}: {v}\n'
         return r

src/smllib/sml/list_entry.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from typing import ClassVar, Dict, Optional, Union
 
 from smllib.const import OBIS_NAMES, UNITS
@@ -31,7 +32,7 @@ def __repr__(self) -> str:
                 r.append(f'{k}: {v}')
         return f'<{", ".join(r)}>'
 
-    def format_msg(self, indent: int = 0):
+    def format_msg(self, indent: int = 0) -> str:
         indent += 1
         r = f'<{self.__class__.__name__}>\n'
         w = max(map(len, self.__dict__), default=0)
@@ -54,7 +55,7 @@ def format_msg(self, indent: int = 0):
             r += f'{INDENT*indent}-> {summary:s}\n'
         return r
 
-    def get_value(self) -> Union[None, float, str]:
+    def get_value(self) -> Union[None, float, str, datetime]:
         if self.value is None:
             return None
 

src/smllib/sml/sml_time.py

@@ -7,7 +7,7 @@
 TIME_HINT = Union[None, int, datetime]
 
 
-def build_time(_in):
+def build_time(_in) -> TIME_HINT:
     if _in is None:
         return _in
 
@@ -24,6 +24,9 @@ def build_time(_in):
         return datetime.fromtimestamp(value_s.value, timezone.utc)
     if _type == 3:
         ts, offset1, offset2 = value_s.value
-        return datetime.fromtimestamp(ts.value, timezone(timedelta(minutes=offset1.value) + timedelta(minutes=offset2.value)))
+        return datetime.fromtimestamp(
+            ts.value,
+            timezone(timedelta(minutes=offset1.value) + timedelta(minutes=offset2.value))
+        )
 
     raise UnsupportedChoiceValue(_type)

src/smllib/sml_frame_snippet.py

@@ -25,7 +25,9 @@ def __init__(self, value: Union[None, bool, int, str, float, list, CEndOfSmlMsg]
         self.msg: Optional[memoryview] = msg
 
     def stop_pos(self, pos: int, buf: memoryview) -> 'SmlFrameSnippet':
-        assert self.msg is None
+        if self.msg is not None:
+            msg = 'Message is already set'
+            raise ValueError(msg)
         self.msg = buf[self.pos: pos]
         return self