fixup! feat(validate): add queries to test object counts

Author: frozenhelium

apps/project/graphql/queries.py

@@ -1,3 +1,5 @@
+import logging
+
 import strawberry
 import strawberry_django
 from django.db.models import QuerySet
@@ -12,6 +14,7 @@
     TestValidateTaskingManagerProjectResponse,
 )
 from apps.project.models import Organization, Project, ProjectAsset, ProjectTypeEnum
+from project_types.base.project import ValidationException
 from project_types.validate.project import ValidateProject
 from utils import fields
 from utils.geo.raster_tile_server.config import RasterConfig, RasterTileServerNameEnum, RasterTileServerNameEnumWithoutCustom
@@ -31,6 +34,8 @@
     ProjectType,
 )
 
+logger = logging.getLogger(__name__)
+
 
 def get_tile_servers() -> RasterTileServersType:
     def _get_raster_tile_server_type(enum: RasterTileServerNameEnumWithoutCustom):
@@ -116,8 +121,10 @@ def test_aoi_objects(
 
             response.object_count = object_count
             return response
-        except Exception as e:
+        except ValidationException as e:
             return response.generate_error(str(e))
+        except Exception as e:
+            raise GraphQLError(str(e)) from e
 
     @strawberry.field(extensions=[IsAuthenticated()])
     def test_tasking_manager_project(
@@ -145,8 +152,10 @@ def test_tasking_manager_project(
             response.object_count = object_count
 
             return response
-        except Exception as e:
+        except ValidationException as e:
             return response.generate_error(str(e))
+        except Exception as e:
+            raise GraphQLError(str(e)) from e
 
     tile_servers: RasterTileServersType = strawberry.field(resolver=get_tile_servers, extensions=[IsAuthenticated()])
 

project_types/validate/api_calls.py

@@ -194,8 +194,8 @@ def get_object_count_from_ohsome(area: str, ohsome_filter: PydanticLongText) ->
         raise ValidateApiCallError
     logger.info("Query successful.")
 
-    response = response.json()
-    results = response.get("result", None)
+    response_json = response.json()
+    results = response_json.get("result", None)
     if results is None:
         return None
 
@@ -204,14 +204,10 @@ def get_object_count_from_ohsome(area: str, ohsome_filter: PydanticLongText) ->
         return None
 
     value = first_result.get("value", None)
-    if value is not None and not isinstance(value, int):
-        logger.warning(
-            "unexpected type received from ohsome element count request",
-            extra=log_extra_response(response=response),
-        )
-        raise ValidateApiCallError
+    if value is None:
+        return None
 
-    return value
+    return int(value)
 
 
 def ohsome(request: dict[str, Any], area: str, properties: str | None = None) -> dict[str, Any]:

project_types/validate/project.py

@@ -184,10 +184,13 @@ def test_ohsome_objects_from_aoi_asset(project_id: strawberry.ID, asset_id: stra
 
         feature_collection = PydanticFeatureCollection.model_validate(aoi_geojson)
 
-        object_count = get_object_count_from_ohsome(
-            feature_collection.model_dump_json(),
-            ohsome_filter,
-        )
+        try:
+            object_count = get_object_count_from_ohsome(
+                feature_collection.model_dump_json(),
+                ohsome_filter,
+            )
+        except Exception as e:
+            raise base_project.ValidationException("Failed to get object_count from ohsome") from e
 
         return ValidateProject.validate_object_count(object_count)
 
@@ -230,11 +233,13 @@ def test_tasking_manager_project(
         }
 
         feature_collection = ValidateProject.validate_geojson_aoi(aoi_geojson)
-
-        object_count = get_object_count_from_ohsome(
-            feature_collection.model_dump_json(),
-            ohsome_filter,
-        )
+        try:
+            object_count = get_object_count_from_ohsome(
+                feature_collection.model_dump_json(),
+                ohsome_filter,
+            )
+        except Exception as e:
+            raise base_project.ValidationException("Failed to get object_count from ohsome") from e
 
         return ValidateProject.validate_object_count(object_count)
 

schema.graphql

@@ -2053,8 +2053,8 @@ type Query {
   publicOrganizations(filters: OrganizationFilter, order: OrganizationOrder, pagination: OffsetPaginationInput): OrganizationTypeOffsetPaginated!
   publicProject(id: ID!): ProjectType!
   publicProjects(filters: ProjectFilter, order: ProjectOrder, pagination: OffsetPaginationInput): ProjectTypeOffsetPaginated!
-  testAoiObjects(projectId: ID, assetId: ID, ohsomeFilter: String): TestAoiObjectsResponse! @isAuthenticated
-  testTaskingManagerProject(hotTmId: String, ohsomeFilter: String): TestTaskingManagerProjectResponse! @isAuthenticated
+  testAoiObjects(projectId: ID, assetId: ID, ohsomeFilter: String): TestValidateAoiObjectsResponse! @isAuthenticated
+  testTaskingManagerProject(hotTmId: String, ohsomeFilter: String): TestValidateTaskingManagerProjectResponse! @isAuthenticated
   tileServers: RasterTileServersType! @isAuthenticated
   tutorial(id: ID!): TutorialType! @isAuthenticated
   tutorialAsset(id: ID!): TutorialAssetType! @isAuthenticated
@@ -2190,7 +2190,7 @@ type StreetTutorialTaskPropertyType {
   mapillaryImageId: String!
 }
 
-type TestAoiObjectsResponse {
+type TestValidateAoiObjectsResponse {
   assetId: ID
   error: String
   objectCount: Int
@@ -2199,7 +2199,7 @@ type TestAoiObjectsResponse {
   projectId: ID
 }
 
-type TestTaskingManagerProjectResponse {
+type TestValidateTaskingManagerProjectResponse {
   error: String
   hotTmId: String
   objectCount: Int