Merge pull request #391 from elsoul/cli-ai

Update - skeet init/ai/check
elsoul · Apr 7, 2024 · 42c389a · 42c389a
2 parents fac6eb7 + 6b9df03
commit 42c389a
Show file tree

Hide file tree

Showing 26 changed files with 626 additions and 699 deletions.
diff --git a/.changeset/four-elephants-count.md b/.changeset/four-elephants-count.md
@@ -0,0 +1,5 @@
+---
+"@skeet-framework/cli": patch
+---
+
+Update - skeet init/ai/check
diff --git a/packages/cli/skeet-cloud.config.json b/packages/cli/skeet-cloud.config.json
@@ -9,7 +9,7 @@
     "nsDomain": "your-nameserver.com",
     "lbDomain": "loadbalancer.your-app-url.com",
     "hasLoadBalancer": false,
-    "cloudStatus": "NOT_CREATED"
+    "cloudStatus": "PROJECT_CREATED"
   },
   "cloudRun": {
     "name": "skeet-nextjs-graphql-graphql",
@@ -138,19 +138,14 @@
       "securityPolicyName": "skeet-sql-armor"
     }
   ],
-  "secretKey": [
-    "TEST_KEY"
-  ],
+  "secretKey": ["TEST_KEY"],
   "ai": {
     "lang": "en",
     "ais": [
       {
         "name": "Gemini",
-        "availableModels": [
-          "gemini-1.0-pro",
-          "gemini-1.0-pro-vision"
-        ]
+        "availableModels": ["gemini-1.0-pro", "gemini-1.0-pro-vision"]
       }
     ]
   }
-}
+}
diff --git a/packages/cli/src/cli/ai/ai.ts b/packages/cli/src/cli/ai/ai.ts
@@ -6,6 +6,8 @@ import { SkeetAIOptions } from '.'
 import { AIType, chat } from '@skeet-framework/ai'
 import { modeSelect } from './modeSelect'
 import { skeetMode } from './mode/skeetMode'
+import { readOrCreateConfig } from '@/config/readOrCreateConfig'
+import { skeetAiPromptV } from './skeetPromptV'
 
 export async function promptUser(
   options: SkeetAIOptions,
@@ -17,6 +19,7 @@ export async function promptUser(
   }
 
   console.log('\n')
+
   const userInput = await inquirer.prompt([
     {
       type: 'input',
@@ -52,7 +55,8 @@ export async function promptUser(
     return
   }
 
-  const skeetPrompt = skeetAiPrompt('en')
+  const config = await readOrCreateConfig()
+  const skeetPrompt = await skeetAiPromptV(config.lang)
   await chat(
     skeetPrompt.context,
     skeetPrompt.examples,

diff --git a/packages/cli/src/cli/ai/index.ts b/packages/cli/src/cli/ai/index.ts
@@ -2,11 +2,10 @@ import { program } from '@/index'
 import { promptUser } from './ai'
 import chalk from 'chalk'
 import { AIType } from '@skeet-framework/ai'
-import { importConfig } from '@/lib/files/importConfig'
 import { AiLog } from './aiLog'
 import { validEnv } from './validEnv'
-import { validateAiConfig } from './validateAiConfig'
 import { modeSelect } from './modeSelect'
+import { readOrCreateConfig } from '@/config/readOrCreateConfig'
 
 export type SkeetAIOptions = {
   ai: AIType
@@ -15,15 +14,14 @@ export type SkeetAIOptions = {
 export const aiCommands = () => {
   program
     .command('ai')
-    .description('AI Playground')
-    .option('-g, --gemini', 'Gemini')
-    .option('-o, --openai', 'OpenAI')
-    .option('-c, --claude', 'Claude')
-    .option('--mode', 'Mode')
+    .description('Call Skeet AI Assistant')
+    .option('-g, --gemini', 'Use Gemini - default')
+    .option('-o, --openai', 'Use OpenAI')
+    .option('-c, --claude', 'Use Claude')
+    .option('--mode', 'Call Mode Select Prompt')
     .action(async (options) => {
-      await validateAiConfig()
-      const { ai } = await importConfig()
-      const lang = ai.lang as 'en' | 'ja'
+      const config = await readOrCreateConfig()
+      const lang = config.lang as 'en' | 'ja'
       const logger = new AiLog(lang)
       let aiType = 'Gemini'
       if (options.claude) {