feat: use pickKey for UX

tak-bro · Jul 24, 2024 · 2440b32 · 2440b32
1 parent 95a3bc7
commit 2440b32
Show file tree

Hide file tree

Showing 20 changed files with 56 additions and 170 deletions.
diff --git a/README.md b/README.md
@@ -163,15 +163,6 @@ aipick -m "Why is the sky blue?"
 aipick --message <s> # or -m <s>
 ```
 
-##### `--generate` or `-g`
-- Number of responses to generate (Warning: generating multiple costs more) (default: **1**)
-
-```sh
-aipick --generate <i> # or -g <i>
-```
-
-> Warning: this uses more tokens, meaning it costs more.
-
 ##### `--systemPrompt` or `-s`
 - System prompt to let users fine-tune prompt
 
@@ -242,7 +233,6 @@ aipick config set OPENAI.key=<your-api-key> GEMINI.temperature=3
 | `OLLAMA_HOST`        | `http://localhost:11434`               | The Ollama Host                                                                                                                    |
 | `OLLAMA_TIMEOUT`     | `100_000` ms                           | Request timeout for the Ollama                                                                                                     |
 | `locale`             | `en`                                   | Locale for the generated commit messages                                                                                           |
-| `generate`           | `1`                                    | Number of commit messages to generate                                                                                              |
 | `type`               | `conventional`                         | Type of commit message to generate                                                                                                 |
 | `proxy`              | N/A                                    | Set a HTTP/HTTPS proxy to use for requests(only **OpenAI**)                                                                        |
 | `timeout`            | `10_000` ms                            | Network request timeout                                                                                                            |

diff --git a/package.json b/package.json
@@ -72,7 +72,7 @@
         "formdata-node": "^6.0.3",
         "groq-sdk": "^0.4.0",
         "inquirer": "9.2.8",
-        "inquirer-reactive-list-prompt": "^1.0.8",
+        "inquirer-reactive-list-prompt": "^1.0.9",
         "ollama": "^0.5.6",
         "ora": "^8.0.1",
         "readline": "^1.3.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/cli.ts b/src/cli.ts
