cloving 0.1.21 → 0.1.22

package/dist/cloving_gpt/adapters/claude.js

@@ -21,7 +21,7 @@ class ClaudeAdapter {
             'anthropic-version': this.anthropicVersion
         };
     }
-    getPayload(request) {
+    getPayload(request, stream = false) {
         return {
             model: this.model.replace(':', '-'),
             system: 'You are a computer programmer giving advice on how to write better code.',
@@ -29,7 +29,8 @@ class ClaudeAdapter {
                 { role: 'user', content: request.prompt }
             ],
             max_tokens: request.maxTokens || 4096,
-            temperature: request.temperature || 0.2
+            temperature: request.temperature || 0.2,
+            stream
         };
     }
     extractResponse(data) {
@@ -47,6 +48,32 @@ class ClaudeAdapter {
             throw error;
         }
     }
+    // data example: data: { type: 'content_block_delta', index: 0, delta: { type: 'text_delta', text: 'Hello, how are you?' } }
+    convertStream(data) {
+        let beginningChar = 0;
+        let lastChar = 0;
+        while (lastChar < data.length) {
+            try {
+                let remainingString = data.slice(beginningChar, lastChar);
+                // Strip any leading characters until we encounter the first '{' in this block
+                const firstBraceIndex = remainingString.indexOf('{');
+                if (firstBraceIndex > -1) {
+                    remainingString = remainingString.slice(firstBraceIndex);
+                }
+                const parsedObject = JSON.parse(remainingString);
+                const output = parsedObject?.delta?.text || '';
+                return {
+                    output,
+                    lastChar
+                };
+            }
+            catch (error) {
+                // Incrementally increase the size of the JSON string to parse
+                lastChar += 1;
+            }
+        }
+        return null;
+    }
 }
 exports.ClaudeAdapter = ClaudeAdapter;
 ClaudeAdapter.supportedModels = [

package/dist/cloving_gpt/adapters/gemini.js

@@ -10,8 +10,13 @@ class GeminiAdapter {
             console.log(model);
         });
     }
