fixup! feat(street): Add max time spend percentile

Author: susilnem

project_types/street/api_calls.py

@@ -2,7 +2,7 @@
 from collections.abc import Hashable
 from concurrent.futures import ProcessPoolExecutor
 from functools import partial
-from typing import Any, TypedDict
+from typing import Any
 from warnings import deprecated
 
 import mercantile
@@ -19,14 +19,13 @@
 
 from main.config import Config
 from main.logging import log_extra_response
+from utils.common import Grouping
 from utils.spatial_sampling import spatial_sampling
 
 logger = logging.getLogger(__name__)
 
 
-class StreetRawGroupItem(TypedDict):
-    ids: list[int]
-    geometries: list[Point]
+class StreetFeature(Point): ...
 
 
 class StreetException(Exception):
@@ -267,7 +266,7 @@ def get_image_metadata(
     end_time: str | None = None,
     randomize_order: bool = False,
     sampling_threshold: int | None = None,
-) -> StreetRawGroupItem:
+) -> Grouping[StreetFeature]:
     kwargs = {
         "is_pano": is_pano,
         "creator_id": creator_id,
@@ -302,7 +301,7 @@ def get_image_metadata(
             f"Too many Images with selected filter options for the AoI: {total_images}",
         )
 
-    return StreetRawGroupItem(
-        ids=downloaded_metadata["id"].tolist(),
-        geometries=downloaded_metadata["geometry"].tolist(),
+    return Grouping[StreetFeature](
+        feature_ids=downloaded_metadata["id"].tolist(),
+        features=downloaded_metadata["geometry"].tolist(),
     )

project_types/street/project.py

@@ -8,7 +8,6 @@
 from pydantic import BaseModel
 from pyfirebase_mapswipe import models as firebase_models
 from shapely import to_wkt
-from shapely.geometry.point import Point
 from ulid import ULID
 
 from apps.common.models import AssetMimetypeEnum, AssetTypeEnum
@@ -22,9 +21,9 @@
 )
 from main.bulk_managers import BulkCreateManager
 from project_types.base import project as base_project
-from project_types.street.api_calls import StreetRawGroupItem, get_image_metadata
+from project_types.street.api_calls import StreetFeature, get_image_metadata
 from utils import fields as custom_fields
-from utils.common import create_json_dump
+from utils.common import Grouping, create_json_dump
 from utils.custom_options.models import CustomOption
 
 logger = logging.getLogger(__name__)
@@ -59,8 +58,8 @@ class StreetProject(
         StreetProjectProperty,
         StreetTaskGroupProperty,
         StreetTaskProperty,
-        StreetRawGroupItem,
-        list[tuple[int, Point]],
+        Grouping[StreetFeature],
+        Grouping[StreetFeature],
     ],
 ):
     project_property_class = StreetProjectProperty
@@ -73,7 +72,7 @@ def __init__(self, project: Project):
             assert project.project_type == ProjectTypeEnum.STREET, f"{type(self)} is defined for STREET"
 
     @typing.override
-    def validate(self) -> StreetRawGroupItem:
+    def validate(self) -> Grouping[StreetFeature]:
         """Validate project before creating groups."""
         self.project.update_processing_status(Project.ProcessingStatus.VALIDATING_GEOMETRY, True)
 
@@ -105,13 +104,14 @@ def create_tasks(
         self,
         /,
         group: ProjectTaskGroup,
-        raw_group: list[tuple[int, Point]],
+        raw_group: Grouping[StreetFeature],
     ) -> int:
         """Create tasks for a group."""
         bulk_mgr = BulkCreateManager(chunk_size=1000)
         tasks_count = 0
+        features = list(zip(raw_group["feature_ids"], raw_group["features"], strict=True))
 
-        for f_id, feature in raw_group:
+        for f_id, feature in features:
             geometry_str = to_wkt(feature)
 
             bulk_mgr.add(
@@ -131,17 +131,18 @@ def create_tasks(
         return tasks_count
 
     @typing.override
-    def create_groups(self, resp: StreetRawGroupItem):
+    def create_groups(self, resp: Grouping[StreetFeature]):
         self.project.update_processing_status(Project.ProcessingStatus.GENERATING_GROUPS_AND_TASKS, True)
-        number_of_groups = math.ceil(len(resp["ids"]) / self.project.group_size)
+        number_of_groups = math.ceil(len(resp["feature_ids"]) / self.project.group_size)
 
         for group_id in range(number_of_groups):
             start_index = group_id * self.project.group_size
             end_index = start_index + self.project.group_size
 
-            group_features = resp["geometries"][start_index:end_index]
-            group_feature_ids = resp["ids"][start_index:end_index]
-            features = list(zip(group_feature_ids, group_features, strict=True))
+            features = Grouping[StreetFeature](
+                feature_ids=resp["feature_ids"][start_index:end_index],
+                features=resp["features"][start_index:end_index],
+            )
             new_group = ProjectTaskGroup.objects.create(
                 firebase_id=f"g{group_id}",
                 project_id=self.project.pk,
@@ -153,7 +154,10 @@ def create_groups(self, resp: StreetRawGroupItem):
             )
 
             # Create new tasks for this group
-            total_tasks = self.create_tasks(new_group, features)
+            total_tasks = self.create_tasks(
+                group=new_group,
+                raw_group=features,
+            )
             logger.info("Created %s tasks for group: %s", total_tasks, new_group.pk)
 
     @typing.override