@sogni-ai/sogni-client 4.0.0-alpha.5 → 4.0.0-alpha.51
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/CHANGELOG.md +357 -0
- package/README.md +295 -58
- package/dist/Account/index.d.ts +18 -16
- package/dist/Account/index.js +42 -21
- package/dist/Account/index.js.map +1 -1
- package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/ChannelCoordinator.d.ts +66 -0
- package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/ChannelCoordinator.js +332 -0
- package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/ChannelCoordinator.js.map +1 -0
- package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/index.d.ts +28 -0
- package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/index.js +203 -0
- package/dist/ApiClient/WebSocketClient/BrowserWebSocketClient/index.js.map +1 -0
- package/dist/ApiClient/WebSocketClient/events.d.ts +12 -0
- package/dist/ApiClient/WebSocketClient/index.d.ts +2 -2
- package/dist/ApiClient/WebSocketClient/index.js +13 -3
- package/dist/ApiClient/WebSocketClient/index.js.map +1 -1
- package/dist/ApiClient/WebSocketClient/types.d.ts +13 -0
- package/dist/ApiClient/index.d.ts +4 -4
- package/dist/ApiClient/index.js +23 -4
- package/dist/ApiClient/index.js.map +1 -1
- package/dist/Projects/Job.d.ts +44 -4
- package/dist/Projects/Job.js +83 -16
- package/dist/Projects/Job.js.map +1 -1
- package/dist/Projects/Project.d.ts +18 -0
- package/dist/Projects/Project.js +38 -10
- package/dist/Projects/Project.js.map +1 -1
- package/dist/Projects/createJobRequestMessage.d.ts +2 -1
- package/dist/Projects/createJobRequestMessage.js +173 -14
- package/dist/Projects/createJobRequestMessage.js.map +1 -1
- package/dist/Projects/index.d.ts +114 -11
- package/dist/Projects/index.js +504 -47
- package/dist/Projects/index.js.map +1 -1
- package/dist/Projects/types/ComfySamplerParams.d.ts +0 -0
- package/dist/Projects/types/ComfySamplerParams.js +2 -0
- package/dist/Projects/types/ComfySamplerParams.js.map +1 -0
- package/dist/Projects/types/EstimationResponse.d.ts +2 -0
- package/dist/Projects/types/ModelOptions.d.ts +31 -0
- package/dist/Projects/types/ModelOptions.js +56 -0
- package/dist/Projects/types/ModelOptions.js.map +1 -0
- package/dist/Projects/types/ModelTiersRaw.d.ts +67 -0
- package/dist/Projects/types/ModelTiersRaw.js +15 -0
- package/dist/Projects/types/ModelTiersRaw.js.map +1 -0
- package/dist/Projects/types/events.d.ts +5 -1
- package/dist/Projects/types/index.d.ts +219 -42
- package/dist/Projects/types/index.js +8 -0
- package/dist/Projects/types/index.js.map +1 -1
- package/dist/Projects/utils/index.d.ts +20 -0
- package/dist/Projects/utils/index.js +91 -0
- package/dist/Projects/utils/index.js.map +1 -0
- package/dist/Projects/utils/samplers.d.ts +6 -0
- package/dist/Projects/utils/samplers.js +39 -0
- package/dist/Projects/utils/samplers.js.map +1 -0
- package/dist/Projects/utils/scheduler.d.ts +6 -0
- package/dist/Projects/utils/scheduler.js +30 -0
- package/dist/Projects/utils/scheduler.js.map +1 -0
- package/dist/index.d.ts +11 -3
- package/dist/index.js +8 -3
- package/dist/index.js.map +1 -1
- package/dist/lib/AuthManager/TokenAuthManager.js +0 -2
- package/dist/lib/AuthManager/TokenAuthManager.js.map +1 -1
- package/dist/lib/DataEntity.js +4 -2
- package/dist/lib/DataEntity.js.map +1 -1
- package/dist/lib/RestClient.js +15 -2
- package/dist/lib/RestClient.js.map +1 -1
- package/dist/lib/{utils.js → utils/index.js} +1 -1
- package/dist/lib/utils/index.js.map +1 -0
- package/dist/lib/validation.d.ts +31 -2
- package/dist/lib/validation.js +80 -13
- package/dist/lib/validation.js.map +1 -1
- package/package.json +4 -4
- package/src/Account/index.ts +39 -20
- package/src/ApiClient/WebSocketClient/BrowserWebSocketClient/ChannelCoordinator.ts +426 -0
- package/src/ApiClient/WebSocketClient/BrowserWebSocketClient/index.ts +237 -0
- package/src/ApiClient/WebSocketClient/events.ts +14 -0
- package/src/ApiClient/WebSocketClient/index.ts +15 -5
- package/src/ApiClient/WebSocketClient/types.ts +16 -0
- package/src/ApiClient/index.ts +30 -8
- package/src/Projects/Job.ts +97 -16
- package/src/Projects/Project.ts +46 -13
- package/src/Projects/createJobRequestMessage.ts +239 -34
- package/src/Projects/index.ts +533 -51
- package/src/Projects/types/ComfySamplerParams.ts +0 -0
- package/src/Projects/types/EstimationResponse.ts +2 -0
- package/src/Projects/types/ModelOptions.ts +92 -0
- package/src/Projects/types/ModelTiersRaw.ts +86 -0
- package/src/Projects/types/events.ts +6 -0
- package/src/Projects/types/index.ts +253 -45
- package/src/Projects/utils/index.ts +90 -0
- package/src/Projects/utils/samplers.ts +36 -0
- package/src/Projects/utils/scheduler.ts +27 -0
- package/src/index.ts +36 -9
- package/src/lib/AuthManager/TokenAuthManager.ts +0 -2
- package/src/lib/DataEntity.ts +4 -2
- package/src/lib/RestClient.ts +16 -2
- package/src/lib/validation.ts +90 -17
- package/dist/Projects/types/SamplerParams.d.ts +0 -15
- package/dist/Projects/types/SamplerParams.js +0 -21
- package/dist/Projects/types/SamplerParams.js.map +0 -1
- package/dist/Projects/types/SchedulerParams.d.ts +0 -13
- package/dist/Projects/types/SchedulerParams.js +0 -19
- package/dist/Projects/types/SchedulerParams.js.map +0 -1
- package/dist/Projects/utils.d.ts +0 -2
- package/dist/Projects/utils.js +0 -14
- package/dist/Projects/utils.js.map +0 -1
- package/dist/lib/utils.js.map +0 -1
- package/src/Projects/types/SamplerParams.ts +0 -19
- package/src/Projects/types/SchedulerParams.ts +0 -17
- package/src/Projects/utils.ts +0 -12
- /package/dist/lib/{utils.d.ts → utils/index.d.ts} +0 -0
- /package/src/lib/{utils.ts → utils/index.ts} +0 -0
|
@@ -42,7 +42,6 @@ class TokenAuthManager extends AuthManagerBase_1.default {
|
|
|
42
42
|
const { expiresAt } = (0, utils_1.decodeToken)(token);
|
|
43
43
|
if (expiresAt > new Date()) {
|
|
44
44
|
this._updateTokens({ token, refreshToken });
|
|
45
|
-
this.emit('updated', true);
|
|
46
45
|
return;
|
|
47
46
|
}
|
|
48
47
|
}
|
|
@@ -51,7 +50,6 @@ class TokenAuthManager extends AuthManagerBase_1.default {
|
|
|
51
50
|
const { expiresAt: refreshExpiresAt } = (0, utils_1.decodeRefreshToken)(refreshToken);
|
|
52
51
|
this._refreshTokenExpiresAt = refreshExpiresAt;
|
|
53
52
|
yield this._renewTokenSafe();
|
|
54
|
-
this.emit('updated', true);
|
|
55
53
|
});
|
|
56
54
|
}
|
|
57
55
|
clear() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TokenAuthManager.js","sourceRoot":"","sources":["../../../src/lib/AuthManager/TokenAuthManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oCAA2D;AAC3D,+CAA6D;AAE7D,2DAAmC;AACnC,0DAA+B;AAC/B,wEAAgD;AAahD,MAAM,gBAAiB,SAAQ,yBAAqC;IAQlE,YAAY,OAAe,EAAE,MAAc;QACzC,KAAK,CAAC,MAAM,CAAC,CAAC;QAPR,oBAAe,GAAS,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;QAEpC,2BAAsB,GAAS,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;QAMjD,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC1B,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,IAAI,CAAC,sBAAsB,GAAG,IAAI,IAAI,EAAE,CAAC;IAC1E,CAAC;IAEK,MAAM;;YACV,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACtC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC;YAClE,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAEK,YAAY;6DAAC,EAAE,YAAY,EAAE,KAAK,EAAiB;YACvD,mEAAmE;YACnE,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC;gBACzC,IAAI,SAAS,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;oBAC3B,IAAI,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;oBAC5C,
|
|
1
|
+
{"version":3,"file":"TokenAuthManager.js","sourceRoot":"","sources":["../../../src/lib/AuthManager/TokenAuthManager.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/DataEntity.js
CHANGED
|
@@ -18,9 +18,11 @@ class DataEntity extends TypedEventEmitter_1.default {
|
|
|
18
18
|
_update(delta) {
|
|
19
19
|
//@ts-ignore
|
|
20
20
|
const changedKeys = Object.keys(delta).filter((key) => this.data[key] !== delta[key]);
|
|
21
|
-
this.data = Object.assign(Object.assign({}, this.data), delta);
|
|
22
21
|
this.lastUpdated = new Date();
|
|
23
|
-
|
|
22
|
+
if (changedKeys.length > 0) {
|
|
23
|
+
this.data = Object.assign(Object.assign({}, this.data), delta);
|
|
24
|
+
this.emit('updated', changedKeys);
|
|
25
|
+
}
|
|
24
26
|
}
|
|
25
27
|
/**
|
|
26
28
|
* Get a copy of the entity's data
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataEntity.js","sourceRoot":"","sources":["../../src/lib/DataEntity.ts"],"names":[],"mappings":";;;;;AAAA,mCAAmC;AACnC,4EAAoD;AASpD,MAAe,UAAqD,SAAQ,2BAAoB;IAK9F,YAAY,IAAO;QACjB,KAAK,EAAE,CAAC;QAHA,gBAAW,GAAS,IAAI,IAAI,EAAE,CAAC;QAIvC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,KAAiB;QACvB,YAAY;QACZ,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACtF,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"DataEntity.js","sourceRoot":"","sources":["../../src/lib/DataEntity.ts"],"names":[],"mappings":";;;;;AAAA,mCAAmC;AACnC,4EAAoD;AASpD,MAAe,UAAqD,SAAQ,2BAAoB;IAK9F,YAAY,IAAO;QACjB,KAAK,EAAE,CAAC;QAHA,gBAAW,GAAS,IAAI,IAAI,EAAE,CAAC;QAIvC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,KAAiB;QACvB,YAAY;QACZ,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACtF,IAAI,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAC9B,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,IAAI,mCAAQ,IAAI,CAAC,IAAI,GAAK,KAAK,CAAE,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,OAAO,IAAA,kBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC;CACF;AAED,kBAAe,UAAU,CAAC"}
|
package/dist/lib/RestClient.js
CHANGED
|
@@ -34,7 +34,20 @@ class RestClient extends TypedEventEmitter_1.default {
|
|
|
34
34
|
request(url_1) {
|
|
35
35
|
return __awaiter(this, arguments, void 0, function* (url, options = {}) {
|
|
36
36
|
const init = yield this.auth.authenticateRequest(options);
|
|
37
|
-
|
|
37
|
+
// Add a timeout to detect hanging requests
|
|
38
|
+
const controller = new AbortController();
|
|
39
|
+
const timeoutId = setTimeout(() => {
|
|
40
|
+
controller.abort();
|
|
41
|
+
}, 30000);
|
|
42
|
+
try {
|
|
43
|
+
const response = yield fetch(url, Object.assign(Object.assign({}, init), { signal: controller.signal }));
|
|
44
|
+
clearTimeout(timeoutId);
|
|
45
|
+
return this.processResponse(response);
|
|
46
|
+
}
|
|
47
|
+
catch (fetchError) {
|
|
48
|
+
clearTimeout(timeoutId);
|
|
49
|
+
throw fetchError;
|
|
50
|
+
}
|
|
38
51
|
});
|
|
39
52
|
}
|
|
40
53
|
processResponse(response) {
|
|
@@ -58,7 +71,7 @@ class RestClient extends TypedEventEmitter_1.default {
|
|
|
58
71
|
});
|
|
59
72
|
}
|
|
60
73
|
get(path, query = {}) {
|
|
61
|
-
return this.request(this.formatUrl(path, query)
|
|
74
|
+
return this.request(this.formatUrl(path, query));
|
|
62
75
|
}
|
|
63
76
|
post(path, body = {}) {
|
|
64
77
|
return this.request(this.formatUrl(path), {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RestClient.js","sourceRoot":"","sources":["../../src/lib/RestClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,4CAA0D;AAC1D,4EAAkE;AAKlE,MAAM,UAAuC,SAAQ,2BAAoB;IAKvE,YAAY,OAAe,EAAE,IAAiB,EAAE,MAAc;QAC5D,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEO,SAAS,CAAC,WAAmB,EAAE,QAAgC,EAAE;QACvE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACjC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;IAEa,OAAO;6DAAgB,GAAW,EAAE,UAAuB,EAAE;YACzE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"RestClient.js","sourceRoot":"","sources":["../../src/lib/RestClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,kCAMC;AAED,gDAMC;AAED,sBAEC;AApBD,2CAAuC;AAEvC,SAAgB,WAAW,CAAC,KAAa;IACvC,MAAM,IAAI,GAAG,IAAA,sBAAS,EAA0D,KAAK,CAAC,CAAC;IACvF,OAAO;QACL,aAAa,EAAE,IAAI,CAAC,IAAI;QACxB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;KACrC,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,KAAa;IAC9C,MAAM,IAAI,GAAG,IAAA,sBAAS,EAA0D,KAAK,CAAC,CAAC;IACvF,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;KACrC,CAAC;AACJ,CAAC;AAED,SAAsB,KAAK,CAAC,EAAU;;QACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;CAAA"}
|
package/dist/lib/validation.d.ts
CHANGED
|
@@ -1,4 +1,11 @@
|
|
|
1
|
+
import { ModelOptions } from '../Projects/types/ModelOptions';
|
|
1
2
|
export declare function validateCustomImageSize(value: any): number;
|
|
3
|
+
/**
|
|
4
|
+
* Validate video dimensions for Wan 2.2 models.
|
|
5
|
+
* Minimum dimension is 480px for both width and height.
|
|
6
|
+
*/
|
|
7
|
+
export declare function validateVideoSize(value: any, propertyName: 'width' | 'height'): number;
|
|
8
|
+
export declare function validateVideoDuration(value: any): number;
|
|
2
9
|
interface NumberValidationOptions {
|
|
3
10
|
min?: number;
|
|
4
11
|
max?: number;
|
|
@@ -6,6 +13,28 @@ interface NumberValidationOptions {
|
|
|
6
13
|
defaultValue?: number;
|
|
7
14
|
}
|
|
8
15
|
export declare function validateNumber(value: any, { min, max, propertyName, defaultValue }?: NumberValidationOptions): number;
|
|
9
|
-
|
|
10
|
-
|
|
16
|
+
/**
|
|
17
|
+
* Validate teacacheThreshold for T2V and I2V models.
|
|
18
|
+
* Range: 0.0-1.0. 0.0 = disabled.
|
|
19
|
+
*/
|
|
20
|
+
export declare function validateTeacacheThreshold(value?: number): number | undefined;
|
|
21
|
+
export declare function isComfyModel(modelId: string): boolean;
|
|
22
|
+
/**
|
|
23
|
+
* Get the maximum number of context images supported by a model.
|
|
24
|
+
* - Flux.2 Dev: 6 images
|
|
25
|
+
* - Qwen Image Edit: 3 images
|
|
26
|
+
* - Flux Kontext: 2 images
|
|
27
|
+
* - Default: 3 images
|
|
28
|
+
*/
|
|
29
|
+
export declare function getMaxContextImages(modelId: string): number;
|
|
30
|
+
/**
|
|
31
|
+
* Validate sampler value against allowed options.
|
|
32
|
+
* Returns the validated value unchanged - sogni-socket handles normalization.
|
|
33
|
+
*/
|
|
34
|
+
export declare function validateSampler(value: string | undefined, options: ModelOptions): string | null;
|
|
35
|
+
/**
|
|
36
|
+
* Validate scheduler value against allowed options.
|
|
37
|
+
* Returns the validated value unchanged - sogni-socket handles normalization.
|
|
38
|
+
*/
|
|
39
|
+
export declare function validateScheduler(value: string | undefined, options: ModelOptions): string | null;
|
|
11
40
|
export {};
|
package/dist/lib/validation.js
CHANGED
|
@@ -1,14 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.validateCustomImageSize = validateCustomImageSize;
|
|
4
|
+
exports.validateVideoSize = validateVideoSize;
|
|
5
|
+
exports.validateVideoDuration = validateVideoDuration;
|
|
4
6
|
exports.validateNumber = validateNumber;
|
|
7
|
+
exports.validateTeacacheThreshold = validateTeacacheThreshold;
|
|
8
|
+
exports.isComfyModel = isComfyModel;
|
|
9
|
+
exports.getMaxContextImages = getMaxContextImages;
|
|
5
10
|
exports.validateSampler = validateSampler;
|
|
6
11
|
exports.validateScheduler = validateScheduler;
|
|
7
|
-
const
|
|
8
|
-
const SchedulerParams_1 = require("../Projects/types/SchedulerParams");
|
|
12
|
+
const ApiClient_1 = require("../ApiClient");
|
|
9
13
|
function validateCustomImageSize(value) {
|
|
10
14
|
return validateNumber(value, { min: 256, max: 2048, propertyName: 'Width and height' });
|
|
11
15
|
}
|
|
16
|
+
/**
|
|
17
|
+
* Validate video dimensions for Wan 2.2 models.
|
|
18
|
+
* Minimum dimension is 480px for both width and height.
|
|
19
|
+
*/
|
|
20
|
+
function validateVideoSize(value, propertyName) {
|
|
21
|
+
return validateNumber(value, { min: 480, propertyName: `Video ${propertyName}` });
|
|
22
|
+
}
|
|
23
|
+
function validateVideoDuration(value) {
|
|
24
|
+
return validateNumber(value, { min: 1, max: 10, propertyName: 'Video duration' });
|
|
25
|
+
}
|
|
12
26
|
function validateNumber(value, { min, max, propertyName, defaultValue } = {}) {
|
|
13
27
|
const number = Number(value);
|
|
14
28
|
const hasDefaultValue = defaultValue !== undefined;
|
|
@@ -35,22 +49,75 @@ function validateNumber(value, { min, max, propertyName, defaultValue } = {}) {
|
|
|
35
49
|
}
|
|
36
50
|
return number;
|
|
37
51
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
52
|
+
/**
|
|
53
|
+
* Validate teacacheThreshold for T2V and I2V models.
|
|
54
|
+
* Range: 0.0-1.0. 0.0 = disabled.
|
|
55
|
+
*/
|
|
56
|
+
function validateTeacacheThreshold(value) {
|
|
57
|
+
if (value === undefined || value === null) {
|
|
58
|
+
return undefined;
|
|
59
|
+
}
|
|
60
|
+
const num = Number(value);
|
|
61
|
+
if (isNaN(num)) {
|
|
62
|
+
throw new Error(`teacacheThreshold must be a number, got ${value}`);
|
|
41
63
|
}
|
|
42
|
-
if (
|
|
43
|
-
throw new Error(`
|
|
64
|
+
if (num < 0.0 || num > 1.0) {
|
|
65
|
+
throw new Error(`teacacheThreshold must be between 0.0 and 1.0 (got ${num})`);
|
|
44
66
|
}
|
|
45
|
-
return
|
|
67
|
+
return num;
|
|
46
68
|
}
|
|
47
|
-
function
|
|
48
|
-
|
|
69
|
+
function isComfyModel(modelId) {
|
|
70
|
+
const COMFY_PREFIXES = ['z_image_', 'qwen_image_', 'flux2_', 'wan_'];
|
|
71
|
+
return COMFY_PREFIXES.some((prefix) => modelId.startsWith(prefix));
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Get the maximum number of context images supported by a model.
|
|
75
|
+
* - Flux.2 Dev: 6 images
|
|
76
|
+
* - Qwen Image Edit: 3 images
|
|
77
|
+
* - Flux Kontext: 2 images
|
|
78
|
+
* - Default: 3 images
|
|
79
|
+
*/
|
|
80
|
+
function getMaxContextImages(modelId) {
|
|
81
|
+
if (modelId.startsWith('flux2_')) {
|
|
82
|
+
return 6;
|
|
83
|
+
}
|
|
84
|
+
if (modelId.startsWith('qwen_image_')) {
|
|
85
|
+
return 3;
|
|
86
|
+
}
|
|
87
|
+
if (modelId.includes('kontext')) {
|
|
88
|
+
return 2;
|
|
89
|
+
}
|
|
90
|
+
// Default fallback for other models that might support context images
|
|
91
|
+
return 3;
|
|
92
|
+
}
|
|
93
|
+
function validateOption(value, options, errorMessage) {
|
|
94
|
+
if (!options.includes(value)) {
|
|
95
|
+
throw new ApiClient_1.ApiError(400, {
|
|
96
|
+
status: 'error',
|
|
97
|
+
errorCode: 0,
|
|
98
|
+
message: errorMessage
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
return value;
|
|
102
|
+
}
|
|
103
|
+
/**
|
|
104
|
+
* Validate sampler value against allowed options.
|
|
105
|
+
* Returns the validated value unchanged - sogni-socket handles normalization.
|
|
106
|
+
*/
|
|
107
|
+
function validateSampler(value, options) {
|
|
108
|
+
if (!options.sampler.allowed.length || !value) {
|
|
49
109
|
return null;
|
|
50
110
|
}
|
|
51
|
-
|
|
52
|
-
|
|
111
|
+
return validateOption(value, options.sampler.allowed, `Invalid sampler ${value}. Must be one of "${options.sampler.allowed.join('", "')}".`);
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Validate scheduler value against allowed options.
|
|
115
|
+
* Returns the validated value unchanged - sogni-socket handles normalization.
|
|
116
|
+
*/
|
|
117
|
+
function validateScheduler(value, options) {
|
|
118
|
+
if (!options.scheduler.allowed.length || !value) {
|
|
119
|
+
return null;
|
|
53
120
|
}
|
|
54
|
-
return
|
|
121
|
+
return validateOption(value, options.scheduler.allowed, `Invalid scheduler ${value}. Must be one of "${options.scheduler.allowed.join('", "')}".`);
|
|
55
122
|
}
|
|
56
123
|
//# sourceMappingURL=validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/lib/validation.ts"],"names":[],"mappings":";;AAGA,0DAEC;AASD,wCA4BC;
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/lib/validation.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"publishConfig": {
|
|
4
4
|
"access": "public"
|
|
5
5
|
},
|
|
6
|
-
"version": "4.0.0-alpha.
|
|
6
|
+
"version": "4.0.0-alpha.51",
|
|
7
7
|
"description": "Sogni Supernet Client",
|
|
8
8
|
"main": "dist/index.js",
|
|
9
9
|
"types": "dist/index.d.ts",
|
|
@@ -37,6 +37,9 @@
|
|
|
37
37
|
"homepage": "https://github.com/Sogni-AI/sogni-client#readme",
|
|
38
38
|
"dependencies": {
|
|
39
39
|
"@lukeed/uuid": "^2.0.1",
|
|
40
|
+
"@types/js-cookie": "^3.0.6",
|
|
41
|
+
"@types/lodash": "^4.17.13",
|
|
42
|
+
"@types/ws": "^8.5.13",
|
|
40
43
|
"ethers": "^6.13.4",
|
|
41
44
|
"isomorphic-ws": "^5.0.0",
|
|
42
45
|
"js-cookie": "^3.0.5",
|
|
@@ -47,9 +50,6 @@
|
|
|
47
50
|
"devDependencies": {
|
|
48
51
|
"@semantic-release/changelog": "^6.0.3",
|
|
49
52
|
"@semantic-release/git": "^10.0.1",
|
|
50
|
-
"@types/js-cookie": "^3.0.6",
|
|
51
|
-
"@types/lodash": "^4.17.13",
|
|
52
|
-
"@types/ws": "^8.5.13",
|
|
53
53
|
"prettier": "^3.3.3",
|
|
54
54
|
"rimraf": "^6.0.1",
|
|
55
55
|
"semantic-release": "^24.2.1",
|
package/src/Account/index.ts
CHANGED
|
@@ -29,11 +29,11 @@ enum ErrorCode {
|
|
|
29
29
|
}
|
|
30
30
|
/**
|
|
31
31
|
* Account API methods that let you interact with the user's account.
|
|
32
|
-
* Can be accessed via `
|
|
32
|
+
* Can be accessed via `sogni.account`. Look for more samples below.
|
|
33
33
|
*
|
|
34
34
|
* @example Retrieve the current account balance
|
|
35
35
|
* ```typescript
|
|
36
|
-
* const balance = await
|
|
36
|
+
* const balance = await sogni.account.refreshBalance();
|
|
37
37
|
* console.log(balance);
|
|
38
38
|
* ```
|
|
39
39
|
*
|
|
@@ -43,7 +43,12 @@ class AccountApi extends ApiGroup {
|
|
|
43
43
|
|
|
44
44
|
constructor(config: ApiConfig) {
|
|
45
45
|
super(config);
|
|
46
|
+
this.currentAccount._update({
|
|
47
|
+
networkStatus: this.client.socket.isConnected ? 'connected' : 'disconnected',
|
|
48
|
+
network: this.client.socket.supernetType
|
|
49
|
+
});
|
|
46
50
|
this.client.socket.on('balanceUpdate', this.handleBalanceUpdate.bind(this));
|
|
51
|
+
this.client.socket.on('changeNetwork', this.handleChangeNetwork.bind(this));
|
|
47
52
|
this.client.on('connected', this.handleServerConnected.bind(this));
|
|
48
53
|
this.client.on('disconnected', this.handleServerDisconnected.bind(this));
|
|
49
54
|
this.client.auth.on('updated', this.handleAuthUpdated.bind(this));
|
|
@@ -53,6 +58,10 @@ class AccountApi extends ApiGroup {
|
|
|
53
58
|
this.currentAccount._update({ balance: data });
|
|
54
59
|
}
|
|
55
60
|
|
|
61
|
+
private handleChangeNetwork({ network }: { network: SupernetType }) {
|
|
62
|
+
this.currentAccount._update({ network, networkStatus: 'connected' });
|
|
63
|
+
}
|
|
64
|
+
|
|
56
65
|
private handleServerConnected({ network }: { network: SupernetType }) {
|
|
57
66
|
this.currentAccount._update({
|
|
58
67
|
networkStatus: 'connected',
|
|
@@ -70,6 +79,8 @@ class AccountApi extends ApiGroup {
|
|
|
70
79
|
private handleAuthUpdated(isAuthenticated: boolean) {
|
|
71
80
|
if (!isAuthenticated) {
|
|
72
81
|
this.currentAccount._clear();
|
|
82
|
+
} else {
|
|
83
|
+
this.me();
|
|
73
84
|
}
|
|
74
85
|
}
|
|
75
86
|
|
|
@@ -92,7 +103,7 @@ class AccountApi extends ApiGroup {
|
|
|
92
103
|
*
|
|
93
104
|
* @example Create a wallet from username and password
|
|
94
105
|
* ```typescript
|
|
95
|
-
* const wallet =
|
|
106
|
+
* const wallet = sogni.account.getWallet('username', 'password');
|
|
96
107
|
* console.log(wallet.address);
|
|
97
108
|
* ```
|
|
98
109
|
*
|
|
@@ -137,7 +148,6 @@ class AccountApi extends ApiGroup {
|
|
|
137
148
|
} else {
|
|
138
149
|
await auth.authenticate();
|
|
139
150
|
}
|
|
140
|
-
await this.me();
|
|
141
151
|
return res.data;
|
|
142
152
|
}
|
|
143
153
|
|
|
@@ -146,7 +156,7 @@ class AccountApi extends ApiGroup {
|
|
|
146
156
|
*
|
|
147
157
|
* @example Login with username and password
|
|
148
158
|
* ```typescript
|
|
149
|
-
* await
|
|
159
|
+
* await sogni.account.login('username', 'password');
|
|
150
160
|
* console.log('Logged in');
|
|
151
161
|
* ```
|
|
152
162
|
*
|
|
@@ -173,7 +183,6 @@ class AccountApi extends ApiGroup {
|
|
|
173
183
|
} else {
|
|
174
184
|
await auth.authenticate();
|
|
175
185
|
}
|
|
176
|
-
await this.me();
|
|
177
186
|
return res.data;
|
|
178
187
|
}
|
|
179
188
|
|
|
@@ -182,12 +191,20 @@ class AccountApi extends ApiGroup {
|
|
|
182
191
|
*
|
|
183
192
|
* @example Logout the user
|
|
184
193
|
* ```typescript
|
|
185
|
-
* await
|
|
194
|
+
* await sogni.account.logout();
|
|
186
195
|
* console.log('Logged out');
|
|
187
196
|
* ```
|
|
188
197
|
*/
|
|
189
198
|
async logout(): Promise<void> {
|
|
190
|
-
|
|
199
|
+
try {
|
|
200
|
+
await this.client.rest.post('/v1/account/logout');
|
|
201
|
+
} catch (e) {
|
|
202
|
+
if (e instanceof ApiError && e.status === 401) {
|
|
203
|
+
this.client.logger.warn('Failed to logout, probably already logged out');
|
|
204
|
+
} else {
|
|
205
|
+
throw e;
|
|
206
|
+
}
|
|
207
|
+
}
|
|
191
208
|
this.client.auth.clear();
|
|
192
209
|
}
|
|
193
210
|
|
|
@@ -200,7 +217,7 @@ class AccountApi extends ApiGroup {
|
|
|
200
217
|
*
|
|
201
218
|
* @example Refresh user account balance
|
|
202
219
|
* ```typescript
|
|
203
|
-
* const balance = await
|
|
220
|
+
* const balance = await sogni.account.refreshBalance();
|
|
204
221
|
* console.log(balance);
|
|
205
222
|
* ```
|
|
206
223
|
*/
|
|
@@ -216,7 +233,7 @@ class AccountApi extends ApiGroup {
|
|
|
216
233
|
*
|
|
217
234
|
* @example Get the account balance of the current user
|
|
218
235
|
* ```typescript
|
|
219
|
-
* const balance = await
|
|
236
|
+
* const balance = await sogni.account.accountBalance();
|
|
220
237
|
* console.log(balance);
|
|
221
238
|
* ```
|
|
222
239
|
*/
|
|
@@ -232,19 +249,21 @@ class AccountApi extends ApiGroup {
|
|
|
232
249
|
*
|
|
233
250
|
* @example Get the balance of the wallet address
|
|
234
251
|
* ```typescript
|
|
235
|
-
* const address =
|
|
236
|
-
* const balance = await
|
|
252
|
+
* const address = sogni.account.currentAccount.walletAddress;
|
|
253
|
+
* const balance = await sogni.account.walletBalance(address);
|
|
237
254
|
* console.log(balance);
|
|
238
255
|
* // { token: '100.000000', ether: '0.000000' }
|
|
239
256
|
* ```
|
|
240
257
|
*
|
|
241
258
|
* @param walletAddress
|
|
259
|
+
* @param provider - blockchain provider, 'base' or 'etherlink' defaults to 'base'
|
|
242
260
|
*/
|
|
243
|
-
async walletBalance(walletAddress: string) {
|
|
261
|
+
async walletBalance(walletAddress: string, provider: 'base' | 'etherlink' = 'base') {
|
|
244
262
|
const res = await this.client.rest.get<
|
|
245
263
|
ApiResponse<{ sogni: string; spark: string; ether: string }>
|
|
246
264
|
>('/v2/wallet/balance', {
|
|
247
|
-
walletAddress
|
|
265
|
+
walletAddress,
|
|
266
|
+
provider
|
|
248
267
|
});
|
|
249
268
|
return res.data;
|
|
250
269
|
}
|
|
@@ -287,9 +306,9 @@ class AccountApi extends ApiGroup {
|
|
|
287
306
|
*
|
|
288
307
|
* @example Switch to the fast network
|
|
289
308
|
* ```typescript
|
|
290
|
-
* await
|
|
309
|
+
* await sogni.account.switchNetwork('fast');
|
|
291
310
|
* console.log('Switched to the fast network, now lets wait until we get list of models');
|
|
292
|
-
* await
|
|
311
|
+
* await sogni.projects.waitForModels();
|
|
293
312
|
* ```
|
|
294
313
|
* @param network - Network type to switch to
|
|
295
314
|
*/
|
|
@@ -311,10 +330,10 @@ class AccountApi extends ApiGroup {
|
|
|
311
330
|
*
|
|
312
331
|
* @example Get the transaction history
|
|
313
332
|
* ```typescript
|
|
314
|
-
* const { entries, next } = await
|
|
333
|
+
* const { entries, next } = await sogni.account.transactionHistory({
|
|
315
334
|
* status: 'completed',
|
|
316
335
|
* limit: 10,
|
|
317
|
-
* address:
|
|
336
|
+
* address: sogni.account.currentAccount.walletAddress
|
|
318
337
|
* });
|
|
319
338
|
* ```
|
|
320
339
|
*
|
|
@@ -420,7 +439,7 @@ class AccountApi extends ApiGroup {
|
|
|
420
439
|
* Withdraw funds from the current account to wallet.
|
|
421
440
|
* @example withdraw to current wallet address
|
|
422
441
|
* ```typescript
|
|
423
|
-
* await
|
|
442
|
+
* await sogni.account.withdraw('your-account-password', 100);
|
|
424
443
|
* ```
|
|
425
444
|
*
|
|
426
445
|
* @param password - account password
|
|
@@ -452,7 +471,7 @@ class AccountApi extends ApiGroup {
|
|
|
452
471
|
* Deposit tokens from wallet to account
|
|
453
472
|
* @example withdraw to current wallet address
|
|
454
473
|
* ```typescript
|
|
455
|
-
* await
|
|
474
|
+
* await sogni.account.deposit('your-account-password', 100);
|
|
456
475
|
* ```
|
|
457
476
|
*
|
|
458
477
|
* @param password - account password
|