fix types

Author: Aravindhan Palanisamy

examples/assetmanagement/assets.py

@@ -3,6 +3,7 @@
     AssetBusType,
     AssetDiscoveryType,
     AssetLocationForCreate,
+    AssetPresence,
     AssetPresenceStatus,
     AssetType,
     CreateAssetRequest,
@@ -45,7 +46,7 @@
         is_NI_asset=True,
         workspace="846e294a-a007-47ac-9fc2-fac07eab240e",
         location=AssetLocationForCreate(
-            state=AssetLocationForCreate(asset_presence=AssetPresenceStatus.PRESENT)
+            state=AssetPresence(asset_presence=AssetPresenceStatus.PRESENT)
         ),
         external_calibration=ExternalCalibration(
             temperature_sensors=[TemperatureSensor(name="Sensor0", reading=25.8)],

nisystemlink/clients/assetmanagement/_asset_management_client.py

@@ -54,7 +54,7 @@ def create_assets(
 
     @post("query-assets")
     def __query_assets(
-        self, query: models.QueryAssetsRequest
+        self, query: models._QueryAssetsRequest
     ) -> models.QueryAssetsResponse:
         """Query Assets.
 
@@ -104,7 +104,7 @@ def query_assets(
 
         query_params = {k: v for k, v in query_params.items() if v is not None}
 
-        query_request = models._QueryAssetRequest(**query_params)
+        query_request = models._QueryAssetsRequest(**query_params)
 
         return self.__query_assets(query=query_request)
 

nisystemlink/clients/assetmanagement/models/__init__.py

@@ -3,7 +3,7 @@
 from ._create_asset_request import CreateAssetRequest
 from ._create_assets_partial_success_response import CreateAssetsPartialSuccessResponse
 from ._delete_assets_response import DeleteAssetsResponse
-from ._query_assets_request import AssetField, QueryAssetsRequest, _QueryAssetRequest
+from ._query_assets_request import AssetField, QueryAssetsRequest, _QueryAssetsRequest
 from ._query_assets_response import QueryAssetsResponse
 from ._asset_location import (
     AssetLocation,

nisystemlink/clients/assetmanagement/models/_asset_location.py

@@ -47,8 +47,8 @@ class AssetPresence(JsonModel):
     """Gets or sets the status of an asset's presence in a system."""
 
 
-class AssetLocation(JsonModel):
-    """Model for information about the asset location, presence and the connection status of the system."""
+class _AssetLocation(JsonModel):
+    """local model for information about the asset location, presence and the connection status of the system."""
 
     minion_id: Optional[str] = None
     """Gets or sets identifier of the minion where the asset is located."""
@@ -65,11 +65,15 @@ class AssetLocation(JsonModel):
     slot_number: Optional[int] = None
     """Gets or sets the number of the slot in which the asset is located."""
 
+
+class AssetLocation(_AssetLocation):
+    """Model for information about the asset location, presence and the connection status of the system."""
+
     state: AssetPresenceWithSystemConnection
     """Presence of an asset and the connection of the system in which it resides."""
 
 
-class AssetLocationForCreate(AssetLocation):
+class AssetLocationForCreate(_AssetLocation):
     """Model for information about the asset presence status of the system, used while create"""
 
     state: AssetPresence

nisystemlink/clients/assetmanagement/models/_query_assets_request.py

@@ -78,7 +78,7 @@ class QueryAssetsRequest(JsonModel):
     """Gets or sets the filter criteria for assets. Consists of a string of queries composed using AND/OR operators."""
 
 
-class _QueryAssetRequest(JsonModel):
+class _QueryAssetsRequest(JsonModel):
     """Model for object containing filters to apply when retrieving assets."""
 
     projection: Optional[str] = None

tests/integration/assetmanagement/test_asset_management.py

@@ -28,7 +28,7 @@ def create_asset(client: AssetManagementClient):
     responses: List[CreateAssetsPartialSuccessResponse] = []
 
     def _create_assets(
-        new_assets: CreateAssetRequest,
+        new_assets: List[CreateAssetRequest],
     ) -> CreateAssetsPartialSuccessResponse:
         response = client.create_assets(assets=new_assets)
         responses.append(response)
@@ -40,7 +40,9 @@ def _create_assets(
     for response in responses:
         if response.assets:
             created_assets = created_assets + response.assets
-    client.delete_assets(ids=[asset.id for asset in created_assets])
+    client.delete_assets(
+        ids=[asset.id for asset in created_assets if asset.id is not None]
+    )
 
 
 @pytest.fixture(scope="class")
@@ -161,7 +163,7 @@ def test__query_assets_with_take_value__returns_specific_number_of_assets(
 
         assert response is not None
         assert response.assets is not None and len(response.assets) == 1
-        assert response.total_count >= 1
+        assert response.total_count is not None and response.total_count >= 1
 
     def test_query_assets_with_projections__returns_the_assets_with_projected_properties(
         self, client: AssetManagementClient
@@ -172,6 +174,7 @@ def test_query_assets_with_projections__returns_the_assets_with_projected_proper
         response = client.query_assets(query=query_asset)
 
         assert response is not None
+        assert response.assets is not None
         assert all(
             asset.id is not None
             and asset.name is not None