Merge pull request #237 from labmlai/stdout

Stdout

Author: lakshith-403

app/server/labml_app/analyses/experiments/stderr.py

@@ -9,7 +9,7 @@
 from fastapi import Request
 
 from labml_app.analyses.analysis import Analysis
-from labml_app.analyses.logs import Logs
+from labml_app.analyses.logs import Logs, LogPageType
 
 
 class StdErr(Logs):
@@ -42,7 +42,7 @@ async def get_std_err(request: Request, run_uuid: str) -> Any:
         return JSONResponse(status_code=404, content={'message': 'Run not found'})
 
     json = await request.json()
-    page = json.get('page', -1)
+    page = json.get('page', LogPageType.LAST.value)
 
     key = StdErrIndex.get(run_uuid)
     std_out: StdErrModel

app/server/labml_app/analyses/experiments/stdlogger.py

@@ -9,7 +9,7 @@
 from fastapi import Request
 
 from labml_app.analyses.analysis import Analysis
-from labml_app.analyses.logs import Logs
+from labml_app.analyses.logs import Logs, LogPageType
 
 
 class StdLogger(Logs):
@@ -42,7 +42,7 @@ async def get_std_logger(request: Request, run_uuid: str) -> Any:
         return JSONResponse(status_code=404, content={'message': 'Run not found'})
 
     json = await request.json()
-    page = json.get('page', -1)
+    page = json.get('page', LogPageType.LAST.value)
 
     key = StdLoggerIndex.get(run_uuid)
     std_out: StdLoggerModel

app/server/labml_app/analyses/experiments/stdout.py

@@ -8,7 +8,7 @@
 
 import labml_app.db.run
 from labml_app.analyses.analysis import Analysis
-from labml_app.analyses.logs import Logs
+from labml_app.analyses.logs import Logs, LogPageType
 
 
 class StdOut(Logs):
@@ -43,7 +43,7 @@ async def get_stdout(request: Request, run_uuid: str) -> Any:
         return JSONResponse(status_code=404, content={'message': 'Run not found'})
 
     json = await request.json()
-    page = json.get('page', -1)
+    page = json.get('page', LogPageType.LAST.value)
 
     key = StdOutIndex.get(run_uuid)
     std_out: StdOutModel

app/server/labml_app/analyses/logs.py

@@ -1,3 +1,5 @@
+from enum import Enum
+
 from labml_app.settings import LOG_CHAR_LIMIT
 
 from typing import Any, Dict, List
@@ -57,6 +59,11 @@ class LogPageModel(Model['LogPageModel'], LogPage):
     pass
 
 
+class LogPageType(Enum):
+    LAST = -1
+    ALL = -2
+
+
 class Logs:
     log_pages: List[Key['LogPageModel']]
 
@@ -66,10 +73,10 @@ def defaults(cls):
             log_pages=[]
         )
 
-    def get_data(self, page_no: int = -1):
+    def get_data(self, page_no: int = LogPageType.LAST.value):
         page_dict: Dict[str, str] = {}
 
-        if page_no == -2:
+        if page_no == LogPageType.ALL.value:
             pages: List['LogPage'] = [page.load() for page in self.log_pages]
             for i, p in enumerate(pages):
                 page_dict[str(i)] = p.logs + p.logs_unmerged

app/ui/src/cache/cache.ts

@@ -1,4 +1,4 @@
-import {AnalysisData, CustomMetric, CustomMetricList, CustomMetricModel, Logs, Run} from "../models/run"
+import {AnalysisData, CustomMetric, CustomMetricList, CustomMetricModel, Logs, LogUpdateType, Run} from "../models/run"
 import {Status} from "../models/status"
 import NETWORK, {ErrorResponse} from "../network"
 import { User} from "../models/user"
@@ -585,14 +585,14 @@ export class LogCache extends CacheObject<Logs> {
 
     private async getAll(isRefresh = false): Promise<Logs> {
         if (isRefresh || this.data == null) {
-            let data = new Logs(await NETWORK.getLogs(this.uuid, this.url, -2))
+            let data = new Logs(await NETWORK.getLogs(this.uuid, this.url, LogUpdateType.ALL))
             this.data.mergeLogs(data)
             return this.data
         }
 
         for (let pageNo = 0; pageNo < this.data.pageLength; pageNo++) {
             if (!this.data.hasPage(pageNo)) {
-                let data = new Logs(await NETWORK.getLogs(this.uuid, this.url, -2))
+                let data = new Logs(await NETWORK.getLogs(this.uuid, this.url, LogUpdateType.ALL))
                 this.data.mergeLogs(data)
                 break
             }
@@ -608,7 +608,7 @@ export class LogCache extends CacheObject<Logs> {
             return this.data.getPageAsLog(this.data.pageLength - 1)
         }
 
-        let data = new Logs(await NETWORK.getLogs(this.uuid, this.url, -1))
+        let data = new Logs(await NETWORK.getLogs(this.uuid, this.url, LogUpdateType.LAST))
         this.data.mergeLogs(data)
         return data
     }
@@ -631,7 +631,7 @@ export class LogCache extends CacheObject<Logs> {
 
     async get(isRefresh = false, ...args: any[]): Promise<Logs> {
         if (this.data == null || (isRefresh && isForceReloadTimeout(this.lastUpdated)) || isReloadTimeout(this.lastUpdated)) {
-            this.data = await this.load(-1)
+            this.data = await this.load(LogUpdateType.LAST)
 
             this.lastUpdated = (new Date()).getTime()
         }

app/ui/src/components/log_view.ts

@@ -1,5 +1,5 @@
 import {Weya as $, WeyaElementFunction} from "../../../lib/weya/weya"
-import {Logs} from "../models/run";
+import {Logs, LogUpdateType} from "../models/run";
 import Filter from "../utils/ansi_to_html"
 import {CustomButton} from "./buttons"
 
@@ -51,17 +51,26 @@ export class LogView {
         this.renderLogs()
     }
 
+    private setLoading(isLoading: boolean) {
+        this.loadMoreButton.disabled = isLoading
+        this.loadAllButton.disabled = isLoading
+    }
+
     private onLoadMoreClick = () => {
+        this.setLoading(true)
         this.loadPage(this.toLoadPage).then((logs) => {
             this.logs.mergeLogs(logs)
             this.renderLogs()
+            this.setLoading(false)
         })
     }
 
     private onLoadAllClick = () => {
-        this.loadPage(-2).then((logs) => {
+        this.setLoading(true)
+        this.loadPage(LogUpdateType.ALL).then((logs) => {
             this.logs.mergeLogs(logs)
             this.renderLogs()
+            this.setLoading(false)
         })
     }
 

app/ui/src/models/run.ts

@@ -263,6 +263,11 @@ export interface LogUpdateFeedback {
     higherIndexes: string[]
 }
 
+export enum LogUpdateType {
+    LAST = -1,
+    ALL = -2
+}
+
 export class Logs {
     pages: Record<string, string>
     pageLength: number