chore: use OpenAI instead of Azure OpenAI

jim60105 · jim60105 · commit 2ab29688b098 · 2025-02-13T04:52:45.000+08:00
Signed-off-by: CHEN, CHUN &lt;jim60105@gmail.com&gt;
diff --git a/.env_sample b/.env_sample
@@ -1,3 +1,3 @@
-AZURE_OPENAI_ENDPOINT=https://your.openai.azure.com
-AZURE_OPENAI_API_KEY=fakekey
-AZURE_OPENAI_DEPLOYMENT=gpt-4o
+OPENAI_ENDPOINT=https://your.openai.azure.com
+OPENAI_API_KEY=fakekey
+OPENAI_DEPLOYMENT=gpt-4o
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -13,15 +13,13 @@
         "toolsai",
         "Waifu"
     ],
-    "prompty.currentModelConfiguration": "default",
+    "prompty.currentModelConfiguration": "${env:OPENAI_DEPLOYMENT}",
     "prompty.modelConfigurations": [
         {
-            "name": "default",
-            "type": "azure_openai",
-            "api_version": "2024-08-01-preview",
-            "azure_endpoint": "${env:AZURE_OPENAI_ENDPOINT}",
-            "azure_deployment": "${env:AZURE_OPENAI_DEPLOYMENT}",
-            "api_key": "${env:AZURE_OPENAI_API_KEY}"
+            "name": "${env:OPENAI_DEPLOYMENT}",
+            "type": "openai",
+            "base_url": "${env:OPENAI_ENDPOINT}",
+            "api_key": "${env:OPENAI_API_KEY}"
         }
     ]
 }
diff --git a/automated-prompt-engineering/0_basic.prompty b/automated-prompt-engineering/0_basic.prompty
@@ -3,8 +3,7 @@ name: Automated Prompt Engineering
 description: 👋 I'm here to help you create effective prompts! 🎯 
 model:
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
 sample:
   USER_INPUT: 你使用什麼樣的技術來最佳化提示詞呢?
 ---
diff --git a/automated-prompt-engineering/scoring-criteria-maker/1_basic.prompty b/automated-prompt-engineering/scoring-criteria-maker/1_basic.prompty
@@ -6,8 +6,7 @@ model:
     response_format:
       type: json_object
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-o1-mini
+    name: gpt-4o
 outputs:
   goal_analysis:
     type: string
diff --git a/automated-prompt-engineering/scoring-criteria-maker/2_is-score-complete.prompty b/automated-prompt-engineering/scoring-criteria-maker/2_is-score-complete.prompty
@@ -3,8 +3,7 @@ name: Scoring Criteria Maker
 description: This bot is part of Automated Prompt Engineering, designed to generate the scoring criteria.
 model:
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
   parameters:
     response_format:
       type: json_object
diff --git a/automated-prompt-engineering/scoring-criteria-maker/3_scoring-rubric.prompty b/automated-prompt-engineering/scoring-criteria-maker/3_scoring-rubric.prompty
@@ -3,8 +3,7 @@ name: Scoring Criteria Maker
 description: This bot is part of Automated Prompt Engineering, designed to generate the scoring criteria.
 model:
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
 outputs:
   scoring_rubric:
     type: string
diff --git a/c-sharp-ai-buddy/0_collate-user-input-for-knowledge.prompty b/c-sharp-ai-buddy/0_collate-user-input-for-knowledge.prompty
@@ -6,8 +6,7 @@ description: |
   🚀 無論你是初學者還是資深開發者，C# AI Buddy 都將成為你開發旅程中不可或缺的得力助手！
 model:
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
 sample:
   input: |
     教我 DI 依頼注入
diff --git a/c-sharp-ai-buddy/0_collate-user-input-for-search.prompty b/c-sharp-ai-buddy/0_collate-user-input-for-search.prompty
@@ -6,8 +6,7 @@ description: |
   🚀 無論你是初學者還是資深開發者，C# AI Buddy 都將成為你開發旅程中不可或缺的得力助手！
 model:
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
 sample:
   input: |
     如何使用 YARP 處理 Angular SPA 重導向?
