Skip to content

Commit e5866c6

Browse files
Misha Bolotskimeta-codesync[bot]
authored andcommitted
{BugFix} Core - Apply timing naming conventions to PyBind tests
Summary: Explanation: This updates Project Aria Tools PyBind test and sample code so nanosecond timestamp local variables use explicit _ns names. The changed files cover the core Python binding examples and tests plus the Aria Digital Twin dataset tools Python binding test. Public API method names and external field names are unchanged. Reproducibility: - Verified with arc lint on the modified files. - Local variable renames only; no behavior change. Reviewed By: ksmdeepak Differential Revision: D103541684 fbshipit-source-id: 329b4c21b69db510c86f0686c6c84e7454843084
1 parent 27229bc commit e5866c6

3 files changed

Lines changed: 60 additions & 56 deletions

File tree

core/python/TestBindings.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -282,15 +282,15 @@ def print_sample_random_access_image_data(provider, camera_name):
282282
option = (
283283
TimeQueryOptions.CLOSEST
284284
) # get data whose time [in TimeDomain] is Closest to query time
285-
start_time = provider.get_first_time_ns(sensor_stream_id, time_domain)
286-
end_time = provider.get_last_time_ns(sensor_stream_id, time_domain)
287-
for time in range(start_time, end_time, int(1e8)):
285+
start_time_ns = provider.get_first_time_ns(sensor_stream_id, time_domain)
286+
end_time_ns = provider.get_last_time_ns(sensor_stream_id, time_domain)
287+
for time_ns in range(start_time_ns, end_time_ns, int(1e8)):
288288
image_data = provider.get_image_data_by_time_ns(
289-
sensor_stream_id, time, time_domain, option
289+
sensor_stream_id, time_ns, time_domain, option
290290
)
291291
pixel_format = image_data[0].get_pixel_format()
292292
print(
293-
f"query time {time} and get image time {image_data[1].arrival_timestamp_ns} within range {start_time} {end_time} \n"
293+
f"query time {time_ns} and get image time {image_data[1].arrival_timestamp_ns} within range {start_time_ns} {end_time_ns} \n"
294294
f"image pixel format is {pixel_format}"
295295
)
296296

@@ -315,11 +315,11 @@ def print_sample_random_access_ppg_data(provider):
315315
option = (
316316
TimeQueryOptions.CLOSEST
317317
) # get data whose time [in TimeDomain] is Closest to query time
318-
start_time = provider.get_first_time_ns(ppg_stream_id, time_domain)
319-
end_time = provider.get_last_time_ns(ppg_stream_id, time_domain)
320-
for time in range(start_time, end_time, int(1e8)):
318+
start_time_ns = provider.get_first_time_ns(ppg_stream_id, time_domain)
319+
end_time_ns = provider.get_last_time_ns(ppg_stream_id, time_domain)
320+
for time_ns in range(start_time_ns, end_time_ns, int(1e8)):
321321
ppg_data = provider.get_ppg_data_by_time_ns(
322-
ppg_stream_id, time, time_domain, option
322+
ppg_stream_id, time_ns, time_domain, option
323323
)
324324
print_ppg_data(ppg_data)
325325

