[Fixes #13939] Add support for non-spatial datasets in CSV format in GeoNode

geonode/base/models.py

@@ -955,23 +955,27 @@ def raw_abstract(self):
 
     @property
     def can_be_downloaded(self):
-        return self.subtype in {"vector", "raster", "vector_time"}
+        return self.subtype in {"vector", "raster", "vector_time", "tabular"}
 
     @property
     def can_have_wfs_links(self):
         return self.subtype == "vector"
 
     @property
     def can_have_wps_links(self):
-        return self.subtype in {"vector", "tileStore", "remote", "wmsStore", "vector_time"}
+        return self.subtype in {"vector", "tileStore", "remote", "wmsStore", "vector_time", "tabular"}
+
+    @property
+    def should_create_style(self):
+        return self.subtype != "tabular"
 
     @property
     def can_have_style(self):
-        return self.subtype not in {"tileStore", "remote"}
+        return self.subtype not in {"tabular", "tileStore", "remote", "tabular"}
 
     @property
     def can_have_thumbnail(self):
-        return self.subtype not in {"3dtiles", "cog", "flatgeobuf"}
+        return self.subtype not in {"tabular", "3dtiles", "cog", "flatgeobuf"}
 
     @property
     def raw_purpose(self):
@@ -993,6 +997,15 @@ def raw_data_quality_statement(self):
     def detail_url(self):
         return self.get_absolute_url()
 
+    def fixup_store_type(self, keys, values):
+        from geonode.geoserver.helpers import get_dataset_storetype
+
+        if self.subtype == "tabular":
+            return self
+        for key in keys:
+            setattr(self, key, get_dataset_storetype(values[key]))
+        return self
+
     def clean(self):
         if self.title:
             self.title = self.title.replace(",", "_")

geonode/geoserver/helpers.py

@@ -101,6 +101,7 @@
     ("application/wfs-collection-1.1", "vector"),
     ("application/zip", "vector"),
     ("text/csv", "vector"),
+    ("text/csv", "tabular"),
 ]
 
 DEFAULT_STYLE_NAME = ["generic", "line", "point", "polygon", "raster"]
@@ -1974,10 +1975,7 @@ def sync_instance_with_geoserver(instance_id, *args, **kwargs):
                 instance.gs_resource = gs_resource
 
                 # Iterate over values from geoserver.
-                for key in ["alternate", "store", "subtype"]:
-                    # attr_name = key if 'typename' not in key else 'alternate'
-                    # print attr_name
-                    setattr(instance, key, get_dataset_storetype(values[key]))
+                instance = instance.fixup_store_type(["alternate", "store", "subtype"], values)
 
                 if updatemetadata:
                     _sync_geoserver_keywords_to_instance(instance, gs_resource.keywords)
@@ -2077,7 +2075,7 @@ def sync_instance_with_geoserver(instance_id, *args, **kwargs):
                     # Refresh from DB
                     instance.refresh_from_db()
 
-                if updatemetadata:
+                if updatemetadata and instance.should_create_style:
                     # Save dataset styles
                     logger.debug(f"... Refresh Legend links for Dataset {instance.title}")
                     try:

geonode/geoserver/tasks.py

@@ -154,6 +154,9 @@ def geoserver_create_style(self, instance_id, name, sld_file, tempdir):
         logger.debug(f"Dataset id {instance_id} does not exist yet!")
         raise
 
+    if not instance.should_create_style:
+        return
+
     lock_id = f"{self.request.id}" if self.request.id else instance.name
     log_lock.debug(f"geoserver_create_style: Creating lock {lock_id} for {instance.name}")
     with AcquireLock(lock_id) as lock:

geonode/layers/api/serializers.py

@@ -189,6 +189,7 @@ class Meta:
                     "store",
                     "subtype",
                     "ptype",
+                    "is_tabular",
                 )
             )
         )

geonode/layers/models.py

@@ -166,6 +166,10 @@ def is_vector(self):
     def is_raster(self):
         return self.subtype == "raster"
 
+    @property
+    def is_tabular(self):
+        return self.subtype == "tabular"
+
     @property
     def supports_time(self):
         valid_attributes = self.get_choices

geonode/upload/celery_tasks.py

@@ -1046,6 +1046,9 @@ def upsert_data(self, execution_id, /, handler_module_path, action, **kwargs):
 
         _datastore.pre_processing(**kwargs)
 
