genlayer 0.0.28 → 0.0.30

package/CHANGELOG.md

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

package/dist/index.js

@@ -39896,7 +39896,7 @@ var {
 } = import_index.default;
 
 // package.json
-var version = "0.0.28";
+var version = "0.0.30";
 
 // 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.";
@@ -42491,6 +42491,7 @@ var inquirer_default = inquirer;
 // src/lib/config/simulator.ts
 var DEFAULT_JSON_RPC_URL = "http://localhost:4000/api";
 var DEFAULT_REPO_GH_URL = "https://github.com/yeagerai/genlayer-simulator.git";
+var DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX = "genlayer-simulator-";
 var DEFAULT_RUN_SIMULATOR_COMMAND = (simulatorLocation) => ({
   darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && docker compose build && docker compose up"'`,
   win32: `start cmd.exe /c "cd /d ${simulatorLocation} && docker compose build && docker compose up && pause"`,
@@ -42501,23 +42502,31 @@ var DEFAULT_PULL_OLLAMA_COMMAND = (simulatorLocation) => ({
   win32: `cd /d ${simulatorLocation} && docker exec ollama ollama pull llama3`,
   linux: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`
 });
+var DEFAULT_RUN_DOCKER_COMMAND = {
+  darwin: "open -a Docker",
+  win32: 'start "" "C:\\Program Files\\Docker\\Docker\\Docker Desktop.exe"',
+  linux: "sudo systemctl start docker"
+};
 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 3)",
+    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"
   }
 };
 
@@ -44384,21 +44393,12 @@ function checkCommand(command, toolName) {
   });
 }
 function executeCommand(cmdsByPlatform, toolName) {
-  try {
-    const runningPlatform = getPlatform();
-    const command = cmdsByPlatform[runningPlatform];
-    return asyncExec(command);
-  } catch (error) {
-    throw new Error(`Error executing ${toolName}: ${error.message}`);
-  }
-}
-function executeCommandInNewTerminal(cmdsByPlatform) {
   const runningPlatform = getPlatform();
   const command = cmdsByPlatform[runningPlatform];
   try {
     return asyncExec(command);
   } catch (error) {
-    throw new Error(`Error executing command ${command}`);
+    throw new Error(`Error executing ${toolName || command}: ${error.message}.`);
   }
 }
 function getHomeDirectory() {
@@ -44407,13 +44407,64 @@ function getHomeDirectory() {
 function getPlatform() {
   const currentPlatform = process.platform;
   if (!AVAILABLE_PLATFORMS.includes(currentPlatform)) {
-    throw new Error(`Unsupported platform: ${currentPlatform}`);
+    throw new Error(`Unsupported platform: ${currentPlatform}.`);
   }
   return currentPlatform;
 }
 function openUrl(url) {
   return open_default(url);
 }
+function listDockerContainers() {
+  return __async(this, null, function* () {
+    try {
+      const dockerResponse = yield asyncExec("docker ps -a --format '{{.Names}}'");
+      const dockerContainers = dockerResponse.stdout.split("\n");
+      return dockerContainers;
+    } catch (error) {
+      throw new Error("Error listing Docker containers.");
+    }
+    return [];
+  });
+}
+function listDockerImages() {
+  return __async(this, null, function* () {
+    try {
+      const dockerResponse = yield asyncExec("docker images --format '{{.Repository}}'");
+      const dockerImages = dockerResponse.stdout.split("\n");
+      return dockerImages;
+    } catch (error) {
+      throw new Error("Error listing Docker images.");
+    }
+    return [];
+  });
+}
+function stopDockerContainer(containerName) {
+  return __async(this, null, function* () {
+    try {
+      yield asyncExec(`docker stop ${containerName}`);
+    } catch (error) {
+      throw new Error(`Error stopping Docker container ${containerName}.`);
+    }
+  });
+}
+function removeDockerContainer(containerName) {
+  return __async(this, null, function* () {
+    try {
+      yield asyncExec(`docker rm ${containerName}`);
+    } catch (error) {
+      throw new Error(`Error removing container ${containerName}.`);
+    }
+  });
+}
+function removeDockerImage(imageName) {
+  return __async(this, null, function* () {
+    try {
+      yield asyncExec(`docker rmi ${imageName}`);
+    } catch (error) {
+      throw new Error(`Error removing image ${imageName}.`);
+    }
+  });
+}
 
 // src/lib/services/simulator.ts
 function getSimulatorLocation() {
@@ -44463,6 +44514,13 @@ function checkRequirements() {
         throw error;
       }
     }
+    if (requirementsInstalled.docker) {
+      try {
+        yield checkCommand("docker ps", "docker");
+      } catch (error) {
+        yield executeCommand(DEFAULT_RUN_DOCKER_COMMAND);
+      }
+    }
     return requirementsInstalled;
   });
 }
@@ -44496,7 +44554,7 @@ function pullOllamaModel() {
   return __async(this, null, function* () {
     const simulatorLocation = getSimulatorLocation();
     const cmdsByPlatform = DEFAULT_PULL_OLLAMA_COMMAND(simulatorLocation);
-    yield executeCommandInNewTerminal(cmdsByPlatform);
+    yield executeCommand(cmdsByPlatform);
     return true;
   });
 }
@@ -44513,7 +44571,7 @@ function configSimulator(newConfig) {
 function runSimulator() {
   const simulatorLocation = getSimulatorLocation();
   const commandsByPlatform = DEFAULT_RUN_SIMULATOR_COMMAND(simulatorLocation);
-  return executeCommandInNewTerminal(commandsByPlatform);
+  return executeCommand(commandsByPlatform);
 }
 function waitForSimulatorToBeReady() {
   return __async(this, arguments, function* (retries = STARTING_TIMEOUT_ATTEMPTS) {
@@ -44528,7 +44586,7 @@ function waitForSimulatorToBeReady() {
         return waitForSimulatorToBeReady(retries - 1);
       }
     } catch (error) {
-      if ((error.message.includes("ECONNRESET") || 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);
       }
@@ -44547,15 +44605,21 @@ function initializeDatabase() {
     return { createResponse, tablesResponse };
   });
 }
-function createRandomValidators(numValidators) {
-  return rpcClient.request({ method: "create_random_validators", params: [numValidators, 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() {
@@ -44568,6 +44632,34 @@ function openFrontend() {
     return true;
   });
 }
+function resetDockerContainers() {
+  return __async(this, null, function* () {
+    const containers = yield listDockerContainers();
+    const genlayerContainers = containers.filter(
+      (container) => container.startsWith(DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX)
+    );
+    const containersStopPromises = genlayerContainers.map(
+      (container) => stopDockerContainer(container)
+    );
+    yield Promise.all(containersStopPromises);
+    const containersRemovePromises = genlayerContainers.map(
+      (container) => removeDockerContainer(container)
+    );
+    yield Promise.all(containersRemovePromises);
+    return true;
+  });
+}
+function resetDockerImages() {
+  return __async(this, null, function* () {
+    const images = yield listDockerImages();
+    const genlayerImages = images.filter(
+      (image) => image.startsWith(DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX)
+    );
+    const imagesRemovePromises = genlayerImages.map((image) => removeDockerImage(image));
+    yield Promise.all(imagesRemovePromises);
+    return true;
+  });
+}
 
 // src/commands/general/init.ts
 function getRequirementsErrorMessage({ git, docker }) {
@@ -44589,6 +44681,9 @@ function initAction(options) {
       const { git, docker } = yield checkRequirements();
       const errorMessage = getRequirementsErrorMessage({ git, docker });
       if (errorMessage) {
+        console.log(
+          "There was a problem running the docker service. Please start the docker service and try again."
+        );
         console.error(errorMessage);
         return;
       }
@@ -44596,6 +44691,14 @@ function initAction(options) {
       console.error(error);
       return;
     }
+    console.log(`Resetting Docker containers and images...`);
+    try {
+      yield resetDockerContainers();
+      yield resetDockerImages();
+    } catch (error) {
+      console.error(error);
+      return;
+    }
     const answers = yield inquirer_default.prompt([
       {
         type: "confirm",
@@ -44623,7 +44726,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.";
@@ -44708,7 +44811,7 @@ function initAction(options) {
     console.log("Initializing validators...");
     try {
       yield deleteAllValidators();
-      yield createRandomValidators(Number(options.numValidators));
+      yield createRandomValidators(Number(options.numValidators), selectedLlmProviders);
     } catch (error) {
       console.error("Unable to initialize the validators.");
       console.error(error);
@@ -44728,9 +44831,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 {
@@ -44783,7 +44886,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);
@@ -44805,7 +44923,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.28",
+  "version": "0.0.30",
   "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

@@ -17,6 +17,8 @@ import {
   getSimulatorLocation,
   getFrontendUrl,
   openFrontend,
+  resetDockerContainers,
+  resetDockerImages,
 } from "@/lib/services/simulator";
 export interface InitActionOptions {
   numValidators: number;
@@ -43,6 +45,9 @@ export async function initAction(options: InitActionOptions) {
     const {git, docker} = await checkRequirements();
     const errorMessage = getRequirementsErrorMessage({git, docker});
     if (errorMessage) {
+      console.log(
+        "There was a problem running the docker service. Please start the docker service and try again.",
+      );
       console.error(errorMessage);
       return;
     }
@@ -51,6 +56,16 @@ export async function initAction(options: InitActionOptions) {
     return;
   }
 
+  // Reset Docker containers and images
+  console.log(`Resetting Docker containers and images...`);
+  try {
+    await resetDockerContainers();
+    await resetDockerImages();
+  } catch (error) {
+    console.error(error);
+    return;
+  }
+
   // Ask for confirmation on downloading the GenLayer Simulator from GitHub
   const answers = await inquirer.prompt([
     {
@@ -84,7 +99,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.";
@@ -188,7 +203,7 @@ export async function initAction(options: InitActionOptions) {
     //remove all validators
     await deleteAllValidators();
     // create random validators
-    await createRandomValidators(Number(options.numValidators));
+    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

@@ -20,32 +20,20 @@ type ExecuteCommandResult = {
   stderr: string;
 };
 
-type ExecuteCommandInNewTerminalInput = {
+type ExecuteCommandByPlatformInput = {
   [key in RunningPlatform]: string;
 };
 
 export function executeCommand(
-  cmdsByPlatform: ExecuteCommandInNewTerminalInput,
-  toolName: string,
-): Promise<ExecuteCommandResult> {
-  try {
-    const runningPlatform = getPlatform();
-    const command = cmdsByPlatform[runningPlatform];
-    return asyncExec(command);
-  } catch (error: any) {
-    throw new Error(`Error executing ${toolName}: ${error.message}`);
-  }
-}
-
-export function executeCommandInNewTerminal(
-  cmdsByPlatform: ExecuteCommandInNewTerminalInput,
-): PromiseWithChild<{stdout: string; stderr: string}> {
+  cmdsByPlatform: ExecuteCommandByPlatformInput,
+  toolName?: string,
+): PromiseWithChild<ExecuteCommandResult> {
   const runningPlatform = getPlatform();
   const command = cmdsByPlatform[runningPlatform];
   try {
     return asyncExec(command);
   } catch (error: any) {
-    throw new Error(`Error executing command ${command}`);
+    throw new Error(`Error executing ${toolName || command}: ${error.message}.`);
   }
 }
 
@@ -56,7 +44,7 @@ export function getHomeDirectory(): string {
 function getPlatform(): RunningPlatform {
   const currentPlatform = process.platform as RunningPlatform;
   if (!AVAILABLE_PLATFORMS.includes(currentPlatform)) {
-    throw new Error(`Unsupported platform: ${currentPlatform}`);
+    throw new Error(`Unsupported platform: ${currentPlatform}.`);
   }
   return currentPlatform;
 }
@@ -64,3 +52,49 @@ function getPlatform(): RunningPlatform {
 export function openUrl(url: string): Promise<ChildProcess> {
   return open(url);
 }
+
+export async function listDockerContainers(): Promise<string[]> {
+  try {
+    const dockerResponse = await asyncExec("docker ps -a --format '{{.Names}}'");
+    const dockerContainers = dockerResponse.stdout.split("\n");
+    return dockerContainers;
+  } catch (error) {
+    throw new Error("Error listing Docker containers.");
+  }
+  return [];
+}
+
+export async function listDockerImages(): Promise<string[]> {
+  try {
+    const dockerResponse = await asyncExec("docker images --format '{{.Repository}}'");
+    const dockerImages = dockerResponse.stdout.split("\n");
+    return dockerImages;
+  } catch (error) {
+    throw new Error("Error listing Docker images.");
+  }
+  return [];
+}
+
+export async function stopDockerContainer(containerName: string): Promise<void> {
+  try {
+    await asyncExec(`docker stop ${containerName}`);
+  } catch (error) {
+    throw new Error(`Error stopping Docker container ${containerName}.`);
+  }
+}
+
+export async function removeDockerContainer(containerName: string) {
+  try {
+    await asyncExec(`docker rm ${containerName}`);
+  } catch (error) {
+    throw new Error(`Error removing container ${containerName}.`);
+  }
+}
+
+export async function removeDockerImage(imageName: string) {
+  try {
+    await asyncExec(`docker rmi ${imageName}`);
+  } catch (error) {
+    throw new Error(`Error removing image ${imageName}.`);
+  }
+}

package/src/lib/config/simulator.ts

@@ -1,5 +1,6 @@
 export const DEFAULT_JSON_RPC_URL = "http://localhost:4000/api";
 export const DEFAULT_REPO_GH_URL = "https://github.com/yeagerai/genlayer-simulator.git";
+export const DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX = "genlayer-simulator-";
 export const DEFAULT_RUN_SIMULATOR_COMMAND = (simulatorLocation: string) => ({
   darwin: `osascript -e 'tell application "Terminal" to do script "cd ${simulatorLocation} && docker compose build && docker compose up"'`,
   win32: `start cmd.exe /c "cd /d ${simulatorLocation} && docker compose build && docker compose up && pause"`,
@@ -10,30 +11,39 @@ export const DEFAULT_PULL_OLLAMA_COMMAND = (simulatorLocation: string) => ({
   win32: `cd /d ${simulatorLocation} && docker exec ollama ollama pull llama3`,
   linux: `cd ${simulatorLocation} && docker exec ollama ollama pull llama3`,
 });
+export const DEFAULT_RUN_DOCKER_COMMAND = {
+  darwin: "open -a Docker",
+  win32: 'start "" "C:\\Program Files\\Docker\\Docker\\Docker Desktop.exe"',
+  linux: "sudo systemctl start docker",
+};
+
 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 3)",
+    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

@@ -5,18 +5,25 @@ import * as path from "path";
 import {rpcClient} from "@/lib/clients/jsonRpcClient";
 import {
   DEFAULT_REPO_GH_URL,
+  DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX,
   DEFAULT_RUN_SIMULATOR_COMMAND,
+  DEFAULT_RUN_DOCKER_COMMAND,
   DEFAULT_PULL_OLLAMA_COMMAND,
   STARTING_TIMEOUT_WAIT_CYLCE,
   STARTING_TIMEOUT_ATTEMPTS,
   AI_PROVIDERS_CONFIG,
+  AiProviders,
 } from "@/lib/config/simulator";
 import {
   checkCommand,
   getHomeDirectory,
   executeCommand,
-  executeCommandInNewTerminal,
   openUrl,
+  listDockerContainers,
+  stopDockerContainer,
+  removeDockerContainer,
+  listDockerImages,
+  removeDockerImage,
 } from "@/lib/clients/system";
 import {MissingRequirementError} from "../errors/missingRequirement";
 
@@ -79,12 +86,20 @@ export async function checkRequirements(): Promise<Record<string, boolean>> {
   try {
     await checkCommand("docker --version", "docker");
     requirementsInstalled.docker = true;
-  } catch (error) {
+  } catch (error: any) {
     if (!(error instanceof MissingRequirementError)) {
       throw error;
     }
   }
 
+  if (requirementsInstalled.docker) {
+    try {
+      await checkCommand("docker ps", "docker");
+    } catch (error: any) {
+      await executeCommand(DEFAULT_RUN_DOCKER_COMMAND);
+    }
+  }
+
   return requirementsInstalled;
 }
 
@@ -120,7 +135,7 @@ export async function updateSimulator(): Promise<DownloadSimulatorResultType> {
 export async function pullOllamaModel(): Promise<boolean> {
   const simulatorLocation = getSimulatorLocation();
   const cmdsByPlatform = DEFAULT_PULL_OLLAMA_COMMAND(simulatorLocation);
-  await executeCommandInNewTerminal(cmdsByPlatform);
+  await executeCommand(cmdsByPlatform);
   return true;
 }
 
@@ -136,7 +151,7 @@ export async function configSimulator(newConfig: Record<string, string>): Promis
 export function runSimulator(): Promise<{stdout: string; stderr: string}> {
   const simulatorLocation = getSimulatorLocation();
   const commandsByPlatform = DEFAULT_RUN_SIMULATOR_COMMAND(simulatorLocation);
-  return executeCommandInNewTerminal(commandsByPlatform);
+  return executeCommand(commandsByPlatform);
 }
 
 type WaitForSimulatorToBeReadyResultType = {
@@ -160,7 +175,8 @@ export async function waitForSimulatorToBeReady(
     }
   } catch (error: any) {
     if (
-      (error.message.includes("ECONNRESET") ||
+      (error.name === "FetchError" ||
+        error.message.includes("ECONNRESET") ||
         error.message.includes("ECONNREFUSED") ||
         error.message.includes("socket hang up")) &&
       retries > 0
@@ -189,17 +205,23 @@ export async function initializeDatabase(): Promise<InitializeDatabaseResultType
   return {createResponse, tablesResponse};
 }
 
-export function createRandomValidators(numValidators: number): Promise<any> {
-  return rpcClient.request({method: "create_random_validators", params: [numValidators, 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,
+    };
   });
 }
 
@@ -212,3 +234,32 @@ export async function openFrontend(): Promise<boolean> {
   await openUrl(getFrontendUrl());
   return true;
 }
+
+export async function resetDockerContainers(): Promise<boolean> {
+  const containers = await listDockerContainers();
+  const genlayerContainers = containers.filter((container: string) =>
+    container.startsWith(DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX),
+  );
+  const containersStopPromises = genlayerContainers.map((container: string) =>
+    stopDockerContainer(container),
+  );
+  await Promise.all(containersStopPromises);
+
+  const containersRemovePromises = genlayerContainers.map((container: string) =>
+    removeDockerContainer(container),
+  );
+  await Promise.all(containersRemovePromises);
+
+  return true;
+}
+
+export async function resetDockerImages(): Promise<boolean> {
+  const images = await listDockerImages();
+  const genlayerImages = images.filter((image: string) =>
+    image.startsWith(DOCKER_IMAGES_AND_CONTAINERS_NAME_PREFIX),
+  );
+  const imagesRemovePromises = genlayerImages.map((image: string) => removeDockerImage(image));
+  await Promise.all(imagesRemovePromises);
+
+  return true;
+}