-    getEndpoint() {
-        return `https://generativelanguage.googleapis.com/v1beta/models/${this.model.replace(':', '-')}:generateContent`;
+    getEndpoint(stream = false) {
+        if (stream) {
+            return `https://generativelanguage.googleapis.com/v1beta/models/${this.model.replace(':', '-')}:streamGenerateContent`;
+        }
+        else {
+            return `https://generativelanguage.googleapis.com/v1beta/models/${this.model.replace(':', '-')}:generateContent`;
+        }
     }
     getHeaders(apiKey) {
         return {
@@ -19,7 +24,7 @@ class GeminiAdapter {
             'x-goog-api-key': apiKey
         };
     }
-    getPayload(request) {
+    getPayload(request, stream = false) {
         return {
             contents: [
                 {
@@ -31,7 +36,7 @@ class GeminiAdapter {
                 }
             ],
             generationConfig: {
-                temperature: 0.2,
+                temperature: request.temperature || 0.2,
                 topK: 40,
                 topP: 0.95,
                 maxOutputTokens: 1024
@@ -53,6 +58,31 @@ class GeminiAdapter {
             throw error;
         }
     }
+    convertStream(data) {
+        let beginningChar = 0;
+        let lastChar = 0;
+        while (lastChar < data.length) {
+            try {
+                let remainingString = data.slice(beginningChar, lastChar);
+                // Strip any leading characters until we encounter the first '{' in this block
+                const firstBraceIndex = remainingString.indexOf('{');
+                if (firstBraceIndex > -1) {
+                    remainingString = remainingString.slice(firstBraceIndex);
+                }
+                const parsedObject = JSON.parse(remainingString);
+                const output = parsedObject?.candidates[0]?.content?.parts[0]?.text || '';
+                return {
+                    output,
+                    lastChar
+                };
+            }
+            catch (error) {
+                // Incrementally increase the size of the JSON string to parse
+                lastChar += 1;
+            }
+        }
+        return null;
+    }
 }
 exports.GeminiAdapter = GeminiAdapter;
 GeminiAdapter.supportedModels = [

package/dist/cloving_gpt/adapters/mistral.js

@@ -19,18 +19,61 @@ class MistralAdapter {
             'Content-Type': 'application/json'
         };
     }
-    getPayload(request) {
+    getPayload(request, stream = false) {
         return {
             model: this.model.replace(':', '-'),
             messages: [{ role: "user", content: request.prompt }],
             max_tokens: request.maxTokens,
             temperature: request.temperature || 0.2,
-            stream: false
+            stream
         };
     }
     extractResponse(data) {
         return data.choices[0].message.content;
     }
+    // data example: 
+    //    {
+    //      id: 'chatcmpl-9tL477A98d54qvVQqJT010bm8BLJl',
+    //      object: 'chat.completion.chunk',
+    //      created: 1722976043,
+    //      model: 'gpt-4o-2024-05-13',
+    //      system_fingerprint: 'fp_3aa7262c27',
+    //      choices: [
+    //          {
+    //            "index": 0,
+    //            "delta": {
+    //              "content": " basic"
+    //            },
+    //            "logprobs": null,
+    //            "finish_reason": null
+    //          }
+    //      ]
+    //    }
+    convertStream(data) {
+        let beginningChar = 0;
+        let lastChar = 0;
+        while (lastChar < data.length) {
+            try {
+                let remainingString = data.slice(beginningChar, lastChar);
+                // Strip any leading characters until we encounter the first '{' in this block
+                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) {
+                // Incrementally increase the size of the JSON string to parse
+                lastChar += 1;
+            }
+        }
+        return null;
+    }
 }
 exports.MistralAdapter = MistralAdapter;
 MistralAdapter.supportedModels = [

package/dist/cloving_gpt/adapters/ollama.js

@@ -40,11 +40,11 @@ class OllamaAdapter {
             'Content-Type': 'application/json'
         };
     }
-    getPayload(request) {
+    getPayload(request, stream = false) {
         return {
             model: this.model,
             prompt: request.prompt,
-            stream: request.stream ?? false
+            stream
         };
     }
     extractResponse(data) {
@@ -62,6 +62,38 @@ class OllamaAdapter {
             throw error;
         }
     }
+    // data example: 
+    // {
+    //   model: 'dolphin-llama3:latest',
+    //   created_at: '2024-08-06T21:04:34.616355Z',
+    //   response: 'The',
+    //   done: false
+    // }
+    convertStream(data) {
+        let beginningChar = 0;
+        let lastChar = 0;
+        while (lastChar < data.length) {
+            try {
+                let remainingString = data.slice(beginningChar, lastChar);
+                // Strip any leading characters until we encounter the first '{' in this block
+                const firstBraceIndex = remainingString.indexOf('{');
+                if (firstBraceIndex > -1) {
+                    remainingString = remainingString.slice(firstBraceIndex);
+                }
+                const parsedObject = JSON.parse(remainingString);
+                const output = parsedObject?.response || '';
+                return {
+                    output,
+                    lastChar
+                };
+            }
+            catch (error) {
+                // Incrementally increase the size of the JSON string to parse
+                lastChar += 1;
+            }
+        }
+        return null;
+    }
 }
 exports.OllamaAdapter = OllamaAdapter;
 OllamaAdapter.supportedModels = [];

package/dist/cloving_gpt/adapters/openai.js

@@ -19,17 +19,61 @@ class OpenAIAdapter {
             'Content-Type': 'application/json'
         };
     }
-    getPayload(request) {
+    getPayload(request, stream = false) {
         return {
             model: this.model.replace(':', '-'),
             messages: [{ role: "user", content: request.prompt }],
             max_tokens: request.maxTokens,
-            temperature: request.temperature || 0.2
+            temperature: request.temperature || 0.2,
+            stream
         };
     }
     extractResponse(data) {
         return data.choices[0].message.content;
     }
+    // data example: 
+    //    {
+    //      id: 'chatcmpl-9tL477A98d54qvVQqJT010bm8BLJl',
+    //      object: 'chat.completion.chunk',
+    //      created: 1722976043,
+    //      model: 'gpt-4o-2024-05-13',
+    //      system_fingerprint: 'fp_3aa7262c27',
+    //      choices: [
+    //          {
+    //            "index": 0,
+    //            "delta": {
+    //              "content": " basic"
+    //            },
+    //            "logprobs": null,
+    //            "finish_reason": null
+    //          }
+    //      ]
+    //    }
+    convertStream(data) {
+        let beginningChar = 0;
+        let lastChar = 0;
+        while (lastChar < data.length) {
+            try {
+                let remainingString = data.slice(beginningChar, lastChar);
+                // Strip any leading characters until we encounter the first '{' in this block
+                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) {
+                // Incrementally increase the size of the JSON string to parse
+                lastChar += 1;
+            }
+        }
+        return null;
+    }
 }
 exports.OpenAIAdapter = OpenAIAdapter;
 OpenAIAdapter.supportedModels = [

package/dist/cloving_gpt/index.js

@@ -3,6 +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 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
 const axios_1 = __importDefault(require("axios"));
 const child_process_1 = require("child_process");
 const process_1 = __importDefault(require("process"));
@@ -13,9 +16,6 @@ const mistral_1 = require("./adapters/mistral");
 const ollama_1 = require("./adapters/ollama");
 const gemini_1 = require("./adapters/gemini");
 const config_utils_1 = require("../utils/config_utils");
-const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
 class ClovingGPT {
     constructor(options) {
         const { model: partialModel } = options;
@@ -33,6 +33,8 @@ class ClovingGPT {
         this.apiKey = modelConfig.apiKey;
         this.temperature = options.temperature || modelConfig.temperature || 0.2;
         this.silent = options.silent || modelConfig.silent;
+        this.stream = options.stream || false;
+        this.timeout = options.timeout || 60000; // Default timeout of 60 seconds
         switch (provider) {
             case 'claude':
                 this.adapter = new claude_1.ClaudeAdapter(model);
@@ -92,10 +94,51 @@ class ClovingGPT {
         }
         return prompt;
     }
+    async streamText(request) {
+        request.stream = true;
+        request.temperature || (request.temperature = this.temperature);
+        const endpoint = this.adapter.getEndpoint(this.stream);
+        const payload = this.adapter.getPayload(request, this.stream);
+        const headers = this.adapter.getHeaders(this.apiKey);
+        const reviewedPrompt = await this.reviewPrompt(request.prompt, endpoint);
+        if (reviewedPrompt === null) {
+            throw new Error('Operation cancelled by user');
+        }
+        request.prompt = reviewedPrompt;
+        const maxRetries = 5;
+        let attempt = 0;
+        let delay = 1000; // Initial delay of 1 second
+        while (attempt < maxRetries) {
+            try {
+                return await (0, axios_1.default)({
+                    method: 'post',
+                    url: endpoint,
+                    data: payload,
+                    headers: headers,
+                    responseType: 'stream',
+                    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));
+                    delay *= 2; // Exponential backoff
+                }
+                else {
+                    throw error;
+                }
+            }
+        }
+        throw new Error('Max retries exceeded');
+    }
     async generateText(request) {
         request.temperature || (request.temperature = this.temperature);
-        const endpoint = this.adapter.getEndpoint();
-        const payload = this.adapter.getPayload(request);
+        const endpoint = this.adapter.getEndpoint(this.stream);
+        const payload = this.adapter.getPayload(request, this.stream);
         const headers = this.adapter.getHeaders(this.apiKey);
         const reviewedPrompt = await this.reviewPrompt(request.prompt, endpoint);
         if (reviewedPrompt === null) {
@@ -111,9 +154,12 @@ class ClovingGPT {
             if (errorMessage === '') {
                 errorMessage = 'connection error';
             }
-            console.error(`Error communicating with the GPT server (${this.adapter.getEndpoint()}):`, errorMessage);
+            console.error(`Error communicating with the GPT server (${this.adapter.getEndpoint(this.stream)}):`, errorMessage);
             throw error;
         }
     }
+    convertStream(data) {
+        return this.adapter.convertStream(data);
+    }
 }
 exports.default = ClovingGPT;

package/dist/commands/chat.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ChatManager_1 = __importDefault(require("../managers/ChatManager"));
+const config_utils_1 = require("../utils/config_utils");
+const chat = async (options) => {
+    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
+    options.stream = true;
+    const chatManager = new ChatManager_1.default(options);
+    await chatManager.initialize();
+};
+exports.default = chat;