interintel 1.0.20 → 1.0.21

package/functions/handleWriteFile.js

@@ -1,10 +1,7 @@
-const path = require('path');
-const { aiChatCompletion } = require('./openai-functions.js');
+const chatCompletion = require('../ollama.js');
 const { writeFileFromPrompt } = require('./file-functions.js');
-const configPath = path.join(process.cwd(), 'interintel.config.js');
-const config = require(configPath);
 
-async function handleWriteFile(openai, config, messages, currentState, userInput, promptFileName) {
+async function handleWriteFile(config, messages, currentState, userInput, promptFileName) {
   let contentToWrite = '';
 
   if (currentState === null) {
@@ -17,28 +14,35 @@ 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;
+
       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 +51,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.',

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,5 +1,4 @@
-const path = require('path')
-const OpenAI = require('openai');
+const path = require('path');
 const readline = require('readline');
 const configPath = path.join(process.cwd(), 'interintel.config.js');
 const config = require(configPath);
@@ -8,13 +7,8 @@ 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');
-
-const openai = new OpenAI({
-  apiKey: config.apiKey,
-  model: config.aiVersion,
-});
+const chatCompletion = require('./ollama.js');
 
 const rl = readline.createInterface({
   input: process.stdin,
@@ -30,7 +24,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 +34,16 @@ async function main() {
     }
 
     if (userMessage.toLowerCase().startsWith('//writefile') && currentState === null) {
-      ({ currentState, messages, promptFileName, response } = await handleWriteFile(
-        openai,
+      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 +51,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 +67,38 @@ 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') {
+        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') {
+        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()
-}
-
+exports.main = function () {
+  main();
+};

package/interintel.config.js

@@ -2,9 +2,9 @@ require('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'],
+  aiService: 'ollama',
+  aiVersion: `mistral`,
+  filePaths: ['./functions/openai-functions.js', './README.md'],
 };
 
 module.exports = config;

package/ollama.js

@@ -1,4 +1,13 @@
+const path = require('path');
 const fetch = require('node-fetch');
+const OpenAI = require('openai');
+const configPath = path.join(process.cwd(), 'interintel.config.js');
+const config = require(configPath);
+
+const openai = new OpenAI({
+  apiKey: config.apiKey,
+  model: config.aiVersion,
+});
 
 let ai = 'ollama';
 let messages = [
@@ -6,36 +15,46 @@ 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,
-    };
+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 === '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),
+      });
 
-    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));
+      // 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;
   }
 }
 
-ollamaChatCompletion(ai, messages, model);
+module.exports = chatCompletion;

package/package.json

@@ -6,7 +6,7 @@
   },
   "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.21",
   "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/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 '';
-  }
-}