feat(street): Add tutorial schema for street

Author: susilnem

apps/project/graphql/inputs/inputs.py

@@ -18,6 +18,7 @@
 from .project_types.compare import CompareProjectPropertyInput
 from .project_types.completeness import CompletenessProjectPropertyInput
 from .project_types.find import FindProjectPropertyInput
+from .project_types.street import StreetProjectPropertyInput
 from .project_types.validate import ValidateProjectPropertyInput
 from .project_types.validate_image import ValidateImageProjectPropertyInput
 
@@ -51,6 +52,7 @@ class ProjectTypeSpecificInput:
     completeness: CompletenessProjectPropertyInput | None = strawberry.UNSET
     validate: ValidateProjectPropertyInput | None = strawberry.UNSET
     validate_image: ValidateImageProjectPropertyInput | None = strawberry.UNSET
+    street: StreetProjectPropertyInput | None = strawberry.UNSET
 
 
 # NOTE: Make sure this matches with the serializers ../serializers.py

apps/project/graphql/inputs/project_types/street.py

@@ -3,5 +3,9 @@
 from project_types.street import project as street_project
 
 
+@strawberry.experimental.pydantic.input(model=street_project.StreetMappilaryImageFilters, all_fields=True)
+class StreetMappilaryImageFiltersInput: ...
+
+
 @strawberry.experimental.pydantic.input(model=street_project.StreetProjectProperty, all_fields=True)
 class StreetProjectPropertyInput: ...

apps/project/tests/mutation_test.py

@@ -8,6 +8,7 @@
 from PIL import Image
 from ulid import ULID
 
