@rimori/client 2.5.14-next.3 → 2.5.14-next.4
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.
|
@@ -15,6 +15,7 @@ import { DbModule } from './module/DbModule';
|
|
|
15
15
|
import { EventModule } from './module/EventModule';
|
|
16
16
|
import { AIModule } from './module/AIModule';
|
|
17
17
|
import { ExerciseModule } from './module/ExerciseModule';
|
|
18
|
+
import { EventBus } from '../fromRimori/EventBus';
|
|
18
19
|
export class RimoriClient {
|
|
19
20
|
constructor(controller, supabase, info) {
|
|
20
21
|
this.navigation = {
|
|
@@ -30,7 +31,10 @@ export class RimoriClient {
|
|
|
30
31
|
this.rimoriInfo = info;
|
|
31
32
|
this.sharedContent = new SharedContentController(supabase, this);
|
|
32
33
|
this.ai = new AIModule(info.backendUrl, () => this.rimoriInfo.token);
|
|
33
|
-
this.
|
|
34
|
+
this.ai.setOnRateLimited((exercisesRemaining) => {
|
|
35
|
+
EventBus.emit(info.pluginId, 'global.quota.triggerExceeded', { exercises_remaining: exercisesRemaining });
|
|
36
|
+
});
|
|
37
|
+
this.event = new EventModule(info.pluginId, info.backendUrl, () => this.rimoriInfo.token, this.ai);
|
|
34
38
|
this.db = new DbModule(supabase, controller, info);
|
|
35
39
|
this.plugin = new PluginModule(supabase, controller, info, this.ai);
|
|
36
40
|
this.exercise = new ExerciseModule(supabase, controller, info, this.event);
|
|
@@ -58,7 +58,17 @@ export interface ObjectRequest {
|
|
|
58
58
|
export declare class AIModule {
|
|
59
59
|
private getToken;
|
|
60
60
|
private backendUrl;
|
|
61
|
+
private sessionTokenId;
|
|
62
|
+
private onRateLimitedCb?;
|
|
61
63
|
constructor(backendUrl: string, getToken: () => string);
|
|
64
|
+
/** Returns the current exercise session token ID (null if no active session). */
|
|
65
|
+
getSessionTokenId(): string | null;
|
|
66
|
+
/** Sets the session token ID (used by workers inheriting a session from the plugin). */
|
|
67
|
+
setSessionToken(id: string): void;
|
|
68
|
+
/** Clears the stored session token (called after macro accomplishment). */
|
|
69
|
+
clearSessionToken(): void;
|
|
70
|
+
/** Registers a callback invoked whenever a 429 rate-limit response is received. */
|
|
71
|
+
setOnRateLimited(cb: (exercisesRemaining: number) => void): void;
|
|
62
72
|
/**
|
|
63
73
|
* Generate text from messages using AI.
|
|
64
74
|
* @param messages The messages to generate text from.
|
|
@@ -13,9 +13,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
13
13
|
*/
|
|
14
14
|
export class AIModule {
|
|
15
15
|
constructor(backendUrl, getToken) {
|
|
16
|
+
this.sessionTokenId = null;
|
|
16
17
|
this.backendUrl = backendUrl;
|
|
17
18
|
this.getToken = getToken;
|
|
18
19
|
}
|
|
20
|
+
/** Returns the current exercise session token ID (null if no active session). */
|
|
21
|
+
getSessionTokenId() {
|
|
22
|
+
return this.sessionTokenId;
|
|
23
|
+
}
|
|
24
|
+
/** Sets the session token ID (used by workers inheriting a session from the plugin). */
|
|
25
|
+
setSessionToken(id) {
|
|
26
|
+
this.sessionTokenId = id;
|
|
27
|
+
}
|
|
28
|
+
/** Clears the stored session token (called after macro accomplishment). */
|
|
29
|
+
clearSessionToken() {
|
|
30
|
+
this.sessionTokenId = null;
|
|
31
|
+
}
|
|
32
|
+
/** Registers a callback invoked whenever a 429 rate-limit response is received. */
|
|
33
|
+
setOnRateLimited(cb) {
|
|
34
|
+
this.onRateLimitedCb = cb;
|
|
35
|
+
}
|
|
19
36
|
/**
|
|
20
37
|
* Generate text from messages using AI.
|
|
21
38
|
* @param messages The messages to generate text from.
|
|
@@ -78,13 +95,14 @@ export class AIModule {
|
|
|
78
95
|
*/
|
|
79
96
|
getVoice(text_1) {
|
|
80
97
|
return __awaiter(this, arguments, void 0, function* (text, voice = 'alloy', speed = 1, language, cache = false) {
|
|
98
|
+
var _a;
|
|
81
99
|
return yield fetch(`${this.backendUrl}/voice/tts`, {
|
|
82
100
|
method: 'POST',
|
|
83
101
|
headers: {
|
|
84
102
|
'Content-Type': 'application/json',
|
|
85
103
|
Authorization: `Bearer ${this.getToken()}`,
|
|
86
104
|
},
|
|
87
|
-
body: JSON.stringify({ input: text, voice, speed, language, cache }),
|
|
105
|
+
body: JSON.stringify({ input: text, voice, speed, language, cache, session_token_id: (_a = this.sessionTokenId) !== null && _a !== void 0 ? _a : undefined }),
|
|
88
106
|
}).then((r) => r.blob());
|
|
89
107
|
});
|
|
90
108
|
}
|
|
@@ -101,6 +119,9 @@ export class AIModule {
|
|
|
101
119
|
if (language) {
|
|
102
120
|
formData.append('language', language.code);
|
|
103
121
|
}
|
|
122
|
+
if (this.sessionTokenId) {
|
|
123
|
+
formData.append('session_token_id', this.sessionTokenId);
|
|
124
|
+
}
|
|
104
125
|
return yield fetch(`${this.backendUrl}/voice/stt`, {
|
|
105
126
|
method: 'POST',
|
|
106
127
|
headers: { Authorization: `Bearer ${this.getToken()}` },
|
|
@@ -172,6 +193,7 @@ export class AIModule {
|
|
|
172
193
|
}
|
|
173
194
|
streamObject(params) {
|
|
174
195
|
return __awaiter(this, void 0, void 0, function* () {
|
|
196
|
+
var _a, _b, _c, _d;
|
|
175
197
|
const { messages, responseSchema, onResult = () => null, cache = false, tools = [], model = undefined, knowledgeId, } = params;
|
|
176
198
|
const chatMessages = messages.map((message, index) => (Object.assign(Object.assign({}, message), { id: `${index + 1}` })));
|
|
177
199
|
const response = yield fetch(`${this.backendUrl}/ai/llm`, {
|
|
@@ -183,11 +205,18 @@ export class AIModule {
|
|
|
183
205
|
messages: chatMessages,
|
|
184
206
|
model,
|
|
185
207
|
knowledge_id: knowledgeId,
|
|
208
|
+
session_token_id: (_a = this.sessionTokenId) !== null && _a !== void 0 ? _a : undefined,
|
|
186
209
|
}),
|
|
187
210
|
method: 'POST',
|
|
188
211
|
headers: { Authorization: `Bearer ${this.getToken()}`, 'Content-Type': 'application/json' },
|
|
189
212
|
});
|
|
190
213
|
if (!response.ok) {
|
|
214
|
+
if (response.status === 429) {
|
|
215
|
+
const body = yield response.json().catch(() => ({}));
|
|
216
|
+
const remaining = (_b = body.exercises_remaining) !== null && _b !== void 0 ? _b : 0;
|
|
217
|
+
(_c = this.onRateLimitedCb) === null || _c === void 0 ? void 0 : _c.call(this, remaining);
|
|
218
|
+
throw new Error(`Rate limit exceeded: ${(_d = body.error) !== null && _d !== void 0 ? _d : 'Daily exercise limit reached'}. exercises_remaining: ${remaining}`);
|
|
219
|
+
}
|
|
191
220
|
throw new Error(`Failed to stream object: ${response.status} ${response.statusText}`);
|
|
192
221
|
}
|
|
193
222
|
if (!response.body) {
|
|
@@ -212,6 +241,19 @@ export class AIModule {
|
|
|
212
241
|
const chunk = decoder.decode(value, { stream: true });
|
|
213
242
|
const lines = chunk.split('\n').filter((line) => line.trim());
|
|
214
243
|
for (const line of lines) {
|
|
244
|
+
// Handle token: line (session token issued by backend on first AI call)
|
|
245
|
+
if (line.startsWith('token:')) {
|
|
246
|
+
try {
|
|
247
|
+
const tokenData = JSON.parse(line.slice(6).trim());
|
|
248
|
+
if (tokenData.token_id) {
|
|
249
|
+
this.sessionTokenId = tokenData.token_id;
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
catch (_e) {
|
|
253
|
+
console.error('Failed to parse token: line', line);
|
|
254
|
+
}
|
|
255
|
+
continue;
|
|
256
|
+
}
|
|
215
257
|
const command = line.substring(0, 5);
|
|
216
258
|
const dataStr = line.substring(5).trim();
|
|
217
259
|
if (dataStr === '[DONE]') {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { MainPanelAction, SidebarAction } from '../../fromRimori/PluginTypes';
|
|
2
2
|
import { AccomplishmentPayload } from '../../controller/AccomplishmentController';
|
|
3
3
|
import { EventBusMessage, EventHandler, EventPayload, EventListener } from '../../fromRimori/EventBus';
|
|
4
|
+
import { AIModule } from './AIModule';
|
|
4
5
|
/**
|
|
5
6
|
* Event module for plugin event bus operations.
|
|
6
7
|
* Provides methods for emitting, listening to, and responding to events.
|
|
@@ -8,7 +9,10 @@ import { EventBusMessage, EventHandler, EventPayload, EventListener } from '../.
|
|
|
8
9
|
export declare class EventModule {
|
|
9
10
|
private pluginId;
|
|
10
11
|
private accomplishmentController;
|
|
11
|
-
|
|
12
|
+
private aiModule;
|
|
13
|
+
private backendUrl;
|
|
14
|
+
private getToken;
|
|
15
|
+
constructor(pluginId: string, backendUrl: string, getToken: () => string, aiModule: AIModule);
|
|
12
16
|
getGlobalEventTopic(preliminaryTopic: string): string;
|
|
13
17
|
/**
|
|
14
18
|
* Emit an event to Rimori or a plugin.
|
|
@@ -51,7 +55,7 @@ export declare class EventModule {
|
|
|
51
55
|
* Emit an accomplishment.
|
|
52
56
|
* @param payload The payload to emit.
|
|
53
57
|
*/
|
|
54
|
-
emitAccomplishment(payload: AccomplishmentPayload): void
|
|
58
|
+
emitAccomplishment(payload: AccomplishmentPayload): Promise<void>;
|
|
55
59
|
/**
|
|
56
60
|
* Subscribe to an accomplishment.
|
|
57
61
|
* @param accomplishmentTopic The topic to subscribe to.
|
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
1
10
|
import { AccomplishmentController } from '../../controller/AccomplishmentController';
|
|
2
11
|
import { EventBus } from '../../fromRimori/EventBus';
|
|
3
12
|
/**
|
|
@@ -5,8 +14,11 @@ import { EventBus } from '../../fromRimori/EventBus';
|
|
|
5
14
|
* Provides methods for emitting, listening to, and responding to events.
|
|
6
15
|
*/
|
|
7
16
|
export class EventModule {
|
|
8
|
-
constructor(pluginId) {
|
|
17
|
+
constructor(pluginId, backendUrl, getToken, aiModule) {
|
|
9
18
|
this.pluginId = pluginId;
|
|
19
|
+
this.backendUrl = backendUrl;
|
|
20
|
+
this.getToken = getToken;
|
|
21
|
+
this.aiModule = aiModule;
|
|
10
22
|
this.accomplishmentController = new AccomplishmentController(pluginId);
|
|
11
23
|
}
|
|
12
24
|
getGlobalEventTopic(preliminaryTopic) {
|
|
@@ -86,7 +98,24 @@ export class EventModule {
|
|
|
86
98
|
* @param payload The payload to emit.
|
|
87
99
|
*/
|
|
88
100
|
emitAccomplishment(payload) {
|
|
89
|
-
this
|
|
101
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
102
|
+
if (payload.type === 'macro') {
|
|
103
|
+
const sessionId = this.aiModule.getSessionTokenId();
|
|
104
|
+
if (sessionId) {
|
|
105
|
+
try {
|
|
106
|
+
yield fetch(`${this.backendUrl}/ai/session/${sessionId}/complete`, {
|
|
107
|
+
method: 'PATCH',
|
|
108
|
+
headers: { Authorization: `Bearer ${this.getToken()}` },
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
catch (_a) {
|
|
112
|
+
// non-fatal — session will expire naturally
|
|
113
|
+
}
|
|
114
|
+
this.aiModule.clearSessionToken();
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
this.accomplishmentController.emitAccomplishment(payload);
|
|
118
|
+
});
|
|
90
119
|
}
|
|
91
120
|
/**
|
|
92
121
|
* Subscribe to an accomplishment.
|