Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[High Priority] Update default value for the pin map sites #915

Merged
merged 1 commit into from
Sep 23, 2024
Merged

[High Priority] Update default value for the pin map sites #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions ...or/ni_measurement_plugin_sdk_generator/client/templates/measurement_plugin_client.py.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class ${class_name}:
if grpc_channel is not None:
self._stub = v2_measurement_service_pb2_grpc.MeasurementServiceStub(grpc_channel)
self._create_file_descriptor()
self._pin_map_context: Optional[PinMapContext] = None
self._pin_map_context: PinMapContext = PinMapContext(pin_map_id="", sites=[0])
MounikaBattu17 marked this conversation as resolved.
Show resolved Hide resolved

@property
def pin_map_context(self) -> PinMapContext:
Expand All @@ -136,8 +136,7 @@ class ${class_name}:
@property
def sites(self) -> List[int]:
"""The sites where the measurement must be executed."""
if self._pin_map_context is not None:
return self._pin_map_context.sites
return self._pin_map_context.sites

@sites.setter
def sites(self, val: List[int]) -> None:
Expand Down Expand Up @@ -206,7 +205,7 @@ class ${class_name}:
)
return v2_measurement_service_pb2.MeasureRequest(
configuration_parameters=serialized_configuration,
pin_map_context=self._pin_map_context._to_grpc() if self._pin_map_context else None,
pin_map_context=self._pin_map_context._to_grpc(),
)

% if output_metadata:
Expand Down Expand Up @@ -298,10 +297,7 @@ class ${class_name}:
pin_map_path: Absolute path of the pin map file.
"""
pin_map_id = self._get_pin_map_client().update_pin_map(pin_map_path)
if self._pin_map_context is None:
self._pin_map_context = PinMapContext(pin_map_id=pin_map_id, sites=[0])
else:
self._pin_map_context = self._pin_map_context._replace(pin_map_id=pin_map_id)
self._pin_map_context = self._pin_map_context._replace(pin_map_id=pin_map_id)

% if "from pathlib import Path" in built_in_import_modules:

Expand Down
12 changes: 4 additions & 8 deletions ...assets/example_renders/measurement_plugin_client/non_streaming_data_measurement_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ def __init__(
if grpc_channel is not None:
self._stub = v2_measurement_service_pb2_grpc.MeasurementServiceStub(grpc_channel)
self._create_file_descriptor()
self._pin_map_context: Optional[PinMapContext] = None
self._pin_map_context: PinMapContext = PinMapContext(pin_map_id="", sites=[0])

@property
def pin_map_context(self) -> PinMapContext:
Expand All @@ -438,8 +438,7 @@ def pin_map_context(self, val: PinMapContext) -> None:
@property
def sites(self) -> List[int]:
"""The sites where the measurement must be executed."""
if self._pin_map_context is not None:
return self._pin_map_context.sites
return self._pin_map_context.sites

@sites.setter
def sites(self, val: List[int]) -> None:
Expand Down Expand Up @@ -510,7 +509,7 @@ def _create_measure_request(
)
return v2_measurement_service_pb2.MeasureRequest(
configuration_parameters=serialized_configuration,
pin_map_context=self._pin_map_context._to_grpc() if self._pin_map_context else None,
pin_map_context=self._pin_map_context._to_grpc(),
)

def _deserialize_response(
Expand Down Expand Up @@ -667,10 +666,7 @@ def register_pin_map(self, pin_map_path: Path) -> None:
pin_map_path: Absolute path of the pin map file.
"""
pin_map_id = self._get_pin_map_client().update_pin_map(pin_map_path)
if self._pin_map_context is None:
self._pin_map_context = PinMapContext(pin_map_id=pin_map_id, sites=[0])
else:
self._pin_map_context = self._pin_map_context._replace(pin_map_id=pin_map_id)
self._pin_map_context = self._pin_map_context._replace(pin_map_id=pin_map_id)


def _convert_paths_to_strings(parameter_values: Iterable[Any]) -> List[Any]:
Expand Down
12 changes: 4 additions & 8 deletions ...or/tests/test_assets/example_renders/measurement_plugin_client/void_measurement_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def __init__(
if grpc_channel is not None:
self._stub = v2_measurement_service_pb2_grpc.MeasurementServiceStub(grpc_channel)
self._create_file_descriptor()
self._pin_map_context: Optional[PinMapContext] = None
self._pin_map_context: PinMapContext = PinMapContext(pin_map_id="", sites=[0])

@property
def pin_map_context(self) -> PinMapContext:
Expand All @@ -91,8 +91,7 @@ def pin_map_context(self, val: PinMapContext) -> None:
@property
def sites(self) -> List[int]:
"""The sites where the measurement must be executed."""
if self._pin_map_context is not None:
return self._pin_map_context.sites
return self._pin_map_context.sites

@sites.setter
def sites(self, val: List[int]) -> None:
Expand Down Expand Up @@ -163,7 +162,7 @@ def _create_measure_request(
)
return v2_measurement_service_pb2.MeasureRequest(
configuration_parameters=serialized_configuration,
pin_map_context=self._pin_map_context._to_grpc() if self._pin_map_context else None,
pin_map_context=self._pin_map_context._to_grpc(),
)

def measure(self, integer_in: int = 10) -> None:
Expand Down Expand Up @@ -216,7 +215,4 @@ def register_pin_map(self, pin_map_path: Path) -> None:
pin_map_path: Absolute path of the pin map file.
"""
pin_map_id = self._get_pin_map_client().update_pin_map(pin_map_path)
if self._pin_map_context is None:
self._pin_map_context = PinMapContext(pin_map_id=pin_map_id, sites=[0])
else:
self._pin_map_context = self._pin_map_context._replace(pin_map_id=pin_map_id)
self._pin_map_context = self._pin_map_context._replace(pin_map_id=pin_map_id)