Merge pull request #1628 from pierotofy/compact

Fix thermal layer name in project map view, add compact feature, onboarding settings

Author: pierotofy

app/api/tasks.py

@@ -153,6 +153,10 @@ def restart(self, *args, **kwargs):
     def remove(self, *args, **kwargs):
         return self.set_pending_action(pending_actions.REMOVE, *args, perms=('delete_project', ), **kwargs)
 
+    @action(detail=True, methods=['post'])
+    def compact(self, *args, **kwargs):
+        return self.set_pending_action(pending_actions.COMPACT, *args, perms=('delete_project', ), **kwargs)
+
     @action(detail=True, methods=['get'])
     def output(self, request, pk=None, project_pk=None):
         """

app/migrations/0041_auto_20250311_2007.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.27 on 2025-03-11 20:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0040_auto_20241106_1832'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='task',
+            name='compacted',
+            field=models.BooleanField(default=False, help_text='A flag indicating whether this task was compacted', verbose_name='Compact'),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='pending_action',
+            field=models.IntegerField(blank=True, choices=[(1, 'CANCEL'), (2, 'REMOVE'), (3, 'RESTART'), (4, 'RESIZE'), (5, 'IMPORT'), (6, 'COMPACT')], db_index=True, help_text='A requested action to be performed on the task. The selected action will be performed by the worker at the next iteration.', null=True, verbose_name='Pending Action'),
+        ),
+    ]

app/models/task.py

@@ -235,6 +235,7 @@ class Task(models.Model):
         (pending_actions.RESTART, 'RESTART'),
         (pending_actions.RESIZE, 'RESIZE'),
         (pending_actions.IMPORT, 'IMPORT'),
+        (pending_actions.COMPACT, 'COMPACT'),
     )
 
     TASK_PROGRESS_LAST_VALUE = 0.85
@@ -285,6 +286,8 @@ class Task(models.Model):
     tags = models.TextField(db_index=True, default="", blank=True, help_text=_("Task tags"), verbose_name=_("Tags"))
     orthophoto_bands = fields.JSONField(default=list, blank=True, help_text=_("List of orthophoto bands"), verbose_name=_("Orthophoto Bands"))
     size = models.FloatField(default=0.0, blank=True, help_text=_("Size of the task on disk in megabytes"), verbose_name=_("Size"))
+    compacted = models.BooleanField(default=False, help_text=_("A flag indicating whether this task was compacted"), verbose_name=_("Compact"))
+    
 
     class Meta:
         verbose_name = _("Task")
@@ -807,6 +810,14 @@ def callback(progress):
 
                     # Stop right here!
                     return
+                
+                elif self.pending_action == pending_actions.COMPACT:
+                    logger.info("Compacting {}".format(self))
+                    time.sleep(2) # Purely to make sure the user sees the "compacting..." message in the UI since this is so fast
+                    self.compact()
+                    self.pending_action = None
+                    self.save()
+                    return
 
             if self.processing_node:
                 # Need to update status (first time, queued or running?)
@@ -1121,7 +1132,6 @@ def update_orthophoto_bands_field(self, commit=False):
         self.orthophoto_bands = bands
         if commit: self.save()
 
-
     def delete(self, using=None, keep_parents=False):
         task_id = self.id
         from app.plugins import signals as plugin_signals
@@ -1142,6 +1152,19 @@ def delete(self, using=None, keep_parents=False):
 
         plugin_signals.task_removed.send_robust(sender=self.__class__, task_id=task_id)
 
+    def compact(self):
+        # Remove all images
+        images_path = self.task_path()
+        images = [os.path.join(images_path, i) for i in self.scan_images()]
+        for im in images:
+            try:
+                os.unlink(im)
+            except Exception as e:
+                logger.warning(e)
+
+        self.compacted = True
+        self.update_size(commit=True)
+
     def set_failure(self, error_message):
         logger.error("FAILURE FOR {}: {}".format(self, error_message))
         self.last_error = error_message
@@ -1157,7 +1180,8 @@ def find_all_files_matching(self, regex):
     def check_if_canceled(self):
         # Check if task has been canceled/removed
         if Task.objects.only("pending_action").get(pk=self.id).pending_action in [pending_actions.CANCEL,
-                                                                                  pending_actions.REMOVE]:
+                                                                                  pending_actions.REMOVE,
+                                                                                  pending_actions.COMPACT]:
             raise TaskInterruptedException()
 
     def resize_images(self):

app/pending_actions.py

@@ -3,3 +3,4 @@
 RESTART = 3
 RESIZE = 4
 IMPORT = 5
+COMPACT = 6

app/static/app/js/classes/PendingActions.js

@@ -4,7 +4,8 @@ const CANCEL = 1,
       REMOVE = 2,
       RESTART = 3,
       RESIZE = 4,
-      IMPORT = 5;
+      IMPORT = 5,
+      COMPACT = 6;
 
 let pendingActions = {
     [CANCEL]: {
@@ -21,6 +22,9 @@ let pendingActions = {
     },
     [IMPORT]: {
       descr: _("Importing...")
+    },
+    [COMPACT]: {
+      descr: _("Compacting...")
     }
 };
 
@@ -30,6 +34,7 @@ export default {
     RESTART: RESTART,
     RESIZE: RESIZE,
     IMPORT: IMPORT,
+    COMPACT: COMPACT,
 
     description: function(pendingAction) {
       if (pendingActions[pendingAction]) return pendingActions[pendingAction].descr;

app/static/app/js/components/Map.jsx

@@ -106,12 +106,12 @@ class Map extends React.Component {
     }
   }
 
-  typeToHuman = (type) => {
+  typeToHuman = (type, thermal = false) => {
       switch(type){
           case "orthophoto":
               return _("Orthophoto");
           case "plant":
-              return this.props.thermal ? _("Thermal") : _("Plant Health");
+              return thermal ? _("Thermal") : _("Plant Health");
           case "dsm":
               return _("Surface Model");
           case "dtm":
@@ -120,12 +120,12 @@ class Map extends React.Component {
       return "";
   }
 
-  typeToIcon = (type) => {
+  typeToIcon = (type, thermal = false) => {
     switch(type){
         case "orthophoto":
             return "far fa-image fa-fw"
         case "plant":
-            return this.props.thermal ? "fa fa-thermometer-half fa-fw" : "fa fa-seedling fa-fw";
+            return thermal ? "fa fa-thermometer-half fa-fw" : "fa fa-seedling fa-fw";
         case "dsm":
         case "dtm":
             return "fa fa-chart-area fa-fw";
@@ -265,8 +265,12 @@ class Map extends React.Component {
                 });
 
             // Associate metadata with this layer
-            meta.name = this.typeToHuman(type);
-            meta.icon = this.typeToIcon(type);
+            let thermal = typeof(mres) === 'object' && mres.band_descriptions && 
+                          Array.isArray(mres.band_descriptions) && mres.band_descriptions.length > 0 &&
+                          mres.band_descriptions[0].indexOf("lwir") !== -1;
+
+            meta.name = this.typeToHuman(type, this.props.thermal || thermal);
+            meta.icon = this.typeToIcon(type, this.props.thermal || thermal);
             meta.type = type;
             meta.raster = true;
             meta.autoExpand = this.taskCount === 1 && type === this.props.mapType;

app/static/app/js/components/NewTaskPanel.jsx

@@ -239,7 +239,7 @@ class NewTaskPanel extends React.Component {
               ref={(domNode) => { if (domNode) this.taskForm = domNode; }}
             />
 
-            {this.state.editTaskFormLoaded && this.props.showAlign && this.state.showMapPreview ?
+            {this.state.editTaskFormLoaded && this.props.showAlign && this.state.showMapPreview && this.state.alignTasks.length > 0 ?
               <div>
                 <div className="form-group">
                   <label className="col-sm-2 control-label">{_("Alignment")}</label>

app/static/app/js/components/TaskListItem.jsx

@@ -461,11 +461,13 @@ class TaskListItem extends React.Component {
 
     const disabled = this.state.actionButtonsDisabled || 
                     ([pendingActions.CANCEL,
-                      pendingActions.REMOVE, 
+                      pendingActions.REMOVE,
+                      pendingActions.COMPACT,
                       pendingActions.RESTART].indexOf(task.pending_action) !== -1);
     const editable = this.props.hasPermission("change") && [statusCodes.FAILED, statusCodes.COMPLETED, statusCodes.CANCELED].indexOf(task.status) !== -1;
     const actionLoading = this.state.actionLoading;
-
+    const showAssetButtons = task.status === statusCodes.COMPLETED;
+    
     let expanded = "";
     if (this.state.expanded){
       let showOrthophotoMissingWarning = false,
@@ -484,7 +486,7 @@ class TaskListItem extends React.Component {
         });
       };
 
-      if (task.status === statusCodes.COMPLETED){
+      if (showAssetButtons){
         if (task.available_assets.indexOf("orthophoto.tif") !== -1 || task.available_assets.indexOf("dsm.tif") !== -1){
           addActionButton(" " + _("View Map"), "btn-primary", "fa fa-globe", () => {
             location.href = `/map/project/${task.project}/task/${task.id}/`;
@@ -514,7 +516,8 @@ class TaskListItem extends React.Component {
       if ([statusCodes.FAILED, statusCodes.COMPLETED, statusCodes.CANCELED].indexOf(task.status) !== -1 &&
             task.processing_node &&
             this.props.hasPermission("change") &&
-            !imported){
+            !imported &&
+            !task.compacted){
           // By default restart reruns every pipeline
           // step from the beginning
           const rerunFrom = task.can_rerun_from.length > 1 ?
@@ -534,7 +537,7 @@ class TaskListItem extends React.Component {
       }
 
       actionButtons = (<div className="action-buttons">
-            {task.status === statusCodes.COMPLETED ?
+            {showAssetButtons ?
               <AssetDownloadButtons task={this.state.task} disabled={disabled} />
             : ""}
             {actionButtons.map(button => {
@@ -672,7 +675,6 @@ class TaskListItem extends React.Component {
             </div>
           </div>
           <div className="row clearfix">
-            <ErrorMessage bind={[this, 'actionError']} />
             {actionButtons}
           </div>
           <TaskPluginActionButtons task={task} disabled={disabled} />
@@ -734,6 +736,10 @@ class TaskListItem extends React.Component {
           type = 'neutral';
       }
 
+      if (task.pending_action === pendingActions.COMPACT){
+        statusIcon = 'fa fa-cog fa-spin fa-fw';
+      }
+
       statusLabel = getStatusLabel(status, type, progress);
     }
 
@@ -764,8 +770,15 @@ class TaskListItem extends React.Component {
 
     if (this.props.hasPermission("delete")){
         taskActions.push(
-            <li key="sep" role="separator" className="divider"></li>,
+            <li key="sep" role="separator" className="divider"></li>
         );
+
+        if (task.status === statusCodes.COMPLETED && !task.compacted){
+          addTaskAction(_("Compact"), "fa fa-database", this.genActionApiCall("compact", {
+              confirm: _("Compacting will free disk space by permanently deleting the original images used for processing. It will no longer be possible to restart the task. Maps and models will remain in place. Continue?"),
+              defaultError: _("Cannot compact task.")
+          }));
+        }
 
         addTaskAction(_("Delete"), "fa fa-trash", this.genActionApiCall("remove", {
             confirm: _("All information related to this task, including images, maps and models will be deleted. Continue?"),
@@ -816,6 +829,7 @@ class TaskListItem extends React.Component {
             : ""}
           </div>
         </div>
+        <ErrorMessage bind={[this, 'actionError']} />
         {expanded}
       </div>
     );