@promptbook/remote-server 0.100.0-35 → 0.100.0-37
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/index.es.js +119 -25
- package/esm/index.es.js.map +1 -1
- package/esm/typings/src/_packages/core.index.d.ts +2 -0
- package/esm/typings/src/config.d.ts +6 -0
- package/esm/typings/src/execution/ExecutionTask.d.ts +13 -0
- package/esm/typings/src/version.d.ts +1 -1
- package/package.json +2 -2
- package/umd/index.umd.js +119 -25
- package/umd/index.umd.js.map +1 -1
|
@@ -46,6 +46,7 @@ import { DEFAULT_CSV_SETTINGS } from '../config';
|
|
|
46
46
|
import { DEFAULT_IS_VERBOSE } from '../config';
|
|
47
47
|
import { SET_IS_VERBOSE } from '../config';
|
|
48
48
|
import { DEFAULT_IS_AUTO_INSTALLED } from '../config';
|
|
49
|
+
import { DEFAULT_TASK_SIMULATED_DURATION_MS } from '../config';
|
|
49
50
|
import { DEFAULT_GET_PIPELINE_COLLECTION_FUNCTION_NAME } from '../config';
|
|
50
51
|
import { DEFAULT_MAX_REQUESTS_PER_MINUTE } from '../config';
|
|
51
52
|
import { MODEL_TRUST_LEVELS } from '../constants';
|
|
@@ -207,6 +208,7 @@ export { DEFAULT_CSV_SETTINGS };
|
|
|
207
208
|
export { DEFAULT_IS_VERBOSE };
|
|
208
209
|
export { SET_IS_VERBOSE };
|
|
209
210
|
export { DEFAULT_IS_AUTO_INSTALLED };
|
|
211
|
+
export { DEFAULT_TASK_SIMULATED_DURATION_MS };
|
|
210
212
|
export { DEFAULT_GET_PIPELINE_COLLECTION_FUNCTION_NAME };
|
|
211
213
|
export { DEFAULT_MAX_REQUESTS_PER_MINUTE };
|
|
212
214
|
export { MODEL_TRUST_LEVELS };
|
|
@@ -281,6 +281,12 @@ export declare function SET_IS_VERBOSE(isVerbose: boolean): void;
|
|
|
281
281
|
* @public exported from `@promptbook/core`
|
|
282
282
|
*/
|
|
283
283
|
export declare const DEFAULT_IS_AUTO_INSTALLED = false;
|
|
284
|
+
/**
|
|
285
|
+
* Default simulated duration for a task in milliseconds (used for progress reporting)
|
|
286
|
+
*
|
|
287
|
+
* @public exported from `@promptbook/core`
|
|
288
|
+
*/
|
|
289
|
+
export declare const DEFAULT_TASK_SIMULATED_DURATION_MS: number;
|
|
284
290
|
/**
|
|
285
291
|
* Function name for generated function via `ptbk make` to get the pipeline collection
|
|
286
292
|
*
|
|
@@ -29,6 +29,19 @@ type CreateTaskOptions<TTaskResult extends AbstractTaskResult> = {
|
|
|
29
29
|
*/
|
|
30
30
|
readonly title?: AbstractTask<TTaskResult>['title'];
|
|
31
31
|
}) => void): Promise<TTaskResult>;
|
|
32
|
+
/**
|
|
33
|
+
* Optional callback to provide custom tldr information
|
|
34
|
+
* @param createdAt When the task was created
|
|
35
|
+
* @param status Current task status
|
|
36
|
+
* @param currentValue Current partial result
|
|
37
|
+
* @param errors Current errors
|
|
38
|
+
* @param warnings Current warnings
|
|
39
|
+
* @returns Custom tldr information
|
|
40
|
+
*/
|
|
41
|
+
tldrProvider?(createdAt: Date, status: task_status, currentValue: PartialDeep<TTaskResult>, errors: Array<Error>, warnings: Array<Error>): {
|
|
42
|
+
readonly percent: number_percent;
|
|
43
|
+
readonly message: string;
|
|
44
|
+
};
|
|
32
45
|
};
|
|
33
46
|
/**
|
|
34
47
|
* Helper to create a new task
|
|
@@ -15,7 +15,7 @@ export declare const BOOK_LANGUAGE_VERSION: string_semantic_version;
|
|
|
15
15
|
export declare const PROMPTBOOK_ENGINE_VERSION: string_promptbook_version;
|
|
16
16
|
/**
|
|
17
17
|
* Represents the version string of the Promptbook engine.
|
|
18
|
-
* It follows semantic versioning (e.g., `0.100.0-
|
|
18
|
+
* It follows semantic versioning (e.g., `0.100.0-36`).
|
|
19
19
|
*
|
|
20
20
|
* @generated
|
|
21
21
|
*/
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@promptbook/remote-server",
|
|
3
|
-
"version": "0.100.0-
|
|
3
|
+
"version": "0.100.0-37",
|
|
4
4
|
"description": "Promptbook: Run AI apps in plain human language across multiple models and platforms",
|
|
5
5
|
"private": false,
|
|
6
6
|
"sideEffects": false,
|
|
@@ -95,7 +95,7 @@
|
|
|
95
95
|
"module": "./esm/index.es.js",
|
|
96
96
|
"typings": "./esm/typings/src/_packages/remote-server.index.d.ts",
|
|
97
97
|
"peerDependencies": {
|
|
98
|
-
"@promptbook/core": "0.100.0-
|
|
98
|
+
"@promptbook/core": "0.100.0-37"
|
|
99
99
|
},
|
|
100
100
|
"dependencies": {
|
|
101
101
|
"colors": "1.4.0",
|
package/umd/index.umd.js
CHANGED
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
* @generated
|
|
49
49
|
* @see https://github.com/webgptorg/promptbook
|
|
50
50
|
*/
|
|
51
|
-
const PROMPTBOOK_ENGINE_VERSION = '0.100.0-
|
|
51
|
+
const PROMPTBOOK_ENGINE_VERSION = '0.100.0-37';
|
|
52
52
|
/**
|
|
53
53
|
* TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
|
|
54
54
|
* Note: [💞] Ignore a discrepancy between file name and entity name
|
|
@@ -231,6 +231,12 @@
|
|
|
231
231
|
* @public exported from `@promptbook/core`
|
|
232
232
|
*/
|
|
233
233
|
const DEFAULT_IS_AUTO_INSTALLED = false;
|
|
234
|
+
/**
|
|
235
|
+
* Default simulated duration for a task in milliseconds (used for progress reporting)
|
|
236
|
+
*
|
|
237
|
+
* @public exported from `@promptbook/core`
|
|
238
|
+
*/
|
|
239
|
+
const DEFAULT_TASK_SIMULATED_DURATION_MS = 5 * 60 * 1000; // 5 minutes
|
|
234
240
|
/**
|
|
235
241
|
* Indicates whether pipeline logic validation is enabled. When true, the pipeline logic is checked for consistency.
|
|
236
242
|
*
|
|
@@ -2015,7 +2021,7 @@
|
|
|
2015
2021
|
* @private internal helper function
|
|
2016
2022
|
*/
|
|
2017
2023
|
function createTask(options) {
|
|
2018
|
-
const { taskType, taskProcessCallback } = options;
|
|
2024
|
+
const { taskType, taskProcessCallback, tldrProvider } = options;
|
|
2019
2025
|
let { title } = options;
|
|
2020
2026
|
// TODO: [🐙] DRY
|
|
2021
2027
|
const taskId = `${taskType.toLowerCase().substring(0, 4)}-${$randomToken(8 /* <- TODO: To global config + Use Base58 to avoid similar char conflicts */)}`;
|
|
@@ -2090,21 +2096,35 @@
|
|
|
2090
2096
|
},
|
|
2091
2097
|
get tldr() {
|
|
2092
2098
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
2093
|
-
//
|
|
2099
|
+
// Use custom tldr provider if available
|
|
2100
|
+
if (tldrProvider) {
|
|
2101
|
+
return tldrProvider(createdAt, status, currentValue, errors, warnings);
|
|
2102
|
+
}
|
|
2103
|
+
// Fallback to default implementation
|
|
2094
2104
|
const cv = currentValue;
|
|
2095
|
-
//
|
|
2105
|
+
// If explicit percent is provided, use it
|
|
2096
2106
|
let percentRaw = (_f = (_d = (_b = (_a = cv === null || cv === void 0 ? void 0 : cv.tldr) === null || _a === void 0 ? void 0 : _a.percent) !== null && _b !== void 0 ? _b : (_c = cv === null || cv === void 0 ? void 0 : cv.usage) === null || _c === void 0 ? void 0 : _c.percent) !== null && _d !== void 0 ? _d : (_e = cv === null || cv === void 0 ? void 0 : cv.progress) === null || _e === void 0 ? void 0 : _e.percent) !== null && _f !== void 0 ? _f : cv === null || cv === void 0 ? void 0 : cv.percent;
|
|
2097
|
-
//
|
|
2107
|
+
// Simulate progress if not provided
|
|
2098
2108
|
if (typeof percentRaw !== 'number') {
|
|
2099
|
-
|
|
2109
|
+
// Simulate progress: evenly split across subtasks, based on elapsed time
|
|
2110
|
+
const now = new Date();
|
|
2111
|
+
const elapsedMs = now.getTime() - createdAt.getTime();
|
|
2112
|
+
const totalMs = DEFAULT_TASK_SIMULATED_DURATION_MS;
|
|
2113
|
+
// If subtasks are defined, split progress evenly
|
|
2114
|
+
const subtaskCount = Array.isArray(cv === null || cv === void 0 ? void 0 : cv.subtasks) ? cv.subtasks.length : 1;
|
|
2115
|
+
const completedSubtasks = Array.isArray(cv === null || cv === void 0 ? void 0 : cv.subtasks)
|
|
2116
|
+
? cv.subtasks.filter((s) => s.done || s.completed).length
|
|
2117
|
+
: 0;
|
|
2118
|
+
// Progress from completed subtasks
|
|
2119
|
+
const subtaskProgress = subtaskCount > 0 ? completedSubtasks / subtaskCount : 0;
|
|
2120
|
+
// Progress from elapsed time for current subtask
|
|
2121
|
+
const timeProgress = Math.min(elapsedMs / totalMs, 1);
|
|
2122
|
+
// Combine: completed subtasks + time progress for current subtask
|
|
2123
|
+
percentRaw = Math.min(subtaskProgress + (1 / subtaskCount) * timeProgress, 1);
|
|
2124
|
+
if (status === 'FINISHED')
|
|
2100
2125
|
percentRaw = 1;
|
|
2101
|
-
|
|
2102
|
-
else if (status === 'ERROR') {
|
|
2126
|
+
if (status === 'ERROR')
|
|
2103
2127
|
percentRaw = 0;
|
|
2104
|
-
}
|
|
2105
|
-
else {
|
|
2106
|
-
percentRaw = 0;
|
|
2107
|
-
}
|
|
2108
2128
|
}
|
|
2109
2129
|
// Clamp to [0,1]
|
|
2110
2130
|
let percent = Number(percentRaw) || 0;
|
|
@@ -2116,20 +2136,29 @@
|
|
|
2116
2136
|
const messageFromResult = (_k = (_j = (_h = (_g = cv === null || cv === void 0 ? void 0 : cv.tldr) === null || _g === void 0 ? void 0 : _g.message) !== null && _h !== void 0 ? _h : cv === null || cv === void 0 ? void 0 : cv.message) !== null && _j !== void 0 ? _j : cv === null || cv === void 0 ? void 0 : cv.summary) !== null && _k !== void 0 ? _k : cv === null || cv === void 0 ? void 0 : cv.statusMessage;
|
|
2117
2137
|
let message = messageFromResult;
|
|
2118
2138
|
if (!message) {
|
|
2119
|
-
|
|
2120
|
-
|
|
2121
|
-
|
|
2122
|
-
|
|
2123
|
-
|
|
2124
|
-
|
|
2125
|
-
else if (status === 'FINISHED') {
|
|
2126
|
-
message = 'Finished';
|
|
2127
|
-
}
|
|
2128
|
-
else if (status === 'ERROR') {
|
|
2129
|
-
message = 'Error';
|
|
2139
|
+
// If subtasks, show current subtask
|
|
2140
|
+
if (Array.isArray(cv === null || cv === void 0 ? void 0 : cv.subtasks) && cv.subtasks.length > 0) {
|
|
2141
|
+
const current = cv.subtasks.find((s) => !s.done && !s.completed);
|
|
2142
|
+
if (current && current.title) {
|
|
2143
|
+
message = `Working on ${current.title}`;
|
|
2144
|
+
}
|
|
2130
2145
|
}
|
|
2131
|
-
|
|
2132
|
-
|
|
2146
|
+
if (!message) {
|
|
2147
|
+
if (errors.length) {
|
|
2148
|
+
message = errors[errors.length - 1].message || 'Error';
|
|
2149
|
+
}
|
|
2150
|
+
else if (warnings.length) {
|
|
2151
|
+
message = warnings[warnings.length - 1].message || 'Warning';
|
|
2152
|
+
}
|
|
2153
|
+
else if (status === 'FINISHED') {
|
|
2154
|
+
message = 'Finished';
|
|
2155
|
+
}
|
|
2156
|
+
else if (status === 'ERROR') {
|
|
2157
|
+
message = 'Error';
|
|
2158
|
+
}
|
|
2159
|
+
else {
|
|
2160
|
+
message = 'Running';
|
|
2161
|
+
}
|
|
2133
2162
|
}
|
|
2134
2163
|
}
|
|
2135
2164
|
return {
|
|
@@ -6475,6 +6504,71 @@
|
|
|
6475
6504
|
updateOngoingResult(newOngoingResult);
|
|
6476
6505
|
});
|
|
6477
6506
|
},
|
|
6507
|
+
tldrProvider(createdAt, status, currentValue, errors) {
|
|
6508
|
+
var _a;
|
|
6509
|
+
// Better progress estimation based on pipeline structure
|
|
6510
|
+
const cv = currentValue;
|
|
6511
|
+
// Handle finished/error states
|
|
6512
|
+
if (status === 'FINISHED') {
|
|
6513
|
+
return {
|
|
6514
|
+
percent: 1,
|
|
6515
|
+
message: 'Finished',
|
|
6516
|
+
};
|
|
6517
|
+
}
|
|
6518
|
+
if (status === 'ERROR') {
|
|
6519
|
+
const errorMessage = errors.length > 0 ? errors[errors.length - 1].message : 'Error';
|
|
6520
|
+
return {
|
|
6521
|
+
percent: 0,
|
|
6522
|
+
message: errorMessage,
|
|
6523
|
+
};
|
|
6524
|
+
}
|
|
6525
|
+
// Calculate progress based on pipeline tasks
|
|
6526
|
+
const totalTasks = pipeline.tasks.length;
|
|
6527
|
+
let completedTasks = 0;
|
|
6528
|
+
let currentTaskName = '';
|
|
6529
|
+
// Check execution report for completed tasks
|
|
6530
|
+
if ((_a = cv === null || cv === void 0 ? void 0 : cv.executionReport) === null || _a === void 0 ? void 0 : _a.promptExecutions) {
|
|
6531
|
+
const executedTaskTitles = new Set(cv.executionReport.promptExecutions.map((execution) => execution.prompt.title));
|
|
6532
|
+
// Count completed tasks by matching titles
|
|
6533
|
+
const completedTasksByTitle = pipeline.tasks.filter(task => executedTaskTitles.has(task.title));
|
|
6534
|
+
completedTasks = completedTasksByTitle.length;
|
|
6535
|
+
// Find current task being executed (first task not yet completed)
|
|
6536
|
+
const remainingTasks = pipeline.tasks.filter(task => !executedTaskTitles.has(task.title));
|
|
6537
|
+
if (remainingTasks.length > 0) {
|
|
6538
|
+
currentTaskName = remainingTasks[0].name;
|
|
6539
|
+
}
|
|
6540
|
+
}
|
|
6541
|
+
// Calculate progress percentage
|
|
6542
|
+
let percent = totalTasks > 0 ? completedTasks / totalTasks : 0;
|
|
6543
|
+
// Add time-based progress for current task (assuming 5 minutes total)
|
|
6544
|
+
if (completedTasks < totalTasks) {
|
|
6545
|
+
const elapsedMs = new Date().getTime() - createdAt.getTime();
|
|
6546
|
+
const totalMs = 5 * 60 * 1000; // 5 minutes
|
|
6547
|
+
const timeProgress = Math.min(elapsedMs / totalMs, 1);
|
|
6548
|
+
// Add partial progress for current task
|
|
6549
|
+
percent += (1 / totalTasks) * timeProgress;
|
|
6550
|
+
}
|
|
6551
|
+
// Clamp to [0,1]
|
|
6552
|
+
percent = Math.min(Math.max(percent, 0), 1);
|
|
6553
|
+
// Generate message
|
|
6554
|
+
let message = '';
|
|
6555
|
+
if (currentTaskName) {
|
|
6556
|
+
// Find the task to get its title
|
|
6557
|
+
const currentTask = pipeline.tasks.find(task => task.name === currentTaskName);
|
|
6558
|
+
const taskTitle = (currentTask === null || currentTask === void 0 ? void 0 : currentTask.title) || currentTaskName;
|
|
6559
|
+
message = `Working on task ${taskTitle}`;
|
|
6560
|
+
}
|
|
6561
|
+
else if (completedTasks === 0) {
|
|
6562
|
+
message = 'Starting pipeline execution';
|
|
6563
|
+
}
|
|
6564
|
+
else {
|
|
6565
|
+
message = `Processing pipeline (${completedTasks}/${totalTasks} tasks completed)`;
|
|
6566
|
+
}
|
|
6567
|
+
return {
|
|
6568
|
+
percent,
|
|
6569
|
+
message,
|
|
6570
|
+
};
|
|
6571
|
+
},
|
|
6478
6572
|
});
|
|
6479
6573
|
// <- TODO: Make types such as there is no need to do `as` for `createTask`
|
|
6480
6574
|
return pipelineExecutor;
|