cloving 0.1.2 → 0.1.4

package/dist/cloving_gpt/index.js

@@ -11,20 +11,24 @@ const claude_1 = require("./adapters/claude");
 const openai_1 = require("./adapters/openai");
 const gpt4all_1 = require("./adapters/gpt4all");
 const ollama_1 = require("./adapters/ollama");
-const command_utils_1 = require("../utils/command_utils");
+const config_utils_1 = require("../utils/config_utils");
 class ClovingGPT {
     constructor(options = { silent: false }) {
-        const config = (0, command_utils_1.getConfig)(options);
-        if (!config || !config.primaryModel || !config.models) {
+        const { model: partialModel } = options;
+        const config = (0, config_utils_1.getConfig)(options);
+        if (!config || !config.models) {
             console.log('No cloving configuration found. Please run: cloving config');
             process_1.default.exit(1);
         }
-        const clovingModel = config.primaryModel;
-        this.apiKey = config.models[config?.primaryModel || ''].trim();
-        this.silent = options.silent || false;
-        const parts = clovingModel.split(':');
-        const model = parts.slice(1).join(':');
-        switch (parts[0]) {
+        const primaryModel = (0, config_utils_1.getPrimaryModel)(partialModel);
+        if (!primaryModel) {
+            console.log('No primary model found in the configuration. Please run: cloving config');
+            process_1.default.exit(1);
+        }
+        const { provider, model, config: modelConfig } = primaryModel;
+        this.apiKey = modelConfig.apiKey;
+        this.silent = options.silent || modelConfig.silent;
+        switch (provider) {
             case 'claude':
                 this.adapter = new claude_1.ClaudeAdapter(model);
                 break;
@@ -38,7 +42,7 @@ class ClovingGPT {
                 this.adapter = new ollama_1.OllamaAdapter(model);
                 break;
             default:
-                throw new Error(`Unsupported provider: ${parts[0]}`);
+                throw new Error(`Unsupported provider: ${provider}`);
         }
     }
     async askUserToConfirm(prompt, message) {

package/dist/commands/commit.js

@@ -8,10 +8,10 @@ const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const git_utils_1 = require("../utils/git_utils");
 const string_utils_1 = require("../utils/string_utils");
-const command_utils_1 = require("../utils/command_utils");
+const config_utils_1 = require("../utils/config_utils");
 const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
 const generateAndCommitMessage = async (options) => {
-    options.silent = (0, command_utils_1.getConfig)(options).silent || false;
+    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
     const gpt = new cloving_gpt_1.default(options);
     try {
         // Generate the prompt for commit message

package/dist/commands/config.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = void 0;
+const config_utils_1 = require("../utils/config_utils");
 const command_utils_1 = require("../utils/command_utils");
 const config = async () => {
-    let currentConfig = (0, command_utils_1.getConfig)({});
+    let currentConfig = (0, config_utils_1.getConfig)({});
     // Ensure models is initialized properly
     if (!currentConfig.models) {
         currentConfig.models = {};
@@ -23,17 +24,43 @@ const config = async () => {
         }
         const selectedModel = models[modelIndex];
         const apiKey = await (0, command_utils_1.promptUser)(`Enter your API key for ${selectedModel}: `);
-        currentConfig.models[selectedModel] = apiKey;
-        const setAsPrimary = await (0, command_utils_1.promptUser)('Do you want to set this model as the primary model? [Yn]: ');
-        if (setAsPrimary.toLowerCase() === 'y' || setAsPrimary === '') {
-            currentConfig.primaryModel = selectedModel;
+        const [provider, ...modelParts] = selectedModel.split(':');
+        const model = modelParts.join(':');
+        if (!currentConfig.models[provider]) {
+            currentConfig.models[provider] = {};
+        }
+        const setAsPrimary = await (0, command_utils_1.promptUser)('Do you want to use this model as a primary model? [Yn]: ');
+        const primary = setAsPrimary.toLowerCase() === 'y' || setAsPrimary === '';
+        const priorityNumber = await (0, command_utils_1.promptUser)('Enter the priority for this model (0-100, higher priority will be used as long as the prompt fits the context token limit): [' + (primary ? 100 : 0) + ']');
+        const priority = primary ? 100 : parseInt(priorityNumber, 10);
+        const silentResponse = await (0, command_utils_1.promptUser)('Do you want to review all prompts before they are sent to this model? [Yn]: ');
+        const silent = !(silentResponse.toLowerCase() === 'y' || silentResponse === '');
+        const trustResponse = await (0, command_utils_1.promptUser)('Do you trust this model with sensitive information? [Yn]: ');
+        const trust = trustResponse.toLowerCase() === 'y' || trustResponse === '';
+        const modelConfig = {
+            apiKey,
+            primary,
+            priority,
+            silent,
+            trust,
+        };
+        currentConfig.models[provider][model] = modelConfig;
+        if (primary) {
+            // Ensure only one primary model
+            for (const p in currentConfig.models) {
+                for (const m in currentConfig.models[p]) {
+                    if (p !== provider || m !== model) {
+                        currentConfig.models[p][m].primary = false;
+                    }
+                }
+            }
         }
         const anotherModel = await (0, command_utils_1.promptUser)('Do you want to configure another model? [Yn]: ');
         if (anotherModel.toLowerCase() !== 'y' && anotherModel !== '') {
             continueConfig = false;
         }
     }
-    (0, command_utils_1.saveConfig)(currentConfig);
+    (0, config_utils_1.saveConfig)(currentConfig);
 };
 exports.config = config;
 exports.default = exports.config;

package/dist/commands/init.js

@@ -11,10 +11,11 @@ const string_utils_1 = require("../utils/string_utils");
 const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
 const ignore_1 = __importDefault(require("ignore"));
 const string_utils_2 = require("../utils/string_utils");
+const config_utils_1 = require("../utils/config_utils");
 const command_utils_1 = require("../utils/command_utils");
 // Main function for the describe command
 const init = async (options) => {
-    options.silent = (0, command_utils_1.getConfig)(options).silent || false;
+    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
     const gpt = new cloving_gpt_1.default(options);
     const specialFileContents = (0, command_utils_1.collectSpecialFileContents)();
     const specialFileNames = Object.keys(specialFileContents).map(file => ' - ' + file);
@@ -22,24 +23,24 @@ const init = async (options) => {
         if (specialFileNames.length > 0) {
             console.log(`Cloving will analyze the list of files and the contents of the following files:
 
-  ${specialFileNames.join("\n")}
+${specialFileNames.join("\n")}
 
-  Cloving will send AI a request to summarize the technologies used in this project.
+Cloving will send AI a request to summarize the technologies used in this project.
 
-  This will provide better context for future Cloving requests.
+This will provide better context for future Cloving requests.
 
-  For increased privacy, you can run \`cloving config\` and make sure to configure a local ollama model (llama3:70b-instruct currently works well for this) so that this data is not sent to an AI service provider.
+For increased privacy, you can run \`cloving config\` and make sure to configure a local ollama model (llama3:70b-instruct currently works well for this) so that this data is not sent to an AI service provider.
   `);
         }
         else {
             console.log(`
-  This script will analyze the list of files in the current directory using GPT to summarize the
-  technologies used. This will provide better context for future Cloving requests.
+This script will analyze the list of files in the current directory using GPT to summarize the
+technologies used. This will provide better context for future Cloving requests.
       `);
         }
     }
-    const config = (0, command_utils_1.getConfig)(options);
-    if (!config || !config?.primaryModel || !config?.models) {
+    const config = (0, config_utils_1.getConfig)(options);
+    if (!config || !config?.models) {
         console.error('No cloving configuration found. Please run `cloving config`');
         return;
     }
@@ -80,10 +81,65 @@ const init = async (options) => {
 ${JSON.stringify(projectDetails, null, 2)}
 
 Please return JSON-formatted metadata about the project, including:
+
 - The programming language(s) used
 - The detected framework(s) (if any)
 - The version of the language(s)
 
+Here is a typescript interface for the expected response:
+
+interface LanguageConfig {
+  name: string
+  version?: string
+  primary?: boolean
+  directory: string
+  extension: string
+}
+
+interface FrameworkConfig {
+  name: string
+  type: string
+  version?: string
+  primary?: boolean
+  directory?: string
+  extension?: string
+}
+
+interface TestingFrameworkConfig {
+  name: string
+  type: string
+  version?: string
+  directory?: string
+}
+
+interface BuildToolConfig {
+  name: string
+  type: string
+  version?: string
+}
+
+interface LinterConfig {
+  name: string
+  version?: string
+  type?: string
+}
+
+interface DatabaseConfig {
+  name: string
+  primary?: boolean
+}
+
+export interface ClovingfileConfig {
+  languages: LanguageConfig[]
+  frameworks: FrameworkConfig[]
+  testingFrameworks?: TestingFrameworkConfig[]
+  buildTools: BuildToolConfig[]
+  packageManager: string
+  linters: LinterConfig[]
+  databases?: DatabaseConfig[]
+  projectType: string
+}
+
 Here is an example response:
 
 {

package/dist/commands/review.js

@@ -8,9 +8,9 @@ const child_process_1 = require("child_process");
 const git_utils_1 = require("../utils/git_utils");
 const string_utils_1 = require("../utils/string_utils");
 const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
-const command_utils_1 = require("../utils/command_utils");
+const config_utils_1 = require("../utils/config_utils");
 const review = async (options) => {
-    options.silent = (0, command_utils_1.getConfig)(options).silent || false;
+    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
     const gpt = new cloving_gpt_1.default(options);
     try {
         // Define the prompt for analysis

package/dist/commands/unit_tests.js

@@ -3,13 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
+const fs_1 = require("fs");
 const child_process_1 = require("child_process");
 const git_utils_1 = require("../utils/git_utils");
 const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
-const command_utils_1 = require("../utils/command_utils");
+const config_utils_1 = require("../utils/config_utils");
 const extractChangedFiles = (gitDiff) => {
     const fileRegex = /diff --git a\/(.+?) b\/(.+?)\n/g;
     const files = new Set();
@@ -19,6 +17,18 @@ const extractChangedFiles = (gitDiff) => {
     }
     return Array.from(files);
 };
+const setupTestingPrompt = async (gpt, config) => {
+    const prompt = `I have the following cloving.json configuration file:
+
+==== begin cloving.json ====
+${JSON.stringify(config, null, 2)}
+==== end cloving.json ====
+
+Please provide instructions on how to set up testing for this project.`;
+    const setupInstructions = await gpt.generateText({ prompt });
+    console.log(setupInstructions);
+    process.exit(0);
+};
 const generatePrompt = (files, srcFiles, testFiles, gitDiff) => {
     const filesList = files.length > 0 ? files.join('\n') : 'No files provided';
     const diffSection = gitDiff ? `Here is my git diff:\n\n==== begin git diff ====\n${gitDiff}\n==== end git diff ====\n` : '';
@@ -62,10 +72,11 @@ const unitTests = async (options) => {
     const { files } = options;
     const gpt = new cloving_gpt_1.default(options);
     // Read the cloving.json file
-    const config = (0, command_utils_1.readClovingConfig)();
-    const testingDirectory = config.testingFrameworks.find((framework) => framework.directory)?.directory || 'spec';
-    // Generate a temporary file path
-    const tempFilePath = path_1.default.join(os_1.default.tmpdir(), `unit_tests_${Date.now()}.tmp`);
+    const config = (0, config_utils_1.readClovingConfig)();
+    const testingDirectory = config.testingFrameworks?.find((framework) => framework.directory)?.directory;
+    if (!testingDirectory) {
+        await setupTestingPrompt(gpt, config);
+    }
     let allSrcFiles = [];
     // Collect srcFiles for each language with specified directory and extension
     for (const language of config.languages) {
@@ -76,8 +87,8 @@ const unitTests = async (options) => {
     }
     // Ensure allSrcFiles is unique
     allSrcFiles = Array.from(new Set(allSrcFiles));
-    if (allSrcFiles.length === 0) {
-        console.error('Could not find any source files to generate unit tests. Please run: cloving init');
+    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();
@@ -96,28 +107,28 @@ const unitTests = async (options) => {
     const lines = [];
     const context = [];
     // Read input from temporary file
-    contextFiles.split("\n").forEach((line) => {
+    contextFiles.split('\n').forEach((line) => {
         if (line.trim()) {
             lines.push(line.trim());
         }
     });
-    lines.forEach((codeFile) => {
-        if (fs_1.default.existsSync(codeFile) && fs_1.default.statSync(codeFile).isFile()) {
-            const fileContents = fs_1.default.readFileSync(codeFile, 'utf-8');
+    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}\n\n### **End of ${codeFile}**`);
         }
-    });
+    }
     // Generate the message for unit test creation
     let analysis = '';
     if ((files || []).length > 0) {
         const message = `please create unit tests for these files:
 
 ## begin list of files
-${(files || []).join("\n")}
+${(files || []).join('\n')}
 ## end list of files
 
 ## context
-${context.join("\n\n")}`;
+${context.join('\n\n')}`;
         // Get the model and analysis using ClovingGPT
         analysis = await gpt.generateText({ prompt: message });
     }
@@ -130,7 +141,7 @@ ${await (0, git_utils_1.getGitDiff)()}
 
 ## context
 
-${context.join("\n\n")}`;
+${context.join('\n\n')}`;
         // Get the model and analysis using ClovingGPT
         analysis = await gpt.generateText({ prompt: message });
     }

package/dist/index.js

@@ -20,12 +20,14 @@ program
     .command('commit')
     .description('Generate a commit message and commit the changes')
     .option('-s, --silent', 'Run the command without asking for confirmation of submitting prompts')
+    .option('-m, --model <model>', 'Select the model to use (e.g., openai, claude, ollama, ollama:llama3, claude:claude-3-5-sonnet-20240620)')
     .action(commit_1.default);
 program
     .command('unit-tests')
-    .description('Generate unit tests for the changes')
+    .description('Generate unit tests (if you don\'t specify filenames, it will generate tests for commited changes that differ from the main/master branch)')
     .option('-s, --silent', 'Run the command without asking for confirmation of submitting prompts')
     .option('-f, --files <filenames...>', 'Specify filenames for the unit tests')
+    .option('-m, --model <model>', 'Select the model to use (e.g., openai, claude, ollama, ollama:llama3, claude:claude-3-5-sonnet-20240620)')
     .action(unit_tests_1.default);
 program
     .command('models')
@@ -33,16 +35,18 @@ program
     .action(models_1.default);
 program
     .command('review')
-    .description('Review the changes and propose ')
+    .description('Review the code for commited changes that differ from the main/master branch')
     .option('-s, --silent', 'Run the command without asking for confirmation of submitting prompts')
+    .option('-m, --model <model>', 'Select the model to use (e.g., openai, claude, ollama, ollama:llama3, claude:claude-3-5-sonnet-20240620)')
     .action(review_1.default);
 program
     .command('init')
     .description('Setup cloving in the current project')
     .option('-s, --silent', 'Run the command without asking for confirmation of submitting prompts')
+    .option('-m, --model <model>', 'Select the model to use (e.g., openai, claude, ollama, ollama:llama3, claude:claude-3-5-sonnet-20240620)')
     .action(init_1.default);
 program
     .command('config')
-    .description('Configure cloving with your API key and model')
+    .description('Configure cloving with your API key and models to use')
     .action(config_1.default);
 program.parse(process.argv);

package/dist/utils/command_utils.js

@@ -3,13 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readClovingConfig = exports.getConfig = exports.saveConfig = exports.fetchModels = exports.promptUser = exports.runCommand = exports.generateFileList = exports.checkForSpecialFiles = exports.collectSpecialFileContents = exports.SPECIAL_FILES = exports.CONFIG_PATH = void 0;
+exports.fetchModels = exports.promptUser = exports.runCommand = exports.generateFileList = exports.checkForSpecialFiles = exports.collectSpecialFileContents = exports.SPECIAL_FILES = void 0;
 const child_process_1 = require("child_process");
 const readline_1 = __importDefault(require("readline"));
 const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-exports.CONFIG_PATH = path_1.default.join(os_1.default.homedir(), '.cloving.json');
 exports.SPECIAL_FILES = [
     'package.json',
     'Gemfile',
@@ -122,47 +119,3 @@ const fetchModels = async () => {
     }
 };
 exports.fetchModels = fetchModels;
-const saveConfig = (config) => {
-    fs_1.default.writeFileSync(exports.CONFIG_PATH, JSON.stringify(config, null, 2));
-    console.log(`Configuration saved to ${exports.CONFIG_PATH}`);
-};
-exports.saveConfig = saveConfig;
-const getConfig = (options) => {
-    try {
-        if (fs_1.default.existsSync(exports.CONFIG_PATH)) {
-            const rawConfig = fs_1.default.readFileSync(exports.CONFIG_PATH, 'utf-8');
-            const config = JSON.parse(rawConfig);
-            if (options.silent) {
-                return { ...config, silent: true };
-            }
-            else {
-                return config;
-            }
-        }
-    }
-    catch (err) {
-        console.error('Error reading configuration:', err);
-    }
-    if (process.env.CLOVING_MODEL) {
-        return {
-            models: { [`${process.env.CLOVING_MODEL}`]: process.env.CLOVING_API_KEY ?? '' },
-            primaryModel: process.env.CLOVING_MODEL,
-            silent: options.silent || false
-        };
-    }
-    else {
-        return { models: {}, primaryModel: null, silent: options.silent || false };
-    }
-};
-exports.getConfig = getConfig;
-const readClovingConfig = () => {
-    const configPath = path_1.default.resolve(process.cwd(), 'cloving.json');
-    if (fs_1.default.existsSync(configPath)) {
-        const configFile = fs_1.default.readFileSync(configPath, 'utf-8');
-        return JSON.parse(configFile);
-    }
-    else {
-        throw new Error('cloving.json file not found');
-    }
-};
-exports.readClovingConfig = readClovingConfig;

package/dist/utils/config_utils.js

@@ -0,0 +1,89 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPrimaryModel = exports.saveConfig = exports.readClovingConfig = exports.getConfig = exports.CLOVINGFILE_PATH = exports.CLOVING_CONFIG_PATH = void 0;
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+const fs_1 = __importDefault(require("fs"));
+const ini_1 = __importDefault(require("ini"));
+exports.CLOVING_CONFIG_PATH = path_1.default.join(os_1.default.homedir(), '.clovingconfig');
+exports.CLOVINGFILE_PATH = 'cloving.json';
+const getConfig = (options) => {
+    try {
+        if (fs_1.default.existsSync(exports.CLOVING_CONFIG_PATH)) {
+            const rawConfig = fs_1.default.readFileSync(exports.CLOVING_CONFIG_PATH, 'utf-8');
+            const config = ini_1.default.parse(rawConfig);
+            if (options.silent) {
+                config.globalSilent = true;
+            }
+            return config;
+        }
+    }
+    catch (err) {
+        console.error('Error reading configuration:', err);
+    }
+    if (process.env.CLOVING_MODEL) {
+        const [provider, ...modelParts] = process.env.CLOVING_MODEL.split(':');
+        const model = modelParts.join(':');
+        return {
+            models: {
+                [provider]: {
+                    [model]: {
+                        apiKey: process.env.CLOVING_API_KEY ?? '',
+                        primary: true,
+                        priority: 10,
+                        silent: options.silent || false,
+                        trust: false
+                    }
+                }
+            },
+            globalSilent: options.silent || false
+        };
+    }
+    else {
+        return { models: {}, globalSilent: options.silent || false };
+    }
+};
+exports.getConfig = getConfig;
+const readClovingConfig = () => {
+    if (fs_1.default.existsSync(exports.CLOVINGFILE_PATH)) {
+        const configFile = fs_1.default.readFileSync(exports.CLOVINGFILE_PATH, 'utf-8');
+        return ini_1.default.parse(configFile);
+    }
+    else {
+        throw new Error('cloving.ini file not found');
+    }
+};
+exports.readClovingConfig = readClovingConfig;
+const saveConfig = (config) => {
+    const iniString = ini_1.default.stringify(config);
+    fs_1.default.writeFileSync(exports.CLOVING_CONFIG_PATH, iniString);
+    console.log(`Configuration saved to ${exports.CLOVING_CONFIG_PATH}`);
+};
+exports.saveConfig = saveConfig;
+const getPrimaryModel = (partialModel) => {
+    try {
+        const config = (0, exports.getConfig)({});
+        const models = [];
+        for (const provider in config.models) {
+            for (const model in config.models[provider]) {
+                if (!partialModel || `${provider}:${model}`.startsWith(partialModel)) {
+                    models.push({
+                        provider,
+                        model,
+                        config: config.models[provider][model],
+                    });
+                }
+            }
+        }
+        models.sort((a, b) => parseInt(`${b.config.priority}`, 10) - parseInt(`${a.config.priority}`, 10));
+        return models.length > 0 ? models[0] : null;
+    }
+    catch (err) {
+        console.error('Error reading model from configuration:', err);
+        return null;
+    }
+};
+exports.getPrimaryModel = getPrimaryModel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -48,11 +48,13 @@
     "eslint-plugin-n": "^17.9.0",
     "eslint-plugin-promise": "^6.4.0",
     "ignore": "^5.3.1",
+    "ini": "^4.1.3",
     "nock": "^13.5.4",
     "vite": "^5.3.3",
     "vite-node": "^2.0.1"
   },
   "devDependencies": {
+    "@types/ini": "^4.1.1",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.14.10",
     "husky": "^9.0.11",