@sogni-ai/sogni-client 0.0.15 → 0.0.17
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/dist/ApiClient/ApiClient.d.ts +2 -1
- package/dist/ApiClient/ApiClient.js +2 -2
- package/dist/ApiClient/ApiClient.js.map +1 -1
- package/dist/ApiClient/WebSocketClient/index.js +11 -1
- package/dist/ApiClient/WebSocketClient/index.js.map +1 -1
- package/dist/Projects/Project.js +2 -2
- package/dist/Projects/Project.js.map +1 -1
- package/dist/Projects/createJobRequestMessage.d.ts +21 -20
- package/dist/Projects/createJobRequestMessage.js +19 -10
- package/dist/Projects/createJobRequestMessage.js.map +1 -1
- package/dist/Projects/index.d.ts +1 -0
- package/dist/Projects/index.js +38 -9
- package/dist/Projects/index.js.map +1 -1
- package/dist/Projects/types/index.d.ts +8 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/lib/getUUID.d.ts +2 -0
- package/dist/lib/getUUID.js +9 -0
- package/dist/lib/getUUID.js.map +1 -0
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
|
@@ -4,6 +4,7 @@ import TypedEventEmitter from '../lib/TypedEventEmitter';
|
|
|
4
4
|
import { ApiClientEvents } from './events';
|
|
5
5
|
import { ServerConnectData, ServerDisconnectData } from './WebSocketClient/events';
|
|
6
6
|
import { JSONValue } from '../types/json';
|
|
7
|
+
import { SupernetType } from './WebSocketClient/types';
|
|
7
8
|
export interface ApiReponse<D = JSONValue> {
|
|
8
9
|
status: 'success';
|
|
9
10
|
data: D;
|
|
@@ -29,7 +30,7 @@ declare class ApiClient extends TypedEventEmitter<ApiClientEvents> {
|
|
|
29
30
|
private _socket;
|
|
30
31
|
private _auth;
|
|
31
32
|
private _reconnectAttempts;
|
|
32
|
-
constructor(baseUrl: string, socketUrl: string, appId: string);
|
|
33
|
+
constructor(baseUrl: string, socketUrl: string, appId: string, networkType: SupernetType);
|
|
33
34
|
get isAuthenticated(): boolean;
|
|
34
35
|
get auth(): AuthData | null;
|
|
35
36
|
get socket(): WebSocketClient;
|
|
@@ -19,13 +19,13 @@ class ApiError extends Error {
|
|
|
19
19
|
}
|
|
20
20
|
exports.ApiError = ApiError;
|
|
21
21
|
class ApiClient extends TypedEventEmitter_1.default {
|
|
22
|
-
constructor(baseUrl, socketUrl, appId) {
|
|
22
|
+
constructor(baseUrl, socketUrl, appId, networkType) {
|
|
23
23
|
super();
|
|
24
24
|
this._auth = null;
|
|
25
25
|
this._reconnectAttempts = WS_RECONNECT_ATTEMPTS;
|
|
26
26
|
this.appId = appId;
|
|
27
27
|
this._rest = new RestClient_1.default(baseUrl);
|
|
28
|
-
this._socket = new WebSocketClient_1.default(socketUrl, appId);
|
|
28
|
+
this._socket = new WebSocketClient_1.default(socketUrl, appId, networkType);
|
|
29
29
|
this._socket.on('connected', this.handleSocketConnect.bind(this));
|
|
30
30
|
this._socket.on('disconnected', this.handleSocketDisconnect.bind(this));
|
|
31
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiClient.js","sourceRoot":"","sources":["../../src/ApiClient/ApiClient.ts"],"names":[],"mappings":";;;;;;AAAA,mEAA2C;AAC3C,wEAAgD;AAChD,2CAAuC;AACvC,iFAAyD;AAGzD,2DAA+D;
|
|
1
|
+
{"version":3,"file":"ApiClient.js","sourceRoot":"","sources":["../../src/ApiClient/ApiClient.ts"],"names":[],"mappings":";;;;;;AAAA,mEAA2C;AAC3C,wEAAgD;AAChD,2CAAuC;AACvC,iFAAyD;AAGzD,2DAA+D;AAI/D,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAahC,MAAa,QAAS,SAAQ,KAAK;IAGjC,YAAY,MAAc,EAAE,OAAyB;QACnD,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AARD,4BAQC;AAQD,MAAM,SAAU,SAAQ,2BAAkC;IAOxD,YAAY,OAAe,EAAE,SAAiB,EAAE,KAAa,EAAE,WAAyB;QACtF,KAAK,EAAE,CAAC;QAJF,UAAK,GAAoB,IAAI,CAAC;QAC9B,uBAAkB,GAAG,qBAAqB,CAAC;QAIjD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,oBAAU,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,CAAC,OAAO,GAAG,IAAI,yBAAe,CAAC,SAAS,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAC3D,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7E,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,YAAY,CAAC,KAAa;QACxB,MAAM,OAAO,GAAG,IAAA,sBAAS,EAA0D,KAAK,CAAC,CAAC;QAC1F,IAAI,CAAC,KAAK,GAAG;YACX,KAAK;YACL,aAAa,EAAE,OAAO,CAAC,IAAI;YAC3B,SAAS,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;SACxC,CAAC;QACF,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,GAAG,EAAE,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,UAAU;QACR,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;IAED,mBAAmB,CAAC,EAAE,OAAO,EAAqB;QAChD,IAAI,CAAC,kBAAkB,GAAG,qBAAqB,CAAC;QAChD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACtC,CAAC;IAED,sBAAsB,CAAC,IAA0B;QAC/C,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAA,4BAAgB,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;YAChC,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,IAAI,CAAC,CAAC;YACpD,OAAO;QACT,CAAC;QACD,IAAI,IAAI,CAAC,kBAAkB,IAAI,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;YAChC,IAAI,CAAC,kBAAkB,GAAG,qBAAqB,CAAC;YAChD,OAAO;QACT,CAAC;QACD,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC1B,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;CACF;AAED,kBAAe,SAAS,CAAC"}
|
|
@@ -51,12 +51,16 @@ class WebSocketClient extends RestClient_1.default {
|
|
|
51
51
|
}
|
|
52
52
|
connect() {
|
|
53
53
|
var _a;
|
|
54
|
+
if (this.socket) {
|
|
55
|
+
this.disconnect();
|
|
56
|
+
}
|
|
54
57
|
const userAgent = `Sogni/${version_1.LIB_VERSION} (sogni-client)`;
|
|
55
58
|
const url = new URL(this.baseUrl);
|
|
56
59
|
url.searchParams.set('appId', this.appId);
|
|
57
60
|
url.searchParams.set('clientName', userAgent);
|
|
58
61
|
url.searchParams.set('clientType', 'artist');
|
|
59
|
-
|
|
62
|
+
//At this point 'relaxed' does not work as expected, so we use 'fast' or empty
|
|
63
|
+
url.searchParams.set('forceWorkerId', this._supernetType === 'fast' ? 'fast' : '');
|
|
60
64
|
let params;
|
|
61
65
|
// In Node.js, ws package is used, so we need to set the auth header
|
|
62
66
|
if (isNodejs_1.default) {
|
|
@@ -152,6 +156,12 @@ class WebSocketClient extends RestClient_1.default {
|
|
|
152
156
|
if (data.data) {
|
|
153
157
|
payload = JSON.parse((0, base64_1.base64Decode)(data.data));
|
|
154
158
|
}
|
|
159
|
+
// Convert jobID and imgID to uppercase for consistency
|
|
160
|
+
['jobID', 'imgID'].forEach((idKey) => {
|
|
161
|
+
if (payload[idKey]) {
|
|
162
|
+
payload[idKey] = payload[idKey].toUpperCase();
|
|
163
|
+
}
|
|
164
|
+
});
|
|
155
165
|
this.emit(data.type, payload);
|
|
156
166
|
})
|
|
157
167
|
.catch((err) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ApiClient/WebSocketClient/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,sEAA4D;AAE5D,kEAAgF;AAChF,6CAA8D;AAC9D,kEAA0C;AAC1C,0DAA+B;AAC/B,2CAA4C;AAE5C,MAAM,eAAgB,SAAQ,oBAA0B;IAMtD,YAAY,OAAe,EAAE,KAAa,EAAE,eAA6B,MAAM;QAC7E,KAAK,CAAC,OAAO,CAAC,CAAC;QAJT,WAAM,GAAqB,IAAI,CAAC;QAKtC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;IACpC,CAAC;IAED,IAAI,IAAI,CAAC,IAAqB;QAC5B,4BAA4B;QAC5B,IAAI,CAAC,kBAAQ,EAAE,CAAC;YACd,IAAI,IAAI,EAAE,CAAC;gBACT,mBAAM,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,KAAK,EAAE;oBACtC,MAAM,EAAE,WAAW;oBACnB,OAAO,EAAE,CAAC;iBACX,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,mBAAM,CAAC,MAAM,CAAC,eAAe,EAAE;oBAC7B,MAAM,EAAE,WAAW;iBACpB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,OAAO;;QACL,MAAM,SAAS,GAAG,SAAS,qBAAW,iBAAiB,CAAC;QACxD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QAC9C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC7C,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ApiClient/WebSocketClient/index.ts"],"names":[],"mappings":"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"}
|
package/dist/Projects/Project.js
CHANGED
|
@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const Job_1 = __importDefault(require("./Job"));
|
|
7
7
|
const DataEntity_1 = __importDefault(require("../lib/DataEntity"));
|
|
8
8
|
const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
|
|
9
|
-
const
|
|
9
|
+
const getUUID_1 = __importDefault(require("../lib/getUUID"));
|
|
10
10
|
class Project extends DataEntity_1.default {
|
|
11
11
|
constructor(data) {
|
|
12
12
|
super({
|
|
13
|
-
id: (0,
|
|
13
|
+
id: (0, getUUID_1.default)(),
|
|
14
14
|
startedAt: new Date(),
|
|
15
15
|
params: data,
|
|
16
16
|
queuePosition: -1,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Project.js","sourceRoot":"","sources":["../../src/Projects/Project.ts"],"names":[],"mappings":";;;;;AAAA,gDAAqC;AACrC,mEAA6D;AAE7D,iEAAyC;
|
|
1
|
+
{"version":3,"file":"Project.js","sourceRoot":"","sources":["../../src/Projects/Project.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
import { ProjectParams } from './types';
|
|
2
2
|
declare function createJobRequestMessage(id: string, params: ProjectParams): {
|
|
3
|
-
selectedUpscalingModel: string;
|
|
4
|
-
cnVideoFramesSketch: never[];
|
|
5
|
-
cnVideoFramesSegmentedSubject: never[];
|
|
6
|
-
cnVideoFramesFace: never[];
|
|
7
|
-
doCanvasBlending: boolean;
|
|
8
|
-
animationIsOn: boolean;
|
|
9
|
-
cnVideoFramesBoth: never[];
|
|
10
|
-
cnVideoFramesDepth: never[];
|
|
11
3
|
keyFrames: {
|
|
4
|
+
scheduler: import("./types").Scheduler | undefined;
|
|
5
|
+
steps: number;
|
|
6
|
+
guidanceScale: number;
|
|
7
|
+
modelID: string;
|
|
8
|
+
negativePrompt: string;
|
|
9
|
+
seed: string | undefined;
|
|
10
|
+
positivePrompt: string;
|
|
11
|
+
stylePrompt: string;
|
|
12
|
+
hasStartingImage: boolean;
|
|
13
|
+
strengthIsEnabled: boolean;
|
|
14
|
+
strength: number | undefined;
|
|
12
15
|
stepsIsEnabled: boolean;
|
|
13
16
|
siRotation: number;
|
|
14
17
|
siDragOffsetIsEnabled: boolean;
|
|
15
|
-
strength: number;
|
|
16
18
|
siZoomScaleIsEnabled: boolean;
|
|
17
19
|
isEnabled: boolean;
|
|
18
20
|
processing: string;
|
|
@@ -20,33 +22,34 @@ declare function createJobRequestMessage(id: string, params: ProjectParams): {
|
|
|
20
22
|
guidanceScaleIsEnabled: boolean;
|
|
21
23
|
siImageBackgroundColor: string;
|
|
22
24
|
cnDragOffset: number[];
|
|
23
|
-
scheduler: string;
|
|
24
25
|
timeStepSpacing: string;
|
|
25
|
-
steps: number;
|
|
26
26
|
cnRotation: number;
|
|
27
|
-
guidanceScale: number;
|
|
28
27
|
siZoomScale: number;
|
|
29
|
-
modelID: string;
|
|
30
28
|
cnRotationIsEnabled: boolean;
|
|
31
|
-
negativePrompt: string;
|
|
32
29
|
startingImageZoomPanIsOn: boolean;
|
|
33
|
-
seed: string;
|
|
34
30
|
siRotationIsEnabled: boolean;
|
|
35
31
|
cnImageBackgroundColor: string;
|
|
36
|
-
strengthIsEnabled: boolean;
|
|
37
32
|
siDragOffset: number[];
|
|
38
33
|
useLastImageAsCNImageInAnimation: boolean;
|
|
39
|
-
positivePrompt: string;
|
|
40
34
|
controlNetZoomPanIsOn: boolean;
|
|
41
35
|
cnZoomScaleIsEnabled: boolean;
|
|
42
36
|
currentControlNets: null;
|
|
43
|
-
stylePrompt: string;
|
|
44
37
|
cnDragOffsetIsEnabled: boolean;
|
|
45
38
|
frameIndex: number;
|
|
46
39
|
startingImage: null;
|
|
47
40
|
cnZoomScale: number;
|
|
48
41
|
}[];
|
|
49
42
|
previews: number;
|
|
43
|
+
numberOfImages: number;
|
|
44
|
+
jobID: string;
|
|
45
|
+
selectedUpscalingModel: string;
|
|
46
|
+
cnVideoFramesSketch: never[];
|
|
47
|
+
cnVideoFramesSegmentedSubject: never[];
|
|
48
|
+
cnVideoFramesFace: never[];
|
|
49
|
+
doCanvasBlending: boolean;
|
|
50
|
+
animationIsOn: boolean;
|
|
51
|
+
cnVideoFramesBoth: never[];
|
|
52
|
+
cnVideoFramesDepth: never[];
|
|
50
53
|
frameRate: number;
|
|
51
54
|
generatedVideoSeconds: number;
|
|
52
55
|
canvasIsOn: boolean;
|
|
@@ -54,9 +57,7 @@ declare function createJobRequestMessage(id: string, params: ProjectParams): {
|
|
|
54
57
|
disableSafety: boolean;
|
|
55
58
|
cnVideoFramesSegmentedBackground: never[];
|
|
56
59
|
cnVideoFramesSegmented: never[];
|
|
57
|
-
numberOfImages: number;
|
|
58
60
|
cnVideoFramesPose: never[];
|
|
59
|
-
jobID: string;
|
|
60
61
|
siVideoFrames: never[];
|
|
61
62
|
};
|
|
62
63
|
export type JobRequestRaw = ReturnType<typeof createJobRequestMessage>;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
3
|
+
// Mac worker can't process the data if some of the fields are missing, so we need to provide a default template
|
|
4
|
+
function getTemplate() {
|
|
4
5
|
return {
|
|
5
6
|
selectedUpscalingModel: 'OFF',
|
|
6
7
|
cnVideoFramesSketch: [],
|
|
@@ -25,25 +26,25 @@ function createJobRequestMessage(id, params) {
|
|
|
25
26
|
cnDragOffset: [0, 0],
|
|
26
27
|
scheduler: 'DPM Solver Multistep (DPM-Solver++)',
|
|
27
28
|
timeStepSpacing: 'Linear',
|
|
28
|
-
steps:
|
|
29
|
+
steps: 20,
|
|
29
30
|
cnRotation: 0,
|
|
30
|
-
guidanceScale:
|
|
31
|
+
guidanceScale: 7.5,
|
|
31
32
|
siZoomScale: 1,
|
|
32
|
-
modelID:
|
|
33
|
+
modelID: '',
|
|
33
34
|
cnRotationIsEnabled: true,
|
|
34
|
-
negativePrompt:
|
|
35
|
+
negativePrompt: '',
|
|
35
36
|
startingImageZoomPanIsOn: false,
|
|
36
|
-
seed:
|
|
37
|
+
seed: undefined,
|
|
37
38
|
siRotationIsEnabled: true,
|
|
38
39
|
cnImageBackgroundColor: 'clear',
|
|
39
40
|
strengthIsEnabled: true,
|
|
40
41
|
siDragOffset: [0, 0],
|
|
41
42
|
useLastImageAsCNImageInAnimation: false,
|
|
42
|
-
positivePrompt:
|
|
43
|
+
positivePrompt: '',
|
|
43
44
|
controlNetZoomPanIsOn: false,
|
|
44
45
|
cnZoomScaleIsEnabled: true,
|
|
45
46
|
currentControlNets: null,
|
|
46
|
-
stylePrompt:
|
|
47
|
+
stylePrompt: '',
|
|
47
48
|
cnDragOffsetIsEnabled: true,
|
|
48
49
|
frameIndex: 0,
|
|
49
50
|
startingImage: null,
|
|
@@ -58,11 +59,19 @@ function createJobRequestMessage(id, params) {
|
|
|
58
59
|
disableSafety: false,
|
|
59
60
|
cnVideoFramesSegmentedBackground: [],
|
|
60
61
|
cnVideoFramesSegmented: [],
|
|
61
|
-
numberOfImages:
|
|
62
|
+
numberOfImages: 1,
|
|
62
63
|
cnVideoFramesPose: [],
|
|
63
|
-
jobID:
|
|
64
|
+
jobID: '',
|
|
64
65
|
siVideoFrames: []
|
|
65
66
|
};
|
|
66
67
|
}
|
|
68
|
+
function createJobRequestMessage(id, params) {
|
|
69
|
+
const template = getTemplate();
|
|
70
|
+
return Object.assign(Object.assign({}, template), { keyFrames: [
|
|
71
|
+
Object.assign(Object.assign({}, template.keyFrames[0]), { scheduler: params.scheduler, steps: params.steps, guidanceScale: params.guidance, modelID: params.modelId, negativePrompt: params.negativePrompt, seed: params.seed, positivePrompt: params.positivePrompt, stylePrompt: params.stylePrompt, hasStartingImage: !!params.startingImage, strengthIsEnabled: !!params.startingImage, strength: !!params.startingImage
|
|
72
|
+
? 1 - (Number(params.startingImageStrength) || 0.5)
|
|
73
|
+
: undefined })
|
|
74
|
+
], previews: params.numberOfPreviews || 0, numberOfImages: params.numberOfImages, jobID: id });
|
|
75
|
+
}
|
|
67
76
|
exports.default = createJobRequestMessage;
|
|
68
77
|
//# sourceMappingURL=createJobRequestMessage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createJobRequestMessage.js","sourceRoot":"","sources":["../../src/Projects/createJobRequestMessage.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"createJobRequestMessage.js","sourceRoot":"","sources":["../../src/Projects/createJobRequestMessage.ts"],"names":[],"mappings":"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"}
|
package/dist/Projects/index.d.ts
CHANGED
package/dist/Projects/index.js
CHANGED
|
@@ -16,6 +16,8 @@ const ApiGroup_1 = __importDefault(require("../ApiGroup"));
|
|
|
16
16
|
const models_json_1 = __importDefault(require("./models.json"));
|
|
17
17
|
const Project_1 = __importDefault(require("./Project"));
|
|
18
18
|
const createJobRequestMessage_1 = __importDefault(require("./createJobRequestMessage"));
|
|
19
|
+
const ApiClient_1 = require("../ApiClient/ApiClient");
|
|
20
|
+
const getUUID_1 = __importDefault(require("../lib/getUUID"));
|
|
19
21
|
const GARBAGE_COLLECT_TIMEOUT = 10000;
|
|
20
22
|
class ProjectsApi extends ApiGroup_1.default {
|
|
21
23
|
get availableModels() {
|
|
@@ -38,16 +40,15 @@ class ProjectsApi extends ApiGroup_1.default {
|
|
|
38
40
|
this.on('job', this.handleJobEvent.bind(this));
|
|
39
41
|
}
|
|
40
42
|
handleSwarmModels(data) {
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
acc.push({
|
|
44
|
-
id: model.modelId,
|
|
45
|
-
name: model.modelShortName,
|
|
46
|
-
workerCount: data[model.modelId]
|
|
47
|
-
});
|
|
48
|
-
}
|
|
43
|
+
const modelIndex = models_json_1.default.reduce((acc, model) => {
|
|
44
|
+
acc[model.modelId] = model;
|
|
49
45
|
return acc;
|
|
50
|
-
},
|
|
46
|
+
}, {});
|
|
47
|
+
this._availableModels = Object.entries(data).map(([id, workerCount]) => ({
|
|
48
|
+
id,
|
|
49
|
+
name: modelIndex[id].modelShortName || id.replace(/-/g, ' '),
|
|
50
|
+
workerCount
|
|
51
|
+
}));
|
|
51
52
|
this.emit('availableModels', this._availableModels);
|
|
52
53
|
}
|
|
53
54
|
handleJobState(data) {
|
|
@@ -157,6 +158,7 @@ class ProjectsApi extends ApiGroup_1.default {
|
|
|
157
158
|
error: event.error
|
|
158
159
|
});
|
|
159
160
|
}
|
|
161
|
+
console.log('Project event', event, project.status);
|
|
160
162
|
if (project.status === 'completed' || project.status === 'failed') {
|
|
161
163
|
setTimeout(() => {
|
|
162
164
|
this.projects = this.projects.filter((p) => p.id !== event.projectId);
|
|
@@ -217,12 +219,39 @@ class ProjectsApi extends ApiGroup_1.default {
|
|
|
217
219
|
create(data) {
|
|
218
220
|
return __awaiter(this, void 0, void 0, function* () {
|
|
219
221
|
const project = new Project_1.default(Object.assign({}, data));
|
|
222
|
+
if (data.startingImage) {
|
|
223
|
+
yield this.uploadGuideImage(project.id, data.startingImage);
|
|
224
|
+
}
|
|
220
225
|
const request = (0, createJobRequestMessage_1.default)(project.id, data);
|
|
221
226
|
yield this.client.socket.send('jobRequest', request);
|
|
222
227
|
this.projects.push(project);
|
|
223
228
|
return project;
|
|
224
229
|
});
|
|
225
230
|
}
|
|
231
|
+
uploadGuideImage(projectId, file) {
|
|
232
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
233
|
+
const imageId = (0, getUUID_1.default)();
|
|
234
|
+
const presignedUrl = yield this.uploadUrl({
|
|
235
|
+
imageId: imageId,
|
|
236
|
+
jobId: projectId,
|
|
237
|
+
type: 'startingImage'
|
|
238
|
+
});
|
|
239
|
+
const res = yield fetch(presignedUrl, {
|
|
240
|
+
method: 'PUT',
|
|
241
|
+
body: file
|
|
242
|
+
});
|
|
243
|
+
if (!res.ok) {
|
|
244
|
+
console.log(res);
|
|
245
|
+
throw new ApiClient_1.ApiError(res.status, {
|
|
246
|
+
status: 'error',
|
|
247
|
+
errorCode: 0,
|
|
248
|
+
message: 'Failed to upload guide image'
|
|
249
|
+
});
|
|
250
|
+
}
|
|
251
|
+
console.log('Uploaded guide image', yield this.downloadUrl({ imageId, jobId: projectId, type: 'startingImage' }));
|
|
252
|
+
return imageId;
|
|
253
|
+
});
|
|
254
|
+
}
|
|
226
255
|
/**
|
|
227
256
|
* Estimate project cost
|
|
228
257
|
* @param network - either 'fast' or 'relaxed' network
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Projects/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAmC;AASnC,wDAAgC;AAChC,wFAAgE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Projects/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,2DAAkD;AAClD,gEAAmC;AASnC,wDAAgC;AAChC,wFAAgE;AAChE,sDAA8D;AAG9D,6DAAqC;AAErC,MAAM,uBAAuB,GAAG,KAAK,CAAC;AAEtC,MAAM,WAAY,SAAQ,kBAA0B;IAIlD,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,YAAY,MAAiB;QAC3B,KAAK,CAAC,MAAM,CAAC,CAAC;QARR,qBAAgB,GAAqB,EAAE,CAAC;QACxC,aAAQ,GAAc,EAAE,CAAC;QAQ/B,kEAAkE;QAClE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACpE,oCAAoC;QACpC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzE,wEAAwE;QACxE,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjD,CAAC;IAEO,iBAAiB,CAAC,IAAmC;QAC3D,MAAM,UAAU,GAAG,qBAAM,CAAC,MAAM,CAAC,CAAC,GAAwB,EAAE,KAAK,EAAE,EAAE;YACnE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC;YAC3B,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;YACvE,EAAE;YACF,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC,CAAC,cAAc,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;YAC5D,WAAW;SACZ,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACtD,CAAC;IAEO,cAAc,CAAC,IAAkB;QACvC,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAClB,KAAK,QAAQ;gBACX,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;oBACnB,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,IAAI,CAAC,KAAK;oBACrB,aAAa,EAAE,IAAI,CAAC,aAAa;iBAClC,CAAC,CAAC;gBACH,OAAO;YACT,KAAK,cAAc;gBACjB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;gBACnE,OAAO;YACT,KAAK,iBAAiB;gBACpB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;gBACnF,OAAO;YACT,KAAK,YAAY,CAAC,CAAC,CAAC;gBAClB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;gBAChF,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;IAEa,iBAAiB,CAAC,IAAqB;;YACnD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBACf,IAAI,EAAE,UAAU;gBAChB,SAAS,EAAE,IAAI,CAAC,KAAK;gBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,SAAS,EAAE,IAAI,CAAC,SAAS;aAC1B,CAAC,CAAC;YAEH,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,WAAW,CAAC;oBACf,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,OAAO,EAAE,IAAI,CAAC,KAAK;oBACnB,IAAI,EAAE,SAAS;iBAChB,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;oBACd,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;wBACf,IAAI,EAAE,SAAS;wBACf,SAAS,EAAE,IAAI,CAAC,KAAK;wBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;wBACjB,GAAG;qBACJ,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KAAA;IAEa,eAAe,CAAC,IAAmB;;YAC/C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC;gBACzC,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,OAAO,EAAE,IAAI,CAAC,KAAK;gBACnB,IAAI,EAAE,UAAU;aACjB,CAAC,CAAC;YAEH,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;gBACf,IAAI,EAAE,WAAW;gBACjB,SAAS,EAAE,IAAI,CAAC,KAAK;gBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,KAAK,EAAE,IAAI,CAAC,kBAAkB;gBAC9B,SAAS,EAAE,WAAW;aACvB,CAAC,CAAC;QACL,CAAC;KAAA;IAEO,cAAc,CAAC,IAAkB;QACvC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACnB,IAAI,EAAE,OAAO;gBACb,SAAS,EAAE,IAAI,CAAC,KAAK;gBACrB,KAAK,EAAE;oBACL,IAAI,EAAE,IAAI,CAAC,KAAK;oBAChB,OAAO,EAAE,IAAI,CAAC,aAAa;iBAC5B;aACF,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,IAAI,EAAE,OAAO;YACb,SAAS,EAAE,IAAI,CAAC,KAAK;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,KAAK,EAAE;gBACL,IAAI,EAAE,IAAI,CAAC,KAAK;gBAChB,OAAO,EAAE,IAAI,CAAC,aAAa;aAC5B;SACF,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAAC,KAAmB;QACpC,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,SAAS,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QACD,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,QAAQ;gBACX,OAAO,CAAC,OAAO,CAAC;oBACd,MAAM,EAAE,QAAQ;oBAChB,aAAa,EAAE,KAAK,CAAC,aAAa;iBACnC,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,WAAW;gBACd,OAAO,CAAC,OAAO,CAAC;oBACd,MAAM,EAAE,WAAW;iBACpB,CAAC,CAAC;gBACH,MAAM;YACR,KAAK,OAAO;gBACV,OAAO,CAAC,OAAO,CAAC;oBACd,MAAM,EAAE,QAAQ;oBAChB,KAAK,EAAE,KAAK,CAAC,KAAK;iBACnB,CAAC,CAAC;QACP,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,OAAO,CAAC,MAAM,KAAK,WAAW,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAClE,UAAU,CAAC,GAAG,EAAE;gBACd,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,SAAS,CAAC,CAAC;YACxE,CAAC,EAAE,uBAAuB,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,cAAc,CAAC,KAAe;QAC5B,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,SAAS,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QACD,IAAI,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;gBACpB,EAAE,EAAE,KAAK,CAAC,KAAK;gBACf,MAAM,EAAE,SAAS;gBACjB,IAAI,EAAE,CAAC;gBACP,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK;aAChC,CAAC,CAAC;QACL,CAAC;QACD,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,YAAY;gBACf,GAAG,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;gBACtC,MAAM;YACR,KAAK,SAAS;gBACZ,GAAG,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;gBACtC,MAAM;YACR,KAAK,UAAU;gBACb,GAAG,CAAC,OAAO,CAAC;oBACV,MAAM,EAAE,YAAY;oBACpB,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,SAAS,EAAE,KAAK,CAAC,SAAS;iBAC3B,CAAC,CAAC;gBACH,IAAI,OAAO,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;oBACpC,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;gBAC5C,CAAC;gBACD,MAAM;YACR,KAAK,SAAS;gBACZ,GAAG,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBACvC,MAAM;YACR,KAAK,WAAW;gBACd,GAAG,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;gBACpF,MAAM;YACR,KAAK,OAAO;gBACV,GAAG,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBACtD,MAAM;QACV,CAAC;IACH,CAAC;IAEO,wBAAwB;QAC9B,IAAI,CAAC,gBAAgB,GAAG,EAAE,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACtD,CAAC;IAED;;;;OAIG;IACG,MAAM,CAAC,IAAmB;;YAC9B,MAAM,OAAO,GAAG,IAAI,iBAAO,mBAAM,IAAI,EAAG,CAAC;YACzC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;gBACvB,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAC9D,CAAC;YACD,MAAM,OAAO,GAAG,IAAA,iCAAuB,EAAC,OAAO,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAC1D,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;YACrD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;IAEa,gBAAgB,CAAC,SAAiB,EAAE,IAA0B;;YAC1E,MAAM,OAAO,GAAG,IAAA,iBAAO,GAAE,CAAC;YAC1B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC;gBACxC,OAAO,EAAE,OAAO;gBAChB,KAAK,EAAE,SAAS;gBAChB,IAAI,EAAE,eAAe;aACtB,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE;gBACpC,MAAM,EAAE,KAAK;gBACb,IAAI,EAAE,IAAI;aACX,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC;gBACZ,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACjB,MAAM,IAAI,oBAAQ,CAAC,GAAG,CAAC,MAAM,EAAE;oBAC7B,MAAM,EAAE,OAAO;oBACf,SAAS,EAAE,CAAC;oBACZ,OAAO,EAAE,8BAA8B;iBACxC,CAAC,CAAC;YACL,CAAC;YACD,OAAO,CAAC,GAAG,CACT,sBAAsB,EACtB,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAC7E,CAAC;YACF,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;IAED;;;;;;;;;OASG;IACG,YAAY;6DAAC,EACjB,OAAO,EACP,KAAK,EACL,UAAU,EACV,SAAS,EACT,YAAY,EACZ,SAAS,EACT,eAAe,EACC;YAChB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CACpC,wBAAwB,OAAO,IAAI,KAAK,IAAI,UAAU,IAAI,SAAS,IAAI,YAAY,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,eAAe,IAAI,CAAC,EAAE,CACnI,CAAC;YACF,OAAO;gBACL,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW;gBAClC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS;aAC/B,CAAC;QACJ,CAAC;KAAA;IAEK,SAAS,CAAC,MAAsB;;YACpC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAClC,qBAAqB,EACrB,MAAM,CACP,CAAC;YACF,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;QAC1B,CAAC;KAAA;IAEK,WAAW,CAAC,MAAsB;;YACtC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAClC,uBAAuB,EACvB,MAAM,CACP,CAAC;YACF,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;QAC5B,CAAC;KAAA;CACF;AAED,kBAAe,WAAW,CAAC"}
|
|
@@ -31,6 +31,8 @@ export interface AiModel {
|
|
|
31
31
|
onlySplitEinsumV2available: boolean;
|
|
32
32
|
customSize?: number[];
|
|
33
33
|
}
|
|
34
|
+
export type Scheduler = 'DPM Solver Multistep (DPM-Solver++)' | 'PNDM (Pseudo-linear multi-step)' | 'LCM (Latent Consistency Model)' | 'Discrete Flow Scheduler (SD3)' | 'Euler';
|
|
35
|
+
export type TimeStepSpacing = 'Karras' | 'Leading' | 'Linear';
|
|
34
36
|
export interface ProjectParams {
|
|
35
37
|
modelId: string;
|
|
36
38
|
positivePrompt: string;
|
|
@@ -38,8 +40,13 @@ export interface ProjectParams {
|
|
|
38
40
|
stylePrompt: string;
|
|
39
41
|
steps: number;
|
|
40
42
|
guidance: number;
|
|
41
|
-
seed
|
|
43
|
+
seed?: string;
|
|
42
44
|
numberOfImages: number;
|
|
45
|
+
startingImage?: File | Buffer | Blob;
|
|
46
|
+
startingImageStrength?: number;
|
|
47
|
+
numberOfPreviews?: number;
|
|
48
|
+
scheduler?: Scheduler;
|
|
49
|
+
timeStepSpacing?: TimeStepSpacing;
|
|
43
50
|
}
|
|
44
51
|
export type ImageUrlParams = {
|
|
45
52
|
imageId: string;
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -59,7 +59,7 @@ class SogniClient {
|
|
|
59
59
|
*/
|
|
60
60
|
static createInstance(config) {
|
|
61
61
|
return __awaiter(this, void 0, void 0, function* () {
|
|
62
|
-
const client = new ApiClient_1.default(config.restEndpoint, config.socketEndpoint, config.appId);
|
|
62
|
+
const client = new ApiClient_1.default(config.restEndpoint, config.socketEndpoint, config.appId, config.network);
|
|
63
63
|
let provider;
|
|
64
64
|
if ('jsonRpcUrl' in config) {
|
|
65
65
|
provider = new ethers_1.JsonRpcProvider(config.jsonRpcUrl);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA+E;AAC/E,wDAAmC;AACnC,mEAA4D;AA2BnD,yFA3BW,oBAAQ,OA2BX;AAzBjB,sEAA8C;AAC9C,0DAAqC;AACrC,oDAA+B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA+E;AAC/E,wDAAmC;AACnC,mEAA4D;AA2BnD,yFA3BW,oBAAQ,OA2BX;AAzBjB,sEAA8C;AAC9C,0DAAqC;AACrC,oDAA+B;AA0C/B,MAAa,WAAW;IAOtB,YAAoB,MAAiB;QACnC,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAU,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAW,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,eAAQ,CAAC,MAAM,CAAC,CAAC;QAElC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IACjC,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,MAAM,CAAO,cAAc,CAAC,MAAyB;;YACnD,MAAM,MAAM,GAAG,IAAI,mBAAS,CAC1B,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,OAAO,CACf,CAAC;YACF,IAAI,QAA0B,CAAC;YAC/B,IAAI,YAAY,IAAI,MAAM,EAAE,CAAC;gBAC3B,QAAQ,GAAG,IAAI,wBAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACpD,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,IAAA,2BAAkB,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC/D,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC/E,MAAM,MAAM,GAAG,IAAI,sBAAY,CAAC;gBAC9B,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,GAAG;gBACZ,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;aAC5B,CAAC,CAAC;YACH,OAAO,IAAI,WAAW,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QACvD,CAAC;KAAA;CACF;AA5CD,kCA4CC;AAED,kBAAe,WAAW,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const uuid_1 = require("@lukeed/uuid");
|
|
4
|
+
// Mac app is using uppercase UUIDs, we need to keep it consistent so Mac workers can process the data
|
|
5
|
+
function getUUID() {
|
|
6
|
+
return (0, uuid_1.v4)().toUpperCase();
|
|
7
|
+
}
|
|
8
|
+
exports.default = getUUID;
|
|
9
|
+
//# sourceMappingURL=getUUID.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getUUID.js","sourceRoot":"","sources":["../../src/lib/getUUID.ts"],"names":[],"mappings":";;AAAA,uCAA4C;AAE5C,sGAAsG;AACtG,SAAS,OAAO;IACd,OAAO,IAAA,SAAM,GAAE,CAAC,WAAW,EAAE,CAAC;AAChC,CAAC;AAED,kBAAe,OAAO,CAAC"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const LIB_VERSION = "0.0.
|
|
1
|
+
export declare const LIB_VERSION = "0.0.17";
|
package/dist/version.js
CHANGED