fix:PRComments

Author: RSam-NI

docs/getting_started.rst

@@ -338,21 +338,20 @@ default connection. The default connection depends on your environment.
 
 With a :class:`.AssetManagementClient` object, you can:
 
-**Asset Operations:**
-
 * Create, delete, query assets and link files to assets.
 
-Example:
+* Track asset utilization with start, heartbeat, end, and query history operations.
+
+Examples
+~~~~~~~~
+
+Create, delete, and query assets
 
 .. literalinclude:: ../examples/assetmanagement/assets.py
    :language: python
    :linenos:
 
-**Asset Utilization Operations:**
-
-* Track asset utilization with start, heartbeat, end, and query history operations.
-
-Example:
+Track asset utilization
 
 .. literalinclude:: ../examples/assetmanagement/asset_utilization.py
    :language: python

examples/assetmanagement/asset_utilization.py

@@ -9,7 +9,7 @@
     AssetIdentification,
     StartUtilizationRequest,
 )
-from nisystemlink.clients.core._http_configuration import HttpConfiguration
+from nisystemlink.clients.core import HttpConfiguration
 
 # Configure connection to SystemLink server
 server_configuration = HttpConfiguration(

nisystemlink/clients/assetmanagement/_asset_management_client.py

@@ -4,6 +4,9 @@
 from typing import List, Optional
 
 from nisystemlink.clients import core
+from nisystemlink.clients.assetmanagement.models._update_utilization_request import (
+    _UpdateUtilizationRequest,
+)
 from nisystemlink.clients.core._http_configuration import HttpConfiguration
 from nisystemlink.clients.core._uplink._base_client import BaseClient
 from nisystemlink.clients.core._uplink._methods import post
@@ -183,7 +186,7 @@ def start_utilization(
 
     @post("assets/end-utilization")
     def __end_utilization(
-        self, request: models.UpdateUtilizationRequest
+        self, request: _UpdateUtilizationRequest
     ) -> models.UpdateUtilizationPartialSuccessResponse:
         """End asset utilization tracking.
 
@@ -215,15 +218,15 @@ def end_utilization(
         Raises:
             ApiException: If unable to communicate with the asset management service or if there are invalid arguments.
         """
-        request = models.UpdateUtilizationRequest(
+        request = _UpdateUtilizationRequest(
             utilization_identifiers=ids,
             utilization_timestamp=timestamp,
         )
         return self.__end_utilization(request)
 
     @post("assets/utilization-heartbeat")
     def __utilization_heartbeat(
-        self, request: models.UpdateUtilizationRequest
+        self, request: _UpdateUtilizationRequest
     ) -> models.UpdateUtilizationPartialSuccessResponse:
         """Send utilization heartbeat.
 
@@ -255,7 +258,7 @@ def utilization_heartbeat(
         Raises:
             ApiException: If unable to communicate with the asset management service or if there are invalid arguments.
         """
-        request = models.UpdateUtilizationRequest(
+        request = _UpdateUtilizationRequest(
             utilization_identifiers=ids,
             utilization_timestamp=timestamp,
         )

nisystemlink/clients/assetmanagement/models/__init__.py

@@ -32,7 +32,6 @@
 from ._start_utilization_partial_success_response import (
     StartUtilizationPartialSuccessResponse,
 )
-from ._update_utilization_request import UpdateUtilizationRequest
 from ._update_utilization_partial_success_response import (
     UpdateUtilizationPartialSuccessResponse,
 )

nisystemlink/clients/assetmanagement/models/_asset_identification.py

@@ -1,7 +1,5 @@
 """Model for asset identification."""
 
-from typing import Optional
-
 from nisystemlink.clients.core._uplink._json_model import JsonModel
 
 from ._asset_types import AssetBusType
@@ -18,20 +16,20 @@ class AssetIdentification(JsonModel):
     * ``serial_number``
     """
 
-    model_name: Optional[str] = None
+    model_name: str | None = None
     """Model name of the asset."""
 
-    model_number: Optional[int] = None
+    model_number: int | None = None
     """Model number of the asset."""
 
-    serial_number: Optional[str] = None
+    serial_number: str | None = None
     """Serial number of the asset."""
 
-    vendor_name: Optional[str] = None
+    vendor_name: str | None = None
     """Vendor name of the asset."""
 
-    vendor_number: Optional[int] = None
+    vendor_number: int | None = None
     """Vendor number of the asset."""
 
-    bus_type: Optional[AssetBusType] = None
+    bus_type: AssetBusType | None = None
     """Bus type for the asset."""

nisystemlink/clients/assetmanagement/models/_start_utilization_partial_success_response.py

@@ -1,6 +1,6 @@
 """Model for start utilization partial success response."""
 
-from nisystemlink.clients.core._api_error import ApiError
+from nisystemlink.clients.core import ApiError
 from nisystemlink.clients.core._uplink._json_model import JsonModel
 
 from ._asset_identification import AssetIdentification

nisystemlink/clients/assetmanagement/models/_update_utilization_partial_success_response.py

@@ -1,6 +1,6 @@
 """Model for update utilization partial success response."""
 
-from nisystemlink.clients.core._api_error import ApiError
+from nisystemlink.clients.core import ApiError
 from nisystemlink.clients.core._uplink._json_model import JsonModel
 
 

nisystemlink/clients/assetmanagement/models/_update_utilization_request.py

@@ -5,7 +5,7 @@
 from nisystemlink.clients.core._uplink._json_model import JsonModel
 
 
-class UpdateUtilizationRequest(JsonModel):
+class _UpdateUtilizationRequest(JsonModel):
     """Request model for updating utilization (heartbeat or end)."""
 
     utilization_identifiers: list[str] | None = None

tests/integration/assetmanagement/test_asset_management.py

@@ -28,13 +28,17 @@
 from nisystemlink.clients.core import ApiException
 from nisystemlink.clients.core._http_configuration import HttpConfiguration
 
+# Type aliases for fixtures
+CreateAssetFixture = Callable[
+    [List[CreateAssetRequest]], CreateAssetsPartialSuccessResponse
+]
+StartUtilizationFixture = Callable[[str, List[Asset], str, str, str, str], None]
+
 
 @pytest.fixture
 def create_asset(
     client: AssetManagementClient,
-) -> Generator[
-    Callable[[List[CreateAssetRequest]], CreateAssetsPartialSuccessResponse], None, None
-]:
+) -> Generator[CreateAssetFixture, None, None]:
     """Fixture to return a factory that creates assets."""
     responses: List[CreateAssetsPartialSuccessResponse] = []
 
@@ -71,7 +75,7 @@ def unique_identifier() -> str:
 @pytest.fixture
 def start_utilization(
     client: AssetManagementClient,
-) -> Generator[Callable[[str, List[Asset], str, str, str, str], None], None, None]:
+) -> Generator[StartUtilizationFixture, None, None]:
     """Fixture to start utilization and automatically clean up."""
     started_utilizations: List[str] = []
 

tests/integration/dataframe/test_dataframe.py

@@ -177,7 +177,7 @@ def _wait_for_table_data(
             elapsed_time = time.time() - start_time
             assert elapsed_time < timeout, (
                 f"Failed to get expected row count {minimum_row_count} after "
-                f"{elapsed_time: .2f} seconds (last count: {actual_row_count})"
+                f"{elapsed_time:.2f} seconds (last count: {actual_row_count})"
             )
 
             time.sleep(sleep_duration)
@@ -245,9 +245,9 @@ def _data_value_to_str(column: Column, value: _DataElement) -> str | None:
             return str(value)
         if isinstance(value, float):
             if column.data_type == DataType.Float32:
-                return f"{value: .9g}"
+                return f"{value:.9g}"
             assert column.data_type == DataType.Float64
-            return f"{value: .17g}"
+            return f"{value:.17g}"
         if isinstance(value, datetime):
             assert column.data_type == DataType.Timestamp
             return value.isoformat()