Merge pull request #233 from labmlai/archive

update folders on the local cache

Author: lakshith-403

app/server/labml_app/db/project.py

@@ -36,7 +36,9 @@ def is_project_session(self, session_uuid: str) -> bool:
     def get_runs(self, folder_name: str = "Default") -> List['run.Run']:
         res = []
         likely_deleted = []
-        run_uuids = self.runs.keys()
+        run_uuids = []
+        if folder_name == 'all':
+            run_uuids = self.runs.keys()
         if folder_name in self.folders:
             f = self.folders[folder_name].load()
             if f:
@@ -52,7 +54,8 @@ def get_runs(self, folder_name: str = "Default") -> List['run.Run']:
                 logger.error('error in creating run list, ' + run_uuid + ':' + str(e))
 
         for run_uuid in likely_deleted:
-            self.runs.pop(run_uuid)
+            if run_uuid in self.runs:
+                self.runs.pop(run_uuid)
 
         if self.is_run_added:
             self.is_run_added = False
@@ -74,7 +77,6 @@ def get_sessions(self) -> List['session.Session']:
     def delete_runs(self, run_uuids: List[str], project_owner: str) -> None:
         for run_uuid in run_uuids:
             if run_uuid in self.runs:
-                self.runs.pop(run_uuid)
                 r = run.get(run_uuid)
                 if r and r.owner == project_owner:
                     try:

app/ui/src/cache/cache.ts

@@ -299,6 +299,12 @@ export class RunCache extends CacheObject<Run> {
     async updateRunData(data: Record<string, any>): Promise<void> {
         await NETWORK.updateRunData(this.uuid, data)
     }
+
+    localUpdateFolder(folder: string) {
+        if (this.data != null) {
+            this.data.folder = folder
+        }
+    }
 }
 
 export class SessionCache extends CacheObject<Session> {
@@ -734,6 +740,11 @@ class Cache {
         archiveFolder.insertRuns(runs)
         defaultFolder.removeRuns(runUUIDS)
 
+        for (let uuid of runUUIDS) {
+            let run = this.getRun(uuid)
+            run.localUpdateFolder(RunsFolder.ARCHIVE)
+        }
+
         return response
     }
 
@@ -749,6 +760,11 @@ class Cache {
         defaultFolder.insertRuns(runs)
         archiveFolder.removeRuns(runUUIDS)
 
+        for (let uuid of runUUIDS) {
+            let run = this.getRun(uuid)
+            run.localUpdateFolder(RunsFolder.DEFAULT)
+        }
+
         return response
     }
 

app/ui/src/views/runs_list_view.ts

@@ -86,7 +86,7 @@ class RunsListView extends ScreenView {
             $('div', $ => {
                 this.userMessages.render($)
                 new HamburgerMenuView({
-                    title: 'Runs',
+                    title: (this.folder == RunsFolder.ARCHIVE ? 'Archived ' : '') + 'Runs',
                     setButtonContainer: container => this.buttonContainer = container
                 }).render($)
 
@@ -136,7 +136,8 @@ class RunsListView extends ScreenView {
     updateButtons() {
         let noRuns = this.currentRunsList.length == 0
 
-        this.deleteButton.hide(noRuns || !this.isEditMode)
+        this.deleteButton.hide((noRuns || !this.isEditMode) ||
+            (this.folder != RunsFolder.DEFAULT && this.folder != RunsFolder.ARCHIVE))
         this.cancelButton.hide(noRuns || !this.isEditMode)
         this.editButton.hide(noRuns || this.isEditMode)
         this.archiveButton.hide((noRuns || !this.isEditMode) ||