Minor fix on upload workflow

Author: mattiagiupponi

geonode/upload/api/serializer.py

@@ -21,6 +21,7 @@
 from geonode.base.api.serializers import BaseDynamicModelSerializer
 from geonode.base.models import ResourceBase
 from geonode.upload.models import UploadParallelismLimit, UploadSizeLimit
+from geonode.resource.enumerator import ExecutionRequestAction as exa
 
 
 class ImporterSerializer(DynamicModelSerializer):
@@ -42,7 +43,7 @@ class Meta:
     sld_file = serializers.FileField(required=False)
     store_spatial_files = serializers.BooleanField(required=False, default=True)
     skip_existing_layers = serializers.BooleanField(required=False, default=False)
-    action = serializers.CharField(required=True)
+    action = serializers.CharField(required=False, default=exa.UPLOAD.value)
 
 
 class OverwriteImporterSerializer(ImporterSerializer):

geonode/upload/handlers/common/serializer.py

@@ -19,6 +19,7 @@
 from rest_framework import serializers
 from dynamic_rest.serializers import DynamicModelSerializer
 from geonode.base.models import ResourceBase
+from geonode.resource.enumerator import ExecutionRequestAction as exa
 
 
 class RemoteResourceSerializer(DynamicModelSerializer):
@@ -34,6 +35,6 @@ class Meta:
         required=True,
         help_text="Remote resource type, for example wms or 3dtiles. Is used by the handler to understand if can handle the resource",
     )
-    action = serializers.CharField(required=True)
+    action = serializers.CharField(required=False, default=exa.UPLOAD.value)
 
     overwrite_existing_layer = serializers.BooleanField(required=False, default=False)

geonode/upload/handlers/common/vector.py

@@ -612,7 +612,12 @@ def setup_dynamic_model(
             "is_dynamic_model_managed", False
         )
         workspace = DataPublisher(None).workspace
-        user_datasets = Dataset.objects.filter(owner=username, alternate__iexact=f"{workspace.name}:{layer_name}")
+
+        if resource_pk := orchestrator.get_execution_object(execution_id).input_params.get("resource_pk", None):
+            user_datasets = Dataset.objects.filter(owner=username, pk=resource_pk)
+        else:
+            user_datasets = Dataset.objects.filter(owner=username, alternate__iexact=f"{workspace.name}:{layer_name}")
+
         dynamic_schema = ModelSchema.objects.filter(name__iexact=layer_name)
 
         dynamic_schema_exists = dynamic_schema.exists()
@@ -624,6 +629,7 @@ def setup_dynamic_model(
             we just take the dynamic_model to overwrite the existing one
             """
             dynamic_schema = dynamic_schema.get()
+            layer_name = user_datasets.first().alternate.split(":")[-1]
         elif not dataset_exists and not dynamic_schema_exists:
             """
             cames here when is a new brand upload or when (for any reasons) the dataset exists but the
@@ -687,14 +693,15 @@ def create_dynamic_model_fields(
 
         # definition of the celery group needed to run the async workflow.
         # in this way each task of the group will handle only 30 field
+        layer_name = layer.GetName() if not isinstance(layer, str) else layer_name
         celery_group = group(
             create_dynamic_structure.s(
                 execution_id,
                 schema,
                 dynamic_model_schema.id,
                 overwrite,
                 layer_name,
-                layer_key=create_layer_key(layer.GetName(), str(execution_id)),
+                layer_key=create_layer_key(layer_name, str(execution_id)),
             )
             for schema in list_chunked
         )

geonode/upload/handlers/empty_dataset/serializer.py

@@ -18,6 +18,7 @@
 #########################################################################
 from rest_framework import serializers
 from dynamic_rest.serializers import DynamicModelSerializer
+from geonode.resource.enumerator import ExecutionRequestAction as exa
 
 from geonode.base.models import ResourceBase
 
@@ -32,6 +33,6 @@ class Meta:
     title = serializers.CharField()
     geom = serializers.CharField()
     attributes = serializers.JSONField()
-    action = serializers.CharField(required=True)
+    action = serializers.CharField(required=False, default=exa.CREATE.value)
     is_empty = serializers.BooleanField(default=True, read_only=True, required=False)
     is_dynamic_model_managed = serializers.BooleanField(default=True, read_only=True, required=False)

geonode/upload/handlers/shapefile/serializer.py

@@ -19,6 +19,7 @@
 from rest_framework import serializers
 from dynamic_rest.serializers import DynamicModelSerializer
 from geonode.base.models import ResourceBase
+from geonode.resource.enumerator import ExecutionRequestAction as exa
 
 
 class ShapeFileSerializer(DynamicModelSerializer):
@@ -48,7 +49,7 @@ class Meta:
     store_spatial_files = serializers.BooleanField(required=False, default=True)
     overwrite_existing_layer = serializers.BooleanField(required=False, default=False)
     skip_existing_layers = serializers.BooleanField(required=False, default=False)
-    action = serializers.CharField(required=True)
+    action = serializers.CharField(required=False, default=exa.UPLOAD.value)
 
 
 class OverwriteShapeFileSerializer(ShapeFileSerializer):

geonode/upload/handlers/tiles3d/handler.py

@@ -276,6 +276,10 @@ def create_geonode_resource(
 
         return resource
 
+    def create_asset_and_link(self, resource, files, action=None, asset_name=None, asset_type=None, **kwargs):
+        if asset_type and kwargs.get("extension", None):
+            return super().create_asset_and_link(resource, files, action, asset_name, asset_type, **kwargs)
+
     def generate_resource_payload(self, layer_name, alternate, asset, _exec, workspace):
         return dict(
             resource_type="dataset",

geonode/upload/handlers/xml/serializer.py

@@ -18,6 +18,7 @@
 #########################################################################
 from rest_framework import serializers
 from dynamic_rest.serializers import DynamicModelSerializer
+from geonode.resource.enumerator import ExecutionRequestAction as exa
 
 from geonode.base.models import ResourceBase
 
@@ -32,4 +33,4 @@ class Meta:
     base_file = serializers.FileField()
     overwrite_existing_layer = serializers.BooleanField(required=False, default=True)
     resource_pk = serializers.IntegerField(required=True)
-    action = serializers.CharField(required=True)
+    action = serializers.CharField(required=False, default=exa.UPLOAD.value)