From d588eb1c67ce3f533d41c4553d904601850faea5 Mon Sep 17 00:00:00 2001 From: Github Actions Bot Date: Thu, 10 Aug 2023 22:57:53 +0000 Subject: [PATCH 1/2] style: [CI] format --- spatialyze/video_processor/utils/format_trajectory.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spatialyze/video_processor/utils/format_trajectory.py b/spatialyze/video_processor/utils/format_trajectory.py index 9b49c0f..69f6762 100644 --- a/spatialyze/video_processor/utils/format_trajectory.py +++ b/spatialyze/video_processor/utils/format_trajectory.py @@ -1,6 +1,7 @@ import datetime -import numpy.typing as npt + import numpy as np +import numpy.typing as npt from ..camera_config import CameraConfig from ..stages.segment_trajectory.construct_segment_trajectory import SegmentPoint @@ -29,8 +30,8 @@ def format_trajectory( for tracking_result_3d, ego_info, segment_mapping in track: if ego_info: if ( - ego_info.filename is not None and - "sweeps/CAM_FRONT/n008-2018-08-30-15-16-55-0400__CAM_FRONT__1535657125362404.jpg" + ego_info.filename is not None + and "sweeps/CAM_FRONT/n008-2018-08-30-15-16-55-0400__CAM_FRONT__1535657125362404.jpg" in ego_info.filename ): info_found.append( From bdcdcb77f40c79561707097d32f1154e291453a3 Mon Sep 17 00:00:00 2001 From: "Chanwut (Mick) Kittivorawong" Date: Thu, 10 Aug 2023 16:09:12 -0700 Subject: [PATCH 2/2] fix typing --- spatialyze/video_processor/utils/format_trajectory.py | 2 +- spatialyze/video_processor/utils/insert_trajectory.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/spatialyze/video_processor/utils/format_trajectory.py b/spatialyze/video_processor/utils/format_trajectory.py index 69f6762..de23007 100644 --- a/spatialyze/video_processor/utils/format_trajectory.py +++ b/spatialyze/video_processor/utils/format_trajectory.py @@ -11,7 +11,7 @@ def format_trajectory( video_name: "str", - obj_id: "str", + obj_id: "int", track: "list[tuple[Tracking3DResult, CameraConfig, SegmentPoint | None]]", base=None, ): diff --git a/spatialyze/video_processor/utils/insert_trajectory.py b/spatialyze/video_processor/utils/insert_trajectory.py index 9df5bd0..2198c29 100644 --- a/spatialyze/video_processor/utils/insert_trajectory.py +++ b/spatialyze/video_processor/utils/insert_trajectory.py @@ -1,3 +1,7 @@ +import datetime +import numpy as np +import numpy.typing as np + from ...database import Database from ...utils import join from ..types import Float3 @@ -9,9 +13,9 @@ def insert_trajectory( item_id: str, camera_id: str, object_type: str, - postgres_timestamps: "list[str]", - pairs: "list[Float3]", - itemHeading_list: "list[int]", + postgres_timestamps: "list[datetime.datetime]", + pairs: "list[npt.NDArray[np.floating]]", + itemHeading_list: "list[float | None]", translation_list: "list[Float3]", # road_types: "list[str]", # roadpolygon_list: "list[list[tuple[float, float]]]"