From 2e02c5d25993ce814daccf8bd80aab13fb46c151 Mon Sep 17 00:00:00 2001 From: "Chanwut (Mick) Kittivorawong" Date: Sun, 25 Feb 2024 00:49:17 -0800 Subject: [PATCH] fix type --- .../video_processor/utils/insert_trajectory.py | 4 ++-- .../video_processor/utils/prepare_trajectory.py | 11 +---------- spatialyze/video_processor/utils/types.py | 12 ++++++++++++ 3 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 spatialyze/video_processor/utils/types.py diff --git a/spatialyze/video_processor/utils/insert_trajectory.py b/spatialyze/video_processor/utils/insert_trajectory.py index d57a1c2..53d3bb6 100644 --- a/spatialyze/video_processor/utils/insert_trajectory.py +++ b/spatialyze/video_processor/utils/insert_trajectory.py @@ -6,16 +6,16 @@ from psycopg2.sql import SQL, Literal from ..types import Float3 -from ..utils.prepare_trajectory import Trajectory from .infer_heading import infer_heading if TYPE_CHECKING: from ...database import Database + from .types import Trajectory def insert_trajectory( database: "Database", - trajectory: Trajectory, + trajectory: "Trajectory", ): ( item_id, diff --git a/spatialyze/video_processor/utils/prepare_trajectory.py b/spatialyze/video_processor/utils/prepare_trajectory.py index c92b1d2..003e7e0 100644 --- a/spatialyze/video_processor/utils/prepare_trajectory.py +++ b/spatialyze/video_processor/utils/prepare_trajectory.py @@ -1,18 +1,9 @@ import datetime -from typing import NamedTuple from ..camera_config import CameraConfig from ..stream.strongsort import TrackingResult from ..types import Float3 - - -class Trajectory(NamedTuple): - obj_id: int | str - ids: list[int] - camera_id: str - object_type: str - pairs: list[Float3] - itemHeadings: list[float | None] +from .types import Trajectory def prepare_trajectory( diff --git a/spatialyze/video_processor/utils/types.py b/spatialyze/video_processor/utils/types.py new file mode 100644 index 0000000..09955f4 --- /dev/null +++ b/spatialyze/video_processor/utils/types.py @@ -0,0 +1,12 @@ +from typing import NamedTuple + +from ..types import Float3 + + +class Trajectory(NamedTuple): + obj_id: int | str + ids: list[int] + camera_id: str + object_type: str + pairs: list[Float3] + itemHeadings: list[float | None]