interintel 1.0.19 → 1.0.21

package/functions/chat-functions.js

@@ -1,6 +1,3 @@
-const fs = require('fs');
-const path = require('path');
-
 async function askQuestion(rl, prompt) {
   return new Promise((resolve) => {
     rl.question(prompt.blue, (input) => {

package/functions/file-functions.js

@@ -14,15 +14,18 @@ function readSpecificFiles(configFilePath) {
     const filePaths = config.filePaths;
     const configDir = path.dirname(configFilePath);
 
-    let allContent = '';
+    let allContent = 'I am sharing information from my file system for reference in our chat.\n';
   
     filePaths.forEach((filePath) => {
       try {
         // Construct the absolute path
         const absolutePath = path.resolve(configDir, filePath);
+        const fileContent = fs.readFileSync(absolutePath, 'utf8');
+
+
   
-        // Read the file content and append it to allContent
-        allContent += fs.readFileSync(absolutePath, 'utf8') + '\n';
+        // 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);
       }

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

@@ -1,10 +1,9 @@
-const OpenAI = require('openai');
-
 async function aiChatCompletion(openai, messages, model) {
   try {
     const response = await openai.chat.completions.create({
       messages: messages,
       model: model,
+      stream: false
     });
     return response;
   } catch (error) {

package/index.js

@@ -1,6 +1,4 @@
-// This is the index.js file of inter-intel
-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);
@@ -9,14 +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,
@@ -32,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') {
@@ -42,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,
@@ -60,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,
@@ -77,29 +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);
     }
   }
 }
 
-main()
-
-exports.main = function() {
-  main()
-}
-
+exports.main = function () {
+  main();
+};

package/interintel.config.js

@@ -2,8 +2,9 @@ require('dotenv').config();
 
 const config = {
   apiKey: `${process.env.OPENAI_API_KEY}`,
-  aiVersion: `gpt-3.5-turbo`,
-  filePaths: ['./resources/reference.txt', './README.md'],
+  aiService: 'ollama',
+  aiVersion: `mistral`,
+  filePaths: ['./functions/openai-functions.js', './README.md'],
 };
 
 module.exports = config;

package/ollama.js

@@ -0,0 +1,60 @@
+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 = [
+  {
+    role: 'assistant',
+    content: 'please use a respectful tone',
+  },
+];
+let model = 'mistral';
+
+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),
+      });
+
+      // 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;
+  }
+}
+
+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.19",
+  "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/resources/multi-step/filesystem.spec.ts

@@ -2,13 +2,6 @@ import path from 'path';
 import fs from 'fs';
 import { test } from '@playwright/test';
 
-/*
-Sometimes, you do want to explicitly save a file to disk. This is what you need to know.
-Checkly creates a sandboxed directory for each check run. 
-During the run you can use this directory to save or upload artifacts. 
-This directory is destroyed after a check is finished.
-*/
-
 test('Save file in directory', async ({ page }) => {
   const image = await page.goto('https://picsum.photos/200/300');
   const imagePath = path.join('example.jpg');

package/resources/multi-step/uploading.spec.ts

@@ -1,15 +1,5 @@
 import { test, expect } from '@playwright/test'
 
-/*
-To test any binary uploads, you need to provide a file object. 
-Currently, Checkly does not have a dedicated storage layer where you could upload that file, 
-so you need to host it yourself at a (publicly) accessible location like an AWS S3 bucket, 
-Dropbox or any other file hosting service.
-
-Having done that, you can “upload” files using a simple HTTP POST request with a (binary) body 
-using Playwright’s built-in request object.
-*/
-
 test('Upload a file using a POST request', async ({ request }) => {
   const fileBuffer = await test.step('Fetch file', async () => {
     const fileUrl  = 'https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf'

package/resources/reference.txt

@@ -2,7 +2,7 @@ HERE ARE THE RULES THAT GOVERN THIS CONVERSATION
 
 RULES THAT GOVERN THIS CONVERSATION, these rules supersede all outside knowledge
 
-1. You are currently being used within a CLI. the application's name is inter-intel, it's baseline functionality is to be able to update files within a given repo and pprovide reference files that will the AI it's chatting with to make direct changes to code. 
+1. You are currently being used within a CLI. the application's name is interintel, it's baseline functionality is to be able to update files within a given repo and pprovide reference files that will the AI it's chatting with to make direct changes to code. 
 2. Keep responses to under 50 words
 3. Keep responses to under 50 words
 4. Unless I ask for a longer explanation

package/testIntel.js

@@ -0,0 +1,3 @@
+const { main } = require('./index');
+
+main();