+from apps.common.models import AssetMimetypeEnum, IconEnum
 from apps.contributor.factories import ContributorTeamFactory
 from apps.project.factories import OrganizationFactory, ProjectFactory
 from apps.project.models import (
@@ -23,6 +24,7 @@
 from apps.tutorial.models import Tutorial
 from apps.user.factories import UserFactory
 from main.tests import TestCase
+from project_types.street import project as street_project
 from project_types.tile_map_service.compare import project as compare_project
 from utils.geo.raster_tile_server.config import RasterTileServerNameEnum
 
@@ -1319,3 +1321,103 @@ class TaskGroupType(typing.TypedDict):
         assert resp_data["errors"] is None, content
         assert resp_data["result"]["status"] == self.genum(Project.Status.PUBLISHED)
         assert resp_data["result"]["processingStatus"] == self.genum(Project.ProcessingStatus.COMPLETED)
+
+    @patch("apps.project.serializers.process_project_task.delay")
+    def test_project_street(self, mock_requests):
+        self.force_login(self.user)
+        project_data = {
+            **self.project_data,
+            "clientId": str(ULID()),
+            "projectType": self.genum(ProjectTypeEnum.STREET),
+        }
+        content = self._create_project_mutation(project_data)
+        resp_data = content["data"]["createProject"]
+        assert resp_data["errors"] is None, content
+
+        project_id = resp_data["result"]["id"]
+        project_client_id = resp_data["result"]["clientId"]
+
+        # Creating AOI Project Asset
+        project_asset_data = {
+            "project": project_id,
+            "mimetype": self.genum(AssetMimetypeEnum.GEOJSON),
+            "clientId": str(ULID()),
+        }
+
+        content = self._create_project_aoi_asset(project_asset_data, assert_errors=True)
+        resp_data = content["data"]["createProjectAsset"]
+        assert resp_data["errors"] is None, content
+        aoi_geometry_asset = resp_data["result"]
+
+        # Creating Project Image Asset
+        project_asset_data = {
+            "project": project_id,
+            "mimetype": self.genum(AssetMimetypeEnum.IMAGE_JPEG),
+            "clientId": str(ULID()),
+        }
+        content = self._create_project_image_asset(project_asset_data, assert_errors=True)
+        resp_data = content["data"]["createProjectAsset"]
+        assert resp_data["errors"] is None, content
+        image_asset = resp_data["result"]
+
+        # Updating Project
+        project_data = {
+            "clientId": project_client_id,
+            "image": image_asset["id"],
+            "verificationNumber": 10,
+            "projectTypeSpecifics": {
+                "street": {
+                    "aoiGeometry": aoi_geometry_asset["id"],
+                    "customOptions": {
+                        "clientId": str(ULID()),
+                        "description": "Street project description",
+                        "icon": self.genum(IconEnum.ADD_OUTLINE),
+                        "iconColor": "#FF0000",
+                        "title": "Street Project Title",
+                        "value": 1,
+                    },
+                    "mapillaryImageFilters": {
+                        "isPano": True,
+                        "creatorId": None,
+                        "organizationId": None,
+                        "startTime": None,
+                        "endTime": None,
+                        "randomizeOrder": False,
+                        "samplingThreshold": None,
+                    },
+                },
+            },
+        }
+        content = self._update_project_mutation(project_id, project_data)
+        resp_data = content["data"]["updateProject"]
+        assert resp_data["errors"] is None, content
+
+        latest_project = Project.objects.get(pk=project_id)
+        assert latest_project.created_by_id == self.user.pk
+        assert latest_project.modified_by_id == self.user.pk
+        assert latest_project.image_id == int(image_asset["id"])
+        assert latest_project.project_type_specifics == {
+            "aoi_geometry": aoi_geometry_asset["id"],
+        }
+
+        street_project.StreetProjectProperty.model_validate(
+            latest_project.project_type_specifics,
+            context={"project_id": latest_project.pk},
+        )
+
+        # Updating Project:
+        # Test project processing
+        project_data = {
+            "clientId": project_client_id,
+            "status": self.genum(Project.Status.MARKED_AS_READY),
+        }
+        content = self._update_project_mutation(project_id, project_data)
+        resp_data = content["data"]["updateProject"]
+        assert resp_data["errors"] is None, content
+        assert resp_data["result"]["status"] == self.genum(Project.Status.MARKED_AS_READY)
+        assert resp_data["result"]["processingStatus"] is None
+
+        mock_requests.assert_called_once()
+        mock_requests.assert_has_calls([call(int(project_id))])
+
+        process_project_task(int(project_id))

project_types/street/project.py

@@ -18,7 +18,6 @@
 from main.bulk_managers import BulkCreateManager
 from project_types.base import project as base_project
 from project_types.street.api_calls import get_image_metadata
-from utils import fields as custom_fields
 from utils.common import create_json_dump
 from utils.custom_options.models import CustomOption
 
@@ -65,7 +64,7 @@ class StreetMappilaryImageFilters(BaseModel):
 
 
 class StreetProjectProperty(base_project.BaseProjectProperty):
-    aoi_geometry: custom_fields.PydanticId
+    aoi_geometry: typing.Annotated[str, Field(strict=True, pattern=r"^\d+$")] | None = None
     custom_options: list[CustomOption] | None = None
     mappilary_image_filters: StreetMappilaryImageFilters
 
@@ -174,6 +173,7 @@ def create_groups(self, resp: StreetRawGroupItem):
         self.project.update_processing_status(Project.ProcessingStatus.GENERATING_GROUPS_AND_TASKS, True)
         number_of_groups = math.ceil(len(resp["feature_ids"]) / self.project.group_size)
 
+        # FIXME (susilnem): We can directly use the firebase_id instead of total_tasks_accumulated
         total_tasks_accumulated: int = 0
 
         for group_id in range(number_of_groups):

project_types/street/tutorial.py

@@ -1,10 +1,15 @@
-from apps.tutorial.models import Tutorial
+import typing
+
+from osgeo import ogr
+from pyfirebase_mapswipe import models as firebase_models
+
+from apps.project.models import ProjectTypeEnum
+from apps.tutorial.models import Tutorial, TutorialTask
 from project_types.base import tutorial as base_tutorial
 from project_types.street.project import StreetProjectProperty
 
 
 class StreetTutorialTaskProperty(base_tutorial.BaseTutorialTaskProperty):
-    identifier: int
     object_geometry: str
 
 
@@ -19,3 +24,52 @@ class StreetTutorial(
 
     def __init__(self, tutorial: Tutorial):
         super().__init__(tutorial)
+
+    @typing.override
+    def get_task_specifics_for_firebase(self, task: TutorialTask, index: int):
+        task_specifics = self.tutorial_task_property_class(
+            **task.project_type_specifics,
+        )
+
+        geometry_ogr = ogr.CreateGeometryFromJson(task_specifics.object_geometry)
+        geometry_wkt = geometry_ogr.ExportToWkt()
+
+        return firebase_models.FbStreetTutorialTask(
+            taskId=f"t{index}",
+            geometry=geometry_wkt,
+            screen=task.scenario.scenario_page_number,
+            referenceAnswer=task.reference,
+        )
+
+    @typing.override
+    def get_tutorial_specifics_for_firebase(self):
+        custom_opts = self.project_type_specifics.custom_options
+
+        projectType = ProjectTypeEnum.STREET.value
+        assert projectType == 7, "Project Street should be 7"
+
+        return firebase_models.FbStreetTutorial(
+            zoomLevel=14,
+            projectType=projectType,
+            customOptions=[
+                firebase_models.FbObjCustomOption(
+                    title=opt.title,
+                    description=opt.description,
+                    value=opt.value,
+                    icon=str(opt.icon.label),
+                    iconColor=opt.icon_color,
+                    subOptions=[
+                        firebase_models.FbBaseObjCustomSubOption(
+                            value=sub_opt.value,
+                            description=sub_opt.description,
+                        )
+                        for sub_opt in opt.sub_options
+                    ]
+                    if opt.sub_options is not None
+                    else None,
+                )
+                for opt in custom_opts
+            ]
+            if custom_opts is not None
+            else None,
+        )

schema.graphql

@@ -294,7 +294,7 @@ type CompareProjectPropertyType {
   tileServerBProperty: ProjectRasterTileServerConfig!
 }
 
-union CompareProjectPropertyTypeFindProjectPropertyTypeValidateProjectPropertyTypeValidateImageProjectPropertyTypeCompletenessProjectPropertyType = CompareProjectPropertyType | FindProjectPropertyType | ValidateProjectPropertyType | ValidateImageProjectPropertyType | CompletenessProjectPropertyType
+union CompareProjectPropertyTypeFindProjectPropertyTypeValidateProjectPropertyTypeValidateImageProjectPropertyTypeCompletenessProjectPropertyTypeStreetProjectPropertyType = CompareProjectPropertyType | FindProjectPropertyType | ValidateProjectPropertyType | ValidateImageProjectPropertyType | CompletenessProjectPropertyType | StreetProjectPropertyType
 
 input CompareTutorialTaskPropertyInput {
   tileX: Int!
@@ -308,7 +308,7 @@ type CompareTutorialTaskPropertyType {
   tileZ: Int!
 }
 
-union CompareTutorialTaskPropertyTypeFindTutorialTaskPropertyTypeValidateTutorialTaskPropertyTypeValidateImageTutorialTaskPropertyTypeCompletenessTutorialTaskPropertyType = CompareTutorialTaskPropertyType | FindTutorialTaskPropertyType | ValidateTutorialTaskPropertyType | ValidateImageTutorialTaskPropertyType | CompletenessTutorialTaskPropertyType
+union CompareTutorialTaskPropertyTypeFindTutorialTaskPropertyTypeValidateTutorialTaskPropertyTypeValidateImageTutorialTaskPropertyTypeCompletenessTutorialTaskPropertyTypeStreetTutorialTaskPropertyType = CompareTutorialTaskPropertyType | FindTutorialTaskPropertyType | ValidateTutorialTaskPropertyType | ValidateImageTutorialTaskPropertyType | CompletenessTutorialTaskPropertyType | StreetTutorialTaskPropertyType
 
 input CompletenessProjectPropertyInput {
   zoomLevel: Int!
@@ -1609,7 +1609,7 @@ type ProjectType implements UserResourceTypeMixin & ProjectExportAssetTypeMixin
   Project name generated from topic, region, project number, and requesting organization name.
   """
   name: String!
-  projectTypeSpecifics: CompareProjectPropertyTypeFindProjectPropertyTypeValidateProjectPropertyTypeValidateImageProjectPropertyTypeCompletenessProjectPropertyType
+  projectTypeSpecifics: CompareProjectPropertyTypeFindProjectPropertyTypeValidateProjectPropertyTypeValidateImageProjectPropertyTypeCompletenessProjectPropertyTypeStreetProjectPropertyType
 }
 
 type ProjectTypeAreaStatsType {
@@ -1624,6 +1624,7 @@ enum ProjectTypeEnum {
   VALIDATE_IMAGE
   COMPARE
   COMPLETENESS
+  STREET
 }
 
 input ProjectTypeEnumFilterLookup {
@@ -1696,6 +1697,7 @@ input ProjectTypeSpecificInput @oneOf {
   completeness: CompletenessProjectPropertyInput
   validate: ValidateProjectPropertyInput
   validateImage: ValidateImageProjectPropertyInput
+  street: StreetProjectPropertyInput
 }
 
 type ProjectTypeSwipeStatsType {
@@ -1891,6 +1893,68 @@ input StrFilterLookup {
   iRegex: String
 }
 
+type StreetMappilaryImageFilters {
+  """Filter for images that are panoramas."""
+  isPano: Boolean
+
+  """Filter for images created by a specific user."""
+  creatorId: Int
+
+  """Filter for images that belong to a specific organization."""
+  organizationId: String
+
+  """Filter for images captured after this timestamp."""
+  startTime: String
+
+  """Filter for images captured before this timestamp."""
+  endTime: String
+
+  """Randomize the order of the images."""
+  randomizeOrder: Boolean!
+
+  """Sampling threshold for filtering images."""
+  samplingThreshold: Int
+}
+
+input StreetMappilaryImageFiltersInput {
+  """Filter for images that are panoramas."""
+  isPano: Boolean = null
+
+  """Filter for images created by a specific user."""
+  creatorId: Int = null
+
+  """Filter for images that belong to a specific organization."""
+  organizationId: String = null
+
+  """Filter for images captured after this timestamp."""
+  startTime: String = null
+
+  """Filter for images captured before this timestamp."""
+  endTime: String = null
+
+  """Randomize the order of the images."""
+  randomizeOrder: Boolean! = false
+
+  """Sampling threshold for filtering images."""
+  samplingThreshold: Int = null
+}
+
+input StreetProjectPropertyInput {
+  aoiGeometry: String = null
+  customOptions: [CustomOptionInput!] = null
+  mappilaryImageFilters: StreetMappilaryImageFiltersInput!
+}
+
+type StreetProjectPropertyType {
+  aoiGeometry: String
+  customOptions: [ProjectCustomOption!]
+  mappilaryImageFilters: StreetMappilaryImageFilters!
+}
+
+type StreetTutorialTaskPropertyType {
+  objectGeometry: String!
+}
+
 """
 TutorialAsset(id, client_id, created_at, modified_at, created_by, modified_by, type, mimetype, file_size, marked_as_deleted, external_url, tutorial, input_type, file)
 """
@@ -2253,7 +2317,7 @@ type TutorialTaskType implements UserResourceTypeMixin {
   id: ID!
   scenarioId: ID!
   reference: Int!
-  projectTypeSpecifics: CompareTutorialTaskPropertyTypeFindTutorialTaskPropertyTypeValidateTutorialTaskPropertyTypeValidateImageTutorialTaskPropertyTypeCompletenessTutorialTaskPropertyType
+  projectTypeSpecifics: CompareTutorialTaskPropertyTypeFindTutorialTaskPropertyTypeValidateTutorialTaskPropertyTypeValidateImageTutorialTaskPropertyTypeCompletenessTutorialTaskPropertyTypeStreetTutorialTaskPropertyType
 }
 
 """