climify_api 1.0.27__tar.gz → 1.0.29__tar.gz

{climify_api-1.0.27 → climify_api-1.0.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: climify_api
-Version: 1.0.27
+Version: 1.0.29
 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

{climify_api-1.0.27 → climify_api-1.0.29}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "climify_api"
-version = "1.0.27"
+version = "1.0.29"
 keywords=['Climify','Environmental engineering']
 authors = [
   { name="Climify Aps", email="info@climify.com" },
@@ -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.27"
+current_version = "1.0.29"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message  = "Bump version {old_version} -> {new_version}"
 commit          = true

{climify_api-1.0.27 → climify_api-1.0.29}/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.27
+    The version of the OpenAPI document: 1.0.29
     Generated by: https://openapi-generator.tech
 """
 
 __name__ = 'climify_api'
-__version__ = "1.0.27"
+__version__ = "1.0.29"
 
 # import ApiClient
 from climify_api.api_client import ApiClient

{climify_api-1.0.27 → climify_api-1.0.29}/src/climify_api/apis/v1/paths/metering_points_id/get.py

@@ -112,39 +112,81 @@ class GetMeteringPointValuesById(PathBase):
         subRequestToTime = to_datetime
         subRequestFromTime = max(subRequestToTime - relativedelta(months=3), from_datetime)
 
-        request = usedPath +\
-              f"?dateTimeFrom={subRequestFromTime.replace(tzinfo=None).isoformat()+'Z'}" +\
-                f"&dateTimeTo={subRequestToTime.replace(tzinfo=None).isoformat()+'Z'}"
-        
-        response = self.api_client.call_api(
-            resource_path=request,
-            method='GET',
-            access_token=access_token,
-            stream=stream,
-            timeout=timeout
-        )
-
-        # Format response
-        if not 200 <= response.status <= 299:
-            raise ClimifyApiException(
-                status=response.status,
-                reason=response.reason,
-                api_response=response
+        while subRequestFromTime >= from_datetime:
+            query_parameters = []
+            for name, value in (
+                ('dateTimeFrom', subRequestFromTime.replace(tzinfo=None).isoformat()+'Z' if subRequestFromTime else None), # Sets timezone to None, to remove +HH:MM
+                ('dateTimeTo', subRequestToTime.replace(tzinfo=None).isoformat()+'Z' if subRequestToTime else None)
+            ):
+                if value:
+                    query_parameters.append(f"{name}={value}")
+
+            if len(query_parameters) > 0:
+                requests.append("?" + "&".join(query_parameters))
+
+            if subRequestFromTime == from_datetime:
+                break
+
+            subRequestToTime = subRequestFromTime - relativedelta(seconds=1)
+            subRequestFromTime = max(subRequestToTime - relativedelta(months=3), from_datetime)
+            
+        bodies = []
+        for request in requests:
+            requestPath = usedPath+request
+            response = self.api_client.call_api(
+                resource_path=requestPath,
+                method='GET',
+                access_token=access_token,
+                stream=stream,
+                timeout=timeout
             )
-    
-        if skip_deserialization:
-            return ClimifyApiResponseWithoutDeserialization(response=response)
+
+            # Format response
+            if not 200 <= response.status <= 299:
+                raise ClimifyApiException(
+                    status=response.status,
+                    reason=response.reason,
+                    api_response=response
+                )
         
-        # Deserialize response
-        deserialized_body = parse_raw_as(List[SensorDataExtDto], response.data)
-        if as_dataframe:
-            deserialized_body = convert_values_to_dataFrame(deserialized_body)
+            if skip_deserialization:
+                bodies.append(response.data)
+                continue
+            
+            deserialized_body = parse_raw_as(List[SensorDataExtDto],response.data) if response.data\
+                                else []
+            
+            # Sort observations on time
+            for sensor in deserialized_body:
+                sensor.data = sorted(sensor.data, key=lambda x: x.time, reverse=True)
+
+            if as_dataframe:
+                deserialized_body = convert_values_to_dataFrame(deserialized_body)
             
-        api_response = ClimifyApiResponse[List[SensorDataExtDto]](
+            bodies.append(deserialized_body)
+
+        if skip_deserialization:
+            response.data = bodies
+            return ClimifyApiResponseWithoutDeserialization(response=response)
+
+        sensors = {}
+        for body in bodies:
+            for sensor in body:
+                if sensor.devId not in sensors:
+                    sensors[sensor.devId] = sensor
+                    continue
+
+                sensor_data = sensors[sensor.devId]
+                if as_dataframe:
+                    sensor_data.data = concat([sensor_data.data, sensor.data], ignore_index=True)
+                else:
+                    sensor_data.data += sensor.data
+
+        deserialized_body = list(sensors.values())
+
+        return ClimifyApiResponse[List[SensorDataExtDto]](
             response=response,
             status=response.status,
             body=deserialized_body,
             headers=response.headers
-        )
-        
-        return api_response
+        )

{climify_api-1.0.27 → climify_api-1.0.29}/src/climify_api/models/__init__.py

@@ -4,12 +4,12 @@
 
 from __future__ import annotations
 
-from datetime import datetime, date
+from datetime import datetime, date, time
 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, constr, validator
 
 
 class Error(BaseModel):
@@ -108,6 +108,30 @@ class SensorDataExtDto(BaseModel):
         arbitrary_types_allowed = True
 
 
+class BuildingOperatingHourDto(BaseModel):
+    id: Optional[int] = None
+    dayOfWeek: Optional[int] = None
+
+    openTime: Optional[time] = None
+    closeTime: Optional[time] = None
+    active: Optional[bool] = None
+
+    @validator('openTime', 'closeTime', pre=True)
+    def parse_list_time(cls, v: Any) -> time:
+        if isinstance(v, list) and len(v) >= 2 and isinstance(v[0], int):
+            return time(v[0], v[1])
+        
+        raise ValueError(f"Invalid time format: {v}")
+
+class BuildingOperatingHourExceptionDto(BaseModel):
+    id: Optional[int] = None
+    dateFrom: Optional[date] = None
+    dateTo: Optional[date] = None
+    openTime: Optional[time] = None
+    closeTime: Optional[time] = None
+    reason: Optional[str] = None
+    active: Optional[bool] = None
+
 class BuildingDto(BaseModel):
     id: Optional[int] = None
     status: Optional[Status] = None
@@ -120,6 +144,8 @@ class BuildingDto(BaseModel):
     organisation: OrganisationDto = None
     coordinates: Optional[GeoPoint] = None
     maps: Optional[List[MapDto]] = []
+    buildingOperatingHours: Optional[List[BuildingOperatingHourDto]] = []
+    buildingOperatingHourExceptions: Optional[List[BuildingOperatingHourExceptionDto]] = []
 
 
 class LocationDto(BaseModel):

{climify_api-1.0.27 → climify_api-1.0.29}/src/climify_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: climify_api
-Version: 1.0.27
+Version: 1.0.29
 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