ul-data-logger-api-sdk 3.1.1__tar.gz → 3.3.0__tar.gz

{ul_data_logger_api_sdk-3.1.1 → ul_data_logger_api_sdk-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ul-data-logger-api-sdk
-Version: 3.1.1
+Version: 3.3.0
 Summary: Data logger API sdk
 Author: Unic-lab
 License-Expression: MIT

{ul_data_logger_api_sdk-3.1.1 → ul_data_logger_api_sdk-3.3.0}/data_logger_api_sdk.py

@@ -13,6 +13,7 @@ from data_logger_api_sdk.data_logger_sdk_config import DataLoggerApiSdkConfig
 from data_logger_api_sdk.types.api_base_stations import (
     ApiBaseStationDetailResponse,
     ApiBaseStationDeviceLogsResponse,
+    ApiBaseStationDeviceLogsStatResponse,
     ApiBaseStationDevicesResponse,
     ApiBaseStationLogsStatForIntervalsResponse,
     ApiBaseStationLogsStatResponse,
@@ -193,13 +194,21 @@ class DataLoggerApiSdk:
         self,
         base_station_id: UUID,
         log_stat_days: int = 0,
+        exclude_log_types: List[str] | None = None,
     ) -> ApiBaseStationDetailResponse:
-        """GET /base-stations/<uuid> — карточка базовой станции Data Logger."""
+        """GET /base-stations/<uuid> — карточка базовой станции Data Logger.
+
+        exclude_log_types исключает типы из logs_stat (например, ['heartbit']);
+        без него счётчики включают служебные heartbeat-логи.
+        """
+        query: Dict[str, Any] = {"log_stat_days": log_stat_days}
+        if exclude_log_types:
+            query["exclude_log_types"] = exclude_log_types
         return self._request_payload_once(
             ApiMethod.GET,
             f"/base-stations/{base_station_id}",
             ApiBaseStationDetailResponse,
-            {"log_stat_days": log_stat_days},
+            query,
         )
 
     def get_base_station_logs(
@@ -209,13 +218,23 @@ class DataLoggerApiSdk:
         end_at: datetime | None = None,
         limit: int = 100,
         offset: int = 0,
+        exclude_log_types: List[str] | None = None,
+        sort: str | None = None,
     ) -> ApiBaseStationLogsListResult:
-        """GET /base-stations/<uuid>/logs — журнал логов базовой станции."""
+        """GET /base-stations/<uuid>/logs — журнал логов базовой станции.
+
+        exclude_log_types передаётся стандартным filter-параметром
+        (например, ['heartbit'] прячет служебные heartbeat-логи).
+        """
         query: Dict[str, Any] = {"limit": limit, "offset": offset}
         if start_at is not None:
             query["start_at"] = start_at.isoformat()
         if end_at is not None:
             query["end_at"] = end_at.isoformat()
+        if exclude_log_types:
+            query["filter"] = json.dumps([{"name": "log_type", "op": "not_in", "val": exclude_log_types}])
+        if sort:
+            query["sort"] = sort
         items, total_count = self._request_list_payload_once(
             ApiMethod.GET,
             f"/base-stations/{base_station_id}/logs",
@@ -224,6 +243,18 @@ class DataLoggerApiSdk:
         )
         return ApiBaseStationLogsListResult(items=items, total_count=total_count)
 
+    def get_base_station_log(
+        self,
+        base_station_id: UUID,
+        log_id: UUID,
+    ) -> ApiBaseStationLogResponse:
+        """GET /base-stations/<uuid>/logs/<uuid> — конкретный лог базовой станции."""
+        return self._request_payload_once(
+            ApiMethod.GET,
+            f"/base-stations/{base_station_id}/logs/{log_id}",
+            ApiBaseStationLogResponse,
+        )
+
     def get_base_station_system_logs(
         self,
         base_station_id: UUID,
@@ -250,13 +281,37 @@ class DataLoggerApiSdk:
         self,
         base_station_id: UUID,
         day: date,
+        exclude_log_types: List[str] | None = None,
     ) -> ApiBaseStationLogsStatResponse:
-        """GET /base-stations/<uuid>/logs-stat — статистика логов базовой станции за сутки."""
+        """GET /base-stations/<uuid>/logs-stat — статистика логов базовой станции за сутки.
+
+        exclude_log_types исключает типы из поминутных счётчиков (['heartbit'] прячет heartbeat).
+        """
+        query: Dict[str, Any] = {"day": day.isoformat()}
+        if exclude_log_types:
+            query["exclude_log_types"] = exclude_log_types
         return self._request_payload_once(
             ApiMethod.GET,
             f"/base-stations/{base_station_id}/logs-stat",
             ApiBaseStationLogsStatResponse,
-            {"day": day.isoformat()},
+            query,
+        )
+
+    def get_base_station_device_logs_stat(
+        self,
+        base_station_id: UUID,
+        start_at: datetime,
+        end_at: datetime | None = None,
+    ) -> ApiBaseStationDeviceLogsStatResponse:
+        """GET /base-stations/<uuid>/device-logs-stat — число логов устройств БС по дням."""
+        query: Dict[str, Any] = {"start_at": start_at.isoformat()}
+        if end_at is not None:
+            query["end_at"] = end_at.isoformat()
+        return self._request_payload_once(
+            ApiMethod.GET,
+            f"/base-stations/{base_station_id}/device-logs-stat",
+            ApiBaseStationDeviceLogsStatResponse,
+            query,
         )
 
     def get_base_station_logs_stat_for_intervals(

{ul_data_logger_api_sdk-3.1.1 → ul_data_logger_api_sdk-3.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ul-data-logger-api-sdk"
-version = "3.1.1"
+version = "3.3.0"
 description = "Data logger API sdk"
 license = "MIT"
 requires-python = ">=3.14"

{ul_data_logger_api_sdk-3.1.1 → ul_data_logger_api_sdk-3.3.0}/types/api_base_stations.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import date, datetime
 from typing import Any, Dict, List, NamedTuple, Tuple
 
 from pydantic.types import UUID4
@@ -110,6 +110,12 @@ class ApiBaseStationLogsStatForIntervalsResponse(JsonApiResponsePayload):
     stats: List[datetime]
 
 
+class ApiBaseStationDeviceLogsStatResponse(JsonApiResponsePayload):
+    """Ответ GET /base-stations/<uuid>/device-logs-stat: число логов устройств по дням."""
+
+    stats: List[Tuple[date, int]]
+
+
 class ApiBaseStationDeviceResponse(JsonApiResponsePayload):
     """Элемент devices ответа GET /base-stations/<uuid>/devices (ApiDeviceResponse без вложенной БС)."""