@rimori/client 1.0.3 → 1.0.5

package/dist/components/avatar/EmbeddedAssistent/VoiceRecoder.js

@@ -0,0 +1,45 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useState, useRef, forwardRef, useImperativeHandle } from 'react';
+import { FaMicrophone } from 'react-icons/fa6';
+import { usePlugin } from '../../../components';
+export const VoiceRecorder = forwardRef(({ onVoiceRecorded, iconSize, className }, ref) => {
+    const [isRecording, setIsRecording] = useState(false);
+    const mediaRecorderRef = useRef(null);
+    const audioChunksRef = useRef([]);
+    const { llm } = usePlugin();
+    const startRecording = () => __awaiter(void 0, void 0, void 0, function* () {
+        const stream = yield navigator.mediaDevices.getUserMedia({ audio: true });
+        const mediaRecorder = new MediaRecorder(stream);
+        mediaRecorderRef.current = mediaRecorder;
+        mediaRecorder.ondataavailable = (event) => {
+            audioChunksRef.current.push(event.data);
+        };
+        mediaRecorder.onstop = () => __awaiter(void 0, void 0, void 0, function* () {
+            const audioBlob = new Blob(audioChunksRef.current);
+            audioChunksRef.current = [];
+            onVoiceRecorded(yield llm.getTextFromVoice(audioBlob));
+        });
+        mediaRecorder.start();
+        setIsRecording(true);
+    });
+    const stopRecording = () => {
+        if (mediaRecorderRef.current) {
+            mediaRecorderRef.current.stop();
+            setIsRecording(false);
+        }
+    };
+    useImperativeHandle(ref, () => ({
+        startRecording,
+        stopRecording,
+    }));
+    return (_jsx("div", { className: className, children: _jsx("button", { onClick: isRecording ? stopRecording : startRecording, children: _jsx(FaMicrophone, { size: iconSize, className: "h-7 w-7 mr-2 " + (isRecording ? "text-red-600" : "") }) }) }));
+});

package/dist/components/avatar/utils.d.ts

@@ -0,0 +1,6 @@
+export interface FirstMessages {
+    instructions?: string;
+    userMessage: string;
+    assistantMessage?: string;
+}
+export declare function getFirstMessages(instructions: FirstMessages): any[];

package/dist/components/avatar/utils.js

@@ -0,0 +1,14 @@
+export function getFirstMessages(instructions) {
+    const messages = [];
+    if (instructions.instructions) {
+        messages.push({ id: '1', role: 'system', content: instructions.instructions });
+    }
+    if (instructions.userMessage) {
+        messages.push({ id: '2', role: 'user', content: instructions.userMessage });
+    }
+    if (instructions.assistantMessage) {
+        messages.push({ id: '3', role: 'assistant', content: instructions.assistantMessage });
+    }
+    console.log("getFirstMessages", messages);
+    return messages;
+}

package/dist/components.d.ts

@@ -0,0 +1,9 @@
+export * from "./components/MarkdownEditor";
+export * from "./components/CRUDModal";
+export * from "./components/Spinner";
+export * from "./components/audio/Playbutton";
+export * from "./hooks/UseChatHook";
+export * from "./plugin/ThemeSetter";
+export * from "./providers/PluginProvider";
+export * from "./components/ai/Avatar";
+export * from "./components/ai/Assistant";

package/dist/components.js

@@ -0,0 +1,10 @@
+// React components and hooks exports
+export * from "./components/MarkdownEditor";
+export * from "./components/CRUDModal";
+export * from "./components/Spinner";
+export * from "./components/audio/Playbutton";
+export * from "./hooks/UseChatHook";
+export * from "./plugin/ThemeSetter";
+export * from "./providers/PluginProvider";
+export * from "./components/ai/Avatar";
+export * from "./components/ai/Assistant";

package/dist/controller/AIController.d.ts