diff --git a/english-textbook-generation-assistant/0_basic.prompty b/english-textbook-generation-assistant/0_basic.prompty
@@ -34,8 +34,7 @@ model:
               type: boolean
           type: object
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
 inputs:
   USER_INPUT:
     type: string
diff --git a/english-textbook-generation-assistant/1_vocabulary_introducer.prompty b/english-textbook-generation-assistant/1_vocabulary_introducer.prompty
@@ -14,8 +14,7 @@ description: |
   目前不支援修改故事，每一次的交談都會產生新的故事。**請在同一次交談中完整交代所有需求。**
 model:
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
 inputs:
   vocabularies:
     type: array
diff --git a/english-textbook-generation-assistant/3_textbook_translator.prompty b/english-textbook-generation-assistant/3_textbook_translator.prompty
@@ -14,8 +14,7 @@ description: |
   目前不支援修改故事，每一次的交談都會產生新的故事。**請在同一次交談中完整交代所有需求。**
 model:
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
 inputs:
   input:
     type: string
diff --git a/jackellie-help-bot/0_extract-the-key-words-from-user-input-llm.prompty b/jackellie-help-bot/0_extract-the-key-words-from-user-input-llm.prompty
@@ -2,8 +2,7 @@
 name: JackEllie Help bot
 model:
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
 sample:
   input: |
     如何安裝 Stable Diffusion WebUI Forge?
diff --git a/rust-ai-buddy/0_extract-the-keywords-from-user-input.prompty b/rust-ai-buddy/0_extract-the-keywords-from-user-input.prompty
@@ -6,8 +6,7 @@ description: |
   🚀 無論你是初學者還是經驗豐富的開發者，Rust AI Buddy 都將成為你 Coding 之旅中不可或缺的得力助手！
 model:
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
 sample:
   input: |
     用簡單易懂的方式解釋 Rust 語言中的 "if let"
diff --git a/rust-ai-buddy/0_rephrase-for-search-from-user-input.prompty b/rust-ai-buddy/0_rephrase-for-search-from-user-input.prompty
@@ -9,8 +9,7 @@ model:
     response_format:
       type: json_object
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
 outputs:
   queries:
     type: List[string]
diff --git a/trash-novel-generator/0_basic.prompty b/trash-novel-generator/0_basic.prompty
@@ -3,8 +3,7 @@ name: 垃圾小說產生器
 description: 📚 探索無限可能的廁紙 🗑️
 model:
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
   parameters:
     tools:
     - type: function
diff --git a/trash-novel-generator/0_check_contain_code.prompty b/trash-novel-generator/0_check_contain_code.prompty
@@ -3,8 +3,7 @@ name: 垃圾小說產生器
 description: 📚 探索無限可能的廁紙 🗑️
 model:
   configuration:
-    type: azure_openai
-    azure_deployment: gpt-4o-mini
+    name: gpt-4o-mini
   parameters:
     response_format:
       type: json_object

Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,13 @@`
`13`	`13`	`"toolsai",`
`14`	`14`	`"Waifu"`
`15`	`15`	`],`
`16`		`- "prompty.currentModelConfiguration": "default",`
	`16`	`+ "prompty.currentModelConfiguration": "${env:OPENAI_DEPLOYMENT}",`
`17`	`17`	`"prompty.modelConfigurations": [`
`18`	`18`	`{`
`19`		`- "name": "default",`
`20`		`- "type": "azure_openai",`
`21`		`- "api_version": "2024-08-01-preview",`
`22`		`- "azure_endpoint": "${env:AZURE_OPENAI_ENDPOINT}",`
`23`		`- "azure_deployment": "${env:AZURE_OPENAI_DEPLOYMENT}",`
`24`		`- "api_key": "${env:AZURE_OPENAI_API_KEY}"`
	`19`	`+ "name": "${env:OPENAI_DEPLOYMENT}",`
	`20`	`+ "type": "openai",`
	`21`	`+ "base_url": "${env:OPENAI_ENDPOINT}",`
	`22`	`+ "api_key": "${env:OPENAI_API_KEY}"`
`25`	`23`	`}`
`26`	`24`	`]`
`27`	`25`	`}`