interintel 1.0.20 → 1.0.22

package/functions/chat-functions.js

@@ -6,6 +6,5 @@ async function askQuestion(rl, prompt) {
   });
 }
 
-module.exports = {
-  askQuestion,
-}
+export { askQuestion };
+

package/functions/file-functions.js

@@ -1,52 +1,50 @@
-const fs = require('fs');
-const path = require('path');
-const { aiVersion } = require('../interintel.config');
+import fs from 'fs';
+import path from 'path';
 
 // READING FOR INITAL REFERENCE
-function readSpecificFiles(configFilePath) {
-  
+async function readSpecificFiles(configFilePath) {
   try {
-    // Read the content of the config file
-    const configContent = fs.readFileSync(configFilePath, 'utf8');    
-    // Parse the config file content as JavaScript
-    const config = eval(configContent);
-    // Extract the file paths from the config object
-    const filePaths = config.filePaths;
-    const configDir = path.dirname(configFilePath);
+    // Dynamically import the config file
+    const absoluteConfigPath = path.resolve(configFilePath);
+    const configModule = await import('file://' + absoluteConfigPath);
+    const config = configModule.default;
 
+    const filePaths = config.filePaths;
     let allContent = 'I am sharing information from my file system for reference in our chat.\n';
-  
-    filePaths.forEach((filePath) => {
+
+    for (const filePath of filePaths) {
       try {
         // Construct the absolute path
-        const absolutePath = path.resolve(configDir, filePath);
+        const absolutePath = path.resolve(process.cwd(), filePath);
         const fileContent = fs.readFileSync(absolutePath, 'utf8');
 
-
-  
         // Read the file content and add it to allContent
         allContent += `\nStart File Name: ${filePath}\n File Content:\n${fileContent}\n End File Name: ${filePath}`;
       } catch (error) {
-        console.error(`Error reading file ${filePath}: ${error.message}`.bgRed);
+        console.error(`Error reading file ${filePath}: ${error.message}`);
       }
-    });
+    }
 
     // Add console.log statements to communicate to the user
-    console.log(`${aiVersion} sent reference files:`.yellow, `${logFileNames(filePaths)}`.yellow);
-      return allContent;
+    console.log(
+      `${config.aiVersion} sent reference files:`.yellow,
+      `${logFileNames(filePaths)}`.yellow
+    );
+    return allContent;
   } catch (error) {
-    console.error(`Error reading config file: ${error.message}`.bgRed);
+    console.error(`Error reading config file: ${error.message}`);
     return '';
   }
 }
 
 function writeFileFromPrompt(promptFileName, contentToWrite, baseDir) {
   try {
-
     if (!promptFileName.includes('.')) {
-      throw new Error("Invalid file name. Please include a file name with an extension (e.g., 'output.txt').");
+      throw new Error(
+        "Invalid file name. Please include a file name with an extension (e.g., 'output.txt')."
+      );
     }
-    
+
     const projectRoot = process.cwd();
     const fullPath = path.join(projectRoot, `interintel/session-samples/${promptFileName}`);
     const directoryPath = path.dirname(fullPath);
@@ -58,7 +56,6 @@ function writeFileFromPrompt(promptFileName, contentToWrite, baseDir) {
     fs.writeFileSync(fullPath, contentToWrite + '\n');
     console.log(`Content written to ${fullPath}`.yellow);
     return true;
-
   } catch (error) {
     console.error(`Error writing file: ${error.message}`.bgRed);
     return false;
@@ -69,7 +66,7 @@ function writeFileFromPrompt(promptFileName, contentToWrite, baseDir) {
 function logFileNames(filePaths) {
   let fileNames = [];
 
-  console.log("")
+  console.log('');
   console.log(`System message`.bgYellow + `: `.yellow);
   filePaths.forEach((filePath) => {
     const fileName = path.basename(filePath);
@@ -84,6 +81,4 @@ function appendToFile(filePath, data) {
 }
 
 // Export the function and the array
-module.exports = {
-  readSpecificFiles, writeFileFromPrompt
-};
+export { readSpecificFiles, writeFileFromPrompt };

package/functions/handleWriteFile.js

@@ -1,10 +1,9 @@
-const path = require('path');
-const { aiChatCompletion } = require('./openai-functions.js');
-const { writeFileFromPrompt } = require('./file-functions.js');
-const configPath = path.join(process.cwd(), 'interintel.config.js');
-const config = require(configPath);
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { chatCompletion } from '../serviceInterface.js';
+import { writeFileFromPrompt } from './file-functions.js';
 
-async function handleWriteFile(openai, config, messages, currentState, userInput, promptFileName) {
+async function handleWriteFile(config, messages, currentState, userInput, promptFileName) {
   let contentToWrite = '';
 
   if (currentState === null) {
@@ -17,28 +16,39 @@ async function handleWriteFile(openai, config, messages, currentState, userInput
     };
   } else if (currentState === 'awaitingFileName') {
     promptFileName = userInput;
-    currentState = 'awaitingGPTPrompt';
+    currentState = 'awaitingAIprompt';
     return {
       currentState,
       messages,
       promptFileName,
       response: `Please provide a prompt for ${config.aiVersion}:`,
     };
-  } else if (currentState === 'awaitingGPTPrompt') {
-    const promptForGPT = userInput;
+  } else if (currentState === 'awaitingAIprompt') {
+    const promptForAI = userInput;
+
+    let updatedMessages = [...messages, { role: 'user', content: promptForAI }];
+
     try {
-      let gptResponse = await aiChatCompletion(
-        openai,
-        [{ role: 'user', content: promptForGPT }],
+      let completionResponse = await chatCompletion(
+        config.aiService,
+        updatedMessages,
         config.aiVersion
       );
-      contentToWrite = gptResponse.choices[0].message.content;
+
+      // Extract the response content
+      let contentToWrite =
+        config.aiService === 'openai'
+          ? completionResponse.choices[0].message.content
+          : completionResponse;
+
+      const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
       await writeFileFromPrompt(promptFileName, contentToWrite, __dirname); // Assuming this function handles file writing
 
       currentState = null; // Reset state after completing the operation
       return {
         currentState,
-        messages,
+        messages: updatedMessages,
         promptFileName,
         contentToWrite,
         response: `Content written to ${promptFileName}`.yellow,
@@ -47,7 +57,7 @@ async function handleWriteFile(openai, config, messages, currentState, userInput
       console.error('Error in handleWriteFile:', error);
       return {
         currentState,
-        messages,
+        messages: updatedMessages, // Return the updated messages array
         promptFileName,
         contentToWrite,
         response: 'An error occurred while writing the file.',
@@ -59,4 +69,4 @@ async function handleWriteFile(openai, config, messages, currentState, userInput
   return { currentState, messages, promptFileName, contentToWrite, response: '' };
 }
 
-module.exports = { handleWriteFile };
+export { handleWriteFile };

package/functions/openai-functions.js

@@ -3,6 +3,7 @@ async function aiChatCompletion(openai, messages, model) {
     const response = await openai.chat.completions.create({
       messages: messages,
       model: model,
+      stream: false
     });
     return response;
   } catch (error) {

package/index.js

@@ -1,20 +1,16 @@
-const path = require('path')
-const OpenAI = require('openai');
-const readline = require('readline');
+import path from 'path';
+import readline from 'readline';
+import dotenv from 'dotenv';
+import colors from 'colors';
 const configPath = path.join(process.cwd(), 'interintel.config.js');
-const config = require(configPath);
-require('dotenv').config();
-require('colors');
 
-const { readSpecificFiles } = require('./functions/file-functions.js');
-const { askQuestion } = require('./functions/chat-functions.js');
-const { aiChatCompletion } = require('./functions/openai-functions.js');
-const { handleWriteFile } = require('./functions/handleWriteFile.js');
+import config from './interintel.config.js';
+import { readSpecificFiles } from './functions/file-functions.js';
+import { askQuestion } from './functions/chat-functions.js';
+import { handleWriteFile } from './functions/handleWriteFile.js';
+import { chatCompletion } from './serviceInterface.js';
 
-const openai = new OpenAI({
-  apiKey: config.apiKey,
-  model: config.aiVersion,
-});
+dotenv.config();
 
 const rl = readline.createInterface({
   input: process.stdin,
@@ -22,7 +18,7 @@ const rl = readline.createInterface({
 });
 
 async function main() {
-  let initialContent = readSpecificFiles(configPath);
+  let initialContent = await readSpecificFiles(configPath);
   let messages = [{ role: 'system', content: initialContent }];
 
   let currentState = null;
@@ -30,7 +26,7 @@ async function main() {
 
   while (true) {
     const userMessage = await askQuestion(rl, 'You: '.blue.bold);
-    let response = ''; // Add a variable to capture the response message
+    let response = '';
 
     // Exit condition
     if (userMessage.toLowerCase() === 'exit') {
@@ -40,17 +36,11 @@ async function main() {
     }
 
     if (userMessage.toLowerCase().startsWith('//writefile') && currentState === null) {
-      ({ currentState, messages, promptFileName, response } = await handleWriteFile(
-        openai,
-        config,
-        messages,
-        currentState,
-        ''
-      ));
+      let result = await handleWriteFile(config, messages, currentState, '');
+      ({ currentState, messages, promptFileName, response } = result); // Update messages array
       console.log(response.yellow);
     } else if (currentState === 'awaitingFileName') {
       ({ currentState, messages, promptFileName, response } = await handleWriteFile(
-        openai,
         config,
         messages,
         currentState,
@@ -58,9 +48,8 @@ async function main() {
         promptFileName
       ));
       console.log(response.yellow);
-    } else if (currentState === 'awaitingGPTPrompt') {
+    } else if (currentState === 'awaitingAIprompt') {
       ({ currentState, messages, promptFileName, response } = await handleWriteFile(
-        openai,
         config,
         messages,
         currentState,
@@ -75,27 +64,36 @@ async function main() {
       let content = readSpecificFiles(configPath);
       messages.push({
         role: 'user',
-        content: `please just acknowledge you have read the name and the content of the files I have provided ${content}`,
+        content: `please just acknowledge you have read the name and the content of the files I have provided. once you have done this a single time you do not need to do it again. ${content}`,
       });
-      const completion = await aiChatCompletion(openai, messages, config.aiVersion);
+      const completion = await chatCompletion(config.aiService, messages, config.aiVersion);
 
-      const botMessage = completion.choices[0].message.content;
-      console.log(`${config.aiVersion}`.bgGreen, botMessage);
-      console.log('----------------'.bgGreen);
+      let botMessage = '';
+
+      if (config.aiService === 'openai' || config.aiService === 'mistral') {
+        botMessage = completion.choices[0].message.content;
+      } else if (config.aiService === 'ollama') {
+        // Adjust this line based on how Ollama's response is structured
+        botMessage = completion;
+      }
     } else {
       // Regular message processing and interaction with GPT model
       messages.push({ role: 'user', content: userMessage });
 
-      const completion = await aiChatCompletion(openai, messages, config.aiVersion);
+      const completion = await chatCompletion(config.aiService, messages, config.aiVersion);
+
+      let botMessage;
+      if (config.aiService === 'openai' || config.aiService === 'mistral') {
+        botMessage = completion.choices[0].message.content;
+      } else if (config.aiService === 'ollama') {
+        // Adjust based on Ollama's response format
+        botMessage = completion; // Example - replace with actual response structure for Ollama
+      }
 
-      const botMessage = completion.choices[0].message.content;
-      console.log(`${config.aiVersion}`.bgGreen, botMessage);
+      console.log(`${config.aiVersion}`.bgGreen, botMessage.green);
       console.log('----------------'.bgGreen);
     }
   }
 }
 
-exports.main = function() {
-  main()
-}
-
+export { main };

package/interintel.config.js

@@ -1,10 +1,11 @@
-require('dotenv').config();
+import dotenv from 'dotenv';
+dotenv.config();
 
 const config = {
-  apiKey: `${process.env.OPENAI_API_KEY}`,
-  hosted: 'public',
-  aiVersion: `gpt-3.5-turbo`,
-  filePaths: ['./interintel/session-samples/updatedReadSpecificFiles.js', './functions/file-functions.js'],
+  apiKey: `${process.env.MISTRAL_API_KEY}`,
+  aiService: 'mistral',
+  aiVersion: `mistral-tiny`,
+  filePaths: ['serviceInterface.js'],
 };
 
-module.exports = config;
+export default config;

package/mistral.js

@@ -0,0 +1,14 @@
+import MistralClient from '@mistralai/mistralai'
+import dotenv from 'dotenv';
+dotenv.config();
+
+const apiKey = process.env.MISTRAL_API_KEY;
+
+const client = new MistralClient(apiKey);
+
+const completion = await client.chat({
+  model: 'mistral-medium',
+  messages: [{role: 'user', content: 'When were you last fine tuned? Please keep to under 25 words'}],
+});
+
+console.log('Chat:', completion.choices[0].message.content);

package/package.json

@@ -1,12 +1,14 @@
 {
   "dependencies": {
+    "@mistralai/mistralai": "^0.0.8",
     "colors": "^1.4.0",
     "dotenv": "^16.3.1",
     "openai": "^4.24.0"
   },
   "name": "interintel",
   "description": "The application `Interintel` is a command line interface (CLI) application implemented in Node.js. It essentially is an interactive communication tool between the user and an AI model, only openai models for now.",
-  "version": "1.0.20",
+  "version": "1.0.22",
+  "type": "module",
   "main": "index.js",
   "directories": {
     "doc": "docs"

package/resources/interintel.config.template.js

@@ -1,9 +1,12 @@
 require('dotenv').config();
 
 const config = {
+  // this is service dependent
   apiKey: `${process.env.OPENAI_API_KEY}`,
-  // only open ai models for now
-  aiVersion: `ONLY_USE_OPENAI_MODEL`,
+  // openai || ollama
+  aiService: 'ONE_OF_THE_ABOVE',
+  // only open ai or ollama models for now
+  aiVersion: `ONLY_USE_OPENAI_OR_OLLAMA_MODELS`,
   // These filepaths are relative to where your config is created
   filePaths: ['interintel/interintelReadMe.md'],
 };

package/serviceInterface.js

@@ -0,0 +1,72 @@
+import path from 'path';
+import fetch from 'node-fetch';
+import OpenAI from 'openai';
+import MistralClient from '@mistralai/mistralai';
+
+const configPath = path.join(process.cwd(), 'interintel.config.js');
+
+let config;
+try {
+  const importedModule = await import(configPath);
+  config = importedModule.default;
+} catch (error) {
+  console.error('Failed to import config:', error);
+}
+
+const mistralClient = new MistralClient(config.apiKey);
+
+const openai = new OpenAI({
+  apiKey: config.apiKey,
+  model: config.aiVersion,
+});
+
+async function chatCompletion(aiService, messages, model) {
+  try {
+    let response;
+
+    if (aiService === 'openai') {
+      response = await openai.chat.completions.create({
+        messages: messages,
+        model: model,
+        stream: false,
+      });
+
+      return response;
+      
+    } else if (aiService === 'mistral') {
+      let chatResponse;
+
+      chatResponse = await mistralClient.chat({
+        model: model, // or a specific model you wish to use
+        messages: messages,
+      });
+
+      return chatResponse;
+    } else if (aiService === 'ollama') {
+      // Ollama specific code
+      let data = {
+        messages,
+        model,
+        stream: false,
+      };
+      const fetchResponse = await fetch('http://localhost:11434/api/chat', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(data),
+      });
+
+      // Properly resolve the response
+      response = await fetchResponse.json();
+      return response.message.content;
+    } else {
+      throw new Error('Invalid AI service');
+    }
+  } catch (error) {
+    console.error('Error:', error);
+    return null;
+  }
+}
+
+export { chatCompletion };

package/interintel/session-samples/updatedReadSpecificFiles.js

@@ -1,32 +0,0 @@
-// role: 'system',
-// content: `I am sharing information from my file system for reference in our chat.\n
-// File Name: ${fileMsg.fileName}\nContent:\n${fileMsg.content}
-// \n Content for File Name: ${fileMsg.fileName}`
-
-
-function readSpecificFiles(configFilePath) {
-  try {
-    const configContent = fs.readFileSync(configFilePath, 'utf8');    
-    const config = eval(configContent);
-    const filePaths = config.filePaths;
-    const configDir = path.dirname(configFilePath);
-
-    let allContent = 'I am sharing information from my file system for reference in our chat.\n';
-
-    filePaths.forEach((filePath) => {
-      try {
-        const absolutePath = path.resolve(configDir, filePath);
-        const fileContent = fs.readFileSync(absolutePath, 'utf8');
-
-        allContent += `\nFile Name: ${filePath}\nContent:\n${fileContent}\n`;
-      } catch (error) {
-        console.error(`Error reading file ${filePath}: ${error.message}`.bgRed);
-      }
-    });
-
-    return allContent;
-  } catch (error) {
-    console.error(`Error reading config file: ${error.message}`.bgRed);
-    return '';
-  }
-}

package/ollama.js

@@ -1,41 +0,0 @@
-const fetch = require('node-fetch');
-
-let ai = 'ollama';
-let messages = [
-  {
-    role: 'assistant',
-    content: 'please use a respectful tone',
-  },
-  {
-    role: 'assistant',
-    content: 'when asked for a code reference, please provide only the code with no commentary or explanation just the code. No commentary or explanation. NO COMMENTARY OR EXPLANATION',
-  },
-  {
-    role: 'user',
-    content: 'how can I most effectively persist chat history with you? Is every conversation then dependent on a finding a way to persist history by sending along the ongoing chat for you to continually reference context?',
-  },
-];
-let model = 'mistral';
-
-async function ollamaChatCompletion(ai, messages, model) {
-  if (ai === 'ollama') {
-    let data = {
-      messages,
-      model,
-      stream: false,
-    };
-
-    fetch('http://localhost:11434/api/chat', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(data),
-    })
-      .then((response) => response.json())
-      .then((data) => console.log(data, 'data baby')) // or process the data as needed
-      .catch((error) => console.error('Error:', error));
-  }
-}
-
-ollamaChatCompletion(ai, messages, model);