cloving 0.3.8 → 0.3.10

package/dist/cloving_gpt/adapters/azureopenai.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AzureOpenAIAdapter = void 0;
+class AzureOpenAIAdapter {
+    static listSupportedModels() {
+        AzureOpenAIAdapter.supportedModels.forEach((model) => {
+            console.log(model);
+        });
+    }
+    constructor(model, endpoint) {
+        this.model = model;
+        this.endpoint = endpoint;
+    }
+    getEndpoint() {
+        return this.endpoint;
+    }
+    getHeaders(apiKey) {
+        return {
+            'api-key': apiKey,
+            'Content-Type': 'application/json',
+        };
+    }
+    getPayload(request, stream = false) {
+        return {
+            model: this.model.replace('azureopenai:', '').replace(':', '-'),
+            messages: request.messages && request.messages.length > 0
+                ? request.messages
+                : [{ role: 'user', content: request.prompt }],
+            max_tokens: request.maxTokens,
+            temperature: request.temperature || 0.2,
+            stream,
+        };
+    }
+    extractResponse(data) {
+        return data.choices[0].message.content;
+    }
+    convertStream(data) {
+        let beginningChar = 0;
+        let lastChar = 0;
+        while (lastChar < data.length) {
+            try {
+                let remainingString = data.slice(beginningChar, lastChar);
+                const firstBraceIndex = remainingString.indexOf('{');
+                if (firstBraceIndex > -1) {
+                    remainingString = remainingString.slice(firstBraceIndex);
+                }
+                const parsedObject = JSON.parse(remainingString);
+                const output = parsedObject?.choices[0]?.delta?.content || '';
+                return {
+                    output,
+                    lastChar,
+                };
+            }
+            catch (error) {
+                lastChar += 1;
+            }
+        }
+        return null;
+    }
+}
+exports.AzureOpenAIAdapter = AzureOpenAIAdapter;
+AzureOpenAIAdapter.supportedModels = [
+    'azureopenai:gpt:4o-2024-08-06',
+    'azureopenai:gpt:4o',
+    'azureopenai:gpt:4o-mini',
+    'azureopenai:gpt:4-turbo',
+    'azureopenai:gpt:3.5-turbo',
+    // Add more supported models as needed
+];

package/dist/cloving_gpt/adapters/claude.js

