Skip to content

Commit 378d425

Browse files
dixonjoelJoel Dixon
andauthored
Uptake the changes to publish responses and add get_condition and get_measurement from id (#73)
* Upgrade to latest data.client dependency * Fix mypy errors * Fix nps style errors * Update examples for new API * Update all notebooks for the new datastore service API * Add unit test coverage for get_measurement and get_condition. * Remove call to get_measurement - not needed --------- Co-authored-by: Joel Dixon <joel.dixon@emerson.com>
1 parent baf80c4 commit 378d425

19 files changed

+253
-198
lines changed

examples/notebooks/custom-metadata/custom_metadata.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
"\n",
142142
"step = Step(name=\"Initial step\", test_result_id=test_result_id)\n",
143143
"step_id = data_store_client.create_step(step)\n",
144-
"published_measurement = data_store_client.publish_measurement(\n",
144+
"data_store_client.publish_measurement(\n",
145145
" name=\"scope reading\",\n",
146146
" value=waveform,\n",
147147
" step_id=step_id,\n",

examples/notebooks/overview/publish_measurement.ipynb

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,12 @@
223223
")\n",
224224
"step = Step(name=\"Initial step\", test_result_id=test_result_id)\n",
225225
"step_id = data_store_client.create_step(step)\n",
226-
"published_measurement = data_store_client.publish_measurement(\n",
226+
"published_measurement_id = data_store_client.publish_measurement(\n",
227227
" name=name,\n",
228228
" value=waveform,\n",
229229
" step_id=step_id,\n",
230230
")\n",
231-
"\n",
232-
"print(f\"The published measurement id is {published_measurement.id}\")"
231+
"print(f\"The published measurement id is {published_measurement_id}\")"
233232
]
234233
},
235234
{
@@ -251,7 +250,7 @@
251250
"source": [
252251
"from nitypes.waveform import AnalogWaveform\n",
253252
"\n",
254-
"published_measurements = data_store_client.query_measurements(odata_query=f\"$filter=id eq {published_measurement.id}\")\n",
253+
"published_measurements = data_store_client.query_measurements(odata_query=f\"$filter=id eq {published_measurement_id}\")\n",
255254
"found_measurement = next(iter(published_measurements), None)\n",
256255
"\n",
257256
"if found_measurement is not None:\n",

examples/overview/poetry.lock

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/overview/pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ requires-poetry = '>=2.1,<3.0'
4141
[tool.poetry.dependencies]
4242
python = "^3.10"
4343
protobuf = {version=">=4.21"}
44-
ni-datamonikers-v1-client = { version = ">=0.1.0.dev1", allow-prereleases = true }
45-
ni-measurements-data-v1-client = { version = ">=0.2.0.dev2", allow-prereleases = true }
46-
ni-measurements-metadata-v1-client = { version = ">=0.2.0.dev2", allow-prereleases = true }
4744
ni-protobuf-types = { version = ">=1.0.1.dev0", allow-prereleases = true }
4845
hightime = { version = ">=0.3.0.dev0", allow-prereleases = true }
4946
grpcio-tools = [

examples/overview/src/overview.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,17 @@ def publish_data() -> str:
7777
# Publish the test step with the waveform data
7878
step = Step(name="Initial step", test_result_id=test_result_id)
7979
step_id = data_store_client.create_step(step)
80-
published_measurement = data_store_client.publish_measurement(
80+
published_measurement_id = data_store_client.publish_measurement(
8181
name=name,
8282
value=waveform,
8383
step_id=step_id,
8484
)
85+
published_measurement = data_store_client.get_measurement(published_measurement_id)
8586
print(
8687
f"Published measurement: '{published_measurement.name}' with id {published_measurement.id}"
8788
)
8889

89-
return published_measurement.id
90+
return published_measurement_id
9091

9192

9293
def query_data(published_measurement_id: str) -> None:

examples/system/poetry.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

poetry.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ requires-poetry = '>=2.1,<3.0'
3838
python = "^3.10"
3939
protobuf = {version=">=4.21"}
4040
ni-datamonikers-v1-client = { version = ">=0.1.0.dev1", allow-prereleases = true }
41-
ni-measurements-data-v1-client = { version = ">=0.2.0.dev2", allow-prereleases = true }
41+
ni-measurements-data-v1-client = { version = ">=0.2.0.dev4", allow-prereleases = true }
4242
ni-measurements-metadata-v1-client = { version = ">=0.2.0.dev2", allow-prereleases = true }
4343
ni-protobuf-types = { version = ">=1.0.1.dev0", allow-prereleases = true }
4444
hightime = { version = ">=0.3.0.dev0", allow-prereleases = true }

0 commit comments

Comments
 (0)