@@ -7,9 +7,10 @@ export interface Tool {
     description: string;
     parameters: {
         name: string;
-        type: "string" | "number" | "boolean";
         description: string;
+        type: "string" | "number" | "boolean";
     }[];
+    execute?: <T = Record<string, string | boolean | number>>(args: T) => Promise<any> | void;
 }
 export interface Message {
     id: string;
@@ -17,6 +18,6 @@ export interface Message {
     content: string;
     toolInvocations?: ToolInvocation[];
 }
-export declare function generateText(messages: Message[], tools: Tool[], token: string): Promise<any>;
+export declare function generateText(supabaseUrl: string, messages: Message[], tools: Tool[], token: string): Promise<any>;
 export type OnLLMResponse = (id: string, response: string, finished: boolean, toolInvocations?: ToolInvocation[]) => void;
-export declare function streamChatGPT(messages: Message[], tools: Tool[], onResponse: OnLLMResponse, token: string): Promise<void>;
+export declare function streamChatGPT(supabaseUrl: string, messages: Message[], tools: Tool[], onResponse: OnLLMResponse, token: string): Promise<void>;

package/dist/controller/AIController.js

@@ -7,24 +7,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { env } from "../utils/constants";
-export function generateText(messages, tools, token) {
+export function generateText(supabaseUrl, messages, tools, token) {
     return __awaiter(this, void 0, void 0, function* () {
-        const response = yield fetch(`${env.SUPABASE_URL}/functions/v1/llm`, {
+        const response = yield fetch(`${supabaseUrl}/functions/v1/llm`, {
             method: 'POST',
             body: JSON.stringify({ messages, tools }),
-            headers: { 'Authorization': `Bearer ${token}` }
+            headers: { 'Authorization': `Bearer ${token}`, 'Content-Type': 'application/json' }
         });
         return yield response.json();
     });
 }
-export function streamChatGPT(messages, tools, onResponse, token) {
+export function streamChatGPT(supabaseUrl, messages, tools, onResponse, token) {
     return __awaiter(this, void 0, void 0, function* () {
         const messageId = Math.random().toString(36).substring(3);
-        const response = yield fetch(`${env.SUPABASE_URL}/functions/v1/llm`, {
+        const response = yield fetch(`${supabaseUrl}/functions/v1/llm`, {
             method: 'POST',
             body: JSON.stringify({ messages, tools, stream: true }),
-            headers: { 'Authorization': `Bearer ${token}` }
+            headers: { 'Authorization': `Bearer ${token}`, 'Content-Type': 'application/json' }
         });
         if (!response.body) {
             console.error('No response body.');
@@ -58,10 +57,35 @@ export function streamChatGPT(messages, tools, onResponse, token) {
                     else if (command === '9') {
                         // console.log("tool call:", JSON.parse(line.substring(2)));
                         // console.log("tools", tools);
-                        toolInvocations.push(JSON.parse(line.substring(2)));
+                        const toolInvocation = JSON.parse(line.substring(2));
+                        toolInvocations.push(toolInvocation);
+                        // Find the tool and execute it if it has an execute function
+                        const tool = tools.find(t => t.name === toolInvocation.toolName);
+                        // console.log("tool", tool);
+                        if (tool && tool.execute) {
+                            try {
+                                const result = yield tool.execute(toolInvocation.args);
+                                const toolResult = { success: true, result: result };
+                                // Add the tool result as a message
+                                messages.push({
+                                    id: Math.random().toString(36).substring(3),
+                                    role: "function",
+                                    content: JSON.stringify(toolResult),
+                                    toolInvocations: [{
+                                            args: toolInvocation.args,
+                                            toolName: toolInvocation.toolName,
+                                        }]
+                                });
+                            }
+                            catch (error) {
+                                console.error(`Error executing tool ${toolInvocation.toolName}:`, error);
+                            }
+                        }
                     }
                 }
             }
+            // Wait for 5ms to avoid blocking the main thread
+            yield new Promise(resolve => setTimeout(resolve, 5));
         }
         onResponse(messageId, content.replace(/\\n/g, '\n'), true, toolInvocations);
     });

package/dist/controller/ObjectController.d.ts

@@ -28,7 +28,7 @@ export interface ObjectRequest {
      */
     instructions: string;
 }
-export declare function generateObject(request: ObjectRequest, token: string): Promise<any>;
+export declare function generateObject(supabaseUrl: string, request: ObjectRequest, token: string): Promise<any>;
 export type OnLLMResponse = (id: string, response: string, finished: boolean, toolInvocations?: any[]) => void;
-export declare function streamObject(request: ObjectRequest, onResponse: OnLLMResponse, token: string): Promise<void>;
+export declare function streamObject(supabaseUrl: string, request: ObjectRequest, onResponse: OnLLMResponse, token: string): Promise<void>;
 export {};

package/dist/controller/ObjectController.js

@@ -7,10 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { env } from "../utils/constants";
-export function generateObject(request, token) {
+export function generateObject(supabaseUrl, request, token) {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield fetch(`${env.SUPABASE_URL}/functions/v1/llm-object`, {
+        return yield fetch(`${supabaseUrl}/functions/v1/llm-object`, {
             method: 'POST',
             body: JSON.stringify({
                 stream: false,
@@ -22,10 +21,10 @@ export function generateObject(request, token) {
         }).then(response => response.json());
     });
 }
-export function streamObject(request, onResponse, token) {
+export function streamObject(supabaseUrl, request, onResponse, token) {
     return __awaiter(this, void 0, void 0, function* () {
         const messageId = Math.random().toString(36).substring(3);
-        const response = yield fetch(`${env.SUPABASE_URL}/functions/v1/llm-object`, {
+        const response = yield fetch(`${supabaseUrl}/functions/v1/llm-object`, {
             method: 'POST',
             body: JSON.stringify({
                 stream: true,

package/dist/controller/SettingsController.d.ts

@@ -1,25 +1,34 @@
 import { SupabaseClient } from "@supabase/supabase-js";
 import { LanguageLevel } from "../utils/difficultyConverter";
-export interface UserSettings {
+export interface UserInfo {
     motherTongue: string;
-    languageLevel: LanguageLevel;
-    contextMenuOnSelect: boolean;
-}
-export interface SystemSettings {
+    xp: number;
+    listening_level: LanguageLevel;
+    reading_level: LanguageLevel;
+    speaking_level: LanguageLevel;
+    writing_level: LanguageLevel;
+    understanding_level: LanguageLevel;
+    grammar_level: LanguageLevel;
+    longterm_goal: string;
+    motivation_type: string;
+    study_buddy: string;
+    preferred_genre: string;
+    milestone: string;
+    settings: {
+        contextMenuOnSelect: boolean;
+    };
 }
 export declare class SettingsController {
     private pluginId;
     private supabase;
     constructor(supabase: SupabaseClient, pluginId: string);
-    private getSettingsType;
     private fetchSettings;
-    private saveSettings;
+    setSettings(settings: any): Promise<void>;
+    getUserInfo(): Promise<UserInfo>;
     /**
      * Get the settings for the plugin. T can be any type of settings, UserSettings or SystemSettings.
      * @param defaultSettings The default settings to use if no settings are found.
-     * @param genericSettings The type of settings to get.
      * @returns The settings for the plugin.
      */
-    getSettings<T extends object>(defaultSettings: T, genericSettings?: "user" | "system"): Promise<T>;
-    setSettings(settings: any, genericSettings?: "user" | "system"): Promise<void>;
+    getSettings<T extends object>(defaultSettings: T): Promise<T>;
 }

package/dist/controller/SettingsController.js

@@ -12,41 +12,56 @@ export class SettingsController {
         this.supabase = supabase;
         this.pluginId = pluginId;
     }
-    getSettingsType(genericSettings) {
-        return genericSettings || "plugin";
-    }
-    fetchSettings(type) {
+    fetchSettings() {
         return __awaiter(this, void 0, void 0, function* () {
-            const pluginId = type === "plugin" ? this.pluginId : type;
-            const { data } = yield this.supabase.from("plugin_settings").select("*").eq("plugin_id", pluginId);
+            const { data } = yield this.supabase.from("plugin_settings").select("*").eq("plugin_id", this.pluginId);
             if (!data || data.length === 0) {
                 return null;
             }
             return data[0].settings;
         });
     }
-    saveSettings(settings, type) {
+    setSettings(settings) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (type !== "plugin") {
-                throw new Error(`Cannot modify ${type} settings`);
-            }
             yield this.supabase.from("plugin_settings").upsert({ plugin_id: this.pluginId, settings });
         });
     }
+    getUserInfo() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { data } = yield this.supabase.from("profiles").select("*");
+            if (!data || data.length === 0) {
+                return {
+                    motherTongue: "en",
+                    xp: 0,
+                    listening_level: "Pre-A1",
+                    reading_level: "Pre-A1",
+                    speaking_level: "Pre-A1",
+                    writing_level: "Pre-A1",
+                    understanding_level: "Pre-A1",
+                    grammar_level: "Pre-A1",
+                    longterm_goal: "",
+                    motivation_type: "self-motivated",
+                    study_buddy: "clarence",
+                    preferred_genre: "adventure",
+                    milestone: "",
+                    settings: {
+                        contextMenuOnSelect: false,
+                    }
+                };
+            }
+            return data[0];
+        });
+    }
     /**
      * Get the settings for the plugin. T can be any type of settings, UserSettings or SystemSettings.
      * @param defaultSettings The default settings to use if no settings are found.
-     * @param genericSettings The type of settings to get.
      * @returns The settings for the plugin.
      */
-    getSettings(defaultSettings, genericSettings) {
+    getSettings(defaultSettings) {
         return __awaiter(this, void 0, void 0, function* () {
-            const type = this.getSettingsType(genericSettings);
-            const storedSettings = yield this.fetchSettings(type);
+            const storedSettings = yield this.fetchSettings();
             if (!storedSettings) {
-                if (type === "plugin") {
-                    yield this.saveSettings(defaultSettings, type);
-                }
+                yield this.setSettings(defaultSettings);
                 return defaultSettings;
             }
             // Handle settings migration
@@ -55,18 +70,10 @@ export class SettingsController {
             if (storedKeys.length !== defaultKeys.length) {
                 const validStoredSettings = Object.fromEntries(Object.entries(storedSettings).filter(([key]) => defaultKeys.includes(key)));
                 const mergedSettings = Object.assign(Object.assign({}, defaultSettings), validStoredSettings);
-                if (type === "plugin") {
-                    yield this.saveSettings(mergedSettings, type);
-                }
+                yield this.setSettings(mergedSettings);
                 return mergedSettings;
             }
             return storedSettings;
         });
     }
-    setSettings(settings, genericSettings) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const type = this.getSettingsType(genericSettings);
-            yield this.saveSettings(settings, type);
-        });
-    }
 }

package/dist/controller/SharedContentController.js

@@ -15,23 +15,23 @@ export class SharedContentController {
     fetchNewSharedContent(type, generatorInstructions, filter) {
         return __awaiter(this, void 0, void 0, function* () {
             const queryParameter = { filter_column: (filter === null || filter === void 0 ? void 0 : filter.column) || null, filter_value: (filter === null || filter === void 0 ? void 0 : filter.value) || null, unread: true };
-            const { data: newAssignments } = yield this.rimoriClient.rpc(type + "_entries", queryParameter);
+            const { data: newAssignments } = yield this.rimoriClient.db.rpc(type + "_entries", queryParameter);
             console.log('newAssignments:', newAssignments);
             if (newAssignments.length > 0) {
                 return newAssignments;
             }
             // generate new assignments
-            const { data: oldAssignments } = yield this.rimoriClient.rpc(type + "_entries", Object.assign(Object.assign({}, queryParameter), { unread: false }));
+            const { data: oldAssignments } = yield this.rimoriClient.db.rpc(type + "_entries", Object.assign(Object.assign({}, queryParameter), { unread: false }));
             console.log('oldAssignments:', oldAssignments);
             const reservedTopics = this.getReservedTopics(oldAssignments);
             const request = yield generatorInstructions(reservedTopics);
             if (!request.tool.keywords || !request.tool.topic) {
                 throw new Error("topic or keywords not found in the request schema");
             }
-            const instructions = yield this.rimoriClient.generateObject(request);
+            const instructions = yield this.rimoriClient.llm.getObject(request);
             console.log('instructions:', instructions);
             const preparedData = Object.assign(Object.assign({ id: uuidv4() }, instructions), { keywords: this.purifyStringArray(instructions.keywords) });
-            return yield this.rimoriClient.from(type).insert(preparedData).then(() => [preparedData]);
+            return yield this.rimoriClient.db.from(type).insert(preparedData).then(() => [preparedData]);
         });
     }
     getReservedTopics(oldAssignments) {
@@ -45,12 +45,12 @@ export class SharedContentController {
     }
     getSharedContent(type, id) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.rimoriClient.from(type).select().eq('id', id).single();
+            return yield this.rimoriClient.db.from(type).select().eq('id', id).single();
         });
     }
     completeSharedContent(type, assignmentId) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.rimoriClient.from(type + "_result").insert({ assignment_id: assignmentId });
+            yield this.rimoriClient.db.from(type + "_result").insert({ assignment_id: assignmentId });
         });
     }
 }

package/dist/core.d.ts

@@ -0,0 +1,9 @@
+export * from "./controller/AIController";
+export * from "./controller/SharedContentController";
+export * from "./controller/SettingsController";
+export * from "./plugin/RimoriClient";
+export * from "./plugin/PluginController";
+export * from "./utils/difficultyConverter";
+export * from "./utils/PluginUtils";
+export * from "./worker/WorkerSetup";
+export * from "./plugin/fromRimori/EventBus";

package/dist/core.js

@@ -0,0 +1,10 @@
+// Core functionality exports
+export * from "./controller/AIController";
+export * from "./controller/SharedContentController";
+export * from "./controller/SettingsController";
+export * from "./plugin/RimoriClient";
+export * from "./plugin/PluginController";
+export * from "./utils/difficultyConverter";
+export * from "./utils/PluginUtils";
+export * from "./worker/WorkerSetup";
+export * from "./plugin/fromRimori/EventBus";

package/dist/hooks/UseChatHook.js

@@ -3,9 +3,9 @@ import { usePlugin } from "../providers/PluginProvider";
 export function useChat(tools) {
     const [messages, setMessages] = React.useState([]);
     const [isLoading, setIsLoading] = React.useState(false);
-    const { getAIResponseStream } = usePlugin();
+    const { llm } = usePlugin();
     const append = (appendMessages) => {
-        getAIResponseStream([...messages, ...appendMessages], (id, message, finished, toolInvocations) => {
+        llm.getSteamedText([...messages, ...appendMessages], (id, message, finished, toolInvocations) => {
             const lastMessage = messages[messages.length - 1];
             setIsLoading(!finished);
             if ((lastMessage === null || lastMessage === void 0 ? void 0 : lastMessage.id) === id) {

package/dist/index.d.ts

@@ -1,3 +1,5 @@
+export * from './core';
+export * from './components';
 export * from "./components/MarkdownEditor";
 export * from "./components/CRUDModal";
 export * from "./components/Spinner";
@@ -8,8 +10,7 @@ export * from "./controller/SettingsController";
 export * from "./hooks/UseChatHook";
 export * from "./plugin/RimoriClient";
 export * from "./plugin/ThemeSetter";
-export * from "./providers/EventEmitter";
-export * from "./providers/EventEmitterContext";
 export * from "./providers/PluginProvider";
 export * from "./utils/difficultyConverter";
 export * from "./utils/PluginUtils";
+export * from "./plugin/PluginController";

package/dist/index.js

@@ -1,3 +1,6 @@
+// Re-export everything
+export * from './core';
+export * from './components';
 export * from "./components/MarkdownEditor";
 export * from "./components/CRUDModal";
 export * from "./components/Spinner";
@@ -8,8 +11,7 @@ export * from "./controller/SettingsController";
 export * from "./hooks/UseChatHook";
 export * from "./plugin/RimoriClient";
 export * from "./plugin/ThemeSetter";
-export * from "./providers/EventEmitter";
-export * from "./providers/EventEmitterContext";
 export * from "./providers/PluginProvider";
 export * from "./utils/difficultyConverter";
 export * from "./utils/PluginUtils";
+export * from "./plugin/PluginController";

package/dist/plugin/PluginController.d.ts

@@ -1,18 +1,14 @@
 import { SupabaseClient } from '@supabase/supabase-js';
 import { RimoriClient } from "./RimoriClient";
 export declare class PluginController {
-    private static instance;
     private static client;
-    private plugin;
-    private onceListeners;
-    private listeners;
+    private static instance;
     private communicationSecret;
-    private initialized;
     private supabase;
     private supabaseInfo;
+    private pluginId;
     private constructor();
-    static getInstance(): Promise<RimoriClient>;
-    init(): Promise<void>;
+    static getInstance(sender: string): Promise<RimoriClient>;
     private getSecret;
     getClient(): Promise<{
         supabase: SupabaseClient;
@@ -21,9 +17,5 @@ export declare class PluginController {
     }>;
     getToken(): Promise<string>;
     getSupabaseUrl(): string;
-    emit(eventName: string, data?: any): void;
-    private internalEmit;
-    subscribe(eventName: string, callback: (_id: number, data: any) => void): void;
-    onOnce(eventName: string, callback: (data: any) => void): void;
-    request<T>(topic: string, data?: any): Promise<T>;
+    getGlobalEventTopic(preliminaryTopic: string): string;
 }