interintel 1.0.21 → 1.1.0

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,5 +1,7 @@
-const chatCompletion = require('../ollama.js');
-const { writeFileFromPrompt } = require('./file-functions.js');
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { chatCompletion } from '../serviceInterface.js';
+import { writeFileFromPrompt } from './file-functions.js';
 
 async function handleWriteFile(config, messages, currentState, userInput, promptFileName) {
   let contentToWrite = '';
@@ -34,8 +36,12 @@ async function handleWriteFile(config, messages, currentState, userInput, prompt
       );
 
       // Extract the response content
-      let contentToWrite = (config.aiService === 'openai') ? 
-        completionResponse.choices[0].message.content : completionResponse;
+      let contentToWrite =
+        config.aiService === 'openai' || config.aiService === 'mistral'
+          ? 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
 
@@ -63,4 +69,4 @@ async function handleWriteFile(config, messages, currentState, userInput, prompt
   return { currentState, messages, promptFileName, contentToWrite, response: '' };
 }
 
-module.exports = { handleWriteFile };
+export { handleWriteFile };

package/index.js

@@ -1,14 +1,16 @@
-const path = require('path');
-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 { handleWriteFile } = require('./functions/handleWriteFile.js');
-const chatCompletion = require('./ollama.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';
+
+dotenv.config();
 
 const rl = readline.createInterface({
   input: process.stdin,
@@ -16,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;
@@ -34,12 +36,7 @@ async function main() {
     }
 
     if (userMessage.toLowerCase().startsWith('//writefile') && currentState === null) {
-      let result = await handleWriteFile(
-        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') {
@@ -71,9 +68,9 @@ async function main() {
       });
       const completion = await chatCompletion(config.aiService, messages, config.aiVersion);
 
-      let botMessage;
+      let botMessage = '';
 
-      if (config.aiService === 'openai') {
+      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
@@ -86,7 +83,7 @@ async function main() {
       const completion = await chatCompletion(config.aiService, messages, config.aiVersion);
 
       let botMessage;
-      if (config.aiService === 'openai') {
+      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
@@ -99,6 +96,4 @@ async function main() {
   }
 }
 
-exports.main = function () {
-  main();
-};
+export { main };

package/interintel.config.js

@@ -1,10 +1,13 @@
-require('dotenv').config();
+import dotenv from 'dotenv';
+dotenv.config();
 
 const config = {
-  apiKey: `${process.env.OPENAI_API_KEY}`,
+  apiKey: `${process.env.MISTRAL_API_KEY}`,
   aiService: 'ollama',
-  aiVersion: `mistral`,
-  filePaths: ['./functions/openai-functions.js', './README.md'],
+  aiVersion: `mistral:instruct`,
+  filePaths: [
+    'resources/reference.txt'  
+  ],
 };
 
-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.21",
+  "version": "1.1.0",
+  "type": "module",
   "main": "index.js",
   "directories": {
     "doc": "docs"

package/resources/reference.txt

@@ -2,12 +2,14 @@ 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 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
-5.  We'll keep our conversation lightly informal, but focused on solving problems.
-6. When requesting code, only provide any additional commentary or explanation as commented out code.
-7. You are currently imported into a project where you are part of a terminal based approach for improving code. You will sometimes see commands like the following;
-8. When writing playwright/test scripts please use modern selectors like this await ```page.getByLabel('User Name').fill('John');``` not ```page.$('input[name="btnI"]')```
-9. Diablo is NOT AN rpg
+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. 
+
+Keep all of your responses brief, and under 50 words, provide brief examples when possible. i.e. Can you write a multi step api check for me, "Here's what I need from you to write this check"
+
+Checkly Assistant is designed to be straightforward and professional, focusing purely on providing efficient and accurate assistance for setting up browser checks and multi-step API checks with Playwright/test. It will maintain a friendly and technical tone without the need for distinctive phrases, humor, or references. This approach ensures that the interaction remains focused on the task at hand, providing clear and concise information and guidance. Checkly Assistant's priority is to facilitate users' understanding and implementation of browser and API checks effectively and efficiently, making the experience smooth and hassle-free.
+
+Multi step  tests AND checks do not utilize page fixtures from playwright/test, we only rely on the request/ response methods.
+
+When asked to create a multi step check, always only provide playwright/test scripts in return. This is what the user expects, and there's no need to explain that. 
+
+A multi step construct is a Checkly construct that allows you to handle things like alerts, grouping, frequency, of a deployed check.

package/{ollama.js → serviceInterface.js}

@@ -1,23 +1,25 @@
-const path = require('path');
-const fetch = require('node-fetch');
-const OpenAI = require('openai');
+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');
-const config = require(configPath);
+
+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,
 });
 
-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;
@@ -30,6 +32,16 @@ async function chatCompletion(aiService, messages, model) {
       });
 
       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 = {
@@ -57,4 +69,4 @@ async function chatCompletion(aiService, messages, model) {
   }
 }
 
-module.exports = chatCompletion;
+export { chatCompletion };

package/testIntel.js

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

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

@@ -1,11 +0,0 @@
-import path from 'path';
-import fs from 'fs';
-import { test } from '@playwright/test';
-
-test('Save file in directory', async ({ page }) => {
-  const image = await page.goto('https://picsum.photos/200/300');
-  const imagePath = path.join('example.jpg');
-  const buffer = await image.body();
-  fs.writeFileSync(imagePath, buffer);
-  const readFileFromDisk = fs.readFileSync(imagePath);
-});

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

@@ -1,15 +0,0 @@
-import { test, expect } from '@playwright/test'
-
-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'
-    return request.get(fileUrl)
-  })
-
-  await test.step('Upload file', async () => {
-    const response = await request.post('https://filebin.net/pp9on3zvwv7zq6lm/dummy.pdf', {
-      data: await fileBuffer.body(),
-    })
-    await expect(response).toBeOK()
-  })
-})