ul-data-logger-api-sdk 2.0.0__tar.gz → 2.0.2__tar.gz

{ul-data-logger-api-sdk-2.0.0 → ul-data-logger-api-sdk-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ul-data-logger-api-sdk
-Version: 2.0.0
+Version: 2.0.2
 Summary: Data logger API sdk
 Author: Unic-lab
 License: MIT

{ul-data-logger-api-sdk-2.0.0 → ul-data-logger-api-sdk-2.0.2}/data_logger_api_sdk/data_logger_api_sdk.py

@@ -2,14 +2,17 @@ import json
 import time
 from datetime import datetime
 from functools import lru_cache
-from typing import List, Type
+from typing import Any, List, Type
+from uuid import UUID
 
 from ul_api_utils.internal_api.internal_api import InternalApi
 from ul_api_utils.internal_api.internal_api_response import TPyloadType
 from ul_api_utils.utils.api_method import ApiMethod
 
 from data_logger_api_sdk.data_logger_sdk_config import DataLoggerApiSdkConfig
+from data_logger_api_sdk.types.api_bs_traffic_stats import ApiBsTrafficStatsResponse
 from data_logger_api_sdk.types.api_device_data_history import ApiDeviceDataHistoryBody, ApiDeviceDataHistoryResponse
+from data_logger_api_sdk.types.api_last_bs_data_by_device_macs import ApiDeviceLastBsDataResponse, ApiDeviceMacsListBodyModel
 from data_logger_api_sdk.types.api_packet_types import ApiPacketTypesListResponse
 from data_logger_api_sdk.types.api_protocol_types import ApiProtocolTypesListResponse
 
@@ -28,12 +31,14 @@ class DataLoggerApiSdk:
         endpoint: str,
         typed_as: Type[TPyloadType],
         body: str | None,
+        query: dict[str, Any] | None = None,
     ) -> TPyloadType:
         return (
             self._api.request(
                 method=method,
                 path=endpoint,
                 json=json.loads(body) if body is not None else None,
+                q=query,
             )
             .typed(typed_as)
             .check()
@@ -46,9 +51,10 @@ class DataLoggerApiSdk:
         path: str,
         typed: Type[TPyloadType],
         body: str | None = None,
+        query: dict[str, Any] | None = None,
     ) -> TPyloadType:
         ttl_status = round(time.time() / self._config.cache_ttl_s)
-        return self.request_payload(ttl_status, method, path, typed, body)  # type: ignore  # Type[TPyloadType] is hashable
+        return self.request_payload(ttl_status, method, path, typed, body, query)  # type: ignore  # Type[TPyloadType] is hashable
 
     def get_protocol_types_list(self, mac: int) -> List[str]:
         return self._get_cache_post_payload(
@@ -85,3 +91,29 @@ class DataLoggerApiSdk:
             List[ApiDeviceDataHistoryResponse],  # type: ignore
             api_device_history_body,
         )
+
+    def get_last_bs_data_by_device_macs(
+        self,
+        macs: set[int],
+    ) -> List[ApiDeviceLastBsDataResponse]:
+        return self._get_cache_post_payload(
+            ApiMethod.POST,
+            "/devices/last-bs-data",
+            List[ApiDeviceLastBsDataResponse],  # type: ignore
+            ApiDeviceMacsListBodyModel(macs=macs).model_dump_json(),
+        )
+
+    def get_bs_traffic_stats(
+        self,
+        base_station_id: UUID,
+        start_at: datetime,
+        end_at: datetime,
+    ) -> List[ApiBsTrafficStatsResponse]:
+        return self._get_cache_post_payload(
+            ApiMethod.POST,
+            f"/base-stations/{base_station_id}/traffic-stats",
+            List[ApiBsTrafficStatsResponse],  # type: ignore
+            None,
+            {"start_at": start_at, "end_at": end_at},
+        )
+

ul-data-logger-api-sdk-2.0.2/data_logger_api_sdk/types/api_bs_traffic_stats.py

@@ -0,0 +1,8 @@
+from datetime import date
+
+from ul_api_utils.api_resource.api_response import JsonApiResponsePayload
+
+
+class ApiBsTrafficStatsResponse(JsonApiResponsePayload):
+    date: date
+    raw_data_size: float

ul-data-logger-api-sdk-2.0.2/data_logger_api_sdk/types/api_last_bs_data_by_device_macs.py

