Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 41 additions & 12 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 17 additions & 16 deletions src/ni/datastore/data/_data_store_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,10 @@
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 (
Expand All @@ -51,6 +36,22 @@
)
from ni_grpc_extensions.channelpool import GrpcChannelPool

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

if TYPE_CHECKING:
if sys.version_info >= (3, 11):
from typing import Self
Expand Down
11 changes: 7 additions & 4 deletions src/ni/datastore/data/_types/_published_measurement.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,18 @@
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.
Expand Down
11 changes: 6 additions & 5 deletions src/ni/datastore/data/_types/_step.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@
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:
Expand Down
11 changes: 6 additions & 5 deletions src/ni/datastore/data/_types/_test_result.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@
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:
Expand Down
25 changes: 13 additions & 12 deletions src/ni/datastore/metadata/_metadata_store_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,6 @@
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,
Expand Down Expand Up @@ -65,6 +53,19 @@
)
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
Expand Down
2 changes: 1 addition & 1 deletion src/ni/datastore/metadata/_types/_alias.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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:
Expand Down
7 changes: 4 additions & 3 deletions src/ni/datastore/metadata/_types/_hardware_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

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:
Expand Down
7 changes: 4 additions & 3 deletions src/ni/datastore/metadata/_types/_metadata_items.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

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
Expand All @@ -13,9 +17,6 @@
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:
Expand Down
7 changes: 4 additions & 3 deletions src/ni/datastore/metadata/_types/_operator.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

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:
Expand Down
7 changes: 4 additions & 3 deletions src/ni/datastore/metadata/_types/_software_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

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:
Expand Down
7 changes: 4 additions & 3 deletions src/ni/datastore/metadata/_types/_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

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:
Expand Down
7 changes: 4 additions & 3 deletions src/ni/datastore/metadata/_types/_test_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

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:
Expand Down
Loading
Loading