pykoplenti 1.2.2__tar.gz → 1.3.0__tar.gz

{pykoplenti-1.2.2 → pykoplenti-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pykoplenti
-Version: 1.2.2
+Version: 1.3.0
 Summary: Python REST-Client for Kostal Plenticore Solar Inverters
 Home-page: https://github.com/stegm/pyclient_koplenti
 Author: @stegm
@@ -13,14 +13,16 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp~=3.8
 Requires-Dist: pycryptodome~=3.19
-Requires-Dist: pydantic~=1.10
+Requires-Dist: pydantic>=1.10
 Provides-Extra: cli
 Requires-Dist: prompt_toolkit>=3.0; extra == "cli"
 Requires-Dist: click>=7.1; extra == "cli"
@@ -155,9 +157,11 @@ await client.login(my_master_key, service_code=my_service_code)
 - [click](https://click.palletsprojects.com/) - command line interface framework
 - [black](https://github.com/psf/black) - Python code formatter
 - [ruff](https://github.com/astral-sh/ruff) - Python linter
+- [pydantic](https://docs.pydantic.dev/latest/) - Data validation library
 - [pytest](https://docs.pytest.org/) - Python test framework
 - [mypy](https://mypy-lang.org/) - Python type checker
 - [setuptools](https://github.com/pypa/setuptools) - Python packager
+- [tox](https://tox.wiki) - Automate testing
 
 ## License
 

{pykoplenti-1.2.2 → pykoplenti-1.3.0}/README.md

@@ -128,9 +128,11 @@ await client.login(my_master_key, service_code=my_service_code)
 - [click](https://click.palletsprojects.com/) - command line interface framework
 - [black](https://github.com/psf/black) - Python code formatter
 - [ruff](https://github.com/astral-sh/ruff) - Python linter
+- [pydantic](https://docs.pydantic.dev/latest/) - Data validation library
 - [pytest](https://docs.pytest.org/) - Python test framework
 - [mypy](https://mypy-lang.org/) - Python type checker
 - [setuptools](https://github.com/pypa/setuptools) - Python packager
+- [tox](https://tox.wiki) - Automate testing
 
 ## License
 

{pykoplenti-1.2.2 → pykoplenti-1.3.0}/pykoplenti/api.py

@@ -13,17 +13,16 @@ import warnings
 
 from Crypto.Cipher import AES
 from aiohttp import ClientResponse, ClientSession, ClientTimeout
-from pydantic import parse_obj_as
 from yarl import URL
 
 from .model import (
     EventData,
     MeData,
     ModuleData,
-    ProcessData,
     ProcessDataCollection,
     SettingsData,
     VersionData,
+    process_data_list,
 )
 
 _logger: Final = logging.getLogger(__name__)
@@ -86,6 +85,20 @@ class ModuleNotFoundException(ApiException):
         self.error = error
 
 
+def _relogin(fn):
+    """Decorator for automatic re-login if session was expired."""
+
+    @functools.wraps(fn)
+    async def _wrapper(self: "ApiClient", *args, **kwargs):
+        with contextlib.suppress(AuthenticationException, NotAuthorizedException):
+            return await fn(self, *args, **kwargs)
+        _logger.debug("Request failed - try to re-login")
+        await self._login()
+        return await fn(self, *args, **kwargs)
+
+    return _wrapper
+
+
 class ApiClient(contextlib.AbstractAsyncContextManager):
     """Client for the REST-API of Kostal Plenticore inverters.
 
@@ -265,7 +278,7 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
         client_signature = hmac.new(
             stored_key, auth_msg.encode("utf-8"), hashlib.sha256
         ).digest()
-        client_proof = bytes([a ^ b for a, b in zip(client_key, client_signature)])
+        client_proof = bytes(a ^ b for a, b in zip(client_key, client_signature))
 
         server_key = hmac.new(
             salted_passwd, "Server Key".encode("utf-8"), hashlib.sha256
@@ -343,47 +356,32 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
         """Check if the given response contains an error and throws
         the appropriate exception."""
 
-        if resp.status != 200:
-            try:
-                response = await resp.json()
-                error = response["message"]
-            except Exception:
-                error = None
-
-            if resp.status == 400:
-                raise AuthenticationException(resp.status, error)
+        if resp.status == 200:
+            return
 
-            if resp.status == 401:
-                raise NotAuthorizedException(resp.status, error)
-
-            if resp.status == 403:
-                raise UserLockedException(resp.status, error)
+        try:
+            response = await resp.json()
+            error = response["message"]
+        except Exception:
+            error = None
 
-            if resp.status == 404:
-                raise ModuleNotFoundException(resp.status, error)
+        if resp.status == 400:
+            raise AuthenticationException(resp.status, error)
 
-            if resp.status == 503:
-                raise InternalCommunicationException(resp.status, error)
+        if resp.status == 401:
+            raise NotAuthorizedException(resp.status, error)
 
-            # we got an undocumented status code
-            raise ApiException(f"Unknown API response [{resp.status}] - {error}")
+        if resp.status == 403:
+            raise UserLockedException(resp.status, error)
 
-    @staticmethod
-    def _relogin(fn):
-        """Decorator for automatic re-login if session was expired."""
+        if resp.status == 404:
+            raise ModuleNotFoundException(resp.status, error)
 
-        @functools.wraps(fn)
-        async def _wrapper(self, *args, **kwargs):
-            try:
-                return await fn(self, *args, **kwargs)
-            except (AuthenticationException, NotAuthorizedException):
-                pass
+        if resp.status == 503:
+            raise InternalCommunicationException(resp.status, error)
 
-            _logger.debug("Request failed - try to re-login")
-            await self._login()
-            return await fn(self, *args, **kwargs)
-
-        return _wrapper
+        # we got an undocumented status code
+        raise ApiException(f"Unknown API response [{resp.status}] - {error}")
 
     async def logout(self):
         """Logs the current user out."""
@@ -422,7 +420,7 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
         if lang is None:
             lang = locale.getlocale()[0]
 
-        language = lang[0:2].lower()
+        language = lang[:2].lower()
         variant = lang[3:5].lower()
         if language not in ApiClient.SUPPORTED_LANGUAGES.keys():
             # Fallback to default
@@ -466,38 +464,33 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
         self,
         module_id: str,
         processdata_id: str,
-    ) -> Mapping[str, ProcessDataCollection]:
-        ...
+    ) -> Mapping[str, ProcessDataCollection]: ...
 
     @overload
     async def get_process_data_values(
         self,
         module_id: str,
         processdata_id: Iterable[str],
-    ) -> Mapping[str, ProcessDataCollection]:
-        ...
+    ) -> Mapping[str, ProcessDataCollection]: ...
 
     @overload
     async def get_process_data_values(
         self,
         module_id: str,
-    ) -> Mapping[str, ProcessDataCollection]:
-        ...
+    ) -> Mapping[str, ProcessDataCollection]: ...
 
     @overload
     async def get_process_data_values(
         self,
         module_id: Mapping[str, Iterable[str]],
-    ) -> Mapping[str, ProcessDataCollection]:
-        ...
+    ) -> Mapping[str, ProcessDataCollection]: ...
 
     @overload
     async def get_process_data_values(
         self,
         module_id: Union[str, Mapping[str, Iterable[str]]],
         processdata_id: Union[str, Iterable[str], None] = None,
-    ) -> Mapping[str, ProcessDataCollection]:
-        ...
+    ) -> Mapping[str, ProcessDataCollection]: ...
 
     @_relogin
     async def get_process_data_values(
@@ -523,7 +516,7 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
                 data_response = await resp.json()
                 return {
                     data_response[0]["moduleid"]: ProcessDataCollection(
-                        parse_obj_as(list[ProcessData], data_response[0]["processdata"])
+                        process_data_list(data_response[0]["processdata"])
                     )
                 }
 
@@ -536,7 +529,7 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
                 data_response = await resp.json()
                 return {
                     data_response[0]["moduleid"]: ProcessDataCollection(
-                        parse_obj_as(list[ProcessData], data_response[0]["processdata"])
+                        process_data_list(data_response[0]["processdata"])
                     )
                 }
 
@@ -552,7 +545,7 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
                 data_response = await resp.json()
                 return {
                     data_response[0]["moduleid"]: ProcessDataCollection(
-                        parse_obj_as(list[ProcessData], data_response[0]["processdata"])
+                        process_data_list(data_response[0]["processdata"])
                     )
                 }
 
@@ -562,7 +555,7 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
             for mid, pids in module_id.items():
                 # the json encoder expects that iterables are either list or tuples,
                 # other types has to be converted
-                if isinstance(pids, list) or isinstance(pids, tuple):
+                if isinstance(pids, (list, tuple)):
                     request.append(dict(moduleid=mid, processdataids=pids))
                 else:
                     request.append(dict(moduleid=mid, processdataids=list(pids)))
@@ -574,7 +567,7 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
                 data_response = await resp.json()
                 return {
                     x["moduleid"]: ProcessDataCollection(
-                        parse_obj_as(List[ProcessData], x["processdata"])
+                        process_data_list(x["processdata"])
                     )
                     for x in data_response
                 }
@@ -588,9 +581,9 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
             response = await resp.json()
             result: Dict[str, List[SettingsData]] = {}
             for module in response:
-                id = module["moduleid"]
-                data = list([SettingsData(**x) for x in module["settings"]])
-                result[id] = data
+                mid = module["moduleid"]
+                data = [SettingsData(**x) for x in module["settings"]]
+                result[mid] = data
 
             return result
 
@@ -599,30 +592,26 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
         self,
         module_id: str,
         setting_id: str,
-    ) -> Mapping[str, Mapping[str, str]]:
-        ...
+    ) -> Mapping[str, Mapping[str, str]]: ...
 
     @overload
     async def get_setting_values(
         self,
         module_id: str,
         setting_id: Iterable[str],
-    ) -> Mapping[str, Mapping[str, str]]:
-        ...
+    ) -> Mapping[str, Mapping[str, str]]: ...
 
     @overload
     async def get_setting_values(
         self,
         module_id: str,
-    ) -> Mapping[str, Mapping[str, str]]:
-        ...
+    ) -> Mapping[str, Mapping[str, str]]: ...
 
     @overload
     async def get_setting_values(
         self,
         module_id: Mapping[str, Iterable[str]],
-    ) -> Mapping[str, Mapping[str, str]]:
-        ...
+    ) -> Mapping[str, Mapping[str, str]]: ...
 
     @_relogin
     async def get_setting_values(
@@ -672,12 +661,11 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
             for mid, pids in module_id.items():
                 # the json encoder expects that iterables are either list or tuples,
                 # other types has to be converted
-                if isinstance(pids, list) or isinstance(pids, tuple):
+                if isinstance(pids, (list, tuple)):
                     request.append(dict(moduleid=mid, settingids=pids))
                 else:
                     request.append(dict(moduleid=mid, settingids=list(pids)))
 
-
             async with self._session_request(
                 "settings", method="POST", json=request
             ) as resp:
@@ -696,7 +684,7 @@ class ApiClient(contextlib.AbstractAsyncContextManager):
         request = [
             {
                 "moduleid": module_id,
-                "settings": list([dict(value=v, id=k) for k, v in values.items()]),
+                "settings": [dict(value=v, id=k) for k, v in values.items()],
             }
         ]
         async with self._session_request(

{pykoplenti-1.2.2 → pykoplenti-1.3.0}/pykoplenti/cli.py

@@ -236,7 +236,7 @@ def read_events(global_args, lang, count):
         for event in data:
             print(
                 f"{event.is_active < 5} {event.start_time} {event.end_time} "
-                "{event.description}"
+                f"{event.description}"
             )
 
     asyncio.run(

{pykoplenti-1.2.2 → pykoplenti-1.3.0}/pykoplenti/model.py

@@ -1,6 +1,7 @@
 from datetime import datetime
-from typing import Iterator, Mapping
+from typing import Final, Iterator, Mapping, Optional
 
+import pydantic
 from pydantic import BaseModel, Field
 
 
@@ -55,7 +56,7 @@ class ProcessDataCollection(Mapping):
         try:
             return next(x for x in self._process_data if x.id == item)
         except StopIteration:
-            raise KeyError(item)
+            raise KeyError(item) from None
 
     def __eq__(self, __other: object) -> bool:
         if not isinstance(__other, ProcessDataCollection):
@@ -77,11 +78,11 @@ class ProcessDataCollection(Mapping):
 class SettingsData(BaseModel):
     """Represents a single settings data."""
 
-    min: str | None
-    max: str | None
-    default: str | None
+    min: Optional[str]
+    max: Optional[str]
+    default: Optional[str]
     access: str
-    unit: str | None
+    unit: Optional[str]
     id: str
     type: str
 
@@ -97,3 +98,24 @@ class EventData(BaseModel):
     description: str
     group: str
     is_active: bool
+
+
+# pydantic version specific code
+# In pydantic 2.x `parse_obj_as` is no longer supported. To stay compatible to
+# both version a small wrapper function is used.
+
+if pydantic.VERSION.startswith("2."):
+    from pydantic import TypeAdapter
+
+    _process_list_adapter: Final = TypeAdapter(list[ProcessData])
+
+    def process_data_list(json) -> list[ProcessData]:
+        """Process json as a list of ProcessData objects."""
+        return _process_list_adapter.validate_python(json)
+
+else:
+    from pydantic import parse_obj_as
+
+    def process_data_list(json) -> list[ProcessData]:
+        """Process json as a list of ProcessData objects."""
+        return parse_obj_as(list[ProcessData], json)

{pykoplenti-1.2.2 → pykoplenti-1.3.0}/pykoplenti.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pykoplenti
-Version: 1.2.2
+Version: 1.3.0
 Summary: Python REST-Client for Kostal Plenticore Solar Inverters
 Home-page: https://github.com/stegm/pyclient_koplenti
 Author: @stegm
@@ -13,14 +13,16 @@ Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp~=3.8
 Requires-Dist: pycryptodome~=3.19
-Requires-Dist: pydantic~=1.10
+Requires-Dist: pydantic>=1.10
 Provides-Extra: cli
 Requires-Dist: prompt_toolkit>=3.0; extra == "cli"
 Requires-Dist: click>=7.1; extra == "cli"
@@ -155,9 +157,11 @@ await client.login(my_master_key, service_code=my_service_code)
 - [click](https://click.palletsprojects.com/) - command line interface framework
 - [black](https://github.com/psf/black) - Python code formatter
 - [ruff](https://github.com/astral-sh/ruff) - Python linter
+- [pydantic](https://docs.pydantic.dev/latest/) - Data validation library
 - [pytest](https://docs.pytest.org/) - Python test framework
 - [mypy](https://mypy-lang.org/) - Python type checker
 - [setuptools](https://github.com/pypa/setuptools) - Python packager
+- [tox](https://tox.wiki) - Automate testing
 
 ## License
 

{pykoplenti-1.2.2 → pykoplenti-1.3.0}/pykoplenti.egg-info/requires.txt

@@ -1,6 +1,6 @@
 aiohttp~=3.8
 pycryptodome~=3.19
-pydantic~=1.10
+pydantic>=1.10
 
 [CLI]
 prompt_toolkit>=3.0

{pykoplenti-1.2.2 → pykoplenti-1.3.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pykoplenti
-version = 1.2.2
+version = 1.3.0
 description = Python REST-Client for Kostal Plenticore Solar Inverters
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -17,8 +17,10 @@ classifiers =
 	Intended Audience :: Developers
 	License :: OSI Approved :: Apache Software License
 	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.7
-	Programming Language :: Python :: 3.8
+	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.10
+	Programming Language :: Python :: 3.11
+	Programming Language :: Python :: 3.12
 	Topic :: Software Development :: Libraries
 
 [options]
@@ -26,7 +28,7 @@ packages = pykoplenti
 install_requires = 
 	aiohttp ~= 3.8
 	pycryptodome ~= 3.19
-	pydantic ~= 1.10
+	pydantic >= 1.10
 
 [options.package_data]
 pykoplenti = py.typed

{pykoplenti-1.2.2 → pykoplenti-1.3.0}/tests/test_extendedapiclient.py

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Iterable
+from typing import Any, Callable, Iterable, Union
 from unittest.mock import ANY, MagicMock, call
 
 import pytest
@@ -40,7 +40,9 @@ class TestVirtualProcessDataValuesDcSum:
     async def test_virtual_process_data(
         self,
         pykoplenti_extended_client: pykoplenti.ExtendedApiClient,
-        client_response_factory: Callable[[int, list[Any] | dict[Any, Any]], MagicMock],
+        client_response_factory: Callable[
+            [int, Union[list[Any], dict[Any, Any]]], MagicMock
+        ],
         websession: MagicMock,
     ):
         """Test virtual process data for PV power if depencies are present."""
@@ -70,7 +72,9 @@ class TestVirtualProcessDataValuesDcSum:
     async def test_virtual_process_data_value(
         self,
         pykoplenti_extended_client: pykoplenti.ExtendedApiClient,
-        client_response_factory: Callable[[int, list[Any] | dict[Any, Any]], MagicMock],
+        client_response_factory: Callable[
+            [int, Union[list[Any], dict[Any, Any]]], MagicMock
+        ],
         websession: MagicMock,
     ):
         """Test virtual process data for PV power."""
@@ -142,7 +146,9 @@ class TestVirtualProcessDataValuesEnergyToGrid:
     async def test_virtual_process_data(
         self,
         pykoplenti_extended_client: pykoplenti.ExtendedApiClient,
-        client_response_factory: Callable[[int, list[Any] | dict[Any, Any]], MagicMock],
+        client_response_factory: Callable[
+            [int, Union[list[Any], dict[Any, Any]]], MagicMock
+        ],
         websession: MagicMock,
         scope: str,
     ):
@@ -183,7 +189,9 @@ class TestVirtualProcessDataValuesEnergyToGrid:
     async def test_virtual_process_data_value(
         self,
         pykoplenti_extended_client: pykoplenti.ExtendedApiClient,
-        client_response_factory: Callable[[int, list[Any] | dict[Any, Any]], MagicMock],
+        client_response_factory: Callable[
+            [int, Union[list[Any], dict[Any, Any]]], MagicMock
+        ],
         websession: MagicMock,
         scope: str,
     ):
@@ -269,10 +277,12 @@ class TestVirtualProcessDataValuesEnergyToGrid:
 @pytest.mark.asyncio
 async def test_virtual_process_data_no_dc_sum(
     pykoplenti_extended_client: pykoplenti.ExtendedApiClient,
-    client_response_factory: Callable[[int, list[Any] | dict[Any, Any]], MagicMock],
+    client_response_factory: Callable[
+        [int, Union[list[Any], dict[Any, Any]]], MagicMock
+    ],
     websession: MagicMock,
 ):
-    """Test if no virtual process data is present if dependecies are missing."""
+    """Test if no virtual process data is present if dependencies are missing."""
     client_response_factory(
         200,
         [
@@ -297,7 +307,9 @@ async def test_virtual_process_data_no_dc_sum(
 @pytest.mark.asyncio
 async def test_virtual_process_data_and_normal_process_data(
     pykoplenti_extended_client: pykoplenti.ExtendedApiClient,
-    client_response_factory: Callable[[int, list[Any] | dict[Any, Any]], MagicMock],
+    client_response_factory: Callable[
+        [int, Union[list[Any], dict[Any, Any]]], MagicMock
+    ],
     websession: MagicMock,
 ):
     """Test if virtual and non-virtual process values can be requested."""
@@ -362,7 +374,9 @@ async def test_virtual_process_data_and_normal_process_data(
 @pytest.mark.asyncio
 async def test_virtual_process_data_not_all_requested(
     pykoplenti_extended_client: pykoplenti.ExtendedApiClient,
-    client_response_factory: Callable[[int, list[Any] | dict[Any, Any]], MagicMock],
+    client_response_factory: Callable[
+        [int, Union[list[Any], dict[Any, Any]]], MagicMock
+    ],
     websession: MagicMock,
 ):
     """Test if not all available virtual process data are requested."""
@@ -429,7 +443,9 @@ async def test_virtual_process_data_not_all_requested(
 @pytest.mark.asyncio
 async def test_virtual_process_data_multiple_requested(
     pykoplenti_extended_client: pykoplenti.ExtendedApiClient,
-    client_response_factory: Callable[[int, list[Any] | dict[Any, Any]], MagicMock],
+    client_response_factory: Callable[
+        [int, Union[list[Any], dict[Any, Any]]], MagicMock
+    ],
     websession: MagicMock,
 ):
     """Test if multiple virtual process data are requested."""

{pykoplenti-1.2.2 → pykoplenti-1.3.0}/tests/test_pykoplenti.py

@@ -3,7 +3,6 @@ import json
 from typing import Any, Callable
 from unittest.mock import ANY, MagicMock
 
-from pydantic import parse_obj_as
 import pytest
 
 import pykoplenti
@@ -123,13 +122,25 @@ def test_settings_parsing():
     assert settings_data.access == "readonly"
 
 
+def test_process_data_list():
+    json = [
+        {"id": "Statistic:Yield:Day", "unit": "%", "value": 1},
+        {"id": "Statistic:Yield:Month", "unit": "%", "value": 2},
+    ]
+
+    assert pykoplenti.model.process_data_list(json) == [
+        pykoplenti.ProcessData(id="Statistic:Yield:Day", unit="%", value="1"),
+        pykoplenti.ProcessData(id="Statistic:Yield:Month", unit="%", value="2"),
+    ]
+
+
 def test_process_data_collection_indicates_length():
     raw_response = (
         '[{"id": "Statistic:Yield:Day", "unit": "", "value": 1}, '
         '{"id": "Statistic:Yield:Month", "unit": "", "value": 2}]'
     )
     pdc = pykoplenti.ProcessDataCollection(
-        parse_obj_as(list[pykoplenti.ProcessData], json.loads(raw_response))
+        pykoplenti.model.process_data_list(json.loads(raw_response))
     )
 
     assert len(pdc) == 2
@@ -141,7 +152,7 @@ def test_process_data_collection_index_returns_processdata():
         '{"id": "Statistic:Yield:Month", "unit": "", "value": 2}]'
     )
     pdc = pykoplenti.ProcessDataCollection(
-        parse_obj_as(list[pykoplenti.ProcessData], json.loads(raw_response))
+        pykoplenti.model.process_data_list(json.loads(raw_response))
     )
 
     result = pdc["Statistic:Yield:Month"]
@@ -158,7 +169,7 @@ def test_process_data_collection_can_be_iterated():
         '{"id": "Statistic:Yield:Month", "unit": "", "value": 2}]'
     )
     pdc = pykoplenti.ProcessDataCollection(
-        parse_obj_as(list[pykoplenti.ProcessData], json.loads(raw_response))
+        pykoplenti.model.process_data_list(json.loads(raw_response))
     )
 
     result = list(pdc)