cloving 0.3.4 → 0.3.5

package/dist/cloving_gpt/adapters/claude.js

@@ -7,7 +7,7 @@ class ClaudeAdapter {
         this.anthropicVersion = '2023-06-01';
     }
     static listSupportedModels() {
-        ClaudeAdapter.supportedModels.forEach(model => {
+        ClaudeAdapter.supportedModels.forEach((model) => {
             console.log(model);
         });
     }
@@ -18,7 +18,7 @@ class ClaudeAdapter {
         return {
             'x-api-key': apiKey,
             'Content-Type': 'application/json',
-            'anthropic-version': this.anthropicVersion
+            'anthropic-version': this.anthropicVersion,
         };
     }
     getPayload(request, stream = false) {
@@ -30,10 +30,12 @@ class ClaudeAdapter {
         return {
             model: this.model.replace(':', '-'),
             system,
-            messages: request.messages && request.messages.length > 0 ? request.messages : [{ role: "user", content: request.prompt }],
+            messages: request.messages && request.messages.length > 0
+                ? request.messages
+                : [{ role: 'user', content: request.prompt }],
             max_tokens: request.maxTokens || 4096,
             temperature: request.temperature || 0.2,
-            stream
+            stream,
         };
     }
     extractResponse(data) {
@@ -67,7 +69,7 @@ class ClaudeAdapter {
                 const output = parsedObject?.delta?.text || '';
                 return {
                     output,
-                    lastChar
+                    lastChar,
                 };
             }
             catch (error) {

package/dist/cloving_gpt/adapters/gemini.js

@@ -6,7 +6,7 @@ class GeminiAdapter {
         this.model = model;
     }
     static async listSupportedModels() {
-        GeminiAdapter.supportedModels.forEach(model => {
+        GeminiAdapter.supportedModels.forEach((model) => {
             console.log(model);
         });
     }
@@ -21,7 +21,7 @@ class GeminiAdapter {
     getHeaders(apiKey) {
         return {
             'Content-Type': 'application/json',
-            'x-goog-api-key': apiKey
+            'x-goog-api-key': apiKey,
         };
     }
     getPayload(request, stream = false) {
@@ -31,22 +31,27 @@ class GeminiAdapter {
                     role: 'user', // or 'model' if generated from the model
                     parts: [
                         {
-                            text: request.prompt
-                        }
-                    ]
+                            text: request.prompt,
+                        },
+                    ],
                 },
             ],
             generationConfig: {
                 temperature: request.temperature || 0.2,
                 topK: 40,
                 topP: 0.95,
-                maxOutputTokens: 1024
-            }
+                maxOutputTokens: 1024,
+            },
         };
     }
     extractResponse(data) {
         try {
-            if (data && data.candidates && data.candidates[0] && data.candidates[0].content && data.candidates[0].content.parts && data.candidates[0].content.parts[0]) {
+            if (data &&
+                data.candidates &&
+                data.candidates[0] &&
+                data.candidates[0].content &&
+                data.candidates[0].content.parts &&
+                data.candidates[0].content.parts[0]) {
                 return data.candidates[0].content.parts[0].text;
             }
             else {
@@ -74,7 +79,7 @@ class GeminiAdapter {
                 const output = parsedObject?.candidates[0]?.content?.parts[0]?.text || '';
                 return {
                     output,
-                    lastChar
+                    lastChar,
                 };
             }
             catch (error) {

package/dist/cloving_gpt/adapters/mistral.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MistralAdapter = void 0;
 class MistralAdapter {
     static listSupportedModels() {
-        MistralAdapter.supportedModels.forEach(model => {
+        MistralAdapter.supportedModels.forEach((model) => {
             console.log(model);
         });
     }
@@ -15,23 +15,25 @@ class MistralAdapter {
     }
     getHeaders(apiKey) {
         return {
-            'Authorization': `Bearer ${apiKey}`,
-            'Content-Type': 'application/json'
+            Authorization: `Bearer ${apiKey}`,
+            'Content-Type': 'application/json',
         };
     }
     getPayload(request, stream = false) {
         return {
             model: this.model.replace(':', '-'),
-            messages: request.messages && request.messages.length > 0 ? request.messages : [{ role: "user", content: request.prompt }],
+            messages: request.messages && request.messages.length > 0
+                ? request.messages
+                : [{ role: 'user', content: request.prompt }],
             max_tokens: request.maxTokens,
             temperature: request.temperature || 0.2,
-            stream
+            stream,
         };
     }
     extractResponse(data) {
         return data.choices[0].message.content;
     }
-    // data example: 
+    // data example:
     //    {
     //      id: 'chatcmpl-9tL477A98d54qvVQqJT010bm8BLJl',
     //      object: 'chat.completion.chunk',
@@ -64,7 +66,7 @@ class MistralAdapter {
                 const output = parsedObject?.choices[0]?.delta?.content || '';
                 return {
                     output,
-                    lastChar
+                    lastChar,
                 };
             }
             catch (error) {

package/dist/cloving_gpt/adapters/ollama.js

@@ -13,13 +13,13 @@ class OllamaAdapter {
         try {
             const endpoint = 'http://localhost:11434/api/tags';
             const headers = {
-                'Content-Type': 'application/json'
+                'Content-Type': 'application/json',
             };
             const response = await axios_1.default.get(endpoint, { headers });
             const data = response.data;
             if (data && Array.isArray(data.models)) {
                 OllamaAdapter.supportedModels = data.models.map((model) => `ollama:${model.name}`);
-                OllamaAdapter.supportedModels.forEach(model => {
+                OllamaAdapter.supportedModels.forEach((model) => {
                     console.log(model);
                 });
             }
@@ -36,15 +36,15 @@ class OllamaAdapter {
     }
     getHeaders(apiKey) {
         return {
-            'Authorization': `Bearer ${apiKey}`,
-            'Content-Type': 'application/json'
+            Authorization: `Bearer ${apiKey}`,
+            'Content-Type': 'application/json',
         };
     }
     getPayload(request, stream = false) {
         return {
             model: this.model,
             prompt: request.prompt,
-            stream
+            stream,
         };
     }
     extractResponse(data) {
@@ -62,7 +62,7 @@ class OllamaAdapter {
             throw error;
         }
     }
-    // data example: 
+    // data example:
     // {
     //   model: 'dolphin-llama3:latest',
     //   created_at: '2024-08-06T21:04:34.616355Z',
@@ -84,7 +84,7 @@ class OllamaAdapter {
                 const output = parsedObject?.response || '';
                 return {
                     output,
-                    lastChar
+                    lastChar,
                 };
             }
             catch (error) {

package/dist/cloving_gpt/adapters/openai.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIAdapter = void 0;
 class OpenAIAdapter {
     static listSupportedModels() {
-        OpenAIAdapter.supportedModels.forEach(model => {
+        OpenAIAdapter.supportedModels.forEach((model) => {
             console.log(model);
         });
     }
@@ -15,23 +15,25 @@ class OpenAIAdapter {
     }
     getHeaders(apiKey) {
         return {
-            'Authorization': `Bearer ${apiKey}`,
-            'Content-Type': 'application/json'
+            Authorization: `Bearer ${apiKey}`,
+            'Content-Type': 'application/json',
         };
     }
     getPayload(request, stream = false) {
         return {
             model: this.model.replace(':', '-'),
-            messages: request.messages && request.messages.length > 0 ? request.messages : [{ role: "user", content: request.prompt }],
+            messages: request.messages && request.messages.length > 0
+                ? request.messages
+                : [{ role: 'user', content: request.prompt }],
             max_tokens: request.maxTokens,
             temperature: request.temperature || 0.2,
-            stream
+            stream,
         };
     }
     extractResponse(data) {
         return data.choices[0].message.content;
     }
-    // data example: 
+    // data example:
     //    {
     //      id: 'chatcmpl-9tL477A98d54qvVQqJT010bm8BLJl',
     //      object: 'chat.completion.chunk',
@@ -64,7 +66,7 @@ class OpenAIAdapter {
                 const output = parsedObject?.choices[0]?.delta?.content || '';
                 return {
                     output,
-                    lastChar
+                    lastChar,
                 };
             }
             catch (error) {

package/dist/cloving_gpt/index.js

@@ -10,6 +10,7 @@ const axios_1 = __importDefault(require("axios"));
 const child_process_1 = require("child_process");
 const process_1 = __importDefault(require("process"));
 const prompts_1 = require("@inquirer/prompts");
+const colors_1 = __importDefault(require("colors"));
 const claude_1 = require("./adapters/claude");
 const openai_1 = require("./adapters/openai");
 const mistral_1 = require("./adapters/mistral");
@@ -58,11 +59,13 @@ class ClovingGPT {
     async reviewPrompt(prompt, messages, endpoint) {
         if (this.silent)
             return prompt;
-        const fullPrompt = messages.map(m => m.role === 'user' ? `# Task\n\n${m.content}` : m.content).join('\n\n');
+        const fullPrompt = messages
+            .map((m) => (m.role === 'user' ? `# Task\n\n${m.content}` : m.content))
+            .join('\n\n');
         const tokenCount = Math.ceil(fullPrompt.length / 4).toLocaleString();
         const reviewPrompt = await (0, prompts_1.confirm)({
             message: `Do you want to review the ~${tokenCount} token prompt before sending it to ${endpoint}?`,
-            default: true
+            default: true,
         });
         if (reviewPrompt) {
             const tempFile = path_1.default.join(os_1.default.tmpdir(), `cloving_prompt_${Date.now()}.txt`);
@@ -86,7 +89,7 @@ class ClovingGPT {
                     }
                     const confirmPrompt = await (0, prompts_1.confirm)({
                         message: `Are you sure you want to continue?`,
-                        default: true
+                        default: true,
                     });
                     if (!confirmPrompt) {
                         resolve(null);
@@ -125,16 +128,18 @@ class ClovingGPT {
                     data: payload,
                     headers: headers,
                     responseType: 'stream',
-                    timeout: this.timeout
+                    timeout: this.timeout,
                 });
             }
             catch (err) {
                 const error = err;
                 if (error.response && error.response.status === 429) {
                     attempt++;
-                    const tokenCount = payload.messages.reduce((acc, message) => acc + Math.ceil(message.content.length / 4), 0).toLocaleString();
-                    console.warn(`Rate limit error for this ${tokenCount} token prompt. Possibly past the token limit for this AI API. Try including fewer code files. Retrying in ${delay / 1000} seconds... (Attempt ${attempt} of ${maxRetries})`);
-                    await new Promise(resolve => setTimeout(resolve, delay));
+                    const tokenCount = payload.messages
+                        .reduce((acc, message) => acc + Math.ceil(message.content.length / 4), 0)
+                        .toLocaleString();
+                    console.warn(`${colors_1.default.red.bold('ERROR')} Rate limit error for this ${tokenCount} token prompt. Possibly past the token limit for this AI API. Try including fewer code files. Retrying in ${delay / 1000} seconds... (Attempt ${attempt} of ${maxRetries})`);
+                    await new Promise((resolve) => setTimeout(resolve, delay));
                     delay *= 2; // Exponential backoff
                 }
                 else {

package/dist/commands/config.js

@@ -17,20 +17,20 @@ const config = async () => {
     }
     let continueConfig = true;
     while (continueConfig) {
-        const providers = [...new Set(models.map(model => model.split(':')[0]))];
+        const providers = [...new Set(models.map((model) => model.split(':')[0]))];
         const selectedProvider = await (0, prompts_1.select)({
             message: 'Select a provider:',
-            choices: providers.map(provider => ({ name: provider, value: provider })),
+            choices: providers.map((provider) => ({ name: provider, value: provider })),
         });
-        const providerModels = models.filter(model => model.startsWith(selectedProvider));
-        const modelCategories = [...new Set(providerModels.map(model => model.split(':')[1]))];
+        const providerModels = models.filter((model) => model.startsWith(selectedProvider));
+        const modelCategories = [...new Set(providerModels.map((model) => model.split(':')[1]))];
         const selectedCategory = await (0, prompts_1.select)({
             message: 'Select a category:',
-            choices: modelCategories.map(category => ({ name: category, value: category })),
+            choices: modelCategories.map((category) => ({ name: category, value: category })),
         });
-        const specificModels = providerModels.filter(model => model.split(':')[1] === selectedCategory);
+        const specificModels = providerModels.filter((model) => model.split(':')[1] === selectedCategory);
         const modelIndex = await (0, prompts_1.select)({
-            message: 'Select an AI model you\'d like to use:',
+            message: "Select an AI model you'd like to use:",
             choices: specificModels.map((model, index) => ({ name: model, value: index })),
             pageSize: specificModels.length,
         });

package/dist/commands/generate/context.js

@@ -12,8 +12,12 @@ const command_utils_1 = require("../../utils/command_utils");
 const config_utils_1 = require("../../utils/config_utils");
 const generateContextPrompt = (files, contextFiles) => {
     const specialFileContents = (0, command_utils_1.collectSpecialFileContents)();
-    const specialFiles = Object.keys(specialFileContents).map((file) => `### Contents of ${file}\n\n${JSON.stringify(specialFileContents[file], null, 2)}\n\n`).join('\n');
-    const contextFileContents = Object.keys(contextFiles).map((file) => `### Contents of ${file}\n\n${contextFiles[file]}\n\n`).join('\n');
+    const specialFiles = Object.keys(specialFileContents)
+        .map((file) => `### Contents of ${file}\n\n${JSON.stringify(specialFileContents[file], null, 2)}\n\n`)
+        .join('\n');
+    const contextFileContents = Object.keys(contextFiles)
+        .map((file) => `### Contents of ${file}\n\n${contextFiles[file]}\n\n`)
+        .join('\n');
     return `### Description of App
 
 ${JSON.stringify((0, config_utils_1.getClovingConfig)(), null, 2)}
@@ -35,7 +39,10 @@ const context = async (options) => {
         if (files) {
             for (const file of files) {
                 const filePath = path_1.default.resolve(file);
-                if (await fs_1.default.promises.stat(filePath).then(stat => stat.isFile()).catch(() => false)) {
+                if (await fs_1.default.promises
+                    .stat(filePath)
+                    .then((stat) => stat.isFile())
+                    .catch(() => false)) {
                     const content = await fs_1.default.promises.readFile(filePath, 'utf-8');
                     contextFiles[file] = content;
                 }

package/dist/commands/generate/unit_tests.js

@@ -3,267 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = require("fs");
-const child_process_1 = require("child_process");
-const cli_highlight_1 = __importDefault(require("cli-highlight"));
-const prompts_1 = require("@inquirer/prompts");
-const git_utils_1 = require("../../utils/git_utils");
-const config_utils_1 = require("../../utils/config_utils");
-const string_utils_1 = require("../../utils/string_utils");
-const cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
-const extractChangedFiles = (gitDiff) => {
-    const fileRegex = /diff --git a\/(.+?) b\/(.+?)\n/g;
-    const files = new Set();
-    let match;
-    while ((match = fileRegex.exec(gitDiff)) !== null) {
-        files.add(match[1]);
-    }
-    return Array.from(files);
-};
-const generatePrompt = (files, srcFiles, testFiles, gitDiff) => {
-    const filesList = files.length > 0 ? files.join('\n') : 'No files provided';
-    return `Enumerate all the files in the provided list${gitDiff ? ' and git diff' : ''} as well as the file names of anything that these files interact with.
-Also, list any test files that might be relevant to these files.
-
-### List of Code Files
-
-${filesList}
-
-### List of All Source Files
-
-${srcFiles}
-
-### List of all test files
-
-${testFiles}
-
-${gitDiff ? '### Git Diff Content' : ''}
-
-${gitDiff || ''}
-
-## Example Output
-
-Here are the files that are relevant:
-
-\`\`\`plaintext
-## files
-
-app/models/foo.rb
-app/views/baz/bar.html.erb
-
-## relevant test files
-
-test/models/foo_test.rb
-test/controllers/baz_controller_test.rb
-\`\`\`
-
-### Prompt
-
-Enumerate all the files in the provided list${gitDiff ? ' and git diff' : ''} as well as the file names of anything that these files interact with.
-Also, list any test files that might be relevant to these files.`;
-};
-const handleUserAction = async (analysis, autoSave = false) => {
-    const blocks = (0, string_utils_1.extractCurrentNewBlocks)(analysis);
-    if (autoSave) {
-        await (0, string_utils_1.applyAndSaveCurrentNewBlocks)(blocks);
-        console.log('All unit test files have been saved.');
-        return;
-    }
-    const files = Array.from(new Set(blocks.map(block => block.filePath)));
-    const action = await (0, prompts_1.select)({
-        message: 'What would you like to do?',
-        choices: [
-            { name: 'Save a Unit Test File', value: 'save' },
-            { name: 'Save All Unit Test Files', value: 'saveAll' },
-            { name: 'Copy Entire Response to Clipboard', value: 'copyAll' },
-            { name: 'Done', value: 'done' },
-        ],
-    });
-    switch (action) {
-        case 'save':
-            let saveAnother = true;
-            while (saveAnother) {
-                const fileToSave = await (0, prompts_1.select)({
-                    message: 'Which unit test file do you want to save?',
-                    choices: files.map(file => ({ name: file, value: file })),
-                });
-                await (0, string_utils_1.applyAndSaveCurrentNewBlocks)(blocks.filter(block => block.filePath === fileToSave));
-                saveAnother = await (0, prompts_1.confirm)({
-                    message: 'Do you want to save another file?',
-                    default: false,
-                });
-            }
-            break;
-        case 'saveAll':
-            await (0, string_utils_1.applyAndSaveCurrentNewBlocks)(blocks);
-            console.log('All unit test files have been saved.');
-            break;
-        case 'copyAll':
-            process.nextTick(() => {
-                require('copy-paste').copy(analysis, () => {
-                    console.log('Entire response copied to clipboard');
-                });
-            });
-            break;
-        case 'done':
-            break;
-    }
-};
+const UnitTestManager_1 = __importDefault(require("../../managers/UnitTestManager"));
 const unitTests = async (options) => {
-    const { files, save } = options;
-    const gpt = new cloving_gpt_1.default(options);
-    const allSrcFiles = await (0, config_utils_1.getAllFiles)(options, true);
-    const testingDirectory = (0, config_utils_1.getTestingDirectory)();
-    if (allSrcFiles.length === 0 || !testingDirectory) {
-        console.error('Could not find any source files to generate unit tests. Please run: cloving init. Then try again.');
-        process.exit(1);
-    }
-    const testFiles = (0, child_process_1.execFileSync)('find', [testingDirectory, '-type', 'f']).toString().trim();
-    let contextFiles;
-    if (files) {
-        console.log('Generating unit tests for the provided files...');
-        console.log('Gathering a list of files related to the changes...');
-        const prompt = generatePrompt(files, allSrcFiles.join('\n'), testFiles);
-        contextFiles = await gpt.generateText({ prompt });
-    }
-    else {
-        console.log('Generating unit tests for the git diff between this branch and the default branch...');
-        console.log('Gathering a list of files related to the changes...');
-        const gitDiff = await (0, git_utils_1.getGitDiff)();
-        const changedFiles = extractChangedFiles(gitDiff);
-        const prompt = generatePrompt(changedFiles, allSrcFiles.join('\n'), testFiles, gitDiff);
-        contextFiles = await gpt.generateText({ prompt });
-    }
-    contextFiles = (0, string_utils_1.extractMarkdown)(contextFiles);
-    console.log(contextFiles);
-    console.log('\nBuilding the tests for these files...');
-    // Initialize variables
-    const lines = [];
-    const context = [];
-    // Read each line of the context files
-    contextFiles.split('\n').forEach((line) => {
-        if (line.trim()) {
-            lines.push(line.trim());
-        }
-    });
-    for (const codeFile of lines) {
-        if (await fs_1.promises.stat(codeFile).then(stat => stat.isFile()).catch(() => false)) {
-            const fileContents = await fs_1.promises.readFile(codeFile, 'utf-8');
-            context.push(`### Contents of **${codeFile}\n\n${fileContents.split('\n').map(line => `    ${line}`).join('\n')}**\n\n`);
-        }
-    }
-    // Generate the message for unit test creation
-    let analysis = '';
-    if ((files || []).length > 0) {
-        const message = `Create unit tests for the List of Files. Always show filenames for the generated code.
-
-## List of Files
-${(files || []).join('\n')}
-
-## Example Response Structure
-
-Here are the unit tests for the provided list of files:
-
-1. **tests/utils/model_utils.test.ts**
-
-\`\`\`typescript
-import { getModel } from '../../src/utils/model_utils'
-
-describe('modelUtils', () => {
-  const originalEnv = process.env
-
-  beforeEach(() => {
-    jest.resetModules()
-    process.env = { ...originalEnv }
-  })
-
-  afterAll(() => {
-    process.env = originalEnv
-  })
-
-  test('getModel should return default model when CLOVING_MODEL is not set', () => {
-    delete process.env.CLOVING_MODEL
-    const result = getModel()
-    expect(result).toBe('claude:claude-3-5-sonnet-20240620')
-  })
-
-  test('getModel should return CLOVING_MODEL when it is set', () => {
-    process.env.CLOVING_MODEL = 'openai:gpt-4'
-    const result = getModel()
-    expect(result).toBe('openai:gpt-4')
-  })
-})
-\`\`\`
-
-## Context
-
-${context.join('\n\n')}
-
-## Prompt
-
-Create unit tests for the List of Files. Always show filenames for the generated code.`;
-        // Get the model and analysis using ClovingGPT
-        analysis = await gpt.generateText({ prompt: message });
-    }
-    else {
-        const message = `Create unit tests for the Code Diff. Always show filenames for the generated code.
-
-## Code Diff
-
-${await (0, git_utils_1.getGitDiff)()}
-
-## Context
-
-${context.join('\n\n')}
-
-## Example Response Structure
-
-Here are the unit tests for the code diff:
-
-1. **tests/utils/model_utils.test.ts**
-
-\`\`\`typescript
-import { getModel } from '../../src/utils/model_utils'
-
-describe('modelUtils', () => {
-  const originalEnv = process.env
-
-  beforeEach(() => {
-    jest.resetModules()
-    process.env = { ...originalEnv }
-  })
-
-  afterAll(() => {
-    process.env = originalEnv
-  })
-
-  test('getModel should return default model when CLOVING_MODEL is not set', () => {
-    delete process.env.CLOVING_MODEL
-    const result = getModel()
-    expect(result).toBe('claude:claude-3-5-sonnet-20240620')
-  })
-
-  test('getModel should return CLOVING_MODEL when it is set', () => {
-    process.env.CLOVING_MODEL = 'openai:gpt-4'
-    const result = getModel()
-    expect(result).toBe('openai:gpt-4')
-  })
-})
-\`\`\`
-
-## Prompt
-
-Create unit tests for the Code Diff. Always show filenames for the generated code.`;
-        // Get the model and analysis using ClovingGPT
-        analysis = await gpt.generateText({ prompt: message });
-    }
-    if (analysis) {
-        console.log((0, cli_highlight_1.default)(analysis));
-    }
-    else {
-        console.log('No unit tests generated.');
-    }
-    // Add the new user action handling
-    await handleUserAction(analysis, save);
+    const unitTestManager = new UnitTestManager_1.default(options);
+    await unitTestManager.generateUnitTests();
 };
 exports.default = unitTests;