@@ -0,0 +1,48 @@
+from datetime import datetime, timedelta, timezone
+from typing import List, Set
+
+from pydantic import UUID4, BaseModel, Field
+from ul_api_utils.api_resource.api_response import JsonApiResponsePayload
+from ul_api_utils.api_resource.api_response_payload_alias import ApiBaseModelPayloadResponse
+
+BASE_STATION__INACTIVITY_LIMIT = timedelta(minutes=10)
+
+
+class ApiDeviceMacsListBodyModel(BaseModel):
+    macs: Set[int] = Field(title="Macs", description="list of device macs", min_length=1)
+
+
+class SdrConfigDataResponse(JsonApiResponsePayload):
+    baud_rate: int
+
+
+class BsResponse(ApiBaseModelPayloadResponse):
+    api_user_modified_id: UUID4 | None = None
+    note: str
+
+    type: str
+    serial_number: int
+
+    latest_log_datetime: datetime | None = None
+    latest_geo_latitude: float | None = None
+    latest_geo_longitude: float | None = None
+    latest_soft_version: str | None = None
+    latest_geo_is_actual: bool | None = None
+
+    sdr_config_data_list: List[SdrConfigDataResponse] | None = None
+
+
+    @property
+    def status_ok(self) -> bool:
+        if self.latest_log_datetime is None:
+            return False
+        if self.latest_log_datetime.tzinfo is None:
+            self.latest_log_datetime = self.latest_log_datetime.replace(tzinfo=timezone.utc)
+        return (datetime.now(tz=timezone.utc) - self.latest_log_datetime) < BASE_STATION__INACTIVITY_LIMIT
+
+
+class ApiDeviceLastBsDataResponse(JsonApiResponsePayload):
+    mac: int
+    latest_signal_rssi: int | None = None
+    latest_signal_snr: int | None = None
+    bs: BsResponse | None = None

{ul-data-logger-api-sdk-2.0.0 → ul-data-logger-api-sdk-2.0.2}/pyproject.toml

@@ -115,6 +115,9 @@ extend-ignore = [
     "FBT001",   # Checks for the use of boolean positional arguments in function definitions, as determined by the presence of a bool type hint
     "PERF203",  # Checks for uses of except handling via try-except within for and while loops
     "A005",     # Checks if module shadows a Python standard-library module
+    "C420",     # Unnecessary dict comprehension for iterable; use dict.fromkeys instead
+    "LOG015",   # {}() call on root logger
+    "TC006",    # Add quotes to type expression in typing.cast()
 ]
 
 [tool.ruff.lint.mccabe]

{ul-data-logger-api-sdk-2.0.0 → ul-data-logger-api-sdk-2.0.2}/setup.py

@@ -13,7 +13,7 @@ if sys.argv:
         sys.argv.remove("broker_sdk")
         setup(
             name="ul-data-logger-sdk",
-            version="3.0.0",
+            version="3.0.4",
             description="Data logger sdk",
             author="Unic-lab",
             long_description=long_description,
@@ -39,17 +39,17 @@ if sys.argv:
             install_requires=[
                 "ul-unipipeline>=2.0.0",
                 # "ul-data-aggregator-sdk>=8.13.2",
-                # "ul-py-tool==2.1.2,
-                # "ul-api-utils==8.1.6",
+                # "ul-py-tool==2.1.3,
+                # "ul-api-utils==8.1.9",
                 # "ul-db-utils==4.0.2",
-                # "ul-data-gateway-sdk==1.0.3",
+                # "ul-data-gateway-sdk==1.0.6",
             ],
         )
     elif "api_sdk" in set(sys.argv):
         sys.argv.remove("api_sdk")
         setup(
             name="ul-data-logger-api-sdk",
-            version="2.0.0",
+            version="2.0.2",
             description="Data logger API sdk",
             author="Unic-lab",
             long_description=long_description,
@@ -76,9 +76,9 @@ if sys.argv:
                 "ul-unipipeline>=2.0.0",
                 "tqdm==4.66.1",
                 # "ul-data-aggregator-sdk>=8.13.2",
-                # "ul-py-tool==2.1.2,
-                # "ul-api-utils==8.1.6",
-                # "ul-db-utils==4.0.2",
-                # "ul-data-gateway-sdk==1.0.3",
+                # "ul-py-tool==2.1.4,
+                # "ul-api-utils==9.1.1",
+                # "ul-db-utils==5.1.0",
+                # "ul-data-gateway-sdk==1.0.6",
             ],
         )

{ul-data-logger-api-sdk-2.0.0 → ul-data-logger-api-sdk-2.0.2}/ul_data_logger_api_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ul-data-logger-api-sdk
-Version: 2.0.0
+Version: 2.0.2
 Summary: Data logger API sdk
 Author: Unic-lab
 License: MIT

{ul-data-logger-api-sdk-2.0.0 → ul-data-logger-api-sdk-2.0.2}/ul_data_logger_api_sdk.egg-info/SOURCES.txt

@@ -6,7 +6,9 @@ data_logger_api_sdk/data_logger_api_sdk.py
 data_logger_api_sdk/data_logger_sdk_config.py
 data_logger_api_sdk/py.typed
 data_logger_api_sdk/types/__init__.py
+data_logger_api_sdk/types/api_bs_traffic_stats.py
 data_logger_api_sdk/types/api_device_data_history.py
+data_logger_api_sdk/types/api_last_bs_data_by_device_macs.py
 data_logger_api_sdk/types/api_packet_types.py
 data_logger_api_sdk/types/api_protocol_types.py
 ul_data_logger_api_sdk.egg-info/PKG-INFO