@lage-run/reporters 0.2.43 → 0.2.44

package/CHANGELOG.json

@@ -2,7 +2,22 @@
   "name": "@lage-run/reporters",
   "entries": [
     {
-      "date": "Thu, 08 Dec 2022 00:49:16 GMT",
+      "date": "Thu, 05 Jan 2023 00:40:39 GMT",
+      "tag": "@lage-run/reporters_v0.2.44",
+      "version": "0.2.44",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/reporters",
+            "commit": "961843bef658c51312e02498554ad338e467e1a7",
+            "comment": "fixing progress bar to not be a bottleneck"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 08 Dec 2022 00:49:28 GMT",
       "tag": "@lage-run/reporters_v0.2.43",
       "version": "0.2.43",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,20 @@
 # Change Log - @lage-run/reporters
 
-This log was last generated on Thu, 08 Dec 2022 00:49:16 GMT and should not be manually modified.
+This log was last generated on Thu, 05 Jan 2023 00:40:39 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.2.44
+
+Thu, 05 Jan 2023 00:40:39 GMT
+
+### Patches
+
+- fixing progress bar to not be a bottleneck (kchau@microsoft.com)
+
 ## 0.2.43
 
-Thu, 08 Dec 2022 00:49:16 GMT
+Thu, 08 Dec 2022 00:49:28 GMT
 
 ### Patches
 

package/lib/ProgressReporter.d.ts

@@ -1,17 +1,14 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import EventEmitter from "events";
 import type { LogEntry, Reporter } from "@lage-run/logger";
 import type { SchedulerRunSummary } from "@lage-run/scheduler-types";
 export declare class ProgressReporter implements Reporter {
-    timer: NodeJS.Timeout;
     startTime: [number, number];
     logEvent: EventEmitter;
     logEntries: Map<string, LogEntry<import("@lage-run/logger").LogStructuredData>[]>;
     constructor(options?: {
         concurrency: number;
     });
-    heartBeat: () => void;
     log(entry: LogEntry<any>): void;
     summarize(schedulerRunSummary: SchedulerRunSummary): void;
 }

package/lib/ProgressReporter.js

@@ -70,7 +70,7 @@ class ProgressReporter {
         if (entry.data && entry.data.schedulerRun) {
             this.startTime = entry.data.schedulerRun.startTime;
         }
-        if (entry.data && entry.data.target && typeof entry.data.threadId !== "undefined") {
+        if (entry.data && entry.data.status) {
             this.logEvent.emit("status", entry);
         }
         if (entry.data && entry.data.progress) {
@@ -82,7 +82,6 @@ class ProgressReporter {
             schedulerRunSummary,
             logEntries: this.logEntries
         });
-        clearTimeout(this.timer);
     }
     constructor(options = {
         concurrency: 0
@@ -93,16 +92,9 @@ class ProgressReporter {
         ];
         this.logEvent = new _events.default();
         this.logEntries = new Map();
-        this.heartBeat = ()=>{
-            this.logEvent.emit("heartbeat", {
-                currentTime: process.hrtime(this.startTime)
-            });
-            this.timer = setTimeout(this.heartBeat, 1000);
-        };
         (0, _ink.render)(/*#__PURE__*/ _react.createElement(_progressReporterApp.ProgressReporterApp, {
             logEvent: this.logEvent,
             concurrency: options.concurrency
         }));
-        this.timer = setTimeout(this.heartBeat, 1000);
     }
 }

package/lib/components/ProgressReporterApp.js

@@ -50,14 +50,8 @@ function _interopRequireWildcard(obj, nodeInterop) {
     }
     return newObj;
 }
-function range(len) {
-    return Array(len).fill(0).map((_, idx)=>idx + 1);
-}
 function ProgressReporterApp(props) {
-    const initialThreadInfo = range(props.concurrency).reduce((acc, threadId)=>{
-        acc[threadId] = "";
-        return acc;
-    }, {});
+    const initialThreadInfo = new Set();
     const [threadInfo, setThreadInfo] = _react.useState(initialThreadInfo);
     const [progress, setProgress] = _react.useState({
         waiting: 0,
@@ -65,26 +59,17 @@ function ProgressReporterApp(props) {
         total: 0
     });
     const [summary, setSummary] = _react.useState();
-    const [currentTime, setCurrentTime] = _react.useState([
-        0,
-        0
-    ]);
     const { logEvent  } = props;
     _react.useEffect(()=>{
         logEvent.on("status", (entry)=>{
             const { target , threadId , status  } = entry.data;
-            if (status && status === "running") {
-                setThreadInfo((threadInfo)=>({
-                        ...threadInfo,
-                        [threadId]: target.id
-                    }));
+            if (status === "running") {
+                setThreadInfo((threadInfo)=>new Set(threadInfo).add(target.id));
             } else if (status === "success" || status === "aborted" || status === "failed" || status === "skipped") {
                 setThreadInfo((threadInfo)=>{
-                    const newThreadInfo = {
-                        ...threadInfo
-                    };
-                    newThreadInfo[threadId] = "";
-                    return newThreadInfo;
+                    const newSet = new Set(threadInfo);
+                    newSet.delete(target.id);
+                    return newSet;
                 });
             }
         });
@@ -94,39 +79,27 @@ function ProgressReporterApp(props) {
         logEvent.on("summary", (summary)=>{
             setSummary(summary);
         });
-        logEvent.on("heartbeat", (heartbeat)=>{
-            setCurrentTime(heartbeat.currentTime);
-        });
     }, [
         logEvent
     ]);
-    const arrayGapLength = props.concurrency - Object.keys(threadInfo).length;
-    const idleWorkerDummyThreadInfo = arrayGapLength > 0 ? new Array(arrayGapLength).fill(0) : [];
+    const limit = 16;
+    const hasMore = threadInfo.size > limit;
     return /*#__PURE__*/ _react.createElement(_ink.Box, {
         flexDirection: "column"
     }, /*#__PURE__*/ _react.createElement(_ink.Text, null, "Lage running tasks with ", props.concurrency, " workers"), summary ? /*#__PURE__*/ _react.createElement(_summaryInfo.SummaryInfo, {
         summary: summary
     }) : /*#__PURE__*/ _react.createElement(_ink.Box, {
         flexDirection: "column"
-    }, /*#__PURE__*/ _react.createElement(_ink.Box, {
+    }, /*#__PURE__*/ _react.createElement(_progressStatus.ProgressStatus, {
+        progress: progress
+    }), /*#__PURE__*/ _react.createElement(_ink.Box, {
         flexDirection: "column",
         marginLeft: 2,
         marginY: 1
-    }, Object.entries(threadInfo).map(([threadId, targetId])=>{
-        return /*#__PURE__*/ _react.createElement(_threadItem.ThreadItem, {
-            key: threadId,
-            threadId: threadId,
+    }, [
+        ...threadInfo
+    ].slice(Math.max(0, threadInfo.size - limit)).map((targetId)=>/*#__PURE__*/ _react.createElement(_threadItem.ThreadItem, {
+            key: targetId,
             targetId: targetId
-        });
-    }), idleWorkerDummyThreadInfo.map((_, index)=>{
-        return /*#__PURE__*/ _react.createElement(_react.Fragment, {
-            key: `idle-${index}`
-        }, /*#__PURE__*/ _react.createElement(_threadItem.ThreadItem, {
-            threadId: "?",
-            targetId: ""
-        }));
-    })), /*#__PURE__*/ _react.createElement(_progressStatus.ProgressStatus, {
-        progress: progress,
-        currentTime: currentTime
-    })));
+        })), hasMore && /*#__PURE__*/ _react.createElement(_ink.Text, null, "... (displaying most recent ", limit, ")"))));
 }

package/lib/components/ProgressStatus.d.ts

@@ -2,6 +2,5 @@
 import { Progress } from "../types/progressBarTypes";
 export interface ProgressStatusProps {
     progress: Progress;
-    currentTime: [number, number];
 }
 export declare function ProgressStatus(props: ProgressStatusProps): JSX.Element;

package/lib/components/ProgressStatus.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "ProgressStatus", {
     enumerable: true,
     get: ()=>ProgressStatus
 });
-const _formatHrtime = require("@lage-run/format-hrtime");
 const _ink = require("ink");
 const _react = /*#__PURE__*/ _interopRequireWildcard(require("react"));
 function _getRequireWildcardCache(nodeInterop) {
@@ -51,6 +50,6 @@ function _interopRequireWildcard(obj, nodeInterop) {
 function ProgressStatus(props) {
     const { waiting , completed , total  } = props.progress;
     const percentage = total > 0 ? `${(completed / total * 100).toFixed(2)}%` : "0%";
-    const status = `Waiting: ${waiting} | Completed: ${completed} | Total: ${total} | ${percentage} | ${(0, _formatHrtime.formatDuration)((0, _formatHrtime.hrToSeconds)(props.currentTime))}`;
+    const status = `Waiting: ${waiting} | Completed: ${completed} | Total: ${total} | ${percentage}`;
     return /*#__PURE__*/ _react.createElement(_ink.Box, null, /*#__PURE__*/ _react.createElement(_ink.Text, null, status));
 }

package/lib/components/ThreadItem.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="react" />
 export declare function ThreadItem(props: {
-    threadId: string | number;
     targetId: string;
 }): JSX.Element;

package/lib/components/ThreadItem.js

@@ -48,12 +48,10 @@ function _interopRequireWildcard(obj, nodeInterop) {
     return newObj;
 }
 function ThreadItem(props) {
-    const { targetId , threadId  } = props;
-    return /*#__PURE__*/ _react.createElement(_ink.Box, null, /*#__PURE__*/ _react.createElement(_ink.Box, {
-        width: "2"
-    }, /*#__PURE__*/ _react.createElement(_ink.Text, null, threadId)), targetId ? /*#__PURE__*/ _react.createElement(_ink.Text, {
+    const { targetId  } = props;
+    return targetId ? /*#__PURE__*/ _react.createElement(_ink.Text, {
         color: "whiteBright"
     }, targetId, " ") : /*#__PURE__*/ _react.createElement(_ink.Text, {
         color: "gray"
-    }, "IDLE"));
+    }, "IDLE");
 }

package/lib/createReporter.js

@@ -23,6 +23,11 @@ function createReporter({ reporter ="npmLog" , progress =false , grouped =false
                 grouped,
                 logLevel: verbose ? _logger.LogLevel.verbose : logLevel
             });
+        case "old":
+            return new _logReporterJs.LogReporter({
+                grouped,
+                logLevel: verbose ? _logger.LogLevel.verbose : logLevel
+            });
         default:
             return progress ? new _progressReporterJs.ProgressReporter({
                 concurrency

package/lib/types/progressBarTypes.d.ts

@@ -5,9 +5,7 @@ export interface Progress {
     completed: number;
     total: number;
 }
-export interface ThreadInfo {
-    [threadId: string]: string;
-}
+export type ThreadInfo = Set<string>;
 export interface SummaryWithLogs {
     schedulerRunSummary: SchedulerRunSummary;
     logEntries: Map<string, LogEntry[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/reporters",
-  "version": "0.2.43",
+  "version": "0.2.44",
   "description": "Log reporters for Lage",
   "repository": {
     "url": "https://github.com/microsoft/lage"