ni.datastore 2.0.0.dev0__tar.gz → 2.1.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/PKG-INFO +4 -4
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/README.md +1 -1
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/pyproject.toml +8 -4
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/_data_store_client.py +33 -32
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/_grpc_conversion.py +196 -49
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/_types/_published_measurement.py +7 -4
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/_types/_step.py +6 -5
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/_types/_test_result.py +6 -5
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_metadata_store_client.py +13 -12
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_alias.py +1 -1
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_hardware_item.py +4 -3
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_metadata_items.py +4 -3
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_operator.py +4 -3
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_software_item.py +4 -3
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_test.py +4 -3
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_test_adapter.py +4 -3
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_test_description.py +4 -3
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_test_station.py +4 -3
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_uut.py +4 -3
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_uut_instance.py +4 -3
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/LICENSE +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/__init__.py +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/__init__.py +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/_types/__init__.py +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/_types/_error_information.py +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/_types/_outcome.py +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/_types/_published_condition.py +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/_types/py.typed +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/py.typed +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/__init__.py +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_grpc_conversion.py +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/__init__.py +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_alias_target_type.py +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_extension_schema.py +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/py.typed +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/py.typed +0 -0
- {ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/py.typed +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.3
|
|
2
2
|
Name: ni.datastore
|
|
3
|
-
Version: 2.
|
|
3
|
+
Version: 2.1.0
|
|
4
4
|
Summary: APIs for publishing and retrieving data from NI Measurement Data Services
|
|
5
5
|
License: MIT
|
|
6
6
|
Keywords: datastore
|
|
@@ -24,9 +24,9 @@ Classifier: Programming Language :: Python :: 3.13
|
|
|
24
24
|
Classifier: Programming Language :: Python :: 3.14
|
|
25
25
|
Classifier: Programming Language :: Python :: Implementation :: CPython
|
|
26
26
|
Requires-Dist: hightime (>=1.0.0)
|
|
27
|
-
Requires-Dist: ni-measurements-data-v1-client (>=1.
|
|
27
|
+
Requires-Dist: ni-measurements-data-v1-client (>=1.3.0)
|
|
28
28
|
Requires-Dist: ni-measurements-metadata-v1-client (>=1.0.0)
|
|
29
|
-
Requires-Dist: ni-protobuf-types (>=1.
|
|
29
|
+
Requires-Dist: ni-protobuf-types (>=1.3.0)
|
|
30
30
|
Requires-Dist: protobuf (>=4.21)
|
|
31
31
|
Project-URL: Documentation, https://datastorepython.readthedocs.io/en/latest/
|
|
32
32
|
Project-URL: Repository, https://github.com/ni/datastore-python
|
|
@@ -65,7 +65,7 @@ NI created and supports this package.
|
|
|
65
65
|
## Installation
|
|
66
66
|
|
|
67
67
|
As a prerequisite to using the `ni.datastore` module, you must install Measurement Data Services
|
|
68
|
-
Software 2026
|
|
68
|
+
Software 2026 Q4 or later on your system. You can download and install this software using
|
|
69
69
|
[NI Package Manager](https://www.ni.com/en/support/downloads/software-products/download.package-manager.html).
|
|
70
70
|
|
|
71
71
|
You can directly install the `ni.datastore` package using `pip` or by listing it as a
|
|
@@ -31,7 +31,7 @@ NI created and supports this package.
|
|
|
31
31
|
## Installation
|
|
32
32
|
|
|
33
33
|
As a prerequisite to using the `ni.datastore` module, you must install Measurement Data Services
|
|
34
|
-
Software 2026
|
|
34
|
+
Software 2026 Q4 or later on your system. You can download and install this software using
|
|
35
35
|
[NI Package Manager](https://www.ni.com/en/support/downloads/software-products/download.package-manager.html).
|
|
36
36
|
|
|
37
37
|
You can directly install the `ni.datastore` package using `pip` or by listing it as a
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "ni.datastore"
|
|
3
|
-
version = "2.
|
|
3
|
+
version = "2.1.0"
|
|
4
4
|
license = "MIT"
|
|
5
5
|
description = "APIs for publishing and retrieving data from NI Measurement Data Services"
|
|
6
6
|
authors = [{name = "NI", email = "opensource@ni.com"}]
|
|
@@ -40,9 +40,9 @@ requires-poetry = '>=2.1,<3.0'
|
|
|
40
40
|
[tool.poetry.dependencies]
|
|
41
41
|
python = "^3.10"
|
|
42
42
|
protobuf = {version=">=4.21"}
|
|
43
|
-
ni-measurements-data-v1-client = { version = ">=1.
|
|
43
|
+
ni-measurements-data-v1-client = { version = ">=1.3.0", allow-prereleases = true }
|
|
44
44
|
ni-measurements-metadata-v1-client = { version = ">=1.0.0" }
|
|
45
|
-
ni-protobuf-types = { version = ">=1.
|
|
45
|
+
ni-protobuf-types = { version = ">=1.3.0", allow-prereleases = true }
|
|
46
46
|
hightime = { version = ">=1.0.0" }
|
|
47
47
|
|
|
48
48
|
[tool.poetry.group.dev.dependencies]
|
|
@@ -78,7 +78,7 @@ Sphinx = [
|
|
|
78
78
|
]
|
|
79
79
|
sphinx-rtd-theme = ">=1.0.0"
|
|
80
80
|
sphinx-autoapi = ">=1.8.4"
|
|
81
|
-
|
|
81
|
+
myst-parser = ">=4.0.1"
|
|
82
82
|
toml = ">=0.10.2"
|
|
83
83
|
|
|
84
84
|
[build-system]
|
|
@@ -113,3 +113,7 @@ exclude = ["**/*_pb2_grpc.py", "**/*_pb2_grpc.pyi", "**/*_pb2.py", "**/*_pb2.pyi
|
|
|
113
113
|
[tool.pytest.ini_options]
|
|
114
114
|
addopts = "--doctest-modules --doctest-plus --strict-markers"
|
|
115
115
|
testpaths = ["tests"]
|
|
116
|
+
norecursedirs = [".venv"]
|
|
117
|
+
filterwarnings = [
|
|
118
|
+
"ignore:cannot collect test class.*because it has a __init__ constructor:pytest.PytestCollectionWarning",
|
|
119
|
+
]
|
|
@@ -7,25 +7,10 @@ import sys
|
|
|
7
7
|
from collections.abc import Iterable, Sequence
|
|
8
8
|
from threading import Lock
|
|
9
9
|
from types import TracebackType
|
|
10
|
-
from typing import
|
|
10
|
+
from typing import overload, Type, TYPE_CHECKING, TypeVar
|
|
11
11
|
|
|
12
12
|
import hightime as ht
|
|
13
13
|
from grpc import Channel
|
|
14
|
-
from ni.datastore.data._grpc_conversion import (
|
|
15
|
-
convert_read_condition_response_from_protobuf,
|
|
16
|
-
convert_read_measurement_response_from_protobuf,
|
|
17
|
-
get_publish_measurement_timestamp,
|
|
18
|
-
populate_publish_condition_batch_request_values,
|
|
19
|
-
populate_publish_condition_request_value,
|
|
20
|
-
populate_publish_measurement_batch_request_values,
|
|
21
|
-
populate_publish_measurement_request_value,
|
|
22
|
-
)
|
|
23
|
-
from ni.datastore.data._types._error_information import ErrorInformation
|
|
24
|
-
from ni.datastore.data._types._outcome import Outcome
|
|
25
|
-
from ni.datastore.data._types._published_condition import PublishedCondition
|
|
26
|
-
from ni.datastore.data._types._published_measurement import PublishedMeasurement
|
|
27
|
-
from ni.datastore.data._types._step import Step
|
|
28
|
-
from ni.datastore.data._types._test_result import TestResult
|
|
29
14
|
from ni.measurementlink.discovery.v1.client import DiscoveryClient
|
|
30
15
|
from ni.measurements.data.v1.client import DataStoreClient as DataStoreServiceClient
|
|
31
16
|
from ni.measurements.data.v1.data_store_service_pb2 import (
|
|
@@ -51,6 +36,22 @@ from ni.protobuf.types.precision_timestamp_conversion import (
|
|
|
51
36
|
)
|
|
52
37
|
from ni_grpc_extensions.channelpool import GrpcChannelPool
|
|
53
38
|
|
|
39
|
+
from ni.datastore.data._grpc_conversion import (
|
|
40
|
+
convert_measurement_timestamp_to_protobuf,
|
|
41
|
+
convert_read_condition_response_from_protobuf,
|
|
42
|
+
convert_read_measurement_response_from_protobuf,
|
|
43
|
+
populate_publish_condition_batch_request_values,
|
|
44
|
+
populate_publish_condition_request_value,
|
|
45
|
+
populate_publish_measurement_batch_request_values,
|
|
46
|
+
populate_publish_measurement_request_value,
|
|
47
|
+
)
|
|
48
|
+
from ni.datastore.data._types._error_information import ErrorInformation
|
|
49
|
+
from ni.datastore.data._types._outcome import Outcome
|
|
50
|
+
from ni.datastore.data._types._published_condition import PublishedCondition
|
|
51
|
+
from ni.datastore.data._types._published_measurement import PublishedMeasurement
|
|
52
|
+
from ni.datastore.data._types._step import Step
|
|
53
|
+
from ni.datastore.data._types._test_result import TestResult
|
|
54
|
+
|
|
54
55
|
if TYPE_CHECKING:
|
|
55
56
|
if sys.version_info >= (3, 11):
|
|
56
57
|
from typing import Self
|
|
@@ -226,19 +227,22 @@ class DataStoreClient:
|
|
|
226
227
|
|
|
227
228
|
- Scalar: Single float, int, str or boolean
|
|
228
229
|
- Vector: Array of float, int, str or boolean values
|
|
229
|
-
-
|
|
230
|
+
- AnalogWaveform[np.float64]: Analog waveform with double precision
|
|
231
|
+
- AnalogWaveform[np.float32]: Analog waveform with single precision
|
|
230
232
|
- DoubleXYData: XY coordinate data with double precision
|
|
231
|
-
-
|
|
232
|
-
-
|
|
233
|
-
-
|
|
234
|
-
-
|
|
233
|
+
- AnalogWaveform[np.int16]: Analog waveform with 16-bit integer precision
|
|
234
|
+
- ComplexWaveform[np.complex128]: Complex waveform with double precision
|
|
235
|
+
- ComplexWaveform[np.complex64]: Complex waveform with single precision
|
|
236
|
+
- ComplexWaveform[ComplexInt32DType]: Complex waveform with 16-bit integer precision
|
|
237
|
+
- Spectrum[np.float64]: Frequency spectrum data with double precision
|
|
238
|
+
- Spectrum[np.float32]: Frequency spectrum data with single precision
|
|
235
239
|
- DigitalWaveform: Digital waveform data
|
|
236
240
|
|
|
237
241
|
step_id: The ID of the step associated with this measurement. This
|
|
238
242
|
value is expected to be a parsable GUID.
|
|
239
243
|
|
|
240
|
-
timestamp: The timestamp of the measurement. If None,
|
|
241
|
-
|
|
244
|
+
timestamp: The timestamp of the measurement. If None, no timestamp
|
|
245
|
+
will be specified.
|
|
242
246
|
|
|
243
247
|
outcome: The outcome of the measurement (PASSED, FAILED,
|
|
244
248
|
INDETERMINATE, or UNSPECIFIED).
|
|
@@ -274,11 +278,9 @@ class DataStoreClient:
|
|
|
274
278
|
test_adapter_ids=test_adapter_ids,
|
|
275
279
|
software_item_ids=software_item_ids,
|
|
276
280
|
notes=notes,
|
|
281
|
+
timestamp=convert_measurement_timestamp_to_protobuf(timestamp),
|
|
277
282
|
)
|
|
278
283
|
populate_publish_measurement_request_value(publish_request, value)
|
|
279
|
-
publish_request.timestamp.CopyFrom(
|
|
280
|
-
get_publish_measurement_timestamp(publish_request, timestamp)
|
|
281
|
-
)
|
|
282
284
|
publish_response = self._get_data_store_client().publish_measurement(publish_request)
|
|
283
285
|
return publish_response.measurement_id
|
|
284
286
|
|
|
@@ -295,7 +297,7 @@ class DataStoreClient:
|
|
|
295
297
|
software_item_ids: Iterable[str] = tuple(),
|
|
296
298
|
notes: str = "",
|
|
297
299
|
) -> Sequence[str]:
|
|
298
|
-
"""Publish multiple
|
|
300
|
+
"""Publish multiple measurements at once for parametric sweeps.
|
|
299
301
|
|
|
300
302
|
Args:
|
|
301
303
|
name: The name used for associating/grouping
|
|
@@ -303,7 +305,7 @@ class DataStoreClient:
|
|
|
303
305
|
iterations. For example, "Temperature" can be used for
|
|
304
306
|
associating temperature readings across multiple iterations.
|
|
305
307
|
|
|
306
|
-
values: The values of the
|
|
308
|
+
values: The values of the measurement being published
|
|
307
309
|
across N iterations.
|
|
308
310
|
|
|
309
311
|
step_id: The ID of the step associated with this measurement. This
|
|
@@ -339,10 +341,9 @@ class DataStoreClient:
|
|
|
339
341
|
notes: Any notes to be associated with the published measurements.
|
|
340
342
|
|
|
341
343
|
Returns:
|
|
342
|
-
Sequence[str]: The
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
returned.
|
|
344
|
+
Sequence[str]: The IDs of the corresponding PublishedMeasurements. A single
|
|
345
|
+
ID will be returned when publishing scalar measurement values.
|
|
346
|
+
N IDs will be returned when publishing (N) non-scalar measurement values.
|
|
346
347
|
"""
|
|
347
348
|
publish_request = PublishMeasurementBatchRequest(
|
|
348
349
|
name=name,
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
|
-
import datetime as std_datetime
|
|
6
5
|
import logging
|
|
7
|
-
from
|
|
6
|
+
from itertools import chain
|
|
7
|
+
from typing import Any, Callable, cast, Iterable
|
|
8
8
|
|
|
9
9
|
import hightime as ht
|
|
10
10
|
import numpy as np
|
|
@@ -25,6 +25,12 @@ from ni.protobuf.types.vector_conversion import vector_from_protobuf, vector_to_
|
|
|
25
25
|
from ni.protobuf.types.waveform_conversion import (
|
|
26
26
|
digital_waveform_from_protobuf,
|
|
27
27
|
digital_waveform_to_protobuf,
|
|
28
|
+
float32_analog_waveform_from_protobuf,
|
|
29
|
+
float32_analog_waveform_to_protobuf,
|
|
30
|
+
float32_complex_waveform_from_protobuf,
|
|
31
|
+
float32_complex_waveform_to_protobuf,
|
|
32
|
+
float32_spectrum_from_protobuf,
|
|
33
|
+
float32_spectrum_to_protobuf,
|
|
28
34
|
float64_analog_waveform_from_protobuf,
|
|
29
35
|
float64_analog_waveform_to_protobuf,
|
|
30
36
|
float64_complex_waveform_from_protobuf,
|
|
@@ -49,6 +55,129 @@ from nitypes.xy_data import XYData
|
|
|
49
55
|
_logger = logging.getLogger(__name__)
|
|
50
56
|
|
|
51
57
|
|
|
58
|
+
def _copy_batch_values(
|
|
59
|
+
repeated_field: Any,
|
|
60
|
+
batch_values: Iterable[object],
|
|
61
|
+
is_supported: Callable[[object], bool],
|
|
62
|
+
convert_value: Callable[[Any], Any],
|
|
63
|
+
error_message: str,
|
|
64
|
+
) -> None:
|
|
65
|
+
for value in batch_values:
|
|
66
|
+
if not is_supported(value):
|
|
67
|
+
raise TypeError(error_message)
|
|
68
|
+
repeated_field.add().CopyFrom(convert_value(value))
|
|
69
|
+
|
|
70
|
+
|
|
71
|
+
def _populate_vector_batch_values(
|
|
72
|
+
publish_request: PublishMeasurementBatchRequest, values: Iterable[object]
|
|
73
|
+
) -> None:
|
|
74
|
+
_copy_batch_values(
|
|
75
|
+
publish_request.vector_values.vectors,
|
|
76
|
+
values,
|
|
77
|
+
lambda value: isinstance(value, Vector),
|
|
78
|
+
vector_to_protobuf,
|
|
79
|
+
"Unsupported iterable: all values must be Vector.",
|
|
80
|
+
)
|
|
81
|
+
|
|
82
|
+
|
|
83
|
+
def _populate_analog_waveform_batch_values(
|
|
84
|
+
publish_request: PublishMeasurementBatchRequest,
|
|
85
|
+
first_value: AnalogWaveform[Any],
|
|
86
|
+
values: Iterable[object],
|
|
87
|
+
) -> None:
|
|
88
|
+
if first_value.dtype == np.float64:
|
|
89
|
+
_copy_batch_values(
|
|
90
|
+
publish_request.double_analog_waveform_values.waveforms,
|
|
91
|
+
values,
|
|
92
|
+
lambda value: isinstance(value, AnalogWaveform) and value.dtype == np.float64,
|
|
93
|
+
float64_analog_waveform_to_protobuf,
|
|
94
|
+
"Unsupported iterable: all values must be float64 AnalogWaveform.",
|
|
95
|
+
)
|
|
96
|
+
return
|
|
97
|
+
elif first_value.dtype == np.int16:
|
|
98
|
+
_copy_batch_values(
|
|
99
|
+
publish_request.i16_analog_waveform_values.waveforms,
|
|
100
|
+
values,
|
|
101
|
+
lambda value: isinstance(value, AnalogWaveform) and value.dtype == np.int16,
|
|
102
|
+
int16_analog_waveform_to_protobuf,
|
|
103
|
+
"Unsupported iterable: all values must be int16 AnalogWaveform.",
|
|
104
|
+
)
|
|
105
|
+
return
|
|
106
|
+
raise TypeError(f"Unsupported AnalogWaveform dtype: {first_value.dtype}")
|
|
107
|
+
|
|
108
|
+
|
|
109
|
+
def _populate_complex_waveform_batch_values(
|
|
110
|
+
publish_request: PublishMeasurementBatchRequest,
|
|
111
|
+
first_value: ComplexWaveform[Any],
|
|
112
|
+
values: Iterable[object],
|
|
113
|
+
) -> None:
|
|
114
|
+
if first_value.dtype == np.complex128:
|
|
115
|
+
_copy_batch_values(
|
|
116
|
+
publish_request.double_complex_waveform_values.waveforms,
|
|
117
|
+
values,
|
|
118
|
+
lambda value: isinstance(value, ComplexWaveform) and value.dtype == np.complex128,
|
|
119
|
+
float64_complex_waveform_to_protobuf,
|
|
120
|
+
"Unsupported iterable: all values must be complex128 ComplexWaveform.",
|
|
121
|
+
)
|
|
122
|
+
return
|
|
123
|
+
if first_value.dtype == ComplexInt32DType:
|
|
124
|
+
_copy_batch_values(
|
|
125
|
+
publish_request.i16_complex_waveform_values.waveforms,
|
|
126
|
+
values,
|
|
127
|
+
lambda value: isinstance(value, ComplexWaveform) and value.dtype == ComplexInt32DType,
|
|
128
|
+
int16_complex_waveform_to_protobuf,
|
|
129
|
+
"Unsupported iterable: all values must be ComplexWaveform with ComplexInt32DType.",
|
|
130
|
+
)
|
|
131
|
+
return
|
|
132
|
+
raise TypeError(f"Unsupported ComplexWaveform dtype: {first_value.dtype}")
|
|
133
|
+
|
|
134
|
+
|
|
135
|
+
def _populate_spectrum_batch_values(
|
|
136
|
+
publish_request: PublishMeasurementBatchRequest,
|
|
137
|
+
first_value: Spectrum[Any],
|
|
138
|
+
values: Iterable[object],
|
|
139
|
+
) -> None:
|
|
140
|
+
if first_value.dtype != np.float64:
|
|
141
|
+
raise TypeError(f"Unsupported Spectrum dtype: {first_value.dtype}")
|
|
142
|
+
|
|
143
|
+
_copy_batch_values(
|
|
144
|
+
publish_request.double_spectrum_values.waveforms,
|
|
145
|
+
values,
|
|
146
|
+
lambda value: isinstance(value, Spectrum) and value.dtype == np.float64,
|
|
147
|
+
float64_spectrum_to_protobuf,
|
|
148
|
+
"Unsupported iterable: all values must be float64 Spectrum.",
|
|
149
|
+
)
|
|
150
|
+
|
|
151
|
+
|
|
152
|
+
def _populate_digital_waveform_batch_values(
|
|
153
|
+
publish_request: PublishMeasurementBatchRequest, values: Iterable[object]
|
|
154
|
+
) -> None:
|
|
155
|
+
_copy_batch_values(
|
|
156
|
+
publish_request.digital_waveform_values.waveforms,
|
|
157
|
+
values,
|
|
158
|
+
lambda value: isinstance(value, DigitalWaveform),
|
|
159
|
+
digital_waveform_to_protobuf,
|
|
160
|
+
"Unsupported iterable: all values must be DigitalWaveform.",
|
|
161
|
+
)
|
|
162
|
+
|
|
163
|
+
|
|
164
|
+
def _populate_xydata_batch_values(
|
|
165
|
+
publish_request: PublishMeasurementBatchRequest,
|
|
166
|
+
first_value: XYData[Any],
|
|
167
|
+
values: Iterable[object],
|
|
168
|
+
) -> None:
|
|
169
|
+
if first_value.dtype != np.float64:
|
|
170
|
+
raise TypeError(f"Unsupported XYData dtype: {first_value.dtype}")
|
|
171
|
+
|
|
172
|
+
_copy_batch_values(
|
|
173
|
+
publish_request.x_y_data_values.x_y_data,
|
|
174
|
+
values,
|
|
175
|
+
lambda value: isinstance(value, XYData) and value.dtype == np.float64,
|
|
176
|
+
float64_xydata_to_protobuf,
|
|
177
|
+
"Unsupported iterable: all values must be float64 XYData.",
|
|
178
|
+
)
|
|
179
|
+
|
|
180
|
+
|
|
52
181
|
def populate_publish_condition_request_value(
|
|
53
182
|
publish_request: PublishConditionRequest, value: object
|
|
54
183
|
) -> None:
|
|
@@ -76,10 +205,15 @@ def populate_publish_condition_batch_request_values(
|
|
|
76
205
|
if isinstance(values, Vector):
|
|
77
206
|
publish_request.scalar_values.CopyFrom(vector_to_protobuf(values))
|
|
78
207
|
elif isinstance(values, Iterable):
|
|
79
|
-
|
|
80
|
-
raise ValueError("Cannot publish an empty Iterable.")
|
|
208
|
+
values_iterator = iter(values)
|
|
81
209
|
try:
|
|
82
|
-
|
|
210
|
+
first_value = next(values_iterator)
|
|
211
|
+
except StopIteration as exc:
|
|
212
|
+
raise ValueError("Cannot publish an empty Iterable.") from exc
|
|
213
|
+
|
|
214
|
+
all_values = chain([first_value], values_iterator)
|
|
215
|
+
try:
|
|
216
|
+
vector = Vector(cast(Iterable[bool | int | float | str], all_values))
|
|
83
217
|
except (TypeError, ValueError):
|
|
84
218
|
raise TypeError(
|
|
85
219
|
f"Unsupported iterable: {values}. Subtype must be bool, float, int, or string."
|
|
@@ -113,6 +247,10 @@ def populate_publish_measurement_request_value(
|
|
|
113
247
|
publish_request.double_analog_waveform.CopyFrom(
|
|
114
248
|
float64_analog_waveform_to_protobuf(value)
|
|
115
249
|
)
|
|
250
|
+
elif value.dtype == np.float32:
|
|
251
|
+
publish_request.float_analog_waveform.CopyFrom(
|
|
252
|
+
float32_analog_waveform_to_protobuf(value)
|
|
253
|
+
)
|
|
116
254
|
elif value.dtype == np.int16:
|
|
117
255
|
publish_request.i16_analog_waveform.CopyFrom(int16_analog_waveform_to_protobuf(value))
|
|
118
256
|
else:
|
|
@@ -122,6 +260,10 @@ def populate_publish_measurement_request_value(
|
|
|
122
260
|
publish_request.double_complex_waveform.CopyFrom(
|
|
123
261
|
float64_complex_waveform_to_protobuf(value)
|
|
124
262
|
)
|
|
263
|
+
elif value.dtype == np.complex64:
|
|
264
|
+
publish_request.float_complex_waveform.CopyFrom(
|
|
265
|
+
float32_complex_waveform_to_protobuf(value)
|
|
266
|
+
)
|
|
125
267
|
elif value.dtype == ComplexInt32DType:
|
|
126
268
|
publish_request.i16_complex_waveform.CopyFrom(int16_complex_waveform_to_protobuf(value))
|
|
127
269
|
else:
|
|
@@ -129,6 +271,8 @@ def populate_publish_measurement_request_value(
|
|
|
129
271
|
elif isinstance(value, Spectrum):
|
|
130
272
|
if value.dtype == np.float64:
|
|
131
273
|
publish_request.double_spectrum.CopyFrom(float64_spectrum_to_protobuf(value))
|
|
274
|
+
elif value.dtype == np.float32:
|
|
275
|
+
publish_request.float_spectrum.CopyFrom(float32_spectrum_to_protobuf(value))
|
|
132
276
|
else:
|
|
133
277
|
raise TypeError(f"Unsupported Spectrum dtype: {value.dtype}")
|
|
134
278
|
elif isinstance(value, DigitalWaveform):
|
|
@@ -139,10 +283,15 @@ def populate_publish_measurement_request_value(
|
|
|
139
283
|
else:
|
|
140
284
|
raise TypeError(f"Unsupported XYData dtype: {value.dtype}")
|
|
141
285
|
elif isinstance(value, Iterable):
|
|
142
|
-
|
|
143
|
-
|
|
286
|
+
value_iterator = iter(value)
|
|
287
|
+
try:
|
|
288
|
+
first_item = next(value_iterator)
|
|
289
|
+
except StopIteration as exc:
|
|
290
|
+
raise ValueError("Cannot publish an empty Iterable.") from exc
|
|
291
|
+
|
|
292
|
+
all_items = chain([first_item], value_iterator)
|
|
144
293
|
try:
|
|
145
|
-
vector = Vector(
|
|
294
|
+
vector = Vector(cast(Iterable[bool | int | float | str], all_items))
|
|
146
295
|
except (TypeError, ValueError):
|
|
147
296
|
raise TypeError(
|
|
148
297
|
f"Unsupported iterable: {value}. Subtype must be bool, float, int, or string."
|
|
@@ -162,16 +311,34 @@ def populate_publish_measurement_batch_request_values(
|
|
|
162
311
|
if isinstance(values, Vector):
|
|
163
312
|
publish_request.scalar_values.CopyFrom(vector_to_protobuf(values))
|
|
164
313
|
elif isinstance(values, Iterable):
|
|
165
|
-
|
|
166
|
-
raise ValueError("Cannot publish an empty Iterable.")
|
|
314
|
+
values_iterator = iter(values)
|
|
167
315
|
try:
|
|
168
|
-
|
|
169
|
-
except
|
|
170
|
-
raise
|
|
171
|
-
f"Unsupported iterable: {values}. Subtype must be bool, float, int, or string."
|
|
172
|
-
)
|
|
316
|
+
first_value = next(values_iterator)
|
|
317
|
+
except StopIteration as exc:
|
|
318
|
+
raise ValueError("Cannot publish an empty Iterable.") from exc
|
|
173
319
|
|
|
174
|
-
|
|
320
|
+
all_values = chain([first_value], values_iterator)
|
|
321
|
+
if isinstance(first_value, Vector):
|
|
322
|
+
_populate_vector_batch_values(publish_request, all_values)
|
|
323
|
+
elif isinstance(first_value, AnalogWaveform):
|
|
324
|
+
_populate_analog_waveform_batch_values(publish_request, first_value, all_values)
|
|
325
|
+
elif isinstance(first_value, ComplexWaveform):
|
|
326
|
+
_populate_complex_waveform_batch_values(publish_request, first_value, all_values)
|
|
327
|
+
elif isinstance(first_value, Spectrum):
|
|
328
|
+
_populate_spectrum_batch_values(publish_request, first_value, all_values)
|
|
329
|
+
elif isinstance(first_value, DigitalWaveform):
|
|
330
|
+
_populate_digital_waveform_batch_values(publish_request, all_values)
|
|
331
|
+
elif isinstance(first_value, XYData):
|
|
332
|
+
_populate_xydata_batch_values(publish_request, first_value, all_values)
|
|
333
|
+
else:
|
|
334
|
+
try:
|
|
335
|
+
vector = Vector(cast(Iterable[bool | int | float | str], all_values))
|
|
336
|
+
except (TypeError, ValueError):
|
|
337
|
+
raise TypeError(
|
|
338
|
+
f"Unsupported iterable. Subtype must be bool, float, int, string, Vector, "
|
|
339
|
+
"AnalogWaveform, ComplexWaveform, Spectrum, DigitalWaveform, or XYData."
|
|
340
|
+
)
|
|
341
|
+
publish_request.scalar_values.CopyFrom(vector_to_protobuf(vector))
|
|
175
342
|
else:
|
|
176
343
|
raise TypeError(
|
|
177
344
|
f"Unsupported measurement values type: {type(values)}. Please consult the documentation."
|
|
@@ -187,10 +354,16 @@ def convert_read_measurement_response_from_protobuf(
|
|
|
187
354
|
return digital_waveform_from_protobuf(response.digital_waveform)
|
|
188
355
|
elif read_data_type == "double_analog_waveform":
|
|
189
356
|
return float64_analog_waveform_from_protobuf(response.double_analog_waveform)
|
|
357
|
+
elif read_data_type == "float_analog_waveform":
|
|
358
|
+
return float32_analog_waveform_from_protobuf(response.float_analog_waveform)
|
|
190
359
|
elif read_data_type == "double_complex_waveform":
|
|
191
360
|
return float64_complex_waveform_from_protobuf(response.double_complex_waveform)
|
|
361
|
+
elif read_data_type == "float_complex_waveform":
|
|
362
|
+
return float32_complex_waveform_from_protobuf(response.float_complex_waveform)
|
|
192
363
|
elif read_data_type == "double_spectrum":
|
|
193
364
|
return float64_spectrum_from_protobuf(response.double_spectrum)
|
|
365
|
+
elif read_data_type == "float_spectrum":
|
|
366
|
+
return float32_spectrum_from_protobuf(response.float_spectrum)
|
|
194
367
|
elif read_data_type == "i16_analog_waveform":
|
|
195
368
|
return int16_analog_waveform_from_protobuf(response.i16_analog_waveform)
|
|
196
369
|
elif read_data_type == "i16_complex_waveform":
|
|
@@ -212,37 +385,11 @@ def convert_read_condition_response_from_protobuf(response: ReadConditionValueRe
|
|
|
212
385
|
raise TypeError(f"Invalid read type: {read_data_type}")
|
|
213
386
|
|
|
214
387
|
|
|
215
|
-
def
|
|
216
|
-
|
|
217
|
-
) -> PrecisionTimestamp:
|
|
218
|
-
"""
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
publish_time = hightime_datetime_to_protobuf(ht.datetime.now(std_datetime.timezone.utc))
|
|
388
|
+
def convert_measurement_timestamp_to_protobuf(
|
|
389
|
+
client_provided_timestamp: ht.datetime | None,
|
|
390
|
+
) -> PrecisionTimestamp | None:
|
|
391
|
+
"""Convert the provided timestamp to PrecisionTimestamp if it's not None."""
|
|
392
|
+
if client_provided_timestamp is not None:
|
|
393
|
+
return hightime_datetime_to_protobuf(client_provided_timestamp)
|
|
222
394
|
else:
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
waveform_t0: PrecisionTimestamp | None = None
|
|
226
|
-
value_case = publish_request.WhichOneof("value")
|
|
227
|
-
if value_case == "double_analog_waveform":
|
|
228
|
-
waveform_t0 = publish_request.double_analog_waveform.t0
|
|
229
|
-
elif value_case == "i16_analog_waveform":
|
|
230
|
-
waveform_t0 = publish_request.i16_analog_waveform.t0
|
|
231
|
-
elif value_case == "double_complex_waveform":
|
|
232
|
-
waveform_t0 = publish_request.double_complex_waveform.t0
|
|
233
|
-
elif value_case == "i16_complex_waveform":
|
|
234
|
-
waveform_t0 = publish_request.i16_complex_waveform.t0
|
|
235
|
-
elif value_case == "digital_waveform":
|
|
236
|
-
waveform_t0 = publish_request.digital_waveform.t0
|
|
237
|
-
|
|
238
|
-
# If an initialized waveform t0 value is present
|
|
239
|
-
if waveform_t0 is not None and waveform_t0 != PrecisionTimestamp():
|
|
240
|
-
if no_client_timestamp_provided:
|
|
241
|
-
# If the client did not provide a timestamp, use the waveform t0 value
|
|
242
|
-
publish_time = waveform_t0
|
|
243
|
-
elif publish_time != waveform_t0:
|
|
244
|
-
raise ValueError(
|
|
245
|
-
"The provided timestamp does not match the waveform t0. Please provide a matching timestamp or "
|
|
246
|
-
"omit the timestamp to use the waveform t0."
|
|
247
|
-
)
|
|
248
|
-
return publish_time
|
|
395
|
+
return None
|
|
@@ -5,15 +5,18 @@ from __future__ import annotations
|
|
|
5
5
|
from typing import Iterable, MutableSequence
|
|
6
6
|
|
|
7
7
|
import hightime as ht
|
|
8
|
-
from ni.
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
from ni.measurements.data.v1.data_store_pb2 import PublishedMeasurement as PublishedMeasurementProto
|
|
8
|
+
from ni.measurements.data.v1.data_store_pb2 import (
|
|
9
|
+
PublishedMeasurement as PublishedMeasurementProto,
|
|
10
|
+
)
|
|
12
11
|
from ni.protobuf.types.precision_timestamp_conversion import (
|
|
13
12
|
hightime_datetime_from_protobuf,
|
|
14
13
|
hightime_datetime_to_protobuf,
|
|
15
14
|
)
|
|
16
15
|
|
|
16
|
+
from ni.datastore.data._types._error_information import ErrorInformation
|
|
17
|
+
from ni.datastore.data._types._outcome import Outcome
|
|
18
|
+
from ni.datastore.data._types._published_condition import PublishedCondition
|
|
19
|
+
|
|
17
20
|
|
|
18
21
|
class PublishedMeasurement:
|
|
19
22
|
"""Represents a measurement that has been published to the data store.
|
|
@@ -5,17 +5,18 @@ from __future__ import annotations
|
|
|
5
5
|
from typing import Mapping, MutableMapping
|
|
6
6
|
|
|
7
7
|
import hightime as ht
|
|
8
|
+
from ni.measurements.data.v1.data_store_pb2 import Step as StepProto
|
|
9
|
+
from ni.protobuf.types.precision_timestamp_conversion import (
|
|
10
|
+
hightime_datetime_from_protobuf,
|
|
11
|
+
hightime_datetime_to_protobuf,
|
|
12
|
+
)
|
|
13
|
+
|
|
8
14
|
from ni.datastore.data._types._error_information import ErrorInformation
|
|
9
15
|
from ni.datastore.data._types._outcome import Outcome
|
|
10
16
|
from ni.datastore.metadata._grpc_conversion import (
|
|
11
17
|
populate_extension_value_message_map,
|
|
12
18
|
populate_from_extension_value_message_map,
|
|
13
19
|
)
|
|
14
|
-
from ni.measurements.data.v1.data_store_pb2 import Step as StepProto
|
|
15
|
-
from ni.protobuf.types.precision_timestamp_conversion import (
|
|
16
|
-
hightime_datetime_from_protobuf,
|
|
17
|
-
hightime_datetime_to_protobuf,
|
|
18
|
-
)
|
|
19
20
|
|
|
20
21
|
|
|
21
22
|
class Step:
|
|
@@ -5,17 +5,18 @@ from __future__ import annotations
|
|
|
5
5
|
from typing import Iterable, Mapping, MutableMapping, MutableSequence
|
|
6
6
|
|
|
7
7
|
import hightime as ht
|
|
8
|
+
from ni.measurements.data.v1.data_store_pb2 import TestResult as TestResultProto
|
|
9
|
+
from ni.protobuf.types.precision_timestamp_conversion import (
|
|
10
|
+
hightime_datetime_from_protobuf,
|
|
11
|
+
hightime_datetime_to_protobuf,
|
|
12
|
+
)
|
|
13
|
+
|
|
8
14
|
from ni.datastore.data._types._error_information import ErrorInformation
|
|
9
15
|
from ni.datastore.data._types._outcome import Outcome
|
|
10
16
|
from ni.datastore.metadata._grpc_conversion import (
|
|
11
17
|
populate_extension_value_message_map,
|
|
12
18
|
populate_from_extension_value_message_map,
|
|
13
19
|
)
|
|
14
|
-
from ni.measurements.data.v1.data_store_pb2 import TestResult as TestResultProto
|
|
15
|
-
from ni.protobuf.types.precision_timestamp_conversion import (
|
|
16
|
-
hightime_datetime_from_protobuf,
|
|
17
|
-
hightime_datetime_to_protobuf,
|
|
18
|
-
)
|
|
19
20
|
|
|
20
21
|
|
|
21
22
|
class TestResult:
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_metadata_store_client.py
RENAMED
|
@@ -11,18 +11,6 @@ from types import TracebackType
|
|
|
11
11
|
from typing import TYPE_CHECKING
|
|
12
12
|
|
|
13
13
|
from grpc import Channel
|
|
14
|
-
from ni.datastore.metadata._types._alias import Alias
|
|
15
|
-
from ni.datastore.metadata._types._extension_schema import ExtensionSchema
|
|
16
|
-
from ni.datastore.metadata._types._hardware_item import HardwareItem
|
|
17
|
-
from ni.datastore.metadata._types._metadata_items import MetadataItems
|
|
18
|
-
from ni.datastore.metadata._types._operator import Operator
|
|
19
|
-
from ni.datastore.metadata._types._software_item import SoftwareItem
|
|
20
|
-
from ni.datastore.metadata._types._test import Test
|
|
21
|
-
from ni.datastore.metadata._types._test_adapter import TestAdapter
|
|
22
|
-
from ni.datastore.metadata._types._test_description import TestDescription
|
|
23
|
-
from ni.datastore.metadata._types._test_station import TestStation
|
|
24
|
-
from ni.datastore.metadata._types._uut import Uut
|
|
25
|
-
from ni.datastore.metadata._types._uut_instance import UutInstance
|
|
26
14
|
from ni.measurementlink.discovery.v1.client import DiscoveryClient
|
|
27
15
|
from ni.measurements.metadata.v1.client import (
|
|
28
16
|
MetadataStoreClient as MetadataStoreServiceClient,
|
|
@@ -65,6 +53,19 @@ from ni.measurements.metadata.v1.metadata_store_service_pb2 import (
|
|
|
65
53
|
)
|
|
66
54
|
from ni_grpc_extensions.channelpool import GrpcChannelPool
|
|
67
55
|
|
|
56
|
+
from ni.datastore.metadata._types._alias import Alias
|
|
57
|
+
from ni.datastore.metadata._types._extension_schema import ExtensionSchema
|
|
58
|
+
from ni.datastore.metadata._types._hardware_item import HardwareItem
|
|
59
|
+
from ni.datastore.metadata._types._metadata_items import MetadataItems
|
|
60
|
+
from ni.datastore.metadata._types._operator import Operator
|
|
61
|
+
from ni.datastore.metadata._types._software_item import SoftwareItem
|
|
62
|
+
from ni.datastore.metadata._types._test import Test
|
|
63
|
+
from ni.datastore.metadata._types._test_adapter import TestAdapter
|
|
64
|
+
from ni.datastore.metadata._types._test_description import TestDescription
|
|
65
|
+
from ni.datastore.metadata._types._test_station import TestStation
|
|
66
|
+
from ni.datastore.metadata._types._uut import Uut
|
|
67
|
+
from ni.datastore.metadata._types._uut_instance import UutInstance
|
|
68
|
+
|
|
68
69
|
if TYPE_CHECKING:
|
|
69
70
|
if sys.version_info >= (3, 11):
|
|
70
71
|
from typing import Self
|
|
@@ -4,7 +4,7 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
from ni.measurements.metadata.v1.metadata_store_pb2 import Alias as AliasProto
|
|
6
6
|
|
|
7
|
-
from ._alias_target_type import AliasTargetType
|
|
7
|
+
from ni.datastore.metadata._types._alias_target_type import AliasTargetType
|
|
8
8
|
|
|
9
9
|
|
|
10
10
|
class Alias:
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_hardware_item.py
RENAMED
|
@@ -4,13 +4,14 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
from typing import Mapping, MutableMapping
|
|
6
6
|
|
|
7
|
+
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
8
|
+
HardwareItem as HardwareItemProto,
|
|
9
|
+
)
|
|
10
|
+
|
|
7
11
|
from ni.datastore.metadata._grpc_conversion import (
|
|
8
12
|
populate_extension_value_message_map,
|
|
9
13
|
populate_from_extension_value_message_map,
|
|
10
14
|
)
|
|
11
|
-
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
12
|
-
HardwareItem as HardwareItemProto,
|
|
13
|
-
)
|
|
14
15
|
|
|
15
16
|
|
|
16
17
|
class HardwareItem:
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_metadata_items.py
RENAMED
|
@@ -4,6 +4,10 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
from collections.abc import Sequence
|
|
6
6
|
|
|
7
|
+
from ni.measurements.metadata.v1.metadata_store_service_pb2 import (
|
|
8
|
+
CreateFromJsonDocumentResponse,
|
|
9
|
+
)
|
|
10
|
+
|
|
7
11
|
from ni.datastore.metadata._types._hardware_item import HardwareItem
|
|
8
12
|
from ni.datastore.metadata._types._operator import Operator
|
|
9
13
|
from ni.datastore.metadata._types._software_item import SoftwareItem
|
|
@@ -13,9 +17,6 @@ from ni.datastore.metadata._types._test_description import TestDescription
|
|
|
13
17
|
from ni.datastore.metadata._types._test_station import TestStation
|
|
14
18
|
from ni.datastore.metadata._types._uut import Uut
|
|
15
19
|
from ni.datastore.metadata._types._uut_instance import UutInstance
|
|
16
|
-
from ni.measurements.metadata.v1.metadata_store_service_pb2 import (
|
|
17
|
-
CreateFromJsonDocumentResponse,
|
|
18
|
-
)
|
|
19
20
|
|
|
20
21
|
|
|
21
22
|
class MetadataItems:
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_operator.py
RENAMED
|
@@ -4,13 +4,14 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
from typing import Mapping, MutableMapping
|
|
6
6
|
|
|
7
|
+
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
8
|
+
Operator as OperatorProto,
|
|
9
|
+
)
|
|
10
|
+
|
|
7
11
|
from ni.datastore.metadata._grpc_conversion import (
|
|
8
12
|
populate_extension_value_message_map,
|
|
9
13
|
populate_from_extension_value_message_map,
|
|
10
14
|
)
|
|
11
|
-
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
12
|
-
Operator as OperatorProto,
|
|
13
|
-
)
|
|
14
15
|
|
|
15
16
|
|
|
16
17
|
class Operator:
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_software_item.py
RENAMED
|
@@ -4,13 +4,14 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
from typing import Mapping, MutableMapping
|
|
6
6
|
|
|
7
|
+
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
8
|
+
SoftwareItem as SoftwareItemProto,
|
|
9
|
+
)
|
|
10
|
+
|
|
7
11
|
from ni.datastore.metadata._grpc_conversion import (
|
|
8
12
|
populate_extension_value_message_map,
|
|
9
13
|
populate_from_extension_value_message_map,
|
|
10
14
|
)
|
|
11
|
-
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
12
|
-
SoftwareItem as SoftwareItemProto,
|
|
13
|
-
)
|
|
14
15
|
|
|
15
16
|
|
|
16
17
|
class SoftwareItem:
|
|
@@ -4,13 +4,14 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
from typing import Mapping, MutableMapping
|
|
6
6
|
|
|
7
|
+
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
8
|
+
Test as TestProto,
|
|
9
|
+
)
|
|
10
|
+
|
|
7
11
|
from ni.datastore.metadata._grpc_conversion import (
|
|
8
12
|
populate_extension_value_message_map,
|
|
9
13
|
populate_from_extension_value_message_map,
|
|
10
14
|
)
|
|
11
|
-
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
12
|
-
Test as TestProto,
|
|
13
|
-
)
|
|
14
15
|
|
|
15
16
|
|
|
16
17
|
class Test:
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_test_adapter.py
RENAMED
|
@@ -4,13 +4,14 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
from typing import Mapping, MutableMapping
|
|
6
6
|
|
|
7
|
+
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
8
|
+
TestAdapter as TestAdapterProto,
|
|
9
|
+
)
|
|
10
|
+
|
|
7
11
|
from ni.datastore.metadata._grpc_conversion import (
|
|
8
12
|
populate_extension_value_message_map,
|
|
9
13
|
populate_from_extension_value_message_map,
|
|
10
14
|
)
|
|
11
|
-
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
12
|
-
TestAdapter as TestAdapterProto,
|
|
13
|
-
)
|
|
14
15
|
|
|
15
16
|
|
|
16
17
|
class TestAdapter:
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_test_description.py
RENAMED
|
@@ -4,13 +4,14 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
from typing import Mapping, MutableMapping
|
|
6
6
|
|
|
7
|
+
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
8
|
+
TestDescription as TestDescriptionProto,
|
|
9
|
+
)
|
|
10
|
+
|
|
7
11
|
from ni.datastore.metadata._grpc_conversion import (
|
|
8
12
|
populate_extension_value_message_map,
|
|
9
13
|
populate_from_extension_value_message_map,
|
|
10
14
|
)
|
|
11
|
-
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
12
|
-
TestDescription as TestDescriptionProto,
|
|
13
|
-
)
|
|
14
15
|
|
|
15
16
|
|
|
16
17
|
class TestDescription:
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_test_station.py
RENAMED
|
@@ -4,13 +4,14 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
from typing import Mapping, MutableMapping
|
|
6
6
|
|
|
7
|
+
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
8
|
+
TestStation as TestStationProto,
|
|
9
|
+
)
|
|
10
|
+
|
|
7
11
|
from ni.datastore.metadata._grpc_conversion import (
|
|
8
12
|
populate_extension_value_message_map,
|
|
9
13
|
populate_from_extension_value_message_map,
|
|
10
14
|
)
|
|
11
|
-
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
12
|
-
TestStation as TestStationProto,
|
|
13
|
-
)
|
|
14
15
|
|
|
15
16
|
|
|
16
17
|
class TestStation:
|
|
@@ -4,13 +4,14 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
from typing import Iterable, Mapping, MutableMapping, MutableSequence
|
|
6
6
|
|
|
7
|
+
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
8
|
+
Uut as UutProto,
|
|
9
|
+
)
|
|
10
|
+
|
|
7
11
|
from ni.datastore.metadata._grpc_conversion import (
|
|
8
12
|
populate_extension_value_message_map,
|
|
9
13
|
populate_from_extension_value_message_map,
|
|
10
14
|
)
|
|
11
|
-
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
12
|
-
Uut as UutProto,
|
|
13
|
-
)
|
|
14
15
|
|
|
15
16
|
|
|
16
17
|
class Uut:
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_uut_instance.py
RENAMED
|
@@ -4,13 +4,14 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
from typing import Mapping, MutableMapping
|
|
6
6
|
|
|
7
|
+
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
8
|
+
UutInstance as UutInstanceProto,
|
|
9
|
+
)
|
|
10
|
+
|
|
7
11
|
from ni.datastore.metadata._grpc_conversion import (
|
|
8
12
|
populate_extension_value_message_map,
|
|
9
13
|
populate_from_extension_value_message_map,
|
|
10
14
|
)
|
|
11
|
-
from ni.measurements.metadata.v1.metadata_store_pb2 import (
|
|
12
|
-
UutInstance as UutInstanceProto,
|
|
13
|
-
)
|
|
14
15
|
|
|
15
16
|
|
|
16
17
|
class UutInstance:
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/_types/_error_information.py
RENAMED
|
File without changes
|
|
File without changes
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/data/_types/_published_condition.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_grpc_conversion.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{ni_datastore-2.0.0.dev0 → ni_datastore-2.1.0}/src/ni/datastore/metadata/_types/_extension_schema.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|