Merge pull request #67 from SmythOS/dev

hotFix : SDK Agent default model loading.

Author: alaa-eddine-k

examples/10-custom-sre-config/01-custom-models.ts

@@ -0,0 +1,37 @@
+import { SRE } from '@smythos/sre'; //Since we'ill
+import { Agent } from '@smythos/sdk';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const modelsPath = path.resolve(__dirname, '../agents-data/models.json');
+
+//We initialize SRE with custom settings of the JSON ModelsProvider, in order to load our additional models
+SRE.init({
+    ModelsProvider: {
+        Connector: 'JSONModelsProvider',
+        Settings: {
+            models: modelsPath,
+            mode: 'merge', //preserve smyth predefined models and add my custom models on top of them
+        },
+    },
+});
+
+async function main() {
+    const agent = new Agent({
+        id: 'js-code-assistant',
+
+        name: 'JS Code Assistant',
+        behavior: 'You are a JS code assistant. you answer any question by providing JS code output, you can use any library you want',
+        model: 'gemma-3n-e4b',
+    });
+
+    
+    const promptResult = await agent.prompt('Write a function that returns the sum of two numbers');
+    
+    console.log(promptResult);
+
+    
+}
+
+main();

examples/agents-data/models.json

@@ -0,0 +1,14 @@
+{
+    "gemma-3n-e4b": {
+        "provider": "OpenAI",
+        "modelId": "google/gemma-3n-e4b",
+        "baseURL": "http://localhost:1234/v1",
+
+        "tokens": 4096,
+        "completionTokens": 1024,
+
+        "enabled": true,
+        "features": ["text", "tools"],
+        "credentials": "vault"
+    }
+}

package.json

@@ -1,6 +1,6 @@
 {
     "name": "sre",
-    "version": "0.1.7",
+    "version": "0.1.8",
     "description": "",
     "author": "Alaa-eddine KADDOURI",
     "license": "MIT",

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@smythos/sdk",
-    "version": "1.0.32",
+    "version": "1.0.33",
     "description": "SRE SDK",
     "keywords": [
         "smythos",

packages/sdk/src/Agent/Agent.class.ts

@@ -2,8 +2,10 @@ import {
     AccessCandidate,
     AgentProcess,
     BinaryInput,
+    ConnectorService,
     Conversation,
     DEFAULT_TEAM_ID,
+    SRE,
     TLLMConnectorParams,
     TLLMEvent,
     TLLMModel,
@@ -344,11 +346,7 @@ export class Agent extends SDKObject {
 
         const { model, ...rest } = this._settings;
 
-        if (typeof model === 'string') {
-            this._data.defaultModel = findClosestModelInfo(model);
-        } else {
-            this._data.defaultModel = model as any;
-        }
+        this._data.defaultModel = model as any;
 
         for (let key in rest) {
             this._data[key as keyof AgentData] = rest[key];
@@ -380,6 +378,26 @@ export class Agent extends SDKObject {
         DummyAccountHelper.addAgentToTeam(this._data.id, this._data.teamId);
     }
 
+    protected async init() {
+        //if the SRE instance is not initializing, initialize it with default settings
+        if (!SRE.initializing) SRE.init({});
+        await SRE.ready();
+
+        const model = this._data.defaultModel;
+
+        const modelsProvider = ConnectorService.getModelsProviderConnector();
+        const modelsProviderReq = modelsProvider.agent(this._data.id);
+
+        const models = await modelsProviderReq.getModels();
+
+        if (typeof model === 'string') {
+            this._data.defaultModel = findClosestModelInfo(models, model);
+        } else {
+            this._data.defaultModel = model as any;
+        }
+        this._readyPromise.resolve(true);
+    }
+
     private _validateId(id: string) {
         //only accept alphanumeric, hyphens and underscores
         return id.length > 0 && id.length <= 64 && /^[a-zA-Z0-9_-]+$/.test(id);

packages/sdk/src/Core/SDKObject.class.ts

@@ -14,7 +14,7 @@ import { SRE } from '@smythos/sre';
  */
 export class SDKObject {
     private _eventEmitter: EventEmitter;
-    private _readyPromise: ControlledPromise<any>;
+    protected _readyPromise: ControlledPromise<any>;
 
     public get ready() {
         return this._readyPromise;

packages/sdk/src/LLM/Model.ts

@@ -1,4 +1,4 @@
-import { TCustomLLMModel, TLLMProvider, TLLMModel, models, SystemEvents } from '@smythos/sre';
+import { TCustomLLMModel, TLLMProvider, TLLMModel, SystemEvents } from '@smythos/sre';
 
 import { adaptModelParams } from './utils';
 import { TLLMInstanceParams } from './LLMInstance.class';
@@ -54,7 +54,7 @@ for (const provider of Object.keys(TLLMProvider)) {
     }) as TModelFactory;
 }
 
-export function findClosestModelInfo(modelId: string) {
+export function findClosestModelInfo(models, modelId: string) {
     if (models[modelId]) {
         return models[modelId];
     }