ni.datastore 0.1.0.dev3__tar.gz → 0.1.0.dev4__tar.gz

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ni.datastore
-Version: 0.1.0.dev3
+Version: 0.1.0.dev4
 Summary: APIs for publishing and retrieving data from the NI Measurement Data Store
 License: MIT
 Keywords: datastore
@@ -25,8 +25,8 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Dist: hightime (>=0.3.0.dev0)
 Requires-Dist: ni-datamonikers-v1-client (>=0.1.0.dev1)
-Requires-Dist: ni-measurements-data-v1-client (>=0.1.0.dev1)
-Requires-Dist: ni-measurements-metadata-v1-client (>=0.1.0.dev1)
+Requires-Dist: ni-measurements-data-v1-client (>=0.1.0.dev2)
+Requires-Dist: ni-measurements-metadata-v1-client (>=0.1.0.dev2)
 Requires-Dist: ni-protobuf-types (>=1.0.1.dev0)
 Requires-Dist: protobuf (>=4.21)
 Description-Content-Type: text/markdown

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ni.datastore"
-version = "0.1.0-dev3"
+version = "0.1.0.dev4"
 license = "MIT"
 description = "APIs for publishing and retrieving data from the NI Measurement Data Store"
 authors = [{name = "NI", email = "opensource@ni.com"}]
@@ -38,8 +38,8 @@ requires-poetry = '>=2.1,<3.0'
 python = "^3.9"
 protobuf = {version=">=4.21"}
 ni-datamonikers-v1-client = { version = ">=0.1.0.dev1", allow-prereleases = true }
-ni-measurements-data-v1-client = { version = ">=0.1.0.dev1", allow-prereleases = true }
-ni-measurements-metadata-v1-client = { version = ">=0.1.0.dev1", allow-prereleases = true }
+ni-measurements-data-v1-client = { version = ">=0.1.0.dev2", allow-prereleases = true }
+ni-measurements-metadata-v1-client = { version = ">=0.1.0.dev2", allow-prereleases = true }
 ni-protobuf-types = { version = ">=1.0.1.dev0", allow-prereleases = true }
 hightime = { version = ">=0.3.0.dev0", allow-prereleases = true }
 

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/data/_data_store_client.py

@@ -44,6 +44,7 @@ from ni.measurements.data.v1.data_store_service_pb2 import (
     QueryConditionsRequest,
     QueryMeasurementsRequest,
     QueryStepsRequest,
+    QueryTestResultsRequest,
 )
 from ni.protobuf.types.precision_timestamp_conversion import (
     hightime_datetime_to_protobuf,
@@ -312,6 +313,14 @@ class DataStoreClient:
             for published_measurement in query_response.published_measurements
         ]
 
+    def query_test_results(self, odata_query: str = "") -> Sequence[TestResult]:
+        """Query test results from the data store."""
+        query_request = QueryTestResultsRequest(odata_query=odata_query)
+        query_response = self._get_data_store_client().query_test_results(query_request)
+        return [
+            TestResult.from_protobuf(test_result) for test_result in query_response.test_results
+        ]
+
     def query_steps(self, odata_query: str = "") -> Sequence[Step]:
         """Query steps from the data store."""
         query_request = QueryStepsRequest(odata_query=odata_query)

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/data/_types/_published_condition.py

@@ -13,7 +13,7 @@ class PublishedCondition:
 
     __slots__ = (
         "moniker",
-        "published_condition_id",
+        "id",
         "condition_name",
         "condition_type",
         "step_id",
@@ -24,7 +24,7 @@ class PublishedCondition:
         self,
         *,
         moniker: Moniker | None = None,
-        published_condition_id: str = "",
+        id: str = "",
         condition_name: str = "",
         condition_type: str = "",
         step_id: str = "",
@@ -32,7 +32,7 @@ class PublishedCondition:
     ) -> None:
         """Initialize a PublishedCondition instance."""
         self.moniker = moniker
-        self.published_condition_id = published_condition_id
+        self.id = id
         self.condition_name = condition_name
         self.condition_type = condition_type
         self.step_id = step_id
@@ -47,7 +47,7 @@ class PublishedCondition:
                 if published_condition_proto.HasField("moniker")
                 else None
             ),
-            published_condition_id=published_condition_proto.published_condition_id,
+            id=published_condition_proto.id,
             condition_name=published_condition_proto.condition_name,
             condition_type=published_condition_proto.condition_type,
             step_id=published_condition_proto.step_id,
