climify_api 1.0.32__tar.gz → 1.0.34__tar.gz

{climify_api-1.0.32 → climify_api-1.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: climify_api
-Version: 1.0.32
+Version: 1.0.34
 Summary: A wrapper library for the Climify REST API
 Author-email: Climify Aps <info@climify.com>
 Project-URL: Homepage, https://gitlab.climify.com/climify/python-api-lib
@@ -27,7 +27,7 @@ Requires-Dist: requests-oauthlib
 Requires-Dist: pyyaml
 Requires-Dist: oauthlib
 Requires-Dist: varname
-Requires-Dist: pydantic<2.0.0
+Requires-Dist: pydantic>2.0.0
 Requires-Dist: pandas
 
 # Climify Python API

{climify_api-1.0.32 → climify_api-1.0.34}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "climify_api"
-version = "1.0.32"
+version = "1.0.34"
 keywords=['Climify','Environmental engineering']
 authors = [
   { name="Climify Aps", email="info@climify.com" },
@@ -41,7 +41,7 @@ dependencies = [
   "pyyaml",
   "oauthlib",
   "varname",
-  "pydantic < 2.0.0",
+  "pydantic > 2.0.0",
   "pandas"
 ]
 
@@ -50,7 +50,7 @@ Homepage = "https://gitlab.climify.com/climify/python-api-lib"
 Issues = "https://gitlab.climify.com/climify/python-api-lib/-/issues"
 
 [tool.bumpver]
-current_version = "1.0.32"
+current_version = "1.0.34"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api/__init__.py

@@ -8,12 +8,12 @@
 
     Provides a REST endpoints for Climify applications and 3rd party solutions.  # noqa: E501
 
-    The version of the OpenAPI document: 1.0.32
+    The version of the OpenAPI document: 1.0.34
     Generated by: https://openapi-generator.tech
 """
 
 __name__ = 'climify_api'
-__version__ = "1.0.32"
+__version__ = "1.0.34"
 
 # import ApiClient
 from climify_api.api_client import ApiClient

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api/apis/v1/paths/buildings_id_devices/get.py

@@ -13,7 +13,7 @@ import typing  # noqa: F401
 import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 from typing import List
-from pydantic import parse_raw_as
+from pydantic import TypeAdapter
 
 
 from climify_api.apis.PathBase import PathBase  # noqa: F401
@@ -80,7 +80,7 @@ class GetBuildingDevicesById(PathBase):
             api_response = ClimifyApiResponseWithoutDeserialization(response=response)
         else:
             # Deserialize response
-            deserialized_body = parse_raw_as(List[DeviceDto], response.data)
+            deserialized_body = TypeAdapter(List[DeviceDto]).validate_json(response.data)
             api_response = ClimifyApiResponse[List[DeviceDto]](
                 response=response,
                 status=response.status,

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api/apis/v1/paths/buildings_id_metering_points/get.py

@@ -13,7 +13,7 @@ import typing  # noqa: F401
 import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 from typing import List
-from pydantic import parse_raw_as
+from pydantic import TypeAdapter
 
 
 from climify_api.apis.PathBase import PathBase  # noqa: F401
@@ -80,7 +80,7 @@ class GetBuildingMeteringPointsById(PathBase):
             api_response = ClimifyApiResponseWithoutDeserialization(response=response)
         else:
             # Deserialize response
-            deserialized_body = parse_raw_as(List[MeteringPointDto], response.data)
+            deserialized_body = TypeAdapter(List[MeteringPointDto]).validate_json(response.data)
             api_response = ClimifyApiResponse[List[MeteringPointDto]](
                 response=response,
                 status=response.status,

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api/apis/v1/paths/feedback_forms_id_locations_id_responses/get.py

@@ -14,7 +14,7 @@ import typing  # noqa: F401
 import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 from typing import List
-from pydantic import parse_raw_as
+from pydantic import TypeAdapter
 
 
 from climify_api.apis.PathBase import PathBase  # noqa: F401
@@ -107,7 +107,7 @@ class GetFormResponsesFromLocationById(PathBase):
             api_response = ClimifyApiResponseWithoutDeserialization(response=response)
         else:
             # Deserialize response
-            deserialized_body = parse_raw_as(List[FormQuestionType],response.data) if response.data\
+            deserialized_body = TypeAdapter(List[FormQuestionType]).validate_json(response.data) if response.data\
                                 else []
             api_response = ClimifyApiResponse[List[FormQuestionType]](
                 response=response,

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api/apis/v1/paths/locations_id_change_temperature/post.py

@@ -14,7 +14,7 @@ import typing  # noqa: F401
 import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 from typing import List
-from pydantic import parse_raw_as
+from pydantic import TypeAdapter
 
 
 from climify_api.apis.PathBase import PathBase  # noqa: F401

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api/apis/v1/paths/locations_id_devices/get.py

@@ -13,7 +13,7 @@ import typing  # noqa: F401
 import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 from typing import List
-from pydantic import parse_raw_as
+from pydantic import TypeAdapter
 
 
 from climify_api.apis.PathBase import PathBase  # noqa: F401
@@ -80,7 +80,7 @@ class GetLocationDevicesById(PathBase):
             api_response = ClimifyApiResponseWithoutDeserialization(response=response)
         else:
             # Deserialize response
-            deserialized_body = parse_raw_as(List[DeviceDto], response.data)
+            deserialized_body = TypeAdapter(List[DeviceDto]).validate_json(response.data)
             api_response = ClimifyApiResponse[List[DeviceDto]](
                 response=response,
                 status=response.status,

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api/apis/v1/paths/locations_id_sensor_values/get.py

@@ -15,7 +15,7 @@ import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 from pandas import DataFrame, concat
 from typing import List
-from pydantic import parse_raw_as
+from pydantic import TypeAdapter
 from varname import nameof
 import pytz
 
@@ -157,7 +157,7 @@ class GetLocationSensorValuesById(PathBase):
                 bodies.append(response.data)
                 continue
             
-            deserialized_body = parse_raw_as(List[SensorDataExtDto],response.data) if response.data\
+            deserialized_body = TypeAdapter(List[SensorDataExtDto]).validate_python(response.json()) if response.data\
                                 else []
             
             # Sort observations on time

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api/apis/v1/paths/maps_id_devices/get.py

@@ -13,7 +13,7 @@ import typing  # noqa: F401
 import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 from typing import List
-from pydantic import parse_raw_as
+from pydantic import TypeAdapter
 
 
 from climify_api.apis.PathBase import PathBase  # noqa: F401
@@ -80,7 +80,7 @@ class GetMapDevicesById(PathBase):
             api_response = ClimifyApiResponseWithoutDeserialization(response=response)
         else:
             # Deserialize response
-            deserialized_body = parse_raw_as(List[DeviceDto], response.data)
+            deserialized_body = TypeAdapter(List[DeviceDto]).validate_json(response.data)
             api_response = ClimifyApiResponse[List[DeviceDto]](
                 response=response,
                 status=response.status,

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api/apis/v1/paths/metering_points_id/get.py

@@ -15,7 +15,7 @@ import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 from pandas import DataFrame, concat
 from typing import List
-from pydantic import parse_raw_as
+from pydantic import TypeAdapter
 from varname import nameof
 import pytz
 
@@ -153,7 +153,7 @@ class GetMeteringPointValuesById(PathBase):
                 bodies.append(response.data)
                 continue
             
-            deserialized_body = parse_raw_as(List[SensorDataExtDto],response.data) if response.data\
+            deserialized_body = TypeAdapter(List[SensorDataExtDto]).validate_python(response.json()) if response.data\
                                 else []
             
             # Sort observations on time

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api/apis/v1/paths/organisations_id_devices/get.py

@@ -13,7 +13,7 @@ import typing  # noqa: F401
 import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 from typing import List
-from pydantic import parse_raw_as
+from pydantic import TypeAdapter
 
 
 from climify_api.apis.PathBase import PathBase  # noqa: F401
@@ -80,7 +80,7 @@ class GetOrganisationDevicesById(PathBase):
             api_response = ClimifyApiResponseWithoutDeserialization(response=response)
         else:
             # Deserialize response
-            deserialized_body = parse_raw_as(List[DeviceDto], response.data)
+            deserialized_body = TypeAdapter(List[DeviceDto]).validate_json(response.data)
             api_response = ClimifyApiResponse[List[DeviceDto]](
                 response=response,
                 status=response.status,

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api/apis/v1/paths/resources/get.py

@@ -5,7 +5,7 @@ import typing  # noqa: F401
 import typing_extensions  # noqa: F401
 import uuid  # noqa: F401
 from typing import List
-from pydantic import parse_raw_as
+from pydantic import TypeAdapter
 
 
 from climify_api.apis.PathBase import PathBase  # noqa: F401
@@ -63,7 +63,7 @@ class GetAllUserResources(PathBase):
             api_response = ClimifyApiResponseWithoutDeserialization(response=response)
         else:
             # Deserialize response
-            deserialized_body = parse_raw_as(List[ResourceDto],response.data)
+            deserialized_body = TypeAdapter(List[ResourceDto]).validate_json(response.data)
             api_response = ClimifyApiResponse[List[ResourceDto]](
                 response=response,
                 status=response.status,

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api/models/__init__.py

@@ -9,7 +9,7 @@ from enum import Enum
 from typing import Any, Dict, List, Optional, Union
 from pandas import DataFrame
 
-from pydantic import BaseModel, Field, constr
+from pydantic import BaseModel, Field
 
 
 class Error(BaseModel):
@@ -68,10 +68,6 @@ class Status5Enum(Enum):
     ACTIVE = 'ACTIVE'
 
 
-class Status5(BaseModel):
-    __root__: Optional[Status5Enum] = None
-
-
 class DeviceType(Enum):
     SENSOR = 'SENSOR'
     BLE_BEACON = 'BLE_BEACON'
@@ -80,8 +76,8 @@ class DeviceType(Enum):
 
 class DeviceModelDto(BaseModel):
     id: Optional[int] = None
-    name: constr(min_length=0, max_length=100)
-    manufacturer: constr(min_length=0, max_length=100)
+    name: str
+    manufacturer: str
     type: DeviceType
     attributes: List[str]
 
@@ -128,13 +124,13 @@ class BuildingOperatingHourExceptionDto(BaseModel):
 class BuildingDto(BaseModel):
     id: Optional[int] = None
     status: Optional[Status] = None
-    name: Optional[constr(min_length=0, max_length=200)] = None
-    country: Optional[constr(min_length=0, max_length=2)] = None
-    address: Optional[constr(min_length=0, max_length=100)] = None
-    zipCode: Optional[constr(min_length=0, max_length=10)] = None
-    city: Optional[constr(min_length=0, max_length=100)] = None
-    timeZone: Optional[constr(min_length=0, max_length=64)] = None
-    organisation: OrganisationDto = None
+    name: Optional[str] = None
+    country: Optional[str] = None
+    address: Optional[str] = None
+    zipCode: Optional[str] = None
+    city: Optional[str] = None
+    timeZone: Optional[str] = None
+    organisation: Optional[OrganisationDto] = None
     coordinates: Optional[GeoPoint] = None
     maps: Optional[List[MapDto]] = []
     buildingOperatingHours: Optional[List[BuildingOperatingHourDto]] = []
@@ -144,9 +140,9 @@ class BuildingDto(BaseModel):
 class LocationDto(BaseModel):
     id: Optional[int] = None
     status: Optional[Status] = None
-    name: Optional[constr(min_length=1, max_length=100)] = None
-    nameAlternate: Optional[constr(min_length=0, max_length=100)] = None
-    map: MapDto = None
+    name: Optional[str] = None
+    nameAlternate: Optional[str] = None
+    map: Optional[MapDto] = None
     locationProfile: Optional[LocationProfileDto] = None
     schedulerProfile: Optional[SchedulerProfileDto] = None
     points: Optional[List[Dict[str, float]]] = None
@@ -155,7 +151,7 @@ class LocationDto(BaseModel):
 class LocationProfileDto(BaseModel):
     id: Optional[int] = None
     organisation: Optional[OrganisationDto] = None
-    name: Optional[constr(min_length=0, max_length=200)] = None
+    name: Optional[str] = None
     parameters: Optional[JsonNode] = None
     version: Optional[int] = None
 
@@ -163,7 +159,7 @@ class LocationProfileDto(BaseModel):
 class MapDto(BaseModel):
     id: Optional[int] = None
     status: Optional[Status] = None
-    name: Optional[constr(min_length=0, max_length=100)] = None
+    name: Optional[str] = None
     building: Optional[BuildingDto] = None
     image: Optional[str] = None
     locations: Optional[List[LocationDto]] = None
@@ -172,13 +168,13 @@ class MapDto(BaseModel):
 class OrganisationDto(BaseModel):
     id: Optional[int] = None
     status: Optional[Status] = None
-    name: Optional[constr(min_length=0, max_length=50)] = None
-    country: Optional[constr(min_length=0, max_length=2)] = None
-    address: Optional[constr(min_length=0, max_length=100)] = None
-    address2: Optional[constr(min_length=0, max_length=100)] = None
-    zipCode: Optional[constr(min_length=0, max_length=10)] = None
-    city: Optional[constr(min_length=0, max_length=100)] = None
-    registrationCode: Optional[constr(min_length=0, max_length=100)] = None
+    name: Optional[str] = None
+    country: Optional[str] = None
+    address: Optional[str] = None
+    address2: Optional[str] = None
+    zipCode: Optional[str] = None
+    city: Optional[str] = None
+    registrationCode: Optional[str] = None
     buildings: Optional[List[BuildingDto]] = []
     locationProfiles: Optional[List[LocationProfileDto]] = []
     schedulerProfiles: Optional[List[SchedulerProfileDto]] = []
@@ -186,27 +182,27 @@ class OrganisationDto(BaseModel):
 
 class SchedulerProfileDto(BaseModel):
     id: Optional[int] = None
-    name: Optional[constr(min_length=0, max_length=200)] = None
+    name: Optional[str] = None
     settings: JsonNode
-    status: Optional[Status5] = None
+    status: Optional[Status5Enum] = None
     organisation: Optional[OrganisationDto] = None
     locations: Optional[List[LocationDto]] = []
 
 
 class DeviceDto(BaseModel):
     id: Optional[int] = None
-    externalId: constr(min_length=0, max_length=100)
-    deviceModel: DeviceModelDto
-    alias: Optional[constr(min_length=0, max_length=100)] = None
+    externalId: str
+    deviceModel: Optional[DeviceModelDto]
+    alias: Optional[str] = None
     integration: Optional[IntegrationDto] = None
     resources: Optional[List[DeviceResourceDto]] = []
     historySyncedAt: Optional[datetime] = None
 
 class MeteringPointDto(BaseModel):
     id: Optional[int] = None
-    externalId: constr(min_length=0, max_length=100)
+    externalId: str
     deviceModel: DeviceModelDto
-    alias: Optional[constr(min_length=0, max_length=100)] = None
+    alias: Optional[str] = None
     integration: Optional[IntegrationDto] = None
     resources: Optional[List[DeviceResourceDto]] = []
     historySyncedAt: Optional[datetime] = None
@@ -226,15 +222,7 @@ class IntegrationDto(BaseModel):
     settings: Optional[Dict[str, str]] = None
     alias: str
     authorized: Optional[bool] = None
-    organisation: OrganisationDto = None
-
-
-BuildingDto.update_forward_refs()
-LocationDto.update_forward_refs()
-LocationProfileDto.update_forward_refs()
-OrganisationDto.update_forward_refs()
-DeviceDto.update_forward_refs()
-MeteringPointDto.update_forward_refs()
+    organisation: Optional[OrganisationDto] = None
 
 # Feedback forms
 class FormQuestionBase(BaseModel):
@@ -249,7 +237,7 @@ class FormTextQuestionResponse(FormQuestionResponse):
     response: str
 
 class FormTextQuestionDto(FormQuestionBase):
-    type: str = Field('Text',const=True)
+    type: str = Field('Text')
     responses: Optional[List[FormTextQuestionResponse]]
 
 class FormChoiceQuestionResponse(FormQuestionResponse):
@@ -260,10 +248,10 @@ class FormChoiceQuestionBase(FormQuestionBase):
     responses: Optional[List[FormChoiceQuestionResponse]]
     
 class FormSingleChoiceQuestionDto(FormChoiceQuestionBase):
-    type: str = Field('SingleChoice',const=True)
+    type: str = Field('SingleChoice')
 
 class FormMultipleChoiceQuestionDto(FormChoiceQuestionBase):
-    type: str = Field('MultipleChoice',const=True)
+    type: str = Field('MultipleChoice')
 
 FormQuestionType = Union[
         FormTextQuestionDto,

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: climify_api
-Version: 1.0.32
+Version: 1.0.34
 Summary: A wrapper library for the Climify REST API
 Author-email: Climify Aps <info@climify.com>
 Project-URL: Homepage, https://gitlab.climify.com/climify/python-api-lib
@@ -27,7 +27,7 @@ Requires-Dist: requests-oauthlib
 Requires-Dist: pyyaml
 Requires-Dist: oauthlib
 Requires-Dist: varname
-Requires-Dist: pydantic<2.0.0
+Requires-Dist: pydantic>2.0.0
 Requires-Dist: pandas
 
 # Climify Python API

{climify_api-1.0.32 → climify_api-1.0.34}/src/climify_api.egg-info/requires.txt

@@ -8,5 +8,5 @@ requests-oauthlib
 pyyaml
 oauthlib
 varname
-pydantic<2.0.0
+pydantic>2.0.0
 pandas