v0.4.2 - fix python 3.13 support

Author: dudanov

.gitignore

@@ -99,7 +99,7 @@ ipython_config.py
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
 #   commonly ignored for libraries.
 #   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-poetry.lock
+#poetry.lock
 
 # pdm
 #   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.

poetry.lock

@@ -4,7 +4,7 @@
 import dataclasses as dc
 import io
 from enum import STRICT, IntEnum, auto
-from typing import Any, Generic, TypeVar, cast, override
+from typing import Any, cast, override
 
 from ..serializer import BaseModel, ModelMeta, model_meta
 
@@ -75,11 +75,8 @@ class IndoorBikeSimulationParameters(BaseModel):
     """
 
 
-T = TypeVar("T", bound=int)
-
-
 @dc.dataclass(frozen=True)
-class CodeSwitchModel(Generic[T], BaseModel):
+class CodeSwitchModel[T: int](BaseModel):
     """Base model based on a code attribute and associated parameter attributes."""
 
     code: T | None = dc.field(

pyftms/models/common.py

@@ -66,6 +66,14 @@ def _get_model_field_serializer(field: dc.Field):
             raise TypeError("'TypeVar' must have bound type.")
 
     def _get_serializer(type_) -> Serializer:
+        if isinstance(type_, GenericAlias):
+            if (num := meta.get("num")) is None:
+                raise TypeError("Number of elements is required.")
+
+            serializer = _get_serializer(get_args(type_)[0])
+
+            return ListSerializer(serializer, num)
+
         if issubclass(type_, (int, float)):
             if fmt := meta.get("format"):
                 return get_serializer(fmt)
@@ -75,14 +83,6 @@ def _get_serializer(type_) -> Serializer:
         if issubclass(type_, BaseModel):
             return get_serializer(type_)
 
-        if isinstance(type_, GenericAlias):
-            if (num := meta.get("num")) is None:
-                raise TypeError("Number of elements is required.")
-
-            serializer = _get_serializer(get_args(type_)[0])
-
-            return ListSerializer(serializer, num)
-
         raise TypeError("Unsupported type.")
 
     return _get_serializer(type_)

pyftms/serializer/model.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyftms"
-version = "0.4.1"
+version = "0.4.2"
 description = "PyFTMS - Python Fitness Machine Service client library."
 authors = ["Sergey V. DUDANOV <sergey.dudanov@gmail.com>"]
 readme = "README.md"

pyproject.toml

@@ -1,6 +1,6 @@
 import pytest
 
-from pyftms.models import TreadmillData
+from pyftms.models import MachineStatusModel, TreadmillData
 from pyftms.serializer import BaseModel, ModelSerializer, get_serializer
 
 
@@ -31,6 +31,11 @@
                 "energy_per_minute": 0,
             },
         ),
+        (
+            MachineStatusModel,
+            b"\x05\x69\x00",
+            {"code": 5, "target_speed": 1.05},
+        ),
     ],
 )
 def test_realtime_data(model: type[BaseModel], data: bytes, result: dict):