@@ -383,11 +383,11 @@ def print_sample_vio_data(provider):
383383
option = (
384384
TimeQueryOptions.CLOSEST
385385
) # get data whose time [in TimeDomain] is Closest to query time
386-
start_time = provider.get_first_time_ns(sensor_stream_id, time_domain)
387-
end_time = provider.get_last_time_ns(sensor_stream_id, time_domain)
388-
for time in range(start_time, end_time, int(1e8)):
386+
start_time_ns = provider.get_first_time_ns(sensor_stream_id, time_domain)
387+
end_time_ns = provider.get_last_time_ns(sensor_stream_id, time_domain)
388+
for time_ns in range(start_time_ns, end_time_ns, int(1e8)):
389389
vioData = provider.get_vio_data_by_time_ns(
390-
sensor_stream_id, time, time_domain, option
390+
sensor_stream_id, time_ns, time_domain, option
391391
)
392392
print(
393393
f"Getting vio data from random accessor with timestamp {vioData.capture_timestamp_ns}, frame id is {vioData.frame_id}\n"

core/python/test/corePyBindTest.py

Lines changed: 45 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -404,24 +404,24 @@ def test_random_accessor_timestamp(self) -> None:
404404
):
405405
if not provider.supports_time_domain(stream_id, time_domain):
406406
continue
407-
first_time = provider.get_first_time_ns(stream_id, time_domain)
408-
last_time = provider.get_last_time_ns(stream_id, time_domain)
409-
assert first_time <= last_time
410-
for time in range(first_time, last_time, int(1e8)):
411-
time_before = provider.get_sensor_data_by_time_ns(
412-
stream_id, time, time_domain, TimeQueryOptions.BEFORE
407+
first_time_ns = provider.get_first_time_ns(stream_id, time_domain)
408+
last_time_ns = provider.get_last_time_ns(stream_id, time_domain)
409+
assert first_time_ns <= last_time_ns
410+
for time_ns in range(first_time_ns, last_time_ns, int(1e8)):
411+
time_before_ns = provider.get_sensor_data_by_time_ns(
412+
stream_id, time_ns, time_domain, TimeQueryOptions.BEFORE
413413
).get_time_ns(time_domain)
414-
time_closest = provider.get_sensor_data_by_time_ns(
415-
stream_id, time, time_domain, TimeQueryOptions.CLOSEST
414+
time_closest_ns = provider.get_sensor_data_by_time_ns(
415+
stream_id, time_ns, time_domain, TimeQueryOptions.CLOSEST
416416
).get_time_ns(time_domain)
417-
time_after = provider.get_sensor_data_by_time_ns(
418-
stream_id, time, time_domain, TimeQueryOptions.AFTER
417+
time_after_ns = provider.get_sensor_data_by_time_ns(
418+
stream_id, time_ns, time_domain, TimeQueryOptions.AFTER
419419
).get_time_ns(time_domain)
420-
assert time_before <= time
421-
assert time_after >= time
422-
delta = abs(time_closest - time)
423-
assert delta <= (time_after - time) and delta <= (
424-
time - time_before
420+
assert time_before_ns <= time_ns
421+
assert time_after_ns >= time_ns
422+
delta = abs(time_closest_ns - time_ns)
423+
assert delta <= (time_after_ns - time_ns) and delta <= (
424+
time_ns - time_before_ns
425425
)
426426

427427
def test_random_accessor_timecode(self) -> None:
@@ -431,41 +431,45 @@ def test_random_accessor_timecode(self) -> None:
431431
for stream_id in streams:
432432
assert provider.supports_time_domain(stream_id, TimeDomain.TIME_CODE)
433433

434-
first_time = provider.get_first_time_ns(stream_id, TimeDomain.TIME_CODE)
435-
last_time = provider.get_last_time_ns(stream_id, TimeDomain.TIME_CODE)
436-
first_device_time = provider.convert_from_timecode_to_device_time_ns(
437-
first_time
434+
first_time_ns = provider.get_first_time_ns(stream_id, TimeDomain.TIME_CODE)
435+
last_time_ns = provider.get_last_time_ns(stream_id, TimeDomain.TIME_CODE)
436+
first_device_time_ns = provider.convert_from_timecode_to_device_time_ns(
437+
first_time_ns
438438
)
439-
first_device_time_compare = (
439+
first_device_time_compare_ns = (
440440
provider.convert_from_synctime_to_device_time_ns(
441-
first_time, TimeSyncMode.TIME_CODE
441+
first_time_ns, TimeSyncMode.TIME_CODE
442442
)
443443
)
444-
last_device_time = provider.convert_from_timecode_to_device_time_ns(
445-
last_time
444+
last_device_time_ns = provider.convert_from_timecode_to_device_time_ns(
445+
last_time_ns
446446
)
447-
last_device_time_compare = provider.convert_from_synctime_to_device_time_ns(
448-
last_time, TimeSyncMode.TIME_CODE
447+
last_device_time_compare_ns = (
448+
provider.convert_from_synctime_to_device_time_ns(
449+
last_time_ns, TimeSyncMode.TIME_CODE
450+
)
449451
)
450-
assert first_device_time == first_device_time_compare
451-
assert last_device_time == last_device_time_compare
452-
453-
assert first_time <= last_time
454-
assert first_device_time <= last_device_time
455-
for time in range(first_time, last_time, int(1e7)):
456-
time_before = provider.get_sensor_data_by_time_ns(
457-
stream_id, time, TimeDomain.TIME_CODE, TimeQueryOptions.BEFORE
452+
assert first_device_time_ns == first_device_time_compare_ns
453+
assert last_device_time_ns == last_device_time_compare_ns
454+
455+
assert first_time_ns <= last_time_ns
456+
assert first_device_time_ns <= last_device_time_ns
457+
for time_ns in range(first_time_ns, last_time_ns, int(1e7)):
458+
time_before_ns = provider.get_sensor_data_by_time_ns(
459+
stream_id, time_ns, TimeDomain.TIME_CODE, TimeQueryOptions.BEFORE
458460
).get_time_ns(TimeDomain.TIME_CODE)
459-
time_closest = provider.get_sensor_data_by_time_ns(
460-
stream_id, time, TimeDomain.TIME_CODE, TimeQueryOptions.CLOSEST
461+
time_closest_ns = provider.get_sensor_data_by_time_ns(
462+
stream_id, time_ns, TimeDomain.TIME_CODE, TimeQueryOptions.CLOSEST
461463
).get_time_ns(TimeDomain.TIME_CODE)
462-
time_after = provider.get_sensor_data_by_time_ns(
463-
stream_id, time, TimeDomain.TIME_CODE, TimeQueryOptions.AFTER
464+
time_after_ns = provider.get_sensor_data_by_time_ns(
465+
stream_id, time_ns, TimeDomain.TIME_CODE, TimeQueryOptions.AFTER
464466
).get_time_ns(TimeDomain.TIME_CODE)
465-
assert time_before <= time
466-
assert time_after >= time
467-
delta = abs(time_closest - time)
468-
assert delta <= (time_after - time) and delta <= (time - time_before)
467+
assert time_before_ns <= time_ns
468+
assert time_after_ns >= time_ns
469+
delta = abs(time_closest_ns - time_ns)
470+
assert delta <= (time_after_ns - time_ns) and delta <= (
471+
time_ns - time_before_ns
472+
)
469473

470474
def test_camera_calibration_rotation(self) -> None:
471475
provider = data_provider.create_vrs_data_provider(timecode_vrs_filepath)

projects/AriaDigitalTwinDatasetTools/python/TestBindings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ def test_data_provider(self):
9090
self.assertTrue(maybe_first_image.is_valid())
9191
self.assertAlmostEqual(abs(maybe_first_image.dt_ns()), 0, 3)
9292
self.assertTrue(dp.get_aria_camera_calibration(stream_id))
93-
first_tc_time = dp.get_timecode_from_device_time_ns(ts1)
93+
first_tc_time_ns = dp.get_timecode_from_device_time_ns(ts1)
9494
self.assertTrue(
95-
abs(ts1 - dp.get_device_time_from_timecode_ns(first_tc_time)) < 1000
95+
abs(ts1 - dp.get_device_time_from_timecode_ns(first_tc_time_ns)) < 1000
9696
)
9797
self.assertTrue(dp.get_aria_3d_pose_by_timestamp_ns(ts1).is_valid())
9898
self.assertTrue(dp.get_object_3d_boundingboxes_by_timestamp_ns(ts1).is_valid())

0 commit comments

Comments
 (0)