v 3.0.17 (#366)

src/engine/anthropic.ts

@@ -59,7 +59,7 @@ if (provider === 'anthropic' &&
   process.exit(1);
 }
 
-class AnthropicAi implements AiEngine {
+export class AnthropicAi implements AiEngine {
   private anthropicAiApiConfiguration = {
     apiKey: apiKey
   };
@@ -120,5 +120,3 @@ class AnthropicAi implements AiEngine {
     }
   };
 }
-
-export const anthropicAi = new AnthropicAi();

src/engine/azure.ts

@@ -54,7 +54,7 @@ if (
 
 const MODEL = config?.OCO_MODEL || 'gpt-3.5-turbo';
 
-class Azure implements AiEngine {
+export class Azure implements AiEngine {
   private openAI!: OpenAIClient;
 
   constructor() {

src/engine/gemini.ts

@@ -0,0 +1,133 @@
+import { ChatCompletionRequestMessage } from 'openai';
+import { AiEngine } from './Engine';
+import { Content, GenerativeModel, GoogleGenerativeAI, HarmBlockThreshold, HarmCategory, Part } from '@google/generative-ai';
+import { CONFIG_MODES, ConfigType, DEFAULT_TOKEN_LIMITS, getConfig, MODEL_LIST } from '../commands/config';
+import { intro, outro } from '@clack/prompts';
+import chalk from 'chalk';
+import axios from 'axios';
+
+
+export class Gemini implements AiEngine {
+
+  private readonly config: ConfigType;
+  private readonly googleGenerativeAi: GoogleGenerativeAI;
+  private ai: GenerativeModel;
+
+  // vars 
+  private maxTokens = {
+    input: DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_INPUT,
+    output: DEFAULT_TOKEN_LIMITS.DEFAULT_MAX_TOKENS_OUTPUT
+  };
+  private basePath: string;
+  private apiKey: string;
+  private model: string;
+
+  constructor() {
+    this.config = getConfig() as ConfigType;
+    this.googleGenerativeAi = new GoogleGenerativeAI(this.config.OCO_GEMINI_API_KEY);
+    
+    this.warmup();
+  }
+
+  async generateCommitMessage(messages: ChatCompletionRequestMessage[]): Promise<string | undefined> {
+    const systemInstruction = messages.filter(m => m.role === 'system')
+      .map(m => m.content)
+      .join('\n');
+    
+    this.ai = this.googleGenerativeAi.getGenerativeModel({
+      model: this.model,
+      systemInstruction,
+    });
+    
+    const contents = messages.filter(m => m.role !== 'system')
+      .map(m => ({ parts: [{ text: m.content } as Part], role: m.role == 'user' ? m.role : 'model', } as Content));
+      
+    try {
+      const result = await this.ai.generateContent({
+        contents, 
+        safetySettings: [
+          { 
+            category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT, 
+            threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE, 
+          },
+          {
+            category: HarmCategory.HARM_CATEGORY_HARASSMENT, 
+            threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE
+          },
+          {
+            category: HarmCategory.HARM_CATEGORY_HATE_SPEECH, 
+            threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE
+          },
+          {
+            category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT, 
+            threshold: HarmBlockThreshold.BLOCK_LOW_AND_ABOVE
+          },
+        ],
+        generationConfig: {
+          maxOutputTokens: this.maxTokens.output,
+          temperature: 0,
+          topP: 0.1,
+        },
+      });
+      
+      return result.response.text();
+    } catch (error) {
+      const err = error as Error;
+      outro(`${chalk.red('✖')} ${err?.message || err}`);
+      
+      if (
+        axios.isAxiosError<{ error?: { message: string } }>(error) &&
+        error.response?.status === 401
+      ) {
+        const geminiError = error.response.data.error;
+
+        if (geminiError?.message) outro(geminiError.message);
+        outro(
+          'For help look into README https://github.com/di-sukharev/opencommit#setup'
+        );
+      }
+      
+      throw err;
+    }
+  }
+
+  private warmup(): void {
+    if (this.config.OCO_TOKENS_MAX_INPUT !== undefined) this.maxTokens.input = this.config.OCO_TOKENS_MAX_INPUT;
+    if (this.config.OCO_TOKENS_MAX_OUTPUT !== undefined) this.maxTokens.output = this.config.OCO_TOKENS_MAX_OUTPUT;
+    this.basePath = this.config.OCO_GEMINI_BASE_PATH;
+    this.apiKey = this.config.OCO_GEMINI_API_KEY;
+
+    const [command, mode] = process.argv.slice(2);
+
+    const provider = this.config.OCO_AI_PROVIDER;
+
+    if (provider === 'gemini' && !this.apiKey &&
+      command !== 'config' && mode !== 'set') {
+      intro('opencommit');
+
+      outro('OCO_GEMINI_API_KEY is not set, please run `oco config set OCO_GEMINI_API_KEY=<your token> . If you are using GPT, make sure you add payment details, so API works.');
+
+      outro(
+        'For help look into README https://github.com/di-sukharev/opencommit#setup'
+      );
+
+      process.exit(1);
+    }
+    
+    this.model = this.config.OCO_MODEL || MODEL_LIST.gemini[0];
+    
+    if (provider === 'gemini' &&
+      !MODEL_LIST.gemini.includes(this.model) &&
+      command !== 'config' &&
+      mode !== CONFIG_MODES.set) {
+      outro(
+        `${chalk.red('✖')} Unsupported model ${this.model} for Gemini. Supported models are: ${MODEL_LIST.gemini.join(
+          ', '
+        )}`
+      );
+
+      process.exit(1);
+    }
+  }
+
+}

src/engine/ollama.ts

@@ -50,5 +50,3 @@ export class OllamaAi implements AiEngine {
     }
   }
 }
-
-export const ollamaAi = new OllamaAi();

src/engine/openAi.ts

@@ -66,7 +66,8 @@ if (provider === 'openai' &&
   process.exit(1);
 }
 
-class OpenAi implements AiEngine {
+export class OpenAi implements AiEngine {
+  
   private openAiApiConfiguration = new OpenAiApiConfiguration({
     apiKey: apiKey
   });
@@ -91,7 +92,7 @@ class OpenAi implements AiEngine {
     };
     try {
       const REQUEST_TOKENS = messages
-        .map((msg) => tokenCount(msg.content) + 4)
+        .map((msg) => tokenCount(msg.content as string) + 4)
         .reduce((a, b) => a + b, 0);
 
       if (REQUEST_TOKENS > MAX_TOKENS_INPUT - MAX_TOKENS_OUTPUT) {
@@ -124,6 +125,6 @@ class OpenAi implements AiEngine {
       throw err;
     }
   };
+  
 }
 
-export const api = new OpenAi();

src/engine/testAi.ts

@@ -1,12 +1,31 @@
 import { ChatCompletionRequestMessage } from 'openai';
 import { AiEngine } from './Engine';
+import { getConfig } from '../commands/config';
+
+export const TEST_MOCK_TYPES = [
+  'commit-message',
+  'prompt-module-commitlint-config',
+] as const
+type TestMockType = typeof TEST_MOCK_TYPES[number];
 
 export class TestAi implements AiEngine {
   async generateCommitMessage(
-    messages: Array<ChatCompletionRequestMessage>
+    _messages: Array<ChatCompletionRequestMessage>
   ): Promise<string | undefined> {
-    return 'test commit message';
+    const config = getConfig();
+    switch (config?.OCO_TEST_MOCK_TYPE as TestMockType | undefined) {
+      case 'commit-message':
+        return 'fix(testAi.ts): test commit message';
+      case 'prompt-module-commitlint-config':
+        return `{\n` +
+          `  "localLanguage": "english",\n` +
+          `  "commitFix": "fix(server): Change 'port' variable to uppercase 'PORT'",\n` +
+          `  "commitFeat": "feat(server): Allow server to listen on a port specified through environment variable",\n` +
+          `  "commitDescription": "Change 'port' variable to uppercase 'PORT'. Allow server to listen on a port specified through environment variable."\n` +
+          `}`
+      default:
+        throw Error('unsupported test mock type')
+    }
   }
 }
 
-export const testAi = new TestAi();