ni.datastore 2.0.0.dev0__tar.gz → 2.0.0.dev1__tar.gz

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ni.datastore
-Version: 2.0.0.dev0
+Version: 2.0.0.dev1
 Summary: APIs for publishing and retrieving data from NI Measurement Data Services
 License: MIT
 Keywords: datastore
@@ -24,9 +24,9 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Dist: hightime (>=1.0.0)
-Requires-Dist: ni-measurements-data-v1-client (>=1.1.0dev0)
+Requires-Dist: ni-measurements-data-v1-client (>=1.1.0)
 Requires-Dist: ni-measurements-metadata-v1-client (>=1.0.0)
-Requires-Dist: ni-protobuf-types (>=1.1.0)
+Requires-Dist: ni-protobuf-types (>=1.2.0)
 Requires-Dist: protobuf (>=4.21)
 Project-URL: Documentation, https://datastorepython.readthedocs.io/en/latest/
 Project-URL: Repository, https://github.com/ni/datastore-python
@@ -65,7 +65,7 @@ NI created and supports this package.
 ## Installation
 
 As a prerequisite to using the `ni.datastore` module, you must install Measurement Data Services
-Software 2026 Q1 or later on your system. You can download and install this software using
+Software 2026 Q3 or later on your system. You can download and install this software using
 [NI Package Manager](https://www.ni.com/en/support/downloads/software-products/download.package-manager.html).
 
 You can directly install the `ni.datastore` package using `pip` or by listing it as a

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/README.md

@@ -31,7 +31,7 @@ NI created and supports this package.
 ## Installation
 
 As a prerequisite to using the `ni.datastore` module, you must install Measurement Data Services
-Software 2026 Q1 or later on your system. You can download and install this software using
+Software 2026 Q3 or later on your system. You can download and install this software using
 [NI Package Manager](https://www.ni.com/en/support/downloads/software-products/download.package-manager.html).
 
 You can directly install the `ni.datastore` package using `pip` or by listing it as a

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ni.datastore"
-version = "2.0.0.dev0"
+version = "2.0.0.dev1"
 license = "MIT"
 description = "APIs for publishing and retrieving data from NI Measurement Data Services"
 authors = [{name = "NI", email = "opensource@ni.com"}]
@@ -40,9 +40,9 @@ requires-poetry = '>=2.1,<3.0'
 [tool.poetry.dependencies]
 python = "^3.10"
 protobuf = {version=">=4.21"}
-ni-measurements-data-v1-client = { version = ">=1.1.0dev0", allow-prereleases = true }
+ni-measurements-data-v1-client = { version = ">=1.1.0", allow-prereleases = true }
 ni-measurements-metadata-v1-client = { version = ">=1.0.0" }
-ni-protobuf-types = { version = ">=1.1.0" }
+ni-protobuf-types = { version = ">=1.2.0", allow-prereleases = true }
 hightime = { version = ">=1.0.0" }
 
 [tool.poetry.group.dev.dependencies]
@@ -113,3 +113,7 @@ exclude = ["**/*_pb2_grpc.py", "**/*_pb2_grpc.pyi", "**/*_pb2.py", "**/*_pb2.pyi
 [tool.pytest.ini_options]
 addopts = "--doctest-modules --doctest-plus --strict-markers"
 testpaths = ["tests"]
+norecursedirs = [".venv"]
+filterwarnings = [
+  "ignore:cannot collect test class.*because it has a __init__ constructor:pytest.PytestCollectionWarning",
+]

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/data/_data_store_client.py

@@ -7,25 +7,10 @@ import sys
 from collections.abc import Iterable, Sequence
 from threading import Lock
 from types import TracebackType
-from typing import TYPE_CHECKING, Type, TypeVar, overload
+from typing import overload, Type, TYPE_CHECKING, TypeVar
 
 import hightime as ht
 from grpc import Channel
-from ni.datastore.data._grpc_conversion import (
-    convert_read_condition_response_from_protobuf,
-    convert_read_measurement_response_from_protobuf,
-    get_publish_measurement_timestamp,
-    populate_publish_condition_batch_request_values,
-    populate_publish_condition_request_value,
-    populate_publish_measurement_batch_request_values,
-    populate_publish_measurement_request_value,
-)
-from ni.datastore.data._types._error_information import ErrorInformation
-from ni.datastore.data._types._outcome import Outcome
-from ni.datastore.data._types._published_condition import PublishedCondition
-from ni.datastore.data._types._published_measurement import PublishedMeasurement
-from ni.datastore.data._types._step import Step
-from ni.datastore.data._types._test_result import TestResult
 from ni.measurementlink.discovery.v1.client import DiscoveryClient
 from ni.measurements.data.v1.client import DataStoreClient as DataStoreServiceClient
 from ni.measurements.data.v1.data_store_service_pb2 import (
@@ -51,6 +36,22 @@ from ni.protobuf.types.precision_timestamp_conversion import (
 )
 from ni_grpc_extensions.channelpool import GrpcChannelPool
 
+from ni.datastore.data._grpc_conversion import (
+    convert_measurement_timestamp_to_protobuf,
+    convert_read_condition_response_from_protobuf,
+    convert_read_measurement_response_from_protobuf,
+    populate_publish_condition_batch_request_values,
+    populate_publish_condition_request_value,
+    populate_publish_measurement_batch_request_values,
+    populate_publish_measurement_request_value,
+)
+from ni.datastore.data._types._error_information import ErrorInformation
+from ni.datastore.data._types._outcome import Outcome
+from ni.datastore.data._types._published_condition import PublishedCondition
+from ni.datastore.data._types._published_measurement import PublishedMeasurement
+from ni.datastore.data._types._step import Step
+from ni.datastore.data._types._test_result import TestResult
+
 if TYPE_CHECKING:
     if sys.version_info >= (3, 11):
         from typing import Self
@@ -237,8 +238,8 @@ class DataStoreClient:
             step_id: The ID of the step associated with this measurement. This
                 value is expected to be a parsable GUID.
 
-            timestamp: The timestamp of the measurement. If None, the current
-                time will be used.
+            timestamp: The timestamp of the measurement. If None, no timestamp
+                will be specified.
 
             outcome: The outcome of the measurement (PASSED, FAILED,
                 INDETERMINATE, or UNSPECIFIED).
@@ -274,11 +275,9 @@ class DataStoreClient:
             test_adapter_ids=test_adapter_ids,
             software_item_ids=software_item_ids,
             notes=notes,
+            timestamp=convert_measurement_timestamp_to_protobuf(timestamp),
         )
         populate_publish_measurement_request_value(publish_request, value)
-        publish_request.timestamp.CopyFrom(
-            get_publish_measurement_timestamp(publish_request, timestamp)
-        )
         publish_response = self._get_data_store_client().publish_measurement(publish_request)
         return publish_response.measurement_id
 
@@ -295,7 +294,7 @@ class DataStoreClient:
         software_item_ids: Iterable[str] = tuple(),
         notes: str = "",
     ) -> Sequence[str]:
-        """Publish multiple scalar measurements at once for parametric sweeps.
+        """Publish multiple measurements at once for parametric sweeps.
 
         Args:
             name: The name used for associating/grouping
@@ -303,7 +302,7 @@ class DataStoreClient:
                 iterations. For example, "Temperature" can be used for
                 associating temperature readings across multiple iterations.
 
-            values: The values of the (scalar) measurement being published
+            values: The values of the measurement being published
                 across N iterations.
 
             step_id: The ID of the step associated with this measurement. This
@@ -339,10 +338,9 @@ class DataStoreClient:
             notes: Any notes to be associated with the published measurements.
 
         Returns:
-            Sequence[str]: The ids of the published measurement ids.
-                NOTE: Using a Sequence is for future flexibility.
-                This sequence will currently always have a single measurement id
-                returned.
+            Sequence[str]: The IDs of the corresponding PublishedMeasurements. A single
+            ID will be returned when publishing scalar measurement values.
+            N IDs will be returned when publishing (N) non-scalar measurement values.
         """
         publish_request = PublishMeasurementBatchRequest(
             name=name,

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/data/_grpc_conversion.py

@@ -2,9 +2,9 @@
 
 from __future__ import annotations
 
-import datetime as std_datetime
 import logging
-from typing import Iterable, cast
+from itertools import chain
+from typing import Any, Callable, cast, Iterable
 
 import hightime as ht
 import numpy as np
@@ -49,6 +49,129 @@ from nitypes.xy_data import XYData
 _logger = logging.getLogger(__name__)
 
 
+def _copy_batch_values(
+    repeated_field: Any,
+    batch_values: Iterable[object],
+    is_supported: Callable[[object], bool],
+    convert_value: Callable[[Any], Any],
+    error_message: str,
+) -> None:
+    for value in batch_values:
+        if not is_supported(value):
+            raise TypeError(error_message)
+        repeated_field.add().CopyFrom(convert_value(value))
+
+
+def _populate_vector_batch_values(
+    publish_request: PublishMeasurementBatchRequest, values: Iterable[object]
+) -> None:
+    _copy_batch_values(
+        publish_request.vector_values.vectors,
+        values,
+        lambda value: isinstance(value, Vector),
+        vector_to_protobuf,
+        "Unsupported iterable: all values must be Vector.",
+    )
+
+
+def _populate_analog_waveform_batch_values(
+    publish_request: PublishMeasurementBatchRequest,
+    first_value: AnalogWaveform[Any],
+    values: Iterable[object],
+) -> None:
+    if first_value.dtype == np.float64:
+        _copy_batch_values(
+            publish_request.double_analog_waveform_values.waveforms,
+            values,
+            lambda value: isinstance(value, AnalogWaveform) and value.dtype == np.float64,
+            float64_analog_waveform_to_protobuf,
+            "Unsupported iterable: all values must be float64 AnalogWaveform.",
+        )
+        return
+    elif first_value.dtype == np.int16:
+        _copy_batch_values(
+            publish_request.i16_analog_waveform_values.waveforms,
+            values,
+            lambda value: isinstance(value, AnalogWaveform) and value.dtype == np.int16,
+            int16_analog_waveform_to_protobuf,
+            "Unsupported iterable: all values must be int16 AnalogWaveform.",
+        )
+        return
+    raise TypeError(f"Unsupported AnalogWaveform dtype: {first_value.dtype}")
+
+
+def _populate_complex_waveform_batch_values(
+    publish_request: PublishMeasurementBatchRequest,
+    first_value: ComplexWaveform[Any],
+    values: Iterable[object],
+) -> None:
+    if first_value.dtype == np.complex128:
+        _copy_batch_values(
+            publish_request.double_complex_waveform_values.waveforms,
+            values,
+            lambda value: isinstance(value, ComplexWaveform) and value.dtype == np.complex128,
+            float64_complex_waveform_to_protobuf,
+            "Unsupported iterable: all values must be complex128 ComplexWaveform.",
+        )
+        return
+    if first_value.dtype == ComplexInt32DType:
+        _copy_batch_values(
+            publish_request.i16_complex_waveform_values.waveforms,
+            values,
+            lambda value: isinstance(value, ComplexWaveform) and value.dtype == ComplexInt32DType,
+            int16_complex_waveform_to_protobuf,
+            "Unsupported iterable: all values must be ComplexWaveform with ComplexInt32DType.",
+        )
+        return
+    raise TypeError(f"Unsupported ComplexWaveform dtype: {first_value.dtype}")
+
+
+def _populate_spectrum_batch_values(
+    publish_request: PublishMeasurementBatchRequest,
+    first_value: Spectrum[Any],
+    values: Iterable[object],
+) -> None:
+    if first_value.dtype != np.float64:
+        raise TypeError(f"Unsupported Spectrum dtype: {first_value.dtype}")
+
+    _copy_batch_values(
+        publish_request.double_spectrum_values.waveforms,
+        values,
+        lambda value: isinstance(value, Spectrum) and value.dtype == np.float64,
+        float64_spectrum_to_protobuf,
+        "Unsupported iterable: all values must be float64 Spectrum.",
+    )
+
+
+def _populate_digital_waveform_batch_values(
+    publish_request: PublishMeasurementBatchRequest, values: Iterable[object]
+) -> None:
+    _copy_batch_values(
+        publish_request.digital_waveform_values.waveforms,
+        values,
+        lambda value: isinstance(value, DigitalWaveform),
+        digital_waveform_to_protobuf,
+        "Unsupported iterable: all values must be DigitalWaveform.",
+    )
+
+
+def _populate_xydata_batch_values(
+    publish_request: PublishMeasurementBatchRequest,
+    first_value: XYData[Any],
+    values: Iterable[object],
+) -> None:
+    if first_value.dtype != np.float64:
+        raise TypeError(f"Unsupported XYData dtype: {first_value.dtype}")
+
+    _copy_batch_values(
+        publish_request.x_y_data_values.x_y_data,
+        values,
+        lambda value: isinstance(value, XYData) and value.dtype == np.float64,
+        float64_xydata_to_protobuf,
+        "Unsupported iterable: all values must be float64 XYData.",
+    )
+
+
 def populate_publish_condition_request_value(
     publish_request: PublishConditionRequest, value: object
 ) -> None:
@@ -76,10 +199,15 @@ def populate_publish_condition_batch_request_values(
     if isinstance(values, Vector):
         publish_request.scalar_values.CopyFrom(vector_to_protobuf(values))
     elif isinstance(values, Iterable):
-        if not values:
-            raise ValueError("Cannot publish an empty Iterable.")
+        values_iterator = iter(values)
+        try:
+            first_value = next(values_iterator)
+        except StopIteration as exc:
+            raise ValueError("Cannot publish an empty Iterable.") from exc
+
+        all_values = chain([first_value], values_iterator)
         try:
-            vector = Vector(values)
+            vector = Vector(cast(Iterable[bool | int | float | str], all_values))
         except (TypeError, ValueError):
             raise TypeError(
                 f"Unsupported iterable: {values}. Subtype must be bool, float, int, or string."
@@ -139,10 +267,15 @@ def populate_publish_measurement_request_value(
         else:
             raise TypeError(f"Unsupported XYData dtype: {value.dtype}")
     elif isinstance(value, Iterable):
-        if not value:
-            raise ValueError("Cannot publish an empty Iterable.")
+        value_iterator = iter(value)
         try:
-            vector = Vector(value)
+            first_item = next(value_iterator)
+        except StopIteration as exc:
+            raise ValueError("Cannot publish an empty Iterable.") from exc
+
+        all_items = chain([first_item], value_iterator)
+        try:
+            vector = Vector(cast(Iterable[bool | int | float | str], all_items))
         except (TypeError, ValueError):
             raise TypeError(
                 f"Unsupported iterable: {value}. Subtype must be bool, float, int, or string."
@@ -162,16 +295,34 @@ def populate_publish_measurement_batch_request_values(
     if isinstance(values, Vector):
         publish_request.scalar_values.CopyFrom(vector_to_protobuf(values))
     elif isinstance(values, Iterable):
-        if not values:
-            raise ValueError("Cannot publish an empty Iterable.")
+        values_iterator = iter(values)
         try:
-            vector = Vector(values)
-        except (TypeError, ValueError):
-            raise TypeError(
-                f"Unsupported iterable: {values}. Subtype must be bool, float, int, or string."
-            )
+            first_value = next(values_iterator)
+        except StopIteration as exc:
+            raise ValueError("Cannot publish an empty Iterable.") from exc
 
-        publish_request.scalar_values.CopyFrom(vector_to_protobuf(vector))
+        all_values = chain([first_value], values_iterator)
+        if isinstance(first_value, Vector):
+            _populate_vector_batch_values(publish_request, all_values)
+        elif isinstance(first_value, AnalogWaveform):
+            _populate_analog_waveform_batch_values(publish_request, first_value, all_values)
+        elif isinstance(first_value, ComplexWaveform):
+            _populate_complex_waveform_batch_values(publish_request, first_value, all_values)
+        elif isinstance(first_value, Spectrum):
+            _populate_spectrum_batch_values(publish_request, first_value, all_values)
+        elif isinstance(first_value, DigitalWaveform):
+            _populate_digital_waveform_batch_values(publish_request, all_values)
+        elif isinstance(first_value, XYData):
+            _populate_xydata_batch_values(publish_request, first_value, all_values)
+        else:
+            try:
+                vector = Vector(cast(Iterable[bool | int | float | str], all_values))
+            except (TypeError, ValueError):
+                raise TypeError(
+                    f"Unsupported iterable. Subtype must be bool, float, int, string, Vector, "
+                    "AnalogWaveform, ComplexWaveform, Spectrum, DigitalWaveform, or XYData."
+                )
+            publish_request.scalar_values.CopyFrom(vector_to_protobuf(vector))
     else:
         raise TypeError(
             f"Unsupported measurement values type: {type(values)}. Please consult the documentation."
@@ -212,37 +363,11 @@ def convert_read_condition_response_from_protobuf(response: ReadConditionValueRe
         raise TypeError(f"Invalid read type: {read_data_type}")
 
 
-def get_publish_measurement_timestamp(
-    publish_request: PublishMeasurementRequest, client_provided_timestamp: ht.datetime | None
-) -> PrecisionTimestamp:
-    """Determine the correct timestamp to use for publishing a measurement."""
-    no_client_timestamp_provided = client_provided_timestamp is None
-    if no_client_timestamp_provided:
-        publish_time = hightime_datetime_to_protobuf(ht.datetime.now(std_datetime.timezone.utc))
+def convert_measurement_timestamp_to_protobuf(
+    client_provided_timestamp: ht.datetime | None,
+) -> PrecisionTimestamp | None:
+    """Convert the provided timestamp to PrecisionTimestamp if it's not None."""
+    if client_provided_timestamp is not None:
+        return hightime_datetime_to_protobuf(client_provided_timestamp)
     else:
-        publish_time = hightime_datetime_to_protobuf(cast(ht.datetime, client_provided_timestamp))
-
-    waveform_t0: PrecisionTimestamp | None = None
-    value_case = publish_request.WhichOneof("value")
-    if value_case == "double_analog_waveform":
-        waveform_t0 = publish_request.double_analog_waveform.t0
-    elif value_case == "i16_analog_waveform":
-        waveform_t0 = publish_request.i16_analog_waveform.t0
-    elif value_case == "double_complex_waveform":
-        waveform_t0 = publish_request.double_complex_waveform.t0
-    elif value_case == "i16_complex_waveform":
-        waveform_t0 = publish_request.i16_complex_waveform.t0
-    elif value_case == "digital_waveform":
-        waveform_t0 = publish_request.digital_waveform.t0
-
-    # If an initialized waveform t0 value is present
-    if waveform_t0 is not None and waveform_t0 != PrecisionTimestamp():
-        if no_client_timestamp_provided:
-            # If the client did not provide a timestamp, use the waveform t0 value
-            publish_time = waveform_t0
-        elif publish_time != waveform_t0:
-            raise ValueError(
-                "The provided timestamp does not match the waveform t0. Please provide a matching timestamp or "
-                "omit the timestamp to use the waveform t0."
-            )
-    return publish_time
+        return None

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/data/_types/_published_measurement.py

@@ -5,15 +5,18 @@ from __future__ import annotations
 from typing import Iterable, MutableSequence
 
 import hightime as ht
-from ni.datastore.data._types._error_information import ErrorInformation
-from ni.datastore.data._types._outcome import Outcome
-from ni.datastore.data._types._published_condition import PublishedCondition
-from ni.measurements.data.v1.data_store_pb2 import PublishedMeasurement as PublishedMeasurementProto
+from ni.measurements.data.v1.data_store_pb2 import (
+    PublishedMeasurement as PublishedMeasurementProto,
+)
 from ni.protobuf.types.precision_timestamp_conversion import (
     hightime_datetime_from_protobuf,
     hightime_datetime_to_protobuf,
 )
 
+from ni.datastore.data._types._error_information import ErrorInformation
+from ni.datastore.data._types._outcome import Outcome
+from ni.datastore.data._types._published_condition import PublishedCondition
+
 
 class PublishedMeasurement:
     """Represents a measurement that has been published to the data store.

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/data/_types/_step.py

@@ -5,17 +5,18 @@ from __future__ import annotations
 from typing import Mapping, MutableMapping
 
 import hightime as ht
+from ni.measurements.data.v1.data_store_pb2 import Step as StepProto
+from ni.protobuf.types.precision_timestamp_conversion import (
+    hightime_datetime_from_protobuf,
+    hightime_datetime_to_protobuf,
+)
+
 from ni.datastore.data._types._error_information import ErrorInformation
 from ni.datastore.data._types._outcome import Outcome
 from ni.datastore.metadata._grpc_conversion import (
     populate_extension_value_message_map,
     populate_from_extension_value_message_map,
 )
-from ni.measurements.data.v1.data_store_pb2 import Step as StepProto
-from ni.protobuf.types.precision_timestamp_conversion import (
-    hightime_datetime_from_protobuf,
-    hightime_datetime_to_protobuf,
-)
 
 
 class Step:

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/data/_types/_test_result.py

@@ -5,17 +5,18 @@ from __future__ import annotations
 from typing import Iterable, Mapping, MutableMapping, MutableSequence
 
 import hightime as ht
+from ni.measurements.data.v1.data_store_pb2 import TestResult as TestResultProto
+from ni.protobuf.types.precision_timestamp_conversion import (
+    hightime_datetime_from_protobuf,
+    hightime_datetime_to_protobuf,
+)
+
 from ni.datastore.data._types._error_information import ErrorInformation
 from ni.datastore.data._types._outcome import Outcome
 from ni.datastore.metadata._grpc_conversion import (
     populate_extension_value_message_map,
     populate_from_extension_value_message_map,
 )
-from ni.measurements.data.v1.data_store_pb2 import TestResult as TestResultProto
-from ni.protobuf.types.precision_timestamp_conversion import (
-    hightime_datetime_from_protobuf,
-    hightime_datetime_to_protobuf,
-)
 
 
 class TestResult:

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/metadata/_metadata_store_client.py

@@ -11,18 +11,6 @@ from types import TracebackType
 from typing import TYPE_CHECKING
 
 from grpc import Channel
-from ni.datastore.metadata._types._alias import Alias
-from ni.datastore.metadata._types._extension_schema import ExtensionSchema
-from ni.datastore.metadata._types._hardware_item import HardwareItem
-from ni.datastore.metadata._types._metadata_items import MetadataItems
-from ni.datastore.metadata._types._operator import Operator
-from ni.datastore.metadata._types._software_item import SoftwareItem
-from ni.datastore.metadata._types._test import Test
-from ni.datastore.metadata._types._test_adapter import TestAdapter
-from ni.datastore.metadata._types._test_description import TestDescription
-from ni.datastore.metadata._types._test_station import TestStation
-from ni.datastore.metadata._types._uut import Uut
-from ni.datastore.metadata._types._uut_instance import UutInstance
 from ni.measurementlink.discovery.v1.client import DiscoveryClient
 from ni.measurements.metadata.v1.client import (
     MetadataStoreClient as MetadataStoreServiceClient,
@@ -65,6 +53,19 @@ from ni.measurements.metadata.v1.metadata_store_service_pb2 import (
 )
 from ni_grpc_extensions.channelpool import GrpcChannelPool
 
+from ni.datastore.metadata._types._alias import Alias
+from ni.datastore.metadata._types._extension_schema import ExtensionSchema
+from ni.datastore.metadata._types._hardware_item import HardwareItem
+from ni.datastore.metadata._types._metadata_items import MetadataItems
+from ni.datastore.metadata._types._operator import Operator
+from ni.datastore.metadata._types._software_item import SoftwareItem
+from ni.datastore.metadata._types._test import Test
+from ni.datastore.metadata._types._test_adapter import TestAdapter
+from ni.datastore.metadata._types._test_description import TestDescription
+from ni.datastore.metadata._types._test_station import TestStation
+from ni.datastore.metadata._types._uut import Uut
+from ni.datastore.metadata._types._uut_instance import UutInstance
+
 if TYPE_CHECKING:
     if sys.version_info >= (3, 11):
         from typing import Self

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/metadata/_types/_alias.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from ni.measurements.metadata.v1.metadata_store_pb2 import Alias as AliasProto
 
-from ._alias_target_type import AliasTargetType
+from ni.datastore.metadata._types._alias_target_type import AliasTargetType
 
 
 class Alias:

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/metadata/_types/_hardware_item.py

@@ -4,13 +4,14 @@ from __future__ import annotations
 
 from typing import Mapping, MutableMapping
 
+from ni.measurements.metadata.v1.metadata_store_pb2 import (
+    HardwareItem as HardwareItemProto,
+)
+
 from ni.datastore.metadata._grpc_conversion import (
     populate_extension_value_message_map,
     populate_from_extension_value_message_map,
 )
-from ni.measurements.metadata.v1.metadata_store_pb2 import (
-    HardwareItem as HardwareItemProto,
-)
 
 
 class HardwareItem:

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/metadata/_types/_metadata_items.py

@@ -4,6 +4,10 @@ from __future__ import annotations
 
 from collections.abc import Sequence
 
+from ni.measurements.metadata.v1.metadata_store_service_pb2 import (
+    CreateFromJsonDocumentResponse,
+)
+
 from ni.datastore.metadata._types._hardware_item import HardwareItem
 from ni.datastore.metadata._types._operator import Operator
 from ni.datastore.metadata._types._software_item import SoftwareItem
@@ -13,9 +17,6 @@ from ni.datastore.metadata._types._test_description import TestDescription
 from ni.datastore.metadata._types._test_station import TestStation
 from ni.datastore.metadata._types._uut import Uut
 from ni.datastore.metadata._types._uut_instance import UutInstance
-from ni.measurements.metadata.v1.metadata_store_service_pb2 import (
-    CreateFromJsonDocumentResponse,
-)
 
 
 class MetadataItems:

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/metadata/_types/_operator.py

@@ -4,13 +4,14 @@ from __future__ import annotations
 
 from typing import Mapping, MutableMapping
 
+from ni.measurements.metadata.v1.metadata_store_pb2 import (
+    Operator as OperatorProto,
+)
+
 from ni.datastore.metadata._grpc_conversion import (
     populate_extension_value_message_map,
     populate_from_extension_value_message_map,
 )
-from ni.measurements.metadata.v1.metadata_store_pb2 import (
-    Operator as OperatorProto,
-)
 
 
 class Operator:

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/metadata/_types/_software_item.py

@@ -4,13 +4,14 @@ from __future__ import annotations
 
 from typing import Mapping, MutableMapping
 
+from ni.measurements.metadata.v1.metadata_store_pb2 import (
+    SoftwareItem as SoftwareItemProto,
+)
+
 from ni.datastore.metadata._grpc_conversion import (
     populate_extension_value_message_map,
     populate_from_extension_value_message_map,
 )
-from ni.measurements.metadata.v1.metadata_store_pb2 import (
-    SoftwareItem as SoftwareItemProto,
-)
 
 
 class SoftwareItem:

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/metadata/_types/_test.py

@@ -4,13 +4,14 @@ from __future__ import annotations
 
 from typing import Mapping, MutableMapping
 
+from ni.measurements.metadata.v1.metadata_store_pb2 import (
+    Test as TestProto,
+)
+
 from ni.datastore.metadata._grpc_conversion import (
     populate_extension_value_message_map,
     populate_from_extension_value_message_map,
 )
-from ni.measurements.metadata.v1.metadata_store_pb2 import (
-    Test as TestProto,
-)
 
 
 class Test:

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/metadata/_types/_test_adapter.py

@@ -4,13 +4,14 @@ from __future__ import annotations
 
 from typing import Mapping, MutableMapping
 
+from ni.measurements.metadata.v1.metadata_store_pb2 import (
+    TestAdapter as TestAdapterProto,
+)
+
 from ni.datastore.metadata._grpc_conversion import (
     populate_extension_value_message_map,
     populate_from_extension_value_message_map,
 )
-from ni.measurements.metadata.v1.metadata_store_pb2 import (
-    TestAdapter as TestAdapterProto,
-)
 
 
 class TestAdapter:

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/metadata/_types/_test_description.py

@@ -4,13 +4,14 @@ from __future__ import annotations
 
 from typing import Mapping, MutableMapping
 
+from ni.measurements.metadata.v1.metadata_store_pb2 import (
+    TestDescription as TestDescriptionProto,
+)
+
 from ni.datastore.metadata._grpc_conversion import (
     populate_extension_value_message_map,
     populate_from_extension_value_message_map,
 )
-from ni.measurements.metadata.v1.metadata_store_pb2 import (
-    TestDescription as TestDescriptionProto,
-)
 
 
 class TestDescription:

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/metadata/_types/_test_station.py

@@ -4,13 +4,14 @@ from __future__ import annotations
 
 from typing import Mapping, MutableMapping
 
+from ni.measurements.metadata.v1.metadata_store_pb2 import (
+    TestStation as TestStationProto,
+)
+
 from ni.datastore.metadata._grpc_conversion import (
     populate_extension_value_message_map,
     populate_from_extension_value_message_map,
 )
-from ni.measurements.metadata.v1.metadata_store_pb2 import (
-    TestStation as TestStationProto,
-)
 
 
 class TestStation:

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/metadata/_types/_uut.py

@@ -4,13 +4,14 @@ from __future__ import annotations
 
 from typing import Iterable, Mapping, MutableMapping, MutableSequence
 
+from ni.measurements.metadata.v1.metadata_store_pb2 import (
+    Uut as UutProto,
+)
+
 from ni.datastore.metadata._grpc_conversion import (
     populate_extension_value_message_map,
     populate_from_extension_value_message_map,
 )
-from ni.measurements.metadata.v1.metadata_store_pb2 import (
-    Uut as UutProto,
-)
 
 
 class Uut:

{ni_datastore-2.0.0.dev0 → ni_datastore-2.0.0.dev1}/src/ni/datastore/metadata/_types/_uut_instance.py

@@ -4,13 +4,14 @@ from __future__ import annotations
 
 from typing import Mapping, MutableMapping
 
+from ni.measurements.metadata.v1.metadata_store_pb2 import (
+    UutInstance as UutInstanceProto,
+)
+
 from ni.datastore.metadata._grpc_conversion import (
     populate_extension_value_message_map,
     populate_from_extension_value_message_map,
 )
-from ni.measurements.metadata.v1.metadata_store_pb2 import (
-    UutInstance as UutInstanceProto,
-)
 
 
 class UutInstance: