gennady 0.2.2 → 0.3.0

package/README.md

@@ -1,6 +1,6 @@
 🤖 Gennadyᵇᵉᵗᵃ 🗯️
 -----------------
-**Gen**erate **N**ext-level **A**utomated **D**escription **Y**ntelligence.
+**GEN**erate **N**ext-level **A**utomated **D**escription **Y**ntelligence.
 
 ```bash
 npx gennady
@@ -8,7 +8,9 @@ npx gennady
 
 ---
 
-### Setup Local LLM
+## Setup LLM
+
+### Local
 
 ```sh
 brew install ollama
@@ -18,6 +20,22 @@ ollama serve
 
 ---
 
+### External
+
+Create `~/.gennadyrc` file:
+
+```json
+[
+    {
+        "url": "https://api.openai.com/v1/chat/completions",
+        "key": "...",
+        "model": "gpt-4o"
+    }
+]
+```
+
+---
+
 ### Usage
 
 ```bash

package/cli/gennady.js

@@ -16,8 +16,9 @@ const PROMPTS_DIR = join(
 const params = parseArgs(process.argv, {
 	mode: ['mode', 'm'],
 	oneline: ['short', 'one', 'o'],
-	reviewerModel: ['model'],
+	model: ['model'],
 	targetBranch: ['branch', 'b'],
+	apiUrl: ['api', 'apiUrl'],
 });
 
 const commit = new CommitGen({
@@ -28,7 +29,9 @@ const commit = new CommitGen({
 	translatePromptTemplate: readFileSync(join(PROMPTS_DIR, 'translate-prompt.md')).toString(),
 });
 
-console.info(`🤖`, style.whiteBright.bold(`GENNADY`), `(${style.cyan(commit.reviewerModel)} → ${style.yellow(commit.mode)})`, `🗯️`);
+console.info(`🤖`, style.whiteBright.bold(`GENNADY`), `(${style.cyan(commit.model)} → ${style.yellow(commit.mode)})`, `🗯️`);
+console.info(style.gray(`-`.repeat(30)));
+console.info(`- url: ${style.blue(commit.apiUrl)}`);
 console.info(style.gray(`-`.repeat(30)));
 
 const msg = await commit.generate();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gennady",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "author": "Konstantin Lebedev <ibnrubaxa@gmail.com>",
   "description": "Gennady — Generate Next-level Automated Description Yntelligence",
   "keywords": [

package/src/commit-gen/commit-gen.js

@@ -1,26 +1,62 @@
+import { readFileSync, existsSync } from 'node:fs';
+import { join } from 'node:path';
 import { getGitCommitCount, getGitDiff } from '../git/git-cmd.js';
 import { parseGitDiff } from '../git/git-diff.js';
 import { style } from '../utils/style.js';
 
+const DEFAULT_MODEL = 'llama3:8b';
+const DEFAULT_API_URL = 'http://127.0.0.1:11434/api/generate';
+
+const GENNADY_RC_FILENAME = '.gennadyrc';
+
 export class CommitGen {
+	api;
+	apiList = [];
+
 	constructor(init) {
 		this.init = {
 			mode: 'auto',
 			oneline: false,
-			reviewerModel: 'llama3:8b',
 			targetBranch: undefined,
 
-			maxInputTokens: init.maxInputTokens || 4000,
-			ollamaUrl: init.ollamaUrl || 'http://127.0.0.1:11434/api/generate',
 			logger: console,
+			maxInputTokens: init.maxInputTokens || 4000,
 
 			basePromptTemplate: undefined,
 			formatOnelinePromptTemplate: undefined,
 			formatDetailedPromptTemplate: undefined,
 			translatePromptTemplate: undefined,
 
+			timeout: 120,
+
 			...init,
 		};
+
+		// Try parse rc files
+		[
+			join(process.cwd(), GENNADY_RC_FILENAME),
+			join(process.env.HOME, GENNADY_RC_FILENAME),
+		].find((file) => {
+			try {
+				if (existsSync(file)) {
+					const items = JSON.parse(readFileSync(file).toString());
+					if (Array.isArray(items)) {
+						this.apiList.push(...items);
+					} else {
+						this.logger.warn(`Invalid "${file}" config:`, items);
+					}
+				}
+			} catch (err) {
+				this.logger.error(`Parse "${file}" error:`, err);
+			}
+		});
+		
+		// Default API
+		this.apiList[this.init.apiUrl ? 'unshift' : 'push']({
+			url: this.init.apiUrl || DEFAULT_API_URL,
+			key: this.init.apiKey,
+			model: this.init.model || DEFAULT_MODEL,
+		});
 	}
 
 	get logger() {
@@ -31,8 +67,12 @@ export class CommitGen {
 		return this.init.mode;
 	}
 
-	get reviewerModel() {
-		return this.init.reviewerModel;
+	get model() {
+		return this.api?.model || this.apiList[0].model;
+	}
+
+	get apiUrl() {
+		return this.api?.url || this.apiList[0].url;
 	}
 
 	get targetBranch() {
@@ -45,25 +85,97 @@ export class CommitGen {
 			.join('\n\n');
 	}
 
+	async getApi() {
+		if (!this.api) {
+			// By default
+			this.api = {url: DEFAULT_API_URL, model: DEFAULT_MODEL};
+
+			for (const api of this.apiList) {
+				try {
+					const resp = await fetch(api.url, {method: 'HEAD', timeout: 1000});
+					if (resp.status >= 200 && resp.status < 500) {
+						this.api = api;
+						return api;
+					}
+				} catch {}
+			}
+		}
+
+		return this.api;
+	}
+
 	async fetchPrompt(prompt, context) {
 		try {
-			const req = await fetch(this.init.ollamaUrl, {
-				method: 'POST',
-				headers: {'Content-Type': 'application/json'},
-				body: JSON.stringify({
-					model: this.init.reviewerModel,
-					stream: false,
-					prompt,
-					context,
-				}),
-			});
-			const data = await req.json();
-			return data.response || '';
+			const api = await this.getApi();
+			if (api.url.includes('completions')) {
+				return await this.callCompletionsApi(api, prompt, context);
+			}
+
+			return await this.callGenerateApi(api, prompt, context);
 		} catch (e) {
-			this.logger.error(`Failed to generate ollama response:`, e);
+			this.logger.error(`Failed to generate LLM response:`, e);
 			return '';
 		}
 	}
+	
+	async callGenerateApi(api, prompt, context) {
+		const req = await fetch(api.url, {
+			method: 'POST',
+			headers: {'Content-Type': 'application/json'},
+			body: JSON.stringify({
+				model: api.model,
+				stream: false,
+				prompt,
+				context,
+			}),
+		});
+		const data = await req.json();
+		return data.response || '';
+	}
+
+	async callCompletionsApi(api, prompt, context) {
+		const messages = [];
+		
+		if (context) {
+			messages.push({ role: 'system', content: context });
+		}
+
+		messages.push({ role: 'user', content: prompt });
+
+		const req = await fetch(api.url, {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/json',
+				'Authorization': `Bearer ${api.key}`,
+			},
+			body: JSON.stringify({
+				model: api.model,
+				messages: messages,
+				temperature: 0.1,
+				stream: false,
+				timeout: this.init.timeout,
+			}),
+		});
+
+		if (!req.ok) {
+			let errorBody = '';
+			try {
+				errorBody = await req.text();
+			} catch (e) { /* ignore */ }
+
+			throw new Error(`LLM completions request failed with status ${req.status}: ${errorBody}`);
+		}
+
+		const data = await req.json();
+		
+		if (data.choices && data.choices.length > 0 && data.choices[0].message) {
+			return data.choices[0].message.content || '';
+		} else {
+			this.logger.warn(style.yellow('LLM completions response structure unexpected:'), data);
+			return '';
+		}
+	}
+
 	async generateCommitMessage(prompt) {
 		const text = await this.fetchPrompt(prompt);
 		return text;

package/src/prompts/base-prompt.md

@@ -1,4 +1,4 @@
-You are {languages} expert tasked with writing a git commit subject and description based on code changes.
+You are {languages} expert tasked with writing a git commit subject and description based on code changes. Think of 3 options and choose the best one.
 
 **Subject:**  
 - Clearly summarize the key changes in one concise yet informative sentence.  

package/src/prompts/format-oneline-prompt.md

@@ -8,4 +8,5 @@ You are a {languages} expert tasked with writing a git commit subject and descri
 
 **Extremely important:**  
 - The output must contain only commit message inside `<message>` and  `</message>`.
-- Do not add unnecessary words and markup, strictly follow the output format.
+- Do not add unnecessary words and markup, strictly follow the output format.
+- The commit message of changes should be no more than 20 tokens.

package/src/utils/parse-args.js

@@ -9,7 +9,9 @@ export const parseArgs = (argv, schema) => {
             
             for (const [optionKey, aliases] of Object.entries(schema)) {
                 if (aliases.includes(key)) {
-                    params[optionKey] = value || true;
+                    params[optionKey] = value
+                        ? value.replace(/^"|"$/g, '')
+                        : true;
                     break;
                 }
             }