genlayer 0.0.27 → 0.0.29

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 
 
+## 0.0.29 (2024-05-15)
+
+## 0.0.28 (2024-05-13)
+
 ## 0.0.27 (2024-05-08)
 
 ## 0.0.26 (2024-05-07)

package/dist/index.js

@@ -39896,7 +39896,7 @@ var {
 } = import_index.default;
 
 // package.json
-var version = "0.0.27";
+var version = "0.0.29";
 
 // src/lib/config/text.ts
 var CLI_DESCRIPTION = "GenLayer CLI is a development environment for the GenLayer ecosystem. It allows developers to interact with the protocol by creating accounts, sending transactions, and working with Intelligent Contracts by testing, debugging, and deploying them.";
@@ -42497,27 +42497,30 @@ var DEFAULT_RUN_SIMULATOR_COMMAND = (simulatorLocation) => ({
   linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker compose build && docker compose up; echo "Press enter to exit"; read'`
 });
 var DEFAULT_PULL_OLLAMA_COMMAND = (simulatorLocation) => ({
-  darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && docker exec ollama ollama pull llama2"'`,
-  win32: `start cmd.exe /c "cd /d ${simulatorLocation} && docker exec ollama ollama pull llama2"`,
-  linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker exec ollama ollama pull llama2'`
+  darwin: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`,
+  win32: `cd /d ${simulatorLocation} && docker exec ollama ollama pull llama3`,
+  linux: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`
 });
 var AVAILABLE_PLATFORMS = ["darwin", "win32", "linux"];
 var STARTING_TIMEOUT_WAIT_CYLCE = 2e3;
 var STARTING_TIMEOUT_ATTEMPTS = 120;
 var AI_PROVIDERS_CONFIG = {
   ollama: {
-    name: "Ollama (This will download and run a local instance of Llama 2)",
+    name: "Ollama",
+    hint: "(This will download and run a local instance of Llama 3)",
     cliOptionValue: "ollama"
   },
   openai: {
-    name: "OpenAI (You will need to provide an OpenAI API key)",
+    name: "OpenAI",
+    hint: "(You will need to provide an OpenAI API key)",
     envVar: "OPENAIKEY",
     cliOptionValue: "openai"
   },
-  heurist: {
-    name: 'Heurist (You will need to provide an API key. Get free API credits at https://dev-api-form.heurist.ai/ with referral code: "genlayer"):',
+  heuristai: {
+    name: "Heurist",
+    hint: '(You will need to provide an API key. Get free API credits at https://dev-api-form.heurist.ai/ with referral code: "genlayer")',
     envVar: "HEURISTAIAPIKEY",
-    cliOptionValue: "heurist"
+    cliOptionValue: "heuristai"
   }
 };
 
@@ -44381,7 +44384,6 @@ function checkCommand(command, toolName) {
     if (stderr) {
       throw new MissingRequirementError(toolName);
     }
-    console.log(`${toolName} is installed.`);
   });
 }
 function executeCommand(cmdsByPlatform, toolName) {
@@ -44529,7 +44531,7 @@ function waitForSimulatorToBeReady() {
         return waitForSimulatorToBeReady(retries - 1);
       }
     } catch (error) {
-      if ((error.message.includes("ECONNREFUSED") || error.message.includes("socket hang up")) && retries > 0) {
+      if ((error.name === "FetchError" || error.message.includes("ECONNRESET") || error.message.includes("ECONNREFUSED") || error.message.includes("socket hang up")) && retries > 0) {
         yield sleep(STARTING_TIMEOUT_WAIT_CYLCE * 2);
         return waitForSimulatorToBeReady(retries - 1);
       }
@@ -44548,15 +44550,21 @@ function initializeDatabase() {
     return { createResponse, tablesResponse };
   });
 }
