weheat 2024.11.2__tar.gz → 2024.11.26__tar.gz

{weheat-2024.11.2/weheat.egg-info → weheat-2024.11.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: weheat
-Version: 2024.11.2
+Version: 2024.11.26
 Summary: Weheat Backend client
 Home-page: https://github.com/wefabricate/wh-python
 Author: Jesper Raemaekers
@@ -11,7 +11,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: urllib3<2.1.0,>=1.25.3
 Requires-Dist: python-dateutil
-Requires-Dist: pydantic<2,>=1.10.5
+Requires-Dist: pydantic<3,>=1.10.5
 Requires-Dist: aenum
 
 # Weheat backend client

{weheat-2024.11.2 → weheat-2024.11.26}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "weheat"
-version = "2024.11.2"
+version = "2024.11.26"
 description = "Weheat Backend"
 authors = ["Jesper Raemaekers <jesper.raemaekers@wefabricate.com>", "Kjell van Straaten <kjell.van.straaten@wefabricate.com>"]
 license = "MIT"
@@ -14,7 +14,7 @@ python = "^3.7"
 
 urllib3 = ">= 1.25.3"
 python-dateutil = ">=2.8.2"
-pydantic = "^1.10.5, <2"
+pydantic = ">=1.10.5, < 3"
 aenum = ">=3.1.11"
 
 [tool.poetry.dev-dependencies]

{weheat-2024.11.2 → weheat-2024.11.26}/setup.py

@@ -21,12 +21,12 @@ from setuptools import setup, find_packages  # noqa: H301
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 NAME = "weheat"
-VERSION = "2024.11.2"
+VERSION = "2024.11.26"
 PYTHON_REQUIRES = ">=3.7"
 REQUIRES = [
     "urllib3 >= 1.25.3, < 2.1.0",
     "python-dateutil",
-    "pydantic >= 1.10.5, < 2",
+    "pydantic >= 1.10.5, < 3",
     "aenum"
 ]
 

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/abstractions/discovery.py

@@ -23,7 +23,7 @@ class HeatPumpDiscovery:
 
         with ApiClient(configuration=config) as client:
 
-            response = HeatPumpApi(client).api_v1_heat_pumps_get_with_http_info('', 0, 1000, DeviceState.NUMBER_3 ,async_req=True).get()
+            response = HeatPumpApi(client).api_v1_heat_pumps_get_with_http_info('', 1, 1000, DeviceState.NUMBER_3 ,async_req=True).get()
             if response.status_code == 200:
                 for pump in response.data:
                     # Model of the heat pump

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/abstractions/heat_pump.py

@@ -250,7 +250,7 @@ class HeatPump:
             return self.State.SELF_TEST
         elif numeric_state == 180:
             return self.State.MANUAL_CONTROL
-        elif numeric_state == 200:
+        elif numeric_state >= 200 and numeric_state <= 240:
             return self.State.DEFROSTING
         return None
 

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/api/energy_log_api.py

@@ -16,13 +16,15 @@ import re  # noqa: F401
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import Field, StrictStr, validate_arguments
+except ImportError:
+    from pydantic import Field, StrictStr, validate_arguments
+
 
 from typing_extensions import Annotated
 from datetime import datetime
 
-from pydantic import Field, StrictStr
-
 from typing import List, Optional
 
 from weheat.models.energy_view_dto import EnergyViewDto

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/api/heat_pump_api.py

@@ -16,10 +16,12 @@ import re  # noqa: F401
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, Field, StrictInt, StrictStr
+except ImportError:
+    from pydantic import validate_arguments, Field, StrictInt, StrictStr
 
 from typing_extensions import Annotated
-from pydantic import Field, StrictInt, StrictStr
 
 from typing import List, Optional
 

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/api/heat_pump_log_api.py

@@ -16,13 +16,14 @@ import re  # noqa: F401
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, Field, StrictStr
+except ImportError:
+    from pydantic import validate_arguments, Field, StrictStr
 
 from typing_extensions import Annotated
 from datetime import datetime
 
-from pydantic import Field, StrictStr
-
 from typing import List, Optional
 
 from weheat.models.heat_pump_log_view_dto import HeatPumpLogViewDto

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/api/user_api.py

@@ -16,10 +16,12 @@ import re  # noqa: F401
 import io
 import warnings
 
-from pydantic import validate_arguments, ValidationError
+try:
+    from pydantic.v1 import validate_arguments, Field, StrictStr
+except ImportError:
+    from pydantic import validate_arguments, Field, StrictStr
 
 from typing_extensions import Annotated
-from pydantic import Field, StrictStr
 
 from typing import Optional
 

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/api_response.py

@@ -2,7 +2,11 @@
 
 from __future__ import annotations
 from typing import Any, Dict, Optional
-from pydantic import Field, StrictInt, StrictStr
+
+try:
+    from pydantic.v1 import Field, StrictInt, StrictStr
+except ImportError:
+    from pydantic import Field, StrictInt, StrictStr
 
 class ApiResponse:
     """

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/models/energy_view_dto.py

@@ -19,7 +19,10 @@ import json
 
 from datetime import datetime
 from typing import Optional, Union
-from pydantic import BaseModel, Field, StrictFloat, StrictInt, StrictStr
+try:
+    from pydantic.v1 import BaseModel, Field, StrictFloat, StrictInt, StrictStr
+except ImportError:
+    from pydantic import BaseModel, Field, StrictFloat, StrictInt, StrictStr
 
 class EnergyViewDto(BaseModel):
     """

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/models/heat_pump_log_view_dto.py

@@ -19,7 +19,10 @@ import json
 
 from datetime import datetime
 from typing import Optional, Union
-from pydantic import BaseModel, Field, StrictFloat, StrictInt, StrictStr
+try:
+    from pydantic.v1 import BaseModel, Field, StrictFloat, StrictInt, StrictStr
+except ImportError:
+    from pydantic import BaseModel, Field, StrictFloat, StrictInt, StrictStr
 
 class HeatPumpLogViewDto(BaseModel):
     """

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/models/raw_heat_pump_log_dto.py

@@ -19,7 +19,11 @@ import json
 
 from datetime import datetime
 from typing import Optional, Union
-from pydantic import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr
+try:
+    from pydantic.v1 import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr
+except ImportError:
+    from pydantic import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr
+
 
 class RawHeatPumpLogDto(BaseModel):
     """

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/models/read_all_heat_pump_dto.py

@@ -19,7 +19,10 @@ import json
 
 from datetime import datetime
 from typing import Optional
-from pydantic import BaseModel, Field, StrictStr, constr
+try:
+    from pydantic.v1 import BaseModel, Field, StrictStr, constr
+except ImportError:
+    from pydantic import BaseModel, Field, StrictStr, constr
 from weheat.models.boiler_type import BoilerType
 from weheat.models.device_state import DeviceState
 from weheat.models.dhw_type import DhwType

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/models/read_heat_pump_dto.py

@@ -19,7 +19,10 @@ import json
 
 from datetime import datetime
 from typing import Optional
-from pydantic import BaseModel, Field, StrictStr, constr
+try:
+    from pydantic.v1 import BaseModel, Field, StrictStr, constr
+except ImportError:
+    from pydantic import BaseModel, Field, StrictStr, constr
 from weheat.models.boiler_type import BoilerType
 from weheat.models.device_state import DeviceState
 from weheat.models.dhw_type import DhwType

{weheat-2024.11.2 → weheat-2024.11.26}/weheat/models/read_user_dto.py

@@ -19,7 +19,10 @@ import json
 
 from datetime import datetime
 from typing import Optional
-from pydantic import BaseModel, Field, StrictStr
+try:
+    from pydantic.v1 import BaseModel, Field, StrictStr
+except ImportError:
+    from pydantic import BaseModel, Field, StrictStr
 from weheat.models.role import Role
 
 class ReadUserDto(BaseModel):

{weheat-2024.11.2 → weheat-2024.11.26/weheat.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: weheat
-Version: 2024.11.2
+Version: 2024.11.26
 Summary: Weheat Backend client
 Home-page: https://github.com/wefabricate/wh-python
 Author: Jesper Raemaekers
@@ -11,7 +11,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: urllib3<2.1.0,>=1.25.3
 Requires-Dist: python-dateutil
-Requires-Dist: pydantic<2,>=1.10.5
+Requires-Dist: pydantic<3,>=1.10.5
 Requires-Dist: aenum
 
 # Weheat backend client

{weheat-2024.11.2 → weheat-2024.11.26}/weheat.egg-info/requires.txt

@@ -1,4 +1,4 @@
 urllib3<2.1.0,>=1.25.3
 python-dateutil
-pydantic<2,>=1.10.5
+pydantic<3,>=1.10.5
 aenum