fix: fix ignoreBody config

tak-bro · Aug 13, 2024 · 1faf9bd · 1faf9bd
1 parent 3ff61b8
commit 1faf9bd
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 64 deletions.
diff --git a/src/commands/aicommit2.ts b/src/commands/aicommit2.ts
@@ -54,6 +54,9 @@ export default async (
             rawArgv
         );
 
+        console.log(config);
+        // throw new KnownError('Please set at least one API key via the `aicommit2 config set` command');
+
         if (config.systemPromptPath) {
             try {
                 fs.readFileSync(path.resolve(config.systemPromptPath), 'utf-8');

diff --git a/src/commands/config.ts b/src/commands/config.ts
@@ -14,7 +14,7 @@ export default command(
             const { mode, keyValue: keyValues } = argv._;
 
             if (mode === 'get') {
-                const config = await getConfig({}, true);
+                const config = await getConfig({}, []);
                 for (const key of keyValues) {
                     if (hasOwn(config, key)) {
                         console.log(`${key}=${config[key as keyof typeof config]}`);

diff --git a/src/services/ai/ai.service.ts b/src/services/ai/ai.service.ts
@@ -4,22 +4,6 @@ import { Observable, of } from 'rxjs';
 import { CommitType, ModelConfig, ModelName } from '../../utils/config.js';
 import { StagedDiff } from '../../utils/git.js';
 
-// NOTE: get AI Type from key names
-export const AIType = {
-    OPEN_AI: 'OPENAI_KEY',
-    GEMINI: 'GEMINI_KEY',
-    ANTHROPIC: 'ANTHROPIC_KEY',
-    HUGGINGFACE: 'HUGGINGFACE_COOKIE',
-    MISTRAL: 'MISTRAL_KEY',
-    CODESTRAL: 'CODESTRAL_KEY',
-    OLLAMA: 'OLLAMA_MODEL',
-    COHERE: 'COHERE_KEY',
-    GROQ: 'GROQ_KEY',
-    PERPLEXITY: 'PERPLEXITY_KEY',
-} as const;
-export type ApiKeyName = (typeof AIType)[keyof typeof AIType];
-export const ApiKeyNames: ApiKeyName[] = Object.values(AIType).map(value => value);
-
 export interface CommitMessage {
     title: string;
     value: string;
@@ -74,18 +58,12 @@ export abstract class AIService {
         });
     };
 
-    protected parseMessage(generatedText: string, type: CommitType, maxCount: number, ignoreBody: boolean): CommitMessage[] {
+    protected parseMessage(generatedText: string, type: CommitType, maxCount: number): CommitMessage[] {
         try {
             const commitMessages: RawCommitMessage[] = JSON.parse(generatedText);
             const filteredMessages = commitMessages
                 .map(data => this.extractMessageAsType(data, type))
                 .map((data: RawCommitMessage) => {
-                    if (ignoreBody) {
-                        return {
-                            title: `${data.subject}`,
-                            value: `${data.subject}`,
-                        };
-                    }
                     return {
                         title: `${data.subject}`,
                         value: `${data.subject}${data.body ? `\n\n${data.body}` : ''}${data.footer ? `\n\n${data.footer}` : ''}`,
@@ -109,12 +87,6 @@ export abstract class AIService {
                 const filteredessages = commitMessages
                     .map(data => this.extractMessageAsType(data, type))
                     .map((data: RawCommitMessage) => {
-                        if (ignoreBody) {
-                            return {
-                                title: `${data.subject}`,
-                                value: `${data.subject}`,
-                            };
-                        }
                         return {
                             title: `${data.subject}`,
                             value: `${data.subject}${data.body ? `\n\n${data.body}` : ''}${data.footer ? `\n\n${data.footer}` : ''}`,

diff --git a/src/services/ai/anthropic.service.ts b/src/services/ai/anthropic.service.ts
@@ -37,8 +37,8 @@ export class AnthropicService extends AIService {
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
                 short: data.title,
-                value: data.value,
-                description: data.value,
+                value: this.params.config.ignoreBody ? data.title : data.value,
+                description: this.params.config.ignoreBody ? '' : data.value,
                 isError: false,
             })),
             catchError(this.handleError$)
@@ -76,7 +76,7 @@ export class AnthropicService extends AIService {
             const result: Anthropic.Message = await this.anthropic.messages.create(params);
             const completion = result.content.map(({ text }) => text).join('');
             logging && createLogResponse('Anthropic', diff, generatedSystemPrompt, completion);
-            return this.parseMessage(completion, type, generate, this.params.config.ignoreBody);
+            return this.parseMessage(completion, type, generate);
         } catch (error) {
             const errorAsAny = error as any;
             if (errorAsAny.code === 'ENOTFOUND') {

diff --git a/src/services/ai/codestral.service.ts b/src/services/ai/codestral.service.ts
@@ -32,10 +32,10 @@ export class CodestralService extends AIService {
         return fromPromise(this.generateMessage()).pipe(
             concatMap(messages => from(messages)),
             map(data => ({
-                name: `${this.serviceName} ${data.title}`,
+                name: `${this.serviceName} ${this.params.config.ignoreBody} ${data.title}`,
                 short: data.title,
-                value: data.value,
-                description: data.value,
+                value: this.params.config.ignoreBody ? data.title : data.value,
+                description: this.params.config.ignoreBody ? '' : data.value,
                 isError: false,
             })),
             catchError(this.handleError$)
@@ -58,7 +58,7 @@ export class CodestralService extends AIService {
             this.checkAvailableModels();
             const chatResponse = await this.createChatCompletions(generatedSystemPrompt);
             logging && createLogResponse('Codestral', diff, generatedSystemPrompt, chatResponse);
-            return this.parseMessage(chatResponse, type, generate, this.params.config.ignoreBody);
+            return this.parseMessage(chatResponse, type, generate);
         } catch (error) {
             const errorAsAny = error as any;
             if (errorAsAny.code === 'ENOTFOUND') {

diff --git a/src/services/ai/cohere.service.ts b/src/services/ai/cohere.service.ts
@@ -32,8 +32,8 @@ export class CohereService extends AIService {
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
                 short: data.title,
-                value: data.value,
-                description: data.value,
+                value: this.params.config.ignoreBody ? data.title : data.value,
+                description: this.params.config.ignoreBody ? '' : data.value,
                 isError: false,
             })),
             catchError(this.handleError$)
@@ -67,7 +67,7 @@ export class CohereService extends AIService {
             });
 
             logging && createLogResponse('Cohere', diff, generatedSystemPrompt, prediction.text);
-            return this.parseMessage(prediction.text, type, generate, this.params.config.ignoreBody);
+            return this.parseMessage(prediction.text, type, generate);
         } catch (error) {
             const errorAsAny = error as any;
             if (errorAsAny instanceof CohereTimeoutError) {

diff --git a/src/services/ai/gemini.service.ts b/src/services/ai/gemini.service.ts
@@ -29,8 +29,8 @@ export class GeminiService extends AIService {
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
                 short: data.title,
-                value: data.value,
-                description: data.value,
+                value: this.params.config.ignoreBody ? data.title : data.value,
+                description: this.params.config.ignoreBody ? '' : data.value,
                 isError: false,
             })),
             catchError(this.handleError$)
@@ -66,7 +66,7 @@ export class GeminiService extends AIService {
             const completion = response.text();
 
             logging && createLogResponse('Gemini', diff, generatedSystemPrompt, completion);
-            return this.parseMessage(completion, type, generate, this.params.config.ignoreBody);
+            return this.parseMessage(completion, type, generate);
         } catch (error) {
             const errorAsAny = error as any;
             if (errorAsAny.code === 'ENOTFOUND') {

diff --git a/src/services/ai/groq.service.ts b/src/services/ai/groq.service.ts
@@ -31,8 +31,8 @@ export class GroqService extends AIService {
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
                 short: data.title,
-                value: data.value,
-                description: data.value,
+                value: this.params.config.ignoreBody ? data.title : data.value,
+                description: this.params.config.ignoreBody ? '' : data.value,
                 isError: false,
             })),
             catchError(this.handleError$)
@@ -85,7 +85,7 @@ export class GroqService extends AIService {
             const results = chatCompletion.choices
                 .filter(choice => choice.message?.content)
                 .map(choice => sanitizeMessage(choice.message!.content as string));
-            return flattenDeep(results.map(value => this.parseMessage(value, type, generate, this.params.config.ignoreBody)));
+            return flattenDeep(results.map(value => this.parseMessage(value, type, generate)));
         } catch (error) {
             throw error as any;
         }

diff --git a/src/services/ai/hugging-face.service.ts b/src/services/ai/hugging-face.service.ts
@@ -80,10 +80,10 @@ export class HuggingFaceService extends AIService {
         return fromPromise(this.generateMessage()).pipe(
             concatMap(messages => from(messages)),
             map(data => ({
-                name: `${this.serviceName} ${data.title}`,
+                name: `${this.serviceName} ${this.params.config.ignoreBody} ${data.title}`,
                 short: data.title,
-                value: data.value,
-                description: data.value,
+                value: this.params.config.ignoreBody ? data.title : data.value,
+                description: this.params.config.ignoreBody ? '' : data.value,
                 isError: false,
             })),
             catchError(this.handleError$)
@@ -113,7 +113,7 @@ export class HuggingFaceService extends AIService {
             // await this.deleteConversation(conversation.id);
 
             logging && createLogResponse('HuggingFace', diff, generatedSystemPrompt, response);
-            return this.parseMessage(response, type, generate, this.params.config.ignoreBody);
+            return this.parseMessage(response, type, generate);
         } catch (error) {
             const errorAsAny = error as any;
             if (errorAsAny.code === 'ENOTFOUND') {
@@ -130,7 +130,7 @@ export class HuggingFaceService extends AIService {
      */
     private async intialize(): Promise<void> {
         const models = await this.getRemoteLlms();
-        const model = models.find(model => model.name?.toLowerCase() === this.params.config.HUGGINGFACE_MODEL.toLowerCase())!;
+        const model = models.find(model => model.name?.toLowerCase() === this.params.config.model.toLowerCase())!;
         if (model) {
             this.currentModel = model;
             this.currentModelId = model.id;

diff --git a/src/services/ai/mistral.service.ts b/src/services/ai/mistral.service.ts
@@ -64,8 +64,8 @@ export class MistralService extends AIService {
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
                 short: data.title,
-                value: data.value,
-                description: data.value,
+                value: this.params.config.ignoreBody ? data.title : data.value,
+                description: this.params.config.ignoreBody ? '' : data.value,
                 isError: false,
             })),
             catchError(this.handleError$)
@@ -90,7 +90,7 @@ export class MistralService extends AIService {
             await this.checkAvailableModels();
             const chatResponse = await this.createChatCompletions(generatedSystemPrompt, `Here are diff: ${diff}`);
             logging && createLogResponse('MistralAI', diff, generatedSystemPrompt, chatResponse);
-            return this.parseMessage(chatResponse, this.params.config.type, generate, this.params.config.ignoreBody);
+            return this.parseMessage(chatResponse, this.params.config.type, generate);
         } catch (error) {
             const errorAsAny = error as any;
             if (errorAsAny.code === 'ENOTFOUND') {

diff --git a/src/services/ai/ollama.service.ts b/src/services/ai/ollama.service.ts
@@ -39,10 +39,10 @@ export class OllamaService extends AIService {
         return fromPromise(this.generateMessage()).pipe(
             concatMap(messages => from(messages)),
             map(data => ({
-                name: `${this.serviceName} ${data.title}`,
+                name: `${this.serviceName} ${this.params.config.ignoreBody} ${data.title}`,
                 short: data.title,
-                value: data.value,
-                description: data.value,
+                value: this.params.config.ignoreBody ? data.title : data.value,
+                description: this.params.config.ignoreBody ? '' : data.value,
                 isError: false,
             })),
             catchError(this.handleError$)
@@ -85,7 +85,7 @@ export class OllamaService extends AIService {
             await this.checkIsAvailableOllama();
             const chatResponse = await this.createChatCompletions(generatedSystemPrompt, `Here are diff: ${diff}`);
             logging && createLogResponse(`Ollama_${this.model}`, diff, generatedSystemPrompt, chatResponse);
-            return this.parseMessage(chatResponse, type, generate, this.params.config.ignoreBody);
+            return this.parseMessage(chatResponse, type, generate);
         } catch (error) {
             const errorAsAny = error as any;
             if (errorAsAny.code === 'ENOTFOUND') {

diff --git a/src/services/ai/openai.service.ts b/src/services/ai/openai.service.ts
@@ -25,8 +25,8 @@ export class OpenAIService extends AIService {
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
                 short: data.title,
-                value: data.value,
-                description: data.value,
+                value: this.params.config.ignoreBody ? data.title : data.value,
+                description: this.params.config.ignoreBody ? '' : data.value,
                 isError: false,
             })),
             catchError(this.handleError$)
@@ -93,6 +93,6 @@ export class OpenAIService extends AIService {
             proxy
         );
 
-        return flattenDeep(results.map(value => this.parseMessage(value, type, generate, this.params.config.ignoreBody)));
+        return flattenDeep(results.map(value => this.parseMessage(value, type, generate)));
     }
 }
diff --git a/src/utils/config.ts b/src/utils/config.ts
@@ -143,13 +143,14 @@ const generalConfigParsers = {
         return parsed;
     },
     ignoreBody(ignore?: string | boolean) {
-        if (!ignore) {
-            return true;
-        }
         if (typeof ignore === 'boolean') {
             return ignore;
         }
 
+        if (ignore === undefined || ignore === null) {
+            return true;
+        }
+
         parseAssert('ignoreBody', /^(?:true|false)$/.test(ignore), 'Must be a boolean(true or false)');
         return ignore === 'true';
     },