Refactor commands

Author: michaelroudnitski

package.json

@@ -57,10 +57,12 @@
       "@oclif/plugin-help",
       "@oclif/plugin-plugins"
     ],
-    "topicSeparator": " ",
     "topics": {
-      "hello": {
-        "description": "Say hello to the world and others"
+      "profiles": {
+        "description": "Manage LLM provider profiles"
+      },
+      "translate": {
+        "description": "Translate content between languages"
       }
     }
   },
@@ -77,4 +79,4 @@
   },
   "types": "dist/index.d.ts",
   "packageManager": "[email protected]"
-}
+}

src/commands/markdown.ts

@@ -0,0 +1,90 @@
+import {BaseChatModel} from '@langchain/core/language_models/chat_models'
+import {Args, Command, Flags, Interfaces} from '@oclif/core'
+
+import {Translator} from '../../core/translators/translator.js'
+import {createProviderFromProfile} from '../../lib/profile/factory.js'
+import {loadProfile} from '../../lib/profile/storage.js'
+
+type TranslateFlags<T extends typeof Command> = Interfaces.InferredFlags<
+  T['flags'] & typeof BaseTranslateCommand.baseFlags
+>
+type TranslateArgs<T extends typeof Command> = Interfaces.InferredArgs<T['args']>
+
+export abstract class BaseTranslateCommand<T extends typeof Command> extends Command {
+  static args = {
+    input: Args.string({
+      description: 'The text you want to translate',
+      required: false,
+    }),
+  }
+  static baseFlags = {
+    from: Flags.string({
+      description: 'Source language',
+      required: true,
+    }),
+    profile: Flags.string({
+      description: 'Profile to use for translation',
+      required: true,
+    }),
+    stream: Flags.boolean({
+      default: false,
+      description: 'Stream the translation output',
+    }),
+    to: Flags.string({
+      description: 'Target language',
+      required: true,
+    }),
+  }
+  protected args!: TranslateArgs<T>
+  protected flags!: TranslateFlags<T>
+
+  abstract createTranslator(llm: BaseChatModel): Translator
+
+  public async init(): Promise<void> {
+    await super.init()
+    const {args, flags} = await this.parse({
+      args: this.ctor.args,
+      baseFlags: (super.ctor as typeof BaseTranslateCommand).baseFlags,
+      flags: this.ctor.flags,
+      strict: this.ctor.strict,
+    })
+    this.flags = flags as TranslateFlags<T>
+    this.args = args as TranslateArgs<T>
+  }
+
+  async run(): Promise<void> {
+    let input: string
+
+    if (this.args.input) {
+      input = this.args.input
+    } else {
+      const chunks: Buffer[] = []
+      for await (const chunk of process.stdin) {
+        chunks.push(chunk)
+      }
+
+      input = Buffer.concat(chunks).toString('utf8')
+    }
+
+    const llm = createProviderFromProfile(loadProfile(this.flags.profile))
+    const translator = this.createTranslator(llm)
+
+    if (this.flags.stream) {
+      for await (const chunk of translator.translateStream({
+        content: input,
+        sourceLanguage: this.flags.from,
+        targetLanguage: this.flags.to,
+      })) {
+        process.stdout.write(chunk)
+      }
+    } else {
+      const result = await translator.translate({
+        content: input,
+        sourceLanguage: this.flags.from,
+        targetLanguage: this.flags.to,
+      })
+
+      process.stdout.write(result)
+    }
+  }
+}

src/commands/translate/base.ts

@@ -0,0 +1,26 @@
+import {BaseChatModel} from '@langchain/core/language_models/chat_models'
+
+import {MARKDOWN_SYSTEM_PROMPT} from '../../core/prompts/markdown.js'
+import {MarkdownSplitter} from '../../core/splitters/markdown.js'
+import {Translator} from '../../core/translators/translator.js'
+import {BaseTranslateCommand} from './base.js'
+
+export default class TranslateMarkdown extends BaseTranslateCommand<typeof TranslateMarkdown> {
+  static args = {
+    ...BaseTranslateCommand.args,
+  }
+  static description = 'Translate markdown'
+  static examples = [
+    '<%= config.bin %> <%= command.id %> --profile default-openai --from EN --to ES "Hello"',
+    '<%= config.bin %> <%= command.id %> --profile default-openai --from EN --to ES --stream "Hello"',
+    'cat doc.md | <%= config.bin %> <%= command.id %> --profile default-openai --from EN --to ES',
+    'echo "# Hello" | <%= config.bin %> <%= command.id %> --profile default-openai --from EN --to ES',
+  ]
+  static flags = {
+    ...BaseTranslateCommand.baseFlags,
+  }
+
+  createTranslator(llm: BaseChatModel): Translator {
+    return new Translator(llm, new MarkdownSplitter(), MARKDOWN_SYSTEM_PROMPT)
+  }
+}

src/commands/translate/markdown.ts

@@ -1,9 +1,9 @@
 import {afterAll, beforeAll, describe, expect, it} from '@jest/globals'
 import {runCommand} from '@oclif/test'
 
-import {setupTestProfile, teardownTestProfile} from '../helpers/profile-setup.js'
+import {setupTestProfile, teardownTestProfile} from '../../helpers/profile-setup.js'
 
-describe('markdown command', () => {
+describe('translate:markdown command', () => {
   beforeAll(() => {
     setupTestProfile()
   })
@@ -15,13 +15,13 @@ describe('markdown command', () => {
   describe('basic usage', () => {
     it('translates markdown', async () => {
       await expect(
-        runCommand(['markdown', '--profile', 'test-profile', '--from', 'EN', '--to', 'ES', 'Hello']),
+        runCommand(['translate:markdown', '--profile', 'test-profile', '--from', 'EN', '--to', 'ES', 'Hello']),
       ).resolves.not.toThrow()
     })
 
     it('streams translated markdown', async () => {
       await expect(
-        runCommand(['markdown', '--profile', 'test-profile', '--from', 'EN', '--to', 'ES', '--stream', 'Hello']),
+        runCommand(['translate:markdown', '--profile', 'test-profile', '--from', 'EN', '--to', 'ES', '--stream', 'Hello']),
       ).resolves.not.toThrow()
     })
   })
@@ -31,7 +31,7 @@ describe('markdown command', () => {
       setupTestProfile('test-profile', ['Hóla'])
 
       const {stdout} = await runCommand([
-        'markdown',
+        'translate:markdown',
         '--profile',
         'test-profile',
         '--from',
@@ -47,7 +47,7 @@ describe('markdown command', () => {
       setupTestProfile('test-profile', ['Hóla'])
 
       const {stdout} = await runCommand([
-        'markdown',
+        'translate:markdown',
         '--profile',
         'test-profile',
         '--from',
@@ -64,7 +64,7 @@ describe('markdown command', () => {
       setupTestProfile('test-profile', ['# Page 1\nbonjour', '# Page 2\nmonde'])
 
       const {stdout} = await runCommand([
-        'markdown',
+        'translate:markdown',
         '--profile',
         'test-profile',
         '--from',