@@ -1,19 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClaudeAdapter = void 0;
+/**
+ * ClaudeAdapter class implements the Adapter interface for Claude AI models.
+ */
 class ClaudeAdapter {
+    /**
+     * Initializes a new ClaudeAdapter instance.
+     * @param model - The Claude model identifier.
+     */
     constructor(model) {
         this.model = model;
         this.anthropicVersion = '2023-06-01';
     }
+    /**
+     * Logs all supported Claude models to the console.
+     */
     static listSupportedModels() {
         ClaudeAdapter.supportedModels.forEach((model) => {
             console.log(model);
         });
     }
+    /**
+     * Returns the API endpoint for Claude.
+     * @returns The API endpoint URL.
+     */
     getEndpoint() {
         return `https://api.anthropic.com/v1/messages`;
     }
+    /**
+     * Generates headers for API requests.
+     * @param apiKey - The API key for authentication.
+     * @returns An object containing the required headers.
+     */
     getHeaders(apiKey) {
         return {
             'x-api-key': apiKey,
@@ -21,6 +40,12 @@ class ClaudeAdapter {
             'anthropic-version': this.anthropicVersion,
         };
     }
+    /**
+     * Prepares the payload for API requests.
+     * @param request - The GPTRequest object containing request details.
+     * @param stream - Whether to enable streaming (default: false).
+     * @returns An object containing the prepared payload.
+     */
     getPayload(request, stream = false) {
         let system = 'You are a computer programmer giving advice on how to write better code.';
         if (request.messages && request.messages.length > 0 && request.messages[0].role === 'system') {
@@ -38,6 +63,12 @@ class ClaudeAdapter {
             stream,
         };
     }
+    /**
+     * Extracts the response text from the API response data.
+     * @param data - The API response data.
+     * @returns The extracted response text.
+     * @throws Error if the response structure is invalid.
+     */
     extractResponse(data) {
         try {
             if (data && data.content && Array.isArray(data.content) && data.content.length > 0) {
@@ -53,7 +84,11 @@ class ClaudeAdapter {
             throw error;
         }
     }
-    // data example: data: { type: 'content_block_delta', index: 0, delta: { type: 'text_delta', text: 'Hello, how are you?' } }
+    /**
+     * Converts streaming data to OpenAIStreamChunk format.
+     * @param data - The streaming data string.
+     * @returns An OpenAIStreamChunk object or null if parsing fails.
+     */
     convertStream(data) {
         let beginningChar = 0;
         let lastChar = 0;
@@ -81,6 +116,9 @@ class ClaudeAdapter {
     }
 }
 exports.ClaudeAdapter = ClaudeAdapter;
+/**
+ * Array of supported Claude model identifiers.
+ */
 ClaudeAdapter.supportedModels = [
     'claude:claude-3-5:sonnet-20240620',
     'claude:claude-3:opus-20240229',

package/dist/cloving_gpt/adapters/gemini.js

@@ -1,15 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GeminiAdapter = void 0;
+/**
+ * GeminiAdapter class implements the Adapter interface for Google's Gemini AI model.
+ */
 class GeminiAdapter {
+    /**
+     * Creates a new GeminiAdapter instance.
+     * @param model - The Gemini model to use.
+     */
     constructor(model) {
         this.model = model;
     }
+    /**
+     * Lists all supported Gemini models to the console.
+     */
     static async listSupportedModels() {
         GeminiAdapter.supportedModels.forEach((model) => {
             console.log(model);
         });
     }
+    /**
+     * Gets the appropriate API endpoint URL based on whether streaming is required.
+     * @param stream - Whether to use streaming endpoint.
+     * @returns The API endpoint URL.
+     */
     getEndpoint(stream = false) {
         if (stream) {
             return `https://generativelanguage.googleapis.com/v1beta/models/${this.model.replace(':', '-')}:streamGenerateContent`;
@@ -18,12 +33,23 @@ class GeminiAdapter {
             return `https://generativelanguage.googleapis.com/v1beta/models/${this.model.replace(':', '-')}:generateContent`;
         }
     }
+    /**
+     * Generates headers for the API request.
+     * @param apiKey - The API key for authentication.
+     * @returns An object containing the necessary headers.
+     */
     getHeaders(apiKey) {
         return {
             'Content-Type': 'application/json',
             'x-goog-api-key': apiKey,
         };
     }
+    /**
+     * Prepares the payload for the API request.
+     * @param request - The GPTRequest object containing prompt and other parameters.
+     * @param stream - Whether the request is for streaming.
+     * @returns The formatted payload object.
+     */
     getPayload(request, stream = false) {
         return {
             contents: [
@@ -44,6 +70,12 @@ class GeminiAdapter {
             },
         };
     }
+    /**
+     * Extracts the response text from the API response data.
+     * @param data - The raw API response data.
+     * @returns The extracted response text.
+     * @throws Error if the response structure is invalid.
+     */
     extractResponse(data) {
         try {
             if (data &&
@@ -64,6 +96,11 @@ class GeminiAdapter {
             throw error;
         }
     }
+    /**
+     * Converts a stream chunk to an OpenAIStreamChunk format.
+     * @param data - The raw stream chunk data.
+     * @returns An OpenAIStreamChunk object or null if parsing fails.
+     */
     convertStream(data) {
         let beginningChar = 0;
         let lastChar = 0;

package/dist/cloving_gpt/adapters/mistral.js

@@ -1,24 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MistralAdapter = void 0;
+/**
+ * MistralAdapter class
+ * Implements the Adapter interface for Mistral AI models.
+ */
 class MistralAdapter {
+    /**
+     * Prints all supported models to the console
+     */
     static listSupportedModels() {
         MistralAdapter.supportedModels.forEach((model) => {
             console.log(model);
         });
     }
+    /**
+     * Constructor
+     * @param model - The Mistral AI model to use
+     */
     constructor(model) {
         this.model = model;
     }
+    /**
+     * @returns The Mistral AI API endpoint
+     */
     getEndpoint() {
         return 'https://api.mistral.ai/v1/chat/completions';
     }
+    /**
+     * @param apiKey - The API key for authentication
+     * @returns Headers for the API request
+     */
     getHeaders(apiKey) {
         return {
             Authorization: `Bearer ${apiKey}`,
             'Content-Type': 'application/json',
         };
     }
+    /**
+     * Prepares the payload for the API request
+     * @param request - The GPT request object
+     * @param stream - Whether to use streaming mode
+     * @returns The formatted payload
+     */
     getPayload(request, stream = false) {
         return {
             model: this.model.replace(':', '-'),
@@ -30,6 +54,11 @@ class MistralAdapter {
             stream,
         };
     }
+    /**
+     * Extracts the response content from the API data
+     * @param data - The API response data
+     * @returns The extracted response content
+     */
     extractResponse(data) {
         return data.choices[0].message.content;
     }
@@ -51,6 +80,11 @@ class MistralAdapter {
     //          }
     //      ]
     //    }
+    /**
+     * Converts streaming data to OpenAIStreamChunk format
+     * @param data - The streaming data string
+     * @returns Parsed OpenAIStreamChunk or null if parsing fails
+     */
     convertStream(data) {
         let beginningChar = 0;
         let lastChar = 0;
@@ -78,6 +112,9 @@ class MistralAdapter {
     }
 }
 exports.MistralAdapter = MistralAdapter;
+/**
+ * List of supported Mistral AI models
+ */
 MistralAdapter.supportedModels = [
     'mistral:mistral:embed',
     'mistral:mistral:tiny-latest',

package/dist/cloving_gpt/adapters/ollama.js

@@ -5,10 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OllamaAdapter = void 0;
 const axios_1 = __importDefault(require("axios"));
+/**
+ * Adapter for interacting with the Ollama API.
+ */
 class OllamaAdapter {
+    /**
+     * Constructor to initialize the OllamaAdapter with a specific model.
+     * @param model - The model to be used by the adapter.
+     */
     constructor(model) {
         this.model = model;
     }
+    /**
+     * Fetches and lists supported models from the Ollama API.
+     */
     static async listSupportedModels() {
         try {
             const endpoint = 'http://localhost:11434/api/tags';
@@ -31,15 +41,30 @@ class OllamaAdapter {
             // do nothing, no ollama server running
         }
     }
+    /**
+     * Returns the endpoint URL for generating responses.
+     * @returns The endpoint URL as a string.
+     */
     getEndpoint() {
         return `http://localhost:11434/api/generate`;
     }
+    /**
+     * Returns the headers required for making API requests.
+     * @param apiKey - The API key for authorization.
+     * @returns An object containing the headers.
+     */
     getHeaders(apiKey) {
         return {
             Authorization: `Bearer ${apiKey}`,
             'Content-Type': 'application/json',
         };
     }
+    /**
+     * Constructs the payload for the API request.
+     * @param request - The GPT request object containing the prompt.
+     * @param stream - Boolean indicating if the response should be streamed.
+     * @returns An object containing the payload.
+     */
     getPayload(request, stream = false) {
         return {
             model: this.model,
@@ -47,6 +72,12 @@ class OllamaAdapter {
             stream,
         };
     }
+    /**
+     * Extracts the response from the API response data.
+     * @param data - The response data from the API.
+     * @returns The extracted response as a string.
+     * @throws Will throw an error if the response structure is invalid.
+     */
     extractResponse(data) {
         try {
             if (data && typeof data === 'object' && 'response' in data) {
@@ -62,13 +93,11 @@ class OllamaAdapter {
             throw error;
         }
     }
-    // data example:
-    // {
-    //   model: 'dolphin-llama3:latest',
-    //   created_at: '2024-08-06T21:04:34.616355Z',
-    //   response: 'The',
-    //   done: false
-    // }
+    /**
+     * Converts a stream of data into an OpenAIStreamChunk.
+     * @param data - The string data to be converted.
+     * @returns An OpenAIStreamChunk object or null if conversion fails.
+     */
     convertStream(data) {
         let beginningChar = 0;
         let lastChar = 0;

package/dist/cloving_gpt/adapters/openai.js

@@ -1,24 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAIAdapter = void 0;
+// OpenAIAdapter class implements the Adapter interface
 class OpenAIAdapter {
+    // Method to list supported models
     static listSupportedModels() {
         OpenAIAdapter.supportedModels.forEach((model) => {
             console.log(model);
         });
     }
+    // Constructor to initialize the model
     constructor(model) {
         this.model = model;
     }
+    // Method to get the API endpoint
     getEndpoint() {
         return `https://api.openai.com/v1/chat/completions`;
     }
+    // Method to get the headers for the API request
     getHeaders(apiKey) {
         return {
             Authorization: `Bearer ${apiKey}`,
             'Content-Type': 'application/json',
         };
     }
+    // Method to get the payload for the API request
     getPayload(request, stream = false) {
         return {
             model: this.model.replace(':', '-'),
@@ -30,9 +36,11 @@ class OpenAIAdapter {
             stream,
         };
     }
+    // Method to extract the response from the API response data
     extractResponse(data) {
         return data.choices[0].message.content;
     }
+    // Method to convert the stream data into OpenAIStreamChunk format
     // data example:
     //    {
     //      id: 'chatcmpl-9tL477A98d54qvVQqJT010bm8BLJl',
@@ -78,6 +86,7 @@ class OpenAIAdapter {
     }
 }
 exports.OpenAIAdapter = OpenAIAdapter;
+// List of supported models
 OpenAIAdapter.supportedModels = [
     'openai:gpt:4o-2024-08-06',
     'openai:gpt:4o',

package/dist/cloving_gpt/index.js

@@ -16,6 +16,7 @@ const openai_1 = require("./adapters/openai");
 const mistral_1 = require("./adapters/mistral");
 const ollama_1 = require("./adapters/ollama");
 const gemini_1 = require("./adapters/gemini");
+const azureopenai_1 = require("./adapters/azureopenai");
 const config_utils_1 = require("../utils/config_utils");
 class ClovingGPT {
     constructor(options) {
@@ -52,6 +53,12 @@ class ClovingGPT {
             case 'gemini':
                 this.adapter = new gemini_1.GeminiAdapter(model);
                 break;
+            case 'azureopenai':
+                if (!modelConfig.endpoint) {
+                    throw new Error('Azure OpenAI endpoint not configured');
+                }
+                this.adapter = new azureopenai_1.AzureOpenAIAdapter(model, modelConfig.endpoint);
+                break;
             default:
                 throw new Error(`Unsupported provider: ${provider}`);
         }
@@ -165,12 +172,24 @@ class ClovingGPT {
         }
         catch (err) {
             const error = err;
-            let errorMessage = error instanceof Error ? error.message : 'connection error';
-            if (errorMessage === '') {
-                errorMessage = 'connection error';
+            let errorMessage = 'An error occurred while communicating with the AI server';
+            if (error.response) {
+                // The request was made and the server responded with a status code
+                // that falls out of the range of 2xx
+                errorMessage = `Server responded with status ${error.response.status}: ${error.response.statusText}`;
+            }
+            else if (error.request) {
+                // The request was made but no response was received
+                errorMessage = 'No response received from the server';
+            }
+            else {
+                // Something happened in setting up the request that triggered an Error
+                errorMessage = error.message || 'Unknown error occurred';
             }
-            console.error(`Error communicating with the GPT server (${this.adapter.getEndpoint(this.stream)})\n\n${colors_1.default.red.bold(JSON.stringify(error.response?.data || "''", null, 2))}\n`);
-            throw error;
+            console.error(`${colors_1.default.red.bold('ERROR')} ${errorMessage}\n` +
+                `Endpoint: ${this.adapter.getEndpoint(this.stream)}\n` +
+                `Details: ${colors_1.default.yellow(JSON.stringify(error.response?.data || {}, null, 2))}\n`);
+            throw new Error(errorMessage);
         }
     }
     convertStream(data) {

package/dist/commands/config.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = void 0;
 const config_utils_1 = require("../utils/config_utils");
 const prompt_utils_1 = require("../utils/prompt_utils");
+// Add this type definition at the top of the file
 const prompts_1 = require("@inquirer/prompts");
 const config = async () => {
     let currentConfig = (0, config_utils_1.getConfig)({});
@@ -78,7 +79,7 @@ const config = async () => {
             },
         });
         const parsedTemperature = parseFloat(temperature);
-        const modelConfig = {
+        let modelConfig = {
             apiKey,
             primary,
             priority: parseInt(priority, 10),
@@ -86,6 +87,18 @@ const config = async () => {
             trust,
             temperature: parsedTemperature,
         };
+        if (provider === 'azureopenai') {
+            const endpoint = await (0, prompts_1.input)({
+                message: 'Enter the Azure OpenAI endpoint URL:',
+                validate: (value) => {
+                    if (!value.startsWith('https://')) {
+                        return 'Please enter a valid HTTPS URL';
+                    }
+                    return true;
+                },
+            });
+            modelConfig.endpoint = endpoint;
+        }
         currentConfig.models[provider][model] = modelConfig;
         if (primary) {
             // Ensure only one primary model

package/dist/commands/models.js

@@ -5,6 +5,7 @@ const openai_1 = require("../cloving_gpt/adapters/openai");
 const ollama_1 = require("../cloving_gpt/adapters/ollama");
 const gemini_1 = require("../cloving_gpt/adapters/gemini");
 const mistral_1 = require("../cloving_gpt/adapters/mistral");
+const azureopenai_1 = require("../cloving_gpt/adapters/azureopenai");
 const listModels = async () => {
     claude_1.ClaudeAdapter.listSupportedModels();
     gemini_1.GeminiAdapter.listSupportedModels();
@@ -16,5 +17,6 @@ const listModels = async () => {
         // do nothing, no ollama server running
     }
     openai_1.OpenAIAdapter.listSupportedModels();
+    azureopenai_1.AzureOpenAIAdapter.listSupportedModels();
 };
 exports.default = listModels;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/utils/string_utils.js

@@ -226,22 +226,25 @@ exports.extractBlock = extractBlock;
  * Each block contains information about file paths, current content, and new content.
  *
  * The blocks are defined by specific delimiters:
+ * - Setup: '```lang'
  * - Start: '<<<<<<< CURRENT'
  * - Divider: '======='
  * - End: '>>>>>>> NEW'
+ * - Finish: '```'
  *
  * @param {string} [input] - The input string containing CURRENT/NEW blocks.
  * @returns {CurrentNewBlock[]} An array of CurrentNewBlock objects, each representing a parsed block.
  *                              If the input is undefined or empty, an empty array is returned.
  *
  * @example
- * const input = `
+ * const input = "
+ * ```typescript
  * <<<<<<< CURRENT path/to/file.ts
  * const oldCode = 'old'
  * =======
  * const newCode = 'new'
  * >>>>>>> NEW
- * `
+ * ```"
  * const blocks = extractCurrentNewBlocks(input)
  * // blocks will contain one CurrentNewBlock object with the parsed information
  */
@@ -312,6 +315,10 @@ const searchReplaceString = (currentContent, block) => {
     if (block.currentContent.trim() === '') {
         return block.newContent;
     }
+    // check if you can replace the entire block without changing indentation
+    if (currentContent.includes(block.currentContent)) {
+        return currentContent.replace(block.currentContent, block.newContent);
+    }
     // 2) split currentContent and block.currentContent into new lines and trim() all the lines, then put back the new lines
     const currentLines = currentContent.split('\n').map((line) => line.trim());
     const blockLines = block.currentContent.split('\n').map((line) => line.trim());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.3.8",
+  "version": "0.3.10",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",