+        if not _datastore.input_is_valid():
+            raise Exception("dataset is invalid")
+
         is_valid, errors = _datastore.upsert_validation(execution_id, **kwargs)
         if not is_valid:
             raise UpsertException(errors)

geonode/upload/handlers/README.md

@@ -149,7 +149,7 @@ class BaseVectorFileHandler(BaseHandler):
         return
 
     def create_geonode_resource(
-        self, layer_name: str, alternate: str, execution_id: str, resource_type: Dataset = Dataset, files=None
+        self, layer_name: str, alternate: str, execution_id: str, resource_type: Dataset = Dataset, files=None, **kwargs
     ):
         """
         Base function to create the resource into geonode. Each handler can specify

geonode/upload/handlers/common/raster.py

@@ -25,7 +25,6 @@
 from typing import List
 
 from django.conf import settings
-from django.db.models import Q
 from geonode.base.models import ResourceBase
 from geonode.layers.models import Dataset
 from geonode.resource.enumerator import ExecutionRequestAction as exa
@@ -238,11 +237,7 @@ def extract_resource_to_publish(self, files, action, layer_name, alternate, **kw
             return [
                 {
                     "name": alternate,
-                    "crs": ResourceBase.objects.filter(
-                        Q(alternate__icontains=layer_name) | Q(title__icontains=layer_name)
-                    )
-                    .first()
-                    .srid,
+                    "crs": ResourceBase.objects.filter(alternate=kwargs.get("original_dataset_alternate")).first().srid,
                     "raster_path": raster_path,
                 }
             ]
@@ -328,12 +323,7 @@ def import_resource(self, files: dict, execution_id: str, **kwargs) -> str:
         return
 
     def create_geonode_resource(
-        self,
-        layer_name: str,
-        alternate: str,
-        execution_id: str,
-        resource_type: Dataset = Dataset,
-        asset=None,
+        self, layer_name: str, alternate: str, execution_id: str, resource_type: Dataset = Dataset, asset=None, **kwargs
     ):
         """
         Base function to create the resource into geonode. Each handler can specify
@@ -385,12 +375,7 @@ def create_geonode_resource(
         return saved_dataset
 
     def overwrite_geonode_resource(
-        self,
-        layer_name: str,
-        alternate: str,
-        execution_id: str,
-        resource_type: Dataset = Dataset,
-        asset=None,
+        self, layer_name: str, alternate: str, execution_id: str, resource_type: Dataset = Dataset, asset=None, **kwargs
     ):
 
         _exec = self._get_execution_request_object(execution_id)
@@ -404,7 +389,19 @@ def overwrite_geonode_resource(
         if dataset.exists() and _overwrite:
             dataset = dataset.first()
 
-            dataset = resource_manager.update(dataset.uuid, instance=dataset)
+            dataset = resource_manager.update(
+                dataset.uuid,
+                instance=dataset,
+                vals=dict(
+                    name=alternate,
+                    workspace=dataset.workspace,
+                    subtype="raster",
+                    alternate=f"{dataset.workspace}:{alternate}",
+                    dirty_state=True,
+                    title=layer_name,
+                    owner=_exec.user,
+                ),
+            )
 
             self.handle_xml_file(dataset, _exec)
             self.handle_sld_file(dataset, _exec)

geonode/upload/handlers/common/remote.py

@@ -204,6 +204,7 @@ def create_geonode_resource(
         execution_id: str,
         resource_type: ResourceBase = ResourceBase,
         asset=None,
+        **kwargs,
     ):
         """
         Creating geonode base resource

geonode/upload/handlers/common/tests_vector.py

@@ -298,6 +298,9 @@ def test_import_resource_should_not_be_imported(self, celery_chord, ogr2ogr_driv
         If the resource exists and should be skept, the celery task
         is not going to be called and the layer is skipped
         """
+        mocked_obj = MagicMock()
+        mocked_obj.name = "CSV"
+        ogr2ogr_driver.return_value = mocked_obj
         exec_id = None
         try:
             # create the executionId
@@ -312,9 +315,9 @@ def test_import_resource_should_not_be_imported(self, celery_chord, ogr2ogr_driv
                 # start the resource import
                 self.handler.import_resource(files=self.valid_files, execution_id=str(exec_id))
             self.assertIn(
-                "No valid layers found",
+                "not recognized as a supported file format.",
                 exception.exception.args[0],
-                "No valid layers found.",
+                "not recognized as a supported file format.",
             )
 
             celery_chord.assert_not_called()