Add label upload endpoint and enhance label creation logic

backend/core/urls.py

@@ -16,6 +16,7 @@
     FeedbackViewset,
     GenerateFeedbackAOIGpxView,
     GenerateGpxView,
+    LabelUploadView,
     LabelViewSet,
     ModelCentroidView,
     ModelViewSet,
@@ -52,6 +53,7 @@
 urlpatterns = [
     path("", include(router.urls)),
     path("label/osm/fetch/<int:aoi_id>/", RawdataApiAOIView.as_view()),
+    path("labels/upload/<int:aoi_id>/", LabelUploadView.as_view(), name="label-upload"),
     path(
         "label/feedback/osm/fetch/<int:feedbackaoi_id>/",
         RawdataApiFeedbackView.as_view(),

backend/core/views.py

@@ -372,9 +372,29 @@ class LabelViewSet(viewsets.ModelViewSet):
     )
     filterset_fields = ["aoi", "aoi__dataset"]
 
+    def create(self, request, *args, **kwargs):
+        aoi_id = request.data.get("aoi")
+        geom = request.data.get("geom")
+
+        existing_label = Label.objects.filter(aoi=aoi_id, geom=geom).first()
+
+        if existing_label:
+            serializer = LabelSerializer(existing_label, data=request.data)
+        else:
+            serializer = LabelSerializer(data=request.data)
+
+        if serializer.is_valid():
+            serializer.save()
+            return Response(serializer.data, status=status.HTTP_200_OK)
+        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
+
+class LabelUploadView(APIView):
+    authentication_classes = [OsmAuthentication]
+    permission_classes = [IsOsmAuthenticated]
     parser_classes = (MultiPartParser, FormParser)
 
-    def create(self, request, *args, **kwargs):
+    def post(self, request, aoi_id, *args, **kwargs):
         geojson_file = request.FILES.get("geojson_file")
         if geojson_file:
             try:
@@ -383,29 +403,17 @@ def create(self, request, *args, **kwargs):
                 async_task(
                     "core.views.process_labels_geojson",
                     geojson_data,
-                    request.data.get("aoi"),
+                    aoi_id,
                 )
                 return Response(
                     {"status": "GeoJSON file is being processed"},
                     status=status.HTTP_202_ACCEPTED,
                 )
             except (json.JSONDecodeError, ValidationError) as e:
                 return Response({"error": str(e)}, status=status.HTTP_400_BAD_REQUEST)
-
-        aoi_id = request.data.get("aoi")
-        geom = request.data.get("geom")
-
-        existing_label = Label.objects.filter(aoi=aoi_id, geom=geom).first()
-
-        if existing_label:
-            serializer = LabelSerializer(existing_label, data=request.data)
-        else:
-            serializer = LabelSerializer(data=request.data)
-
-        if serializer.is_valid():
-            serializer.save()
-            return Response(serializer.data, status=status.HTTP_200_OK)
-        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+        return Response(
+            {"error": "No GeoJSON file provided"}, status=status.HTTP_400_BAD_REQUEST
+        )
 
     def validate_geojson(self, geojson_data):
         if geojson_data.get("type") != "FeatureCollection":
@@ -427,9 +435,8 @@ def validate_geojson(self, geojson_data):
             )
 
         # Validate the first feature with the serializer
-        aoi_id = self.request.data.get("aoi")
         label_data = {
-            "aoi": aoi_id,
+            "aoi": self.kwargs.get("aoi_id"),
             "geom": first_feature["geometry"],
             **first_feature["properties"],
         }
@@ -447,7 +454,12 @@ def process_labels_geojson(geojson_data, aoi_id):
             geom = feature["geometry"]
             properties = feature["properties"]
             label_data = {"aoi": aoi_id, "geom": geom, **properties}
-            serializer = LabelSerializer(data=label_data)
+
+            existing_label = Label.objects.filter(aoi=aoi_id, geom=geom).first()
+            if existing_label:
+                serializer = LabelSerializer(existing_label, data=label_data)
+            else:
+                serializer = LabelSerializer(data=label_data)
             if serializer.is_valid():
                 serializer.save()