-function createRandomValidators() {
-  return rpcClient.request({ method: "create_random_validators", params: [10, 1, 10] });
+function createRandomValidators(numValidators, llmProviders) {
+  return rpcClient.request({
+    method: "create_random_validators",
+    params: [numValidators, 1, 10, llmProviders]
+  });
 }
 function deleteAllValidators() {
   return rpcClient.request({ method: "delete_all_validators", params: [] });
 }
-function getAiProvidersOptions() {
+function getAiProvidersOptions(withHint = true) {
   return Object.values(AI_PROVIDERS_CONFIG).map((providerConfig) => {
-    return { name: providerConfig.name, value: providerConfig.cliOptionValue };
+    return {
+      name: `${providerConfig.name}${withHint ? ` ${providerConfig.hint}` : ""}`,
+      value: providerConfig.cliOptionValue
+    };
   });
 }
 function getFrontendUrl() {
@@ -44624,7 +44632,7 @@ function initAction(options) {
         type: "checkbox",
         name: "selectedLlmProviders",
         message: "Select which LLM providers do you want to use:",
-        choices: getAiProvidersOptions(),
+        choices: getAiProvidersOptions(true),
         validate: function(answer) {
           if (answer.length < 1) {
             return "You must choose at least one option.";
@@ -44691,7 +44699,7 @@ function initAction(options) {
       return;
     }
     if (selectedLlmProviders.includes("ollama")) {
-      console.log("Pulling llama2 from Ollama...");
+      console.log("Pulling llama3 from Ollama...");
       yield pullOllamaModel();
     }
     console.log("Initializing the database...");
@@ -44709,7 +44717,7 @@ function initAction(options) {
     console.log("Initializing validators...");
     try {
       yield deleteAllValidators();
-      yield createRandomValidators();
+      yield createRandomValidators(Number(options.numValidators), selectedLlmProviders);
     } catch (error) {
       console.error("Unable to initialize the validators.");
       console.error(error);
@@ -44729,9 +44737,9 @@ function initAction(options) {
 // src/commands/general/start.ts
 function startAction(options) {
   return __async(this, null, function* () {
-    const { resetAccounts, resetValidators } = options;
+    const { resetAccounts, resetValidators, numValidators } = options;
     const restartAccountsHintText = resetAccounts ? "restarting the accounts and transactions database" : "keeping the accounts and transactions records";
-    const restartValidatorsHintText = resetValidators ? "and creating new random validators" : "and keeping the existing validators";
+    const restartValidatorsHintText = resetValidators ? `and creating new ${numValidators} random validators` : "and keeping the existing validators";
     console.log(`Starting GenLayer simulator ${restartAccountsHintText} ${restartValidatorsHintText}`);
     console.log(`Updating GenLayer Simulator...`);
     try {
@@ -44784,7 +44792,22 @@ function startAction(options) {
       console.log("Initializing validators...");
       try {
         yield deleteAllValidators();
-        yield createRandomValidators();
+        const questions = [
+          {
+            type: "checkbox",
+            name: "selectedLlmProviders",
+            message: "Select which LLM providers do you want to use:",
+            choices: getAiProvidersOptions(false),
+            validate: function(answer) {
+              if (answer.length < 1) {
+                return "You must choose at least one option.";
+              }
+              return true;
+            }
+          }
+        ];
+        const llmProvidersAnswer = yield inquirer_default.prompt(questions);
+        yield createRandomValidators(Number(options.numValidators), llmProvidersAnswer.selectedLlmProviders);
       } catch (error) {
         console.error("Unable to initialize the validators.");
         console.error(error);
@@ -44806,7 +44829,7 @@ function startAction(options) {
 // src/commands/general/index.ts
 function initializeGeneralCommands(program2) {
   program2.command("init").description("Initialize the GenLayer Environment").option("-n, --numValidators <numValidators>", "Number of validators", "5").action(initAction);
-  program2.command("up").description("Starts GenLayer's simulator").option("--no-reset-accounts", "Don't restart the database for accouts and transactions", true).option("--reset-validators", "Remove all current validators and create new random ones", false).action(startAction);
+  program2.command("up").description("Starts GenLayer's simulator").option("--no-reset-accounts", "Don't restart the database for accouts and transactions", true).option("--reset-validators", "Remove all current validators and create new random ones", false).option("--numValidators <numValidators>", "Number of validators", "5").action(startAction);
   return program2;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genlayer",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "GenLayer Command Line Tool",
   "main": "src/index.ts",
   "bin": {

package/src/commands/general/index.ts

@@ -15,6 +15,7 @@ export function initializeGeneralCommands(program: Command) {
     .description("Starts GenLayer's simulator")
     .option("--no-reset-accounts", "Don't restart the database for accouts and transactions", true)
     .option("--reset-validators", "Remove all current validators and create new random ones", false)
+    .option("--numValidators <numValidators>", "Number of validators", "5")
     .action(startAction);
 
   return program;

package/src/commands/general/init.ts

@@ -84,7 +84,7 @@ export async function initAction(options: InitActionOptions) {
       type: "checkbox",
       name: "selectedLlmProviders",
       message: "Select which LLM providers do you want to use:",
-      choices: getAiProvidersOptions(),
+      choices: getAiProvidersOptions(true),
       validate: function (answer: string[]) {
         if (answer.length < 1) {
           return "You must choose at least one option.";
@@ -162,7 +162,7 @@ export async function initAction(options: InitActionOptions) {
 
   // Ollama doesn't need changes in configuration, we just run it
   if (selectedLlmProviders.includes("ollama")) {
-    console.log("Pulling llama2 from Ollama...");
+    console.log("Pulling llama3 from Ollama...");
     await pullOllamaModel();
   }
 
@@ -188,7 +188,7 @@ export async function initAction(options: InitActionOptions) {
     //remove all validators
     await deleteAllValidators();
     // create random validators
-    await createRandomValidators();
+    await createRandomValidators(Number(options.numValidators), selectedLlmProviders);
   } catch (error) {
     console.error("Unable to initialize the validators.");
     console.error(error);

package/src/commands/general/start.ts

@@ -1,3 +1,5 @@
+import inquirer from "inquirer";
+
 import {
   updateSimulator,
   runSimulator,
@@ -8,22 +10,24 @@ import {
   initializeDatabase,
   getFrontendUrl,
   openFrontend,
+  getAiProvidersOptions,
 } from "@/lib/services/simulator";
 
 export interface StartActionOptions {
   resetAccounts: string;
   resetValidators: string;
+  numValidators: number;
 }
 
 export async function startAction(options: StartActionOptions) {
-  const {resetAccounts, resetValidators} = options;
+  const {resetAccounts, resetValidators, numValidators} = options;
 
   const restartAccountsHintText = resetAccounts
     ? "restarting the accounts and transactions database"
     : "keeping the accounts and transactions records";
 
   const restartValidatorsHintText = resetValidators
-    ? "and creating new random validators"
+    ? `and creating new ${numValidators} random validators`
     : "and keeping the existing validators";
 
   console.log(`Starting GenLayer simulator ${restartAccountsHintText} ${restartValidatorsHintText}`);
@@ -90,8 +94,26 @@ export async function startAction(options: StartActionOptions) {
     try {
       //remove all validators
       await deleteAllValidators();
+      const questions = [
+        {
+          type: "checkbox",
+          name: "selectedLlmProviders",
+          message: "Select which LLM providers do you want to use:",
+          choices: getAiProvidersOptions(false),
+          validate: function (answer: string[]) {
+            if (answer.length < 1) {
+              return "You must choose at least one option.";
+            }
+            return true;
+          },
+        },
+      ];
+
+      // Since ollama runs locally we can run it here and then look for the other providers
+      const llmProvidersAnswer = await inquirer.prompt(questions);
+
       // create random validators
-      await createRandomValidators();
+      await createRandomValidators(Number(options.numValidators), llmProvidersAnswer.selectedLlmProviders);
     } catch (error) {
       console.error("Unable to initialize the validators.");
       console.error(error);

package/src/lib/clients/system.ts

@@ -13,7 +13,6 @@ export async function checkCommand(command: string, toolName: string): Promise<v
   if (stderr) {
     throw new MissingRequirementError(toolName);
   }
-  console.log(`${toolName} is installed.`);
 }
 
 type ExecuteCommandResult = {

package/src/lib/config/simulator.ts

@@ -6,34 +6,37 @@ export const DEFAULT_RUN_SIMULATOR_COMMAND = (simulatorLocation: string) => ({
   linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker compose build && docker compose up; echo "Press enter to exit"; read'`,
 });
 export const DEFAULT_PULL_OLLAMA_COMMAND = (simulatorLocation: string) => ({
-  darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && docker exec ollama ollama pull llama2"'`,
-  win32: `start cmd.exe /c "cd /d ${simulatorLocation} && docker exec ollama ollama pull llama2"`,
-  linux: `x-terminal-emulator -e bash -c 'cd ${simulatorLocation} && docker exec ollama ollama pull llama2'`,
+  darwin: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`,
+  win32: `cd /d ${simulatorLocation} && docker exec ollama ollama pull llama3`,
+  linux: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`,
 });
 export const AVAILABLE_PLATFORMS = ["darwin", "win32", "linux"] as const;
 export type RunningPlatform = (typeof AVAILABLE_PLATFORMS)[number];
 export const STARTING_TIMEOUT_WAIT_CYLCE = 2000;
 export const STARTING_TIMEOUT_ATTEMPTS = 120;
 
-export type AiProviders = "ollama" | "openai" | "heurist";
+export type AiProviders = "ollama" | "openai" | "heuristai";
 export type AiProvidersEnvVars = "ollama" | "OPENAIKEY" | "HEURISTAIAPIKEY";
 export type AiProvidersConfigType = {
-  [key in AiProviders]: {name: string; envVar?: AiProvidersEnvVars; cliOptionValue: string};
+  [key in AiProviders]: {name: string; hint: string; envVar?: AiProvidersEnvVars; cliOptionValue: string};
 };
 
 export const AI_PROVIDERS_CONFIG: AiProvidersConfigType = {
   ollama: {
-    name: "Ollama (This will download and run a local instance of Llama 2)",
+    name: "Ollama",
+    hint: "(This will download and run a local instance of Llama 3)",
     cliOptionValue: "ollama",
   },
   openai: {
-    name: "OpenAI (You will need to provide an OpenAI API key)",
+    name: "OpenAI",
+    hint: "(You will need to provide an OpenAI API key)",
     envVar: "OPENAIKEY",
     cliOptionValue: "openai",
   },
-  heurist: {
-    name: 'Heurist (You will need to provide an API key. Get free API credits at https://dev-api-form.heurist.ai/ with referral code: "genlayer"):',
+  heuristai: {
+    name: "Heurist",
+    hint: '(You will need to provide an API key. Get free API credits at https://dev-api-form.heurist.ai/ with referral code: "genlayer")',
     envVar: "HEURISTAIAPIKEY",
-    cliOptionValue: "heurist",
+    cliOptionValue: "heuristai",
   },
 };

package/src/lib/services/simulator.ts

@@ -10,6 +10,7 @@ import {
   STARTING_TIMEOUT_WAIT_CYLCE,
   STARTING_TIMEOUT_ATTEMPTS,
   AI_PROVIDERS_CONFIG,
+  AiProviders,
 } from "@/lib/config/simulator";
 import {
   checkCommand,
@@ -159,7 +160,13 @@ export async function waitForSimulatorToBeReady(
       return waitForSimulatorToBeReady(retries - 1);
     }
   } catch (error: any) {
-    if ((error.message.includes("ECONNREFUSED") || error.message.includes("socket hang up")) && retries > 0) {
+    if (
+      (error.name === "FetchError" ||
+        error.message.includes("ECONNRESET") ||
+        error.message.includes("ECONNREFUSED") ||
+        error.message.includes("socket hang up")) &&
+      retries > 0
+    ) {
       await sleep(STARTING_TIMEOUT_WAIT_CYLCE * 2);
       return waitForSimulatorToBeReady(retries - 1);
     }
@@ -184,17 +191,23 @@ export async function initializeDatabase(): Promise<InitializeDatabaseResultType
   return {createResponse, tablesResponse};
 }
 
-export function createRandomValidators(): Promise<any> {
-  return rpcClient.request({method: "create_random_validators", params: [10, 1, 10]});
+export function createRandomValidators(numValidators: number, llmProviders: AiProviders[]): Promise<any> {
+  return rpcClient.request({
+    method: "create_random_validators",
+    params: [numValidators, 1, 10, llmProviders],
+  });
 }
 
 export function deleteAllValidators(): Promise<any> {
   return rpcClient.request({method: "delete_all_validators", params: []});
 }
 
-export function getAiProvidersOptions(): Array<{name: string; value: string}> {
+export function getAiProvidersOptions(withHint: boolean = true): Array<{name: string; value: string}> {
   return Object.values(AI_PROVIDERS_CONFIG).map(providerConfig => {
-    return {name: providerConfig.name, value: providerConfig.cliOptionValue};
+    return {
+      name: `${providerConfig.name}${withHint ? ` ${providerConfig.hint}` : ""}`,
+      value: providerConfig.cliOptionValue,
+    };
   });
 }