@@ -58,7 +58,7 @@ class PublishedCondition:
         """Convert this PublishedCondition instance to a protobuf PublishedCondition message."""
         return PublishedConditionProto(
             moniker=self.moniker,
-            published_condition_id=self.published_condition_id,
+            id=self.id,
             condition_name=self.condition_name,
             condition_type=self.condition_type,
             step_id=self.step_id,
@@ -71,7 +71,7 @@ class PublishedCondition:
             return NotImplemented
         return (
             self.moniker == other.moniker
-            and self.published_condition_id == other.published_condition_id
+            and self.id == other.id
             and self.condition_name == other.condition_name
             and self.condition_type == other.condition_type
             and self.step_id == other.step_id

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/data/_types/_published_measurement.py

@@ -24,7 +24,7 @@ class PublishedMeasurement:
     __slots__ = (
         "moniker",
         "_published_conditions",
-        "published_measurement_id",
+        "id",
         "test_result_id",
         "step_id",
         "_software_item_ids",
@@ -65,7 +65,7 @@ class PublishedMeasurement:
         *,
         moniker: Moniker | None = None,
         published_conditions: Iterable[PublishedCondition] | None = None,
-        published_measurement_id: str = "",
+        id: str = "",
         test_result_id: str = "",
         step_id: str = "",
         software_item_ids: Iterable[str] | None = None,
@@ -85,7 +85,7 @@ class PublishedMeasurement:
         self._published_conditions: MutableSequence[PublishedCondition] = (
             list(published_conditions) if published_conditions is not None else []
         )
-        self.published_measurement_id = published_measurement_id
+        self.id = id
         self.test_result_id = test_result_id
         self.step_id = step_id
         self._software_item_ids: MutableSequence[str] = (
@@ -121,7 +121,7 @@ class PublishedMeasurement:
                 PublishedCondition.from_protobuf(cond)
                 for cond in published_measurement_proto.published_conditions
             ],
-            published_measurement_id=published_measurement_proto.published_measurement_id,
+            id=published_measurement_proto.id,
             test_result_id=published_measurement_proto.test_result_id,
             step_id=published_measurement_proto.step_id,
             software_item_ids=published_measurement_proto.software_item_ids,
@@ -156,7 +156,7 @@ class PublishedMeasurement:
             published_conditions=[
                 condition.to_protobuf() for condition in self.published_conditions
             ],
-            published_measurement_id=self.published_measurement_id,
+            id=self.id,
             test_result_id=self.test_result_id,
             step_id=self.step_id,
             software_item_ids=self.software_item_ids,
@@ -187,7 +187,7 @@ class PublishedMeasurement:
         return (
             self.moniker == other.moniker
             and self.published_conditions == other.published_conditions
-            and self.published_measurement_id == other.published_measurement_id
+            and self.id == other.id
             and self.test_result_id == other.test_result_id
             and self.step_id == other.step_id
             and self.software_item_ids == other.software_item_ids

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/data/_types/_step.py

@@ -22,7 +22,7 @@ class Step:
     """Information about a step into which measurements and conditions are published."""
 
     __slots__ = (
-        "step_id",
+        "id",
         "parent_step_id",
         "test_result_id",
         "test_id",
@@ -54,7 +54,7 @@ class Step:
     def __init__(
         self,
         *,
-        step_id: str = "",
+        id: str = "",
         parent_step_id: str = "",
         test_result_id: str = "",
         test_id: str = "",
@@ -66,7 +66,7 @@ class Step:
         schema_id: str = "",
     ) -> None:
         """Initialize a Step instance."""
-        self.step_id = step_id
+        self.id = id
         self.parent_step_id = parent_step_id
         self.test_result_id = test_result_id
         self.test_id = test_id
@@ -86,7 +86,7 @@ class Step:
     def from_protobuf(step_proto: StepProto) -> "Step":
         """Create a Step instance from a protobuf Step message."""
         step = Step(
-            step_id=step_proto.step_id,
+            id=step_proto.id,
             parent_step_id=step_proto.parent_step_id,
             test_result_id=step_proto.test_result_id,
             test_id=step_proto.test_id,
@@ -112,7 +112,7 @@ class Step:
     def to_protobuf(self) -> StepProto:
         """Convert this Step to a protobuf Step message."""
         step_proto = StepProto(
-            step_id=self.step_id,
+            id=self.id,
             parent_step_id=self.parent_step_id,
             test_result_id=self.test_result_id,
             test_id=self.test_id,
@@ -138,7 +138,7 @@ class Step:
         if not isinstance(other, Step):
             return NotImplemented
         return (
-            self.step_id == other.step_id
+            self.id == other.id
             and self.parent_step_id == other.parent_step_id
             and self.test_result_id == other.test_result_id
             and self.test_id == other.test_id

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/data/_types/_test_result.py

@@ -23,7 +23,7 @@ class TestResult:
     """Information about a test result."""
 
     __slots__ = (
-        "test_result_id",
+        "id",
         "uut_instance_id",
         "operator_id",
         "test_station_id",
@@ -78,7 +78,7 @@ class TestResult:
     def __init__(
         self,
         *,
-        test_result_id: str = "",
+        id: str = "",
         uut_instance_id: str = "",
         operator_id: str = "",
         test_station_id: str = "",
@@ -92,7 +92,7 @@ class TestResult:
         schema_id: str = "",
     ) -> None:
         """Initialize a TestResult instance."""
-        self.test_result_id = test_result_id
+        self.id = id
         self.uut_instance_id = uut_instance_id
         self.operator_id = operator_id
         self.test_station_id = test_station_id
@@ -121,7 +121,7 @@ class TestResult:
     def from_protobuf(test_result_proto: TestResultProto) -> "TestResult":
         """Create a TestResult instance from a protobuf TestResult message."""
         test_result = TestResult(
-            test_result_id=test_result_proto.test_result_id,
+            id=test_result_proto.id,
             uut_instance_id=test_result_proto.uut_instance_id,
             operator_id=test_result_proto.operator_id,
             test_station_id=test_result_proto.test_station_id,
@@ -152,7 +152,7 @@ class TestResult:
     def to_protobuf(self) -> TestResultProto:
         """Convert this TestResult to a protobuf TestResult message."""
         test_result_proto = TestResultProto(
-            test_result_id=self.test_result_id,
+            id=self.id,
             uut_instance_id=self.uut_instance_id,
             operator_id=self.operator_id,
             test_station_id=self.test_station_id,
@@ -181,7 +181,7 @@ class TestResult:
         if not isinstance(other, TestResult):
             return NotImplemented
         return (
-            self.test_result_id == other.test_result_id
+            self.id == other.id
             and self.uut_instance_id == other.uut_instance_id
             and self.operator_id == other.operator_id
             and self.test_station_id == other.test_station_id

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/metadata/_types/_hardware_item.py

@@ -17,6 +17,7 @@ class HardwareItem:
     """Information about a hardware item."""
 
     __slots__ = (
+        "_id",
         "manufacturer",
         "model",
         "serial_number",
@@ -33,6 +34,11 @@ class HardwareItem:
         """The extensions of the hardware item."""
         return self._extensions
 
+    @property
+    def id(self) -> str:
+        """The string id of the hardware item."""
+        return self._id
+
     def __init__(
         self,
         *,
@@ -47,6 +53,7 @@ class HardwareItem:
         schema_id: str = "",
     ) -> None:
         """Initialize a HardwareItem instance."""
+        self._id = ""
         self.manufacturer = manufacturer
         self.model = model
         self.serial_number = serial_number
@@ -75,11 +82,13 @@ class HardwareItem:
         populate_from_extension_value_message_map(
             hardware_item.extensions, hardware_item_proto.extensions
         )
+        hardware_item._id = hardware_item_proto.id
         return hardware_item
 
     def to_protobuf(self) -> HardwareItemProto:
         """Convert this HardwareItem to a protobuf HardwareItem message."""
         hardware_item_proto = HardwareItemProto(
+            id=self.id,
             manufacturer=self.manufacturer,
             model=self.model,
             serial_number=self.serial_number,
@@ -97,7 +106,8 @@ class HardwareItem:
         if not isinstance(other, HardwareItem):
             return NotImplemented
         return (
-            self.manufacturer == other.manufacturer
+            self.id == other.id
+            and self.manufacturer == other.manufacturer
             and self.model == other.model
             and self.serial_number == other.serial_number
             and self.part_number == other.part_number

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/metadata/_types/_operator.py

@@ -17,6 +17,7 @@ class Operator:
     """Information about an operator."""
 
     __slots__ = (
+        "_id",
         "operator_name",
         "role",
         "link",
@@ -29,6 +30,11 @@ class Operator:
         """The extensions of the operator."""
         return self._extensions
 
+    @property
+    def id(self) -> str:
+        """The string id of the operator."""
+        return self._id
+
     def __init__(
         self,
         *,
@@ -39,6 +45,7 @@ class Operator:
         schema_id: str = "",
     ) -> None:
         """Initialize an Operator instance."""
+        self._id = ""
         self.operator_name = operator_name
         self.role = role
         self.link = link
@@ -57,11 +64,13 @@ class Operator:
             schema_id=operator_proto.schema_id,
         )
         populate_from_extension_value_message_map(operator.extensions, operator_proto.extensions)
+        operator._id = operator_proto.id
         return operator
 
     def to_protobuf(self) -> OperatorProto:
         """Convert this Operator to a protobuf Operator message."""
         operator_proto = OperatorProto(
+            id=self.id,
             operator_name=self.operator_name,
             role=self.role,
             link=self.link,
@@ -75,7 +84,8 @@ class Operator:
         if not isinstance(other, Operator):
             return NotImplemented
         return (
-            self.operator_name == other.operator_name
+            self.id == other.id
+            and self.operator_name == other.operator_name
             and self.role == other.role
             and self.link == other.link
             and self.extensions == other.extensions

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/metadata/_types/_software_item.py

@@ -17,6 +17,7 @@ class SoftwareItem:
     """Information about a software item."""
 
     __slots__ = (
+        "_id",
         "product",
         "version",
         "link",
@@ -29,6 +30,11 @@ class SoftwareItem:
         """The extensions of the software item."""
         return self._extensions
 
+    @property
+    def id(self) -> str:
+        """The string id of the software item."""
+        return self._id
+
     def __init__(
         self,
         *,
@@ -39,6 +45,7 @@ class SoftwareItem:
         schema_id: str = "",
     ) -> None:
         """Initialize a SoftwareItem instance."""
+        self._id = ""
         self.product = product
         self.version = version
         self.link = link
@@ -59,11 +66,13 @@ class SoftwareItem:
         populate_from_extension_value_message_map(
             software_item.extensions, software_item_proto.extensions
         )
+        software_item._id = software_item_proto.id
         return software_item
 
     def to_protobuf(self) -> SoftwareItemProto:
         """Convert this SoftwareItem to a protobuf SoftwareItem message."""
         software_item_proto = SoftwareItemProto(
+            id=self.id,
             product=self.product,
             version=self.version,
             link=self.link,
@@ -77,7 +86,8 @@ class SoftwareItem:
         if not isinstance(other, SoftwareItem):
             return NotImplemented
         return (
-            self.product == other.product
+            self.id == other.id
+            and self.product == other.product
             and self.version == other.version
             and self.link == other.link
             and self.extensions == other.extensions

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/metadata/_types/_test.py

@@ -17,6 +17,7 @@ class Test:
     """Information about a test."""
 
     __slots__ = (
+        "_id",
         "test_name",
         "description",
         "link",
@@ -29,6 +30,11 @@ class Test:
         """The extensions of the test."""
         return self._extensions
 
+    @property
+    def id(self) -> str:
+        """The string id of the test."""
+        return self._id
+
     def __init__(
         self,
         *,
@@ -39,6 +45,7 @@ class Test:
         schema_id: str = "",
     ) -> None:
         """Initialize a Test instance."""
+        self._id = ""
         self.test_name = test_name
         self.description = description
         self.link = link
@@ -57,11 +64,13 @@ class Test:
             schema_id=test_proto.schema_id,
         )
         populate_from_extension_value_message_map(test.extensions, test_proto.extensions)
+        test._id = test_proto.id
         return test
 
     def to_protobuf(self) -> TestProto:
         """Convert this Test to a protobuf Test message."""
         test_proto = TestProto(
+            id=self.id,
             test_name=self.test_name,
             description=self.description,
             link=self.link,
@@ -75,7 +84,8 @@ class Test:
         if not isinstance(other, Test):
             return NotImplemented
         return (
-            self.test_name == other.test_name
+            self.id == other.id
+            and self.test_name == other.test_name
             and self.description == other.description
             and self.link == other.link
             and self.extensions == other.extensions

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/metadata/_types/_test_adapter.py

@@ -17,7 +17,8 @@ class TestAdapter:
     """Information about a test adapter."""
 
     __slots__ = (
-        "test_adapter_name",
+        "_id",
+        "name",
         "manufacturer",
         "model",
         "serial_number",
@@ -34,10 +35,15 @@ class TestAdapter:
         """The extensions of the test adapter."""
         return self._extensions
 
+    @property
+    def id(self) -> str:
+        """The string id of the test adapter."""
+        return self._id
+
     def __init__(
         self,
         *,
-        test_adapter_name: str = "",
+        name: str = "",
         manufacturer: str = "",
         model: str = "",
         serial_number: str = "",
@@ -49,7 +55,8 @@ class TestAdapter:
         schema_id: str = "",
     ) -> None:
         """Initialize a TestAdapter instance."""
-        self.test_adapter_name = test_adapter_name
+        self._id = ""
+        self.name = name
         self.manufacturer = manufacturer
         self.model = model
         self.serial_number = serial_number
@@ -66,7 +73,7 @@ class TestAdapter:
     def from_protobuf(test_adapter_proto: TestAdapterProto) -> "TestAdapter":
         """Create a TestAdapter instance from a protobuf TestAdapter message."""
         test_adapter = TestAdapter(
-            test_adapter_name=test_adapter_proto.test_adapter_name,
+            name=test_adapter_proto.name,
             manufacturer=test_adapter_proto.manufacturer,
             model=test_adapter_proto.model,
             serial_number=test_adapter_proto.serial_number,
@@ -79,12 +86,14 @@ class TestAdapter:
         populate_from_extension_value_message_map(
             test_adapter.extensions, test_adapter_proto.extensions
         )
+        test_adapter._id = test_adapter_proto.id
         return test_adapter
 
     def to_protobuf(self) -> TestAdapterProto:
         """Convert this TestAdapter to a protobuf TestAdapter message."""
         test_adapter_proto = TestAdapterProto(
-            test_adapter_name=self.test_adapter_name,
+            id=self.id,
+            name=self.name,
             manufacturer=self.manufacturer,
             model=self.model,
             serial_number=self.serial_number,
@@ -102,7 +111,8 @@ class TestAdapter:
         if not isinstance(other, TestAdapter):
             return NotImplemented
         return (
-            self.test_adapter_name == other.test_adapter_name
+            self.id == other.id
+            and self.name == other.name
             and self.manufacturer == other.manufacturer
             and self.model == other.model
             and self.serial_number == other.serial_number

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/metadata/_types/_test_description.py

@@ -17,6 +17,7 @@ class TestDescription:
     """Information about a test description."""
 
     __slots__ = (
+        "_id",
         "uut_id",
         "test_description_name",
         "link",
@@ -29,6 +30,11 @@ class TestDescription:
         """The extensions of the test description."""
         return self._extensions
 
+    @property
+    def id(self) -> str:
+        """The string id of the test description."""
+        return self._id
+
     def __init__(
         self,
         *,
@@ -39,6 +45,7 @@ class TestDescription:
         schema_id: str = "",
     ) -> None:
         """Initialize a TestDescription instance."""
+        self._id = ""
         self.uut_id = uut_id
         self.test_description_name = test_description_name
         self.link = link
@@ -59,11 +66,13 @@ class TestDescription:
         populate_from_extension_value_message_map(
             test_description.extensions, test_description_proto.extensions
         )
+        test_description._id = test_description_proto.id
         return test_description
 
     def to_protobuf(self) -> TestDescriptionProto:
         """Convert this TestDescription to a protobuf TestDescription message."""
         test_description_proto = TestDescriptionProto(
+            id=self.id,
             uut_id=self.uut_id,
             test_description_name=self.test_description_name,
             link=self.link,
@@ -77,7 +86,8 @@ class TestDescription:
         if not isinstance(other, TestDescription):
             return NotImplemented
         return (
-            self.uut_id == other.uut_id
+            self.id == other.id
+            and self.uut_id == other.uut_id
             and self.test_description_name == other.test_description_name
             and self.link == other.link
             and self.extensions == other.extensions

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/metadata/_types/_test_station.py

@@ -17,6 +17,7 @@ class TestStation:
     """Information about a test station."""
 
     __slots__ = (
+        "_id",
         "test_station_name",
         "asset_identifier",
         "link",
@@ -29,6 +30,11 @@ class TestStation:
         """The extensions of the test station."""
         return self._extensions
 
+    @property
+    def id(self) -> str:
+        """The string id of the test station."""
+        return self._id
+
     def __init__(
         self,
         *,
@@ -39,6 +45,7 @@ class TestStation:
         schema_id: str = "",
     ) -> None:
         """Initialize a TestStation instance."""
+        self._id = ""
         self.test_station_name = test_station_name
         self.asset_identifier = asset_identifier
         self.link = link
@@ -59,11 +66,13 @@ class TestStation:
         populate_from_extension_value_message_map(
             test_station.extensions, test_station_proto.extensions
         )
+        test_station._id = test_station_proto.id
         return test_station
 
     def to_protobuf(self) -> TestStationProto:
         """Convert this TestStation to a protobuf TestStation message."""
         test_station_proto = TestStationProto(
+            id=self.id,
             test_station_name=self.test_station_name,
             asset_identifier=self.asset_identifier,
             link=self.link,
@@ -77,7 +86,8 @@ class TestStation:
         if not isinstance(other, TestStation):
             return NotImplemented
         return (
-            self.test_station_name == other.test_station_name
+            self.id == other.id
+            and self.test_station_name == other.test_station_name
             and self.asset_identifier == other.asset_identifier
             and self.link == other.link
             and self.extensions == other.extensions

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/metadata/_types/_uut.py

@@ -17,6 +17,7 @@ class Uut:
     """Information about a Unit Under Test (UUT)."""
 
     __slots__ = (
+        "_id",
         "model_name",
         "family",
         "_manufacturers",
@@ -36,6 +37,11 @@ class Uut:
         """The extensions of the UUT."""
         return self._extensions
 
+    @property
+    def id(self) -> str:
+        """The string id of the uut."""
+        return self._id
+
     def __init__(
         self,
         *,
@@ -48,6 +54,7 @@ class Uut:
         schema_id: str = "",
     ) -> None:
         """Initialize a Uut instance."""
+        self._id = ""
         self.model_name = model_name
         self.family = family
         self._manufacturers: MutableSequence[str] = (
@@ -72,11 +79,13 @@ class Uut:
             schema_id=uut_proto.schema_id,
         )
         populate_from_extension_value_message_map(uut.extensions, uut_proto.extensions)
+        uut._id = uut_proto.id
         return uut
 
     def to_protobuf(self) -> UutProto:
         """Convert this Uut to a protobuf Uut message."""
         uut_proto = UutProto(
+            id=self.id,
             model_name=self.model_name,
             family=self.family,
             manufacturers=self.manufacturers,
@@ -92,7 +101,8 @@ class Uut:
         if not isinstance(other, Uut):
             return NotImplemented
         return (
-            self.model_name == other.model_name
+            self.id == other.id
+            and self.model_name == other.model_name
             and self.family == other.family
             and self.manufacturers == other.manufacturers
             and self.part_number == other.part_number

{ni_datastore-0.1.0.dev3 → ni_datastore-0.1.0.dev4}/src/ni/datastore/metadata/_types/_uut_instance.py

@@ -17,6 +17,7 @@ class UutInstance:
     """Information about a Unit Under Test (UUT) instance."""
 
     __slots__ = (
+        "_id",
         "uut_id",
         "serial_number",
         "manufacture_date",
@@ -32,6 +33,11 @@ class UutInstance:
         """The extensions of the UUT instance."""
         return self._extensions
 
+    @property
+    def id(self) -> str:
+        """The string id of the uut instance."""
+        return self._id
+
     def __init__(
         self,
         *,
@@ -45,6 +51,7 @@ class UutInstance:
         schema_id: str = "",
     ) -> None:
         """Initialize a UutInstance instance."""
+        self._id = ""
         self.uut_id = uut_id
         self.serial_number = serial_number
         self.manufacture_date = manufacture_date
@@ -71,11 +78,13 @@ class UutInstance:
         populate_from_extension_value_message_map(
             uut_instance.extensions, uut_instance_proto.extensions
         )
+        uut_instance._id = uut_instance_proto.id
         return uut_instance
 
     def to_protobuf(self) -> UutInstanceProto:
         """Convert this UutInstance to a protobuf UutInstance message."""
         uut_instance_proto = UutInstanceProto(
+            id=self.id,
             uut_id=self.uut_id,
             serial_number=self.serial_number,
             manufacture_date=self.manufacture_date,
@@ -92,7 +101,8 @@ class UutInstance:
         if not isinstance(other, UutInstance):
             return NotImplemented
         return (
-            self.uut_id == other.uut_id
+            self.id == other.id
+            and self.uut_id == other.uut_id
             and self.serial_number == other.serial_number
             and self.manufacture_date == other.manufacture_date
             and self.firmware_version == other.firmware_version