@@ -12,11 +12,6 @@ cli(
         name: 'aipick',
         version,
         flags: {
-            generate: {
-                type: Number,
-                description: 'Number of responses to generate (Warning: generating multiple costs more) (default: 1)',
-                alias: 'g',
-            },
             message: {
                 type: String,
                 description: 'Message to ask to AI',
@@ -38,7 +33,7 @@ cli(
         ignoreArgv: type => type === 'unknown-flag' || type === 'argument',
     },
     argv => {
-        aipick(argv.flags.generate, argv.flags.message, argv.flags.systemPrompt, rawArgv);
+        aipick(argv.flags.message, argv.flags.systemPrompt, rawArgv);
     },
     rawArgv
 );
diff --git a/src/commands/aipick.ts b/src/commands/aipick.ts
@@ -11,7 +11,7 @@ import { KnownError, handleCliError } from '../utils/error.js';
 
 const consoleManager = new ConsoleManager();
 
-export default async (generate: number | undefined, message: string | undefined, systemPrompt: string | undefined, rawArgv: string[]) =>
+export default async (message: string | undefined, systemPrompt: string | undefined, rawArgv: string[]) =>
     (async () => {
         consoleManager.printTitle();
 
@@ -21,7 +21,6 @@ export default async (generate: number | undefined, message: string | undefined,
 
         const config = await getConfig(
             {
-                generate: generate as number,
                 systemPrompt: systemPrompt?.toString() as string,
             },
             rawArgv

diff --git a/src/managers/reactive-prompt.manager.ts b/src/managers/reactive-prompt.manager.ts
@@ -30,9 +30,11 @@ export class ReactivePromptManager {
             emptyMessage: `⚠ ${emptyResponses}`,
             loop: false,
             showDescription,
-            descPageSize: 10,
+            descPageSize: 15,
             choices$: this.choices$,
             loader$: this.loader$,
+            // @ts-ignore ignore
+            pickKey: 'short',
         });
     }
 

diff --git a/src/services/ai/ai.service.ts b/src/services/ai/ai.service.ts
@@ -2,17 +2,13 @@ import { ReactiveListChoice } from 'inquirer-reactive-list-prompt';
 import { Observable, of } from 'rxjs';
 
 import { ModelConfig, ModelName } from '../../utils/config.js';
+import { getFirstWordsFrom } from '../../utils/utils.js';
 
 export interface AIResponse {
     title: string;
     value: string;
 }
 
-export interface RawAIResponse {
-    summary: string;
-    description?: string;
-}
-
 export interface AIServiceParams {
     config: ModelConfig<ModelName>;
     userMessage: string;
@@ -56,57 +52,13 @@ export abstract class AIService {
         });
     };
 
-    protected sanitizeResponse(generatedText: string, maxCount: number, ignoreBody: boolean): AIResponse[] {
+    protected sanitizeResponse(generatedText: string, ignoreBody: boolean): AIResponse[] {
         try {
-            const rawResponses: RawAIResponse[] = JSON.parse(generatedText);
-            const filtedResponses = rawResponses.map((data: RawAIResponse) => {
-                if (ignoreBody) {
-                    return {
-                        title: `${data.summary}`,
-                        value: `${data.summary}`,
-                    };
-                }
-                return {
-                    title: `${data.summary}`,
-                    value: `${data.summary}${data.description ? `\n\n${data.description}` : ''}`,
-                };
-            });
-
-            if (filtedResponses.length > maxCount) {
-                return filtedResponses.slice(0, maxCount);
-            }
-            return filtedResponses;
+            const title = `${getFirstWordsFrom(generatedText)}...`;
+            const value = generatedText;
+            return [{ title, value }];
         } catch (error) {
-            const jsonPattern = /\[[\s\S]*?\]/;
-            try {
-                const jsonMatch = generatedText.match(jsonPattern);
-                if (!jsonMatch) {
-                    // No valid JSON array found in the response
-                    return [];
-                }
-                const jsonStr = jsonMatch[0];
-                const rawResponses: RawAIResponse[] = JSON.parse(jsonStr);
-                const filtedResponses = rawResponses.map((data: RawAIResponse) => {
-                    if (ignoreBody) {
-                        return {
-                            title: `${data.summary}`,
-                            value: `${data.summary}`,
-                        };
-                    }
-                    return {
-                        title: `${data.summary}`,
-                        value: `${data.summary}${data.description ? `\n\n${data.description}` : ''}`,
-                    };
-                });
-
-                if (filtedResponses.length > maxCount) {
-                    return filtedResponses.slice(0, maxCount);
-                }
-                return filtedResponses;
-            } catch (e) {
-                // Error parsing JSON
-                return [];
-            }
+            return [];
         }
     }
 }
diff --git a/src/services/ai/anthropic.service.ts b/src/services/ai/anthropic.service.ts
@@ -36,6 +36,7 @@ export class AnthropicService extends AIService {
             concatMap(messages => from(messages)),
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
+                short: data.title,
                 value: data.value,
                 description: data.value,
                 isError: false,
@@ -47,11 +48,10 @@ export class AnthropicService extends AIService {
     private async generateResponses(): Promise<AIResponse[]> {
         try {
             const userMessage = this.params.userMessage;
-            const { generate, systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
+            const { systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
 
             const promptOptions: PromptOptions = {
                 ...DEFAULT_PROMPT_OPTIONS,
-                generate,
                 userMessage,
                 systemPrompt,
                 systemPromptPath,
@@ -73,7 +73,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', userMessage, generatedSystemPrompt, completion);
-            return this.sanitizeResponse(completion, generate, this.params.config.ignoreBody);
+            return this.sanitizeResponse(completion, this.params.config.ignoreBody);
         } 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
@@ -33,6 +33,7 @@ export class CodestralService extends AIService {
             concatMap(messages => from(messages)),
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
+                short: data.title,
                 value: data.value,
                 description: data.value,
                 isError: false,
@@ -43,10 +44,9 @@ export class CodestralService extends AIService {
     private async generateResponses(): Promise<AIResponse[]> {
         try {
             const userMessage = this.params.userMessage;
-            const { generate, systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
+            const { systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
             const promptOptions: PromptOptions = {
                 ...DEFAULT_PROMPT_OPTIONS,
-                generate,
                 userMessage,
                 systemPrompt,
                 systemPromptPath,
@@ -55,7 +55,7 @@ export class CodestralService extends AIService {
             this.checkAvailableModels();
             const chatResponse = await this.createChatCompletions(generatedSystemPrompt, userMessage);
             logging && createLogResponse('Codestral', userMessage, generatedSystemPrompt, chatResponse);
-            return this.sanitizeResponse(chatResponse, generate, this.params.config.ignoreBody);
+            return this.sanitizeResponse(chatResponse, this.params.config.ignoreBody);
         } 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
@@ -30,6 +30,7 @@ export class CohereService extends AIService {
             concatMap(messages => from(messages)),
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
+                short: data.title,
                 value: data.value,
                 description: data.value,
                 isError: false,
@@ -41,10 +42,9 @@ export class CohereService extends AIService {
     private async generateResponses(): Promise<AIResponse[]> {
         try {
             const userMessage = this.params.userMessage;
-            const { generate, systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
+            const { systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
             const promptOptions: PromptOptions = {
                 ...DEFAULT_PROMPT_OPTIONS,
-                generate,
                 userMessage,
                 systemPrompt,
                 systemPromptPath,
@@ -62,7 +62,7 @@ export class CohereService extends AIService {
             });
 
             logging && createLogResponse('Cohere', userMessage, generatedSystemPrompt, prediction.text);
-            return this.sanitizeResponse(prediction.text, generate, this.params.config.ignoreBody);
+            return this.sanitizeResponse(prediction.text, this.params.config.ignoreBody);
         } 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
@@ -28,6 +28,7 @@ export class GeminiService extends AIService {
             concatMap(messages => from(messages)),
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
+                short: data.title,
                 value: data.value,
                 description: data.value,
                 isError: false,
@@ -39,11 +40,10 @@ export class GeminiService extends AIService {
     private async generateResponses(): Promise<AIResponse[]> {
         try {
             const userMessage = this.params.userMessage;
-            const { generate, systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
+            const { systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
             const maxTokens = this.params.config['max-tokens'];
             const promptOptions: PromptOptions = {
                 ...DEFAULT_PROMPT_OPTIONS,
-                generate,
                 userMessage,
                 systemPrompt,
                 systemPromptPath,
@@ -63,7 +63,7 @@ export class GeminiService extends AIService {
             const completion = response.text();
 
             logging && createLogResponse('Gemini', userMessage, generatedSystemPrompt, completion);
-            return this.sanitizeResponse(completion, generate, this.params.config.ignoreBody);
+            return this.sanitizeResponse(completion, this.params.config.ignoreBody);
         } 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
@@ -28,6 +28,7 @@ export class GroqService extends AIService {
             concatMap(messages => from(messages)),
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
+                short: data.title,
                 value: data.value,
                 description: data.value,
                 isError: false,
@@ -39,11 +40,10 @@ export class GroqService extends AIService {
     private async generateResponses(): Promise<AIResponse[]> {
         try {
             const userMessage = this.params.userMessage;
-            const { generate, systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
+            const { systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
             const maxTokens = this.params.config['max-tokens'];
             const promptOptions: PromptOptions = {
                 ...DEFAULT_PROMPT_OPTIONS,
-                generate,
                 userMessage,
                 systemPrompt,
                 systemPromptPath,
@@ -73,7 +73,7 @@ export class GroqService extends AIService {
 
             const result = chatCompletion.choices[0].message.content || '';
             logging && createLogResponse('Groq', userMessage, generatedSystemPrompt, result);
-            return this.sanitizeResponse(result, generate, this.params.config.ignoreBody);
+            return this.sanitizeResponse(result, this.params.config.ignoreBody);
         } catch (error) {
             throw error as any;
         }

diff --git a/src/services/ai/hugging-face.service.ts b/src/services/ai/hugging-face.service.ts
@@ -81,6 +81,7 @@ export class HuggingFaceService extends AIService {
             concatMap(messages => from(messages)),
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
+                short: data.title,
                 value: data.value,
                 description: data.value,
                 isError: false,
@@ -94,10 +95,9 @@ export class HuggingFaceService extends AIService {
             await this.intialize();
 
             const userMessage = this.params.userMessage;
-            const { generate, systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
+            const { systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
             const promptOptions: PromptOptions = {
                 ...DEFAULT_PROMPT_OPTIONS,
-                generate,
                 userMessage,
                 systemPrompt,
                 systemPromptPath,
@@ -110,7 +110,7 @@ export class HuggingFaceService extends AIService {
             // await this.deleteConversation(conversation.id);
 
             logging && createLogResponse('HuggingFace', userMessage, generatedSystemPrompt, response);
-            return this.sanitizeResponse(response, generate, this.params.config.ignoreBody);
+            return this.sanitizeResponse(response, this.params.config.ignoreBody);
         } catch (error) {
             const errorAsAny = error as any;
             if (errorAsAny.code === 'ENOTFOUND') {

diff --git a/src/services/ai/mistral.service.ts b/src/services/ai/mistral.service.ts
@@ -63,6 +63,7 @@ export class MistralService extends AIService {
             concatMap(messages => from(messages)),
             map(data => ({
                 name: `${this.serviceName} ${data.title}`,
+                short: data.title,
                 value: data.value,
                 description: data.value,
                 isError: false,
@@ -74,10 +75,9 @@ export class MistralService extends AIService {
     private async generateMessages(): Promise<AIResponse[]> {
         try {
             const userMessage = this.params.userMessage;
-            const { generate, systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
+            const { systemPrompt, systemPromptPath, logging, temperature } = this.params.config;
             const promptOptions: PromptOptions = {
                 ...DEFAULT_PROMPT_OPTIONS,
-                generate,
                 userMessage,
                 systemPrompt,
                 systemPromptPath,
@@ -87,7 +87,7 @@ export class MistralService extends AIService {
             await this.checkAvailableModels();
             const chatResponse = await this.createChatCompletions(generatedSystemPrompt, userMessage);
             logging && createLogResponse('MistralAI', userMessage, generatedSystemPrompt, chatResponse);
-            return this.sanitizeResponse(chatResponse, generate, this.params.config.ignoreBody);
+            return this.sanitizeResponse(chatResponse, this.params.config.ignoreBody);
         } catch (error) {
             const errorAsAny = error as any;
             if (errorAsAny.code === 'ENOTFOUND') {