fix: environment example and property json to better support custom o…

…penai key & model
TEN-framework · Oct 27, 2024 · baec9b4 · baec9b4
1 parent fbf254d
commit baec9b4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/.env.example b/.env.example
@@ -86,6 +86,7 @@ LITELLM_MODEL=gpt-4o-mini
 # Extension: openai_chatgpt
 # OpenAI API key
 OPENAI_API_KEY=
+OPENAI_MODEL=gpt-4o-mini
 
 # OpenAI API key for realtime API
 OPENAI_REALTIME_API_KEY=

diff --git a/agents/property.json b/agents/property.json
@@ -173,15 +173,15 @@
                         "extension_group": "chatgpt",
                         "name": "openai_chatgpt",
                         "property": {
-                            "api_key": "$OPENAI_API_KEY",
-                            "base_url": "",
+                            "api_key": "${env:OPENAI_API_KEY}",
+                            "base_url": "${env:OPENAI_API_BASE}",
                             "frequency_penalty": 0.9,
                             "greeting": "TEN Agent connected. How can I help you today?",
                             "max_memory_length": 10,
                             "max_tokens": 512,
-                            "model": "gpt-4o-mini",
+                            "model": "${env:OPENAI_MODEL}",
                             "prompt": "",
-                            "proxy_url": "$OPENAI_PROXY_URL"
+                            "proxy_url": "${env:OPENAI_PROXY_URL}"
                         },
                         "type": "extension"
                     },
@@ -258,10 +258,10 @@
                         "addon": "openai_chatgpt",
                         "name": "openai_chatgpt",
                         "property": {
-                            "base_url": "",
+                            "base_url": "${env:OPENAI_API_BASE}",
                             "api_key": "${env:OPENAI_API_KEY}",
                             "frequency_penalty": 0.9,
-                            "model": "gpt-4o-mini",
+                            "model": "${env:OPENAI_MODEL}",
                             "max_tokens": 512,
                             "prompt": "",
                             "proxy_url": "${env:OPENAI_PROXY_URL}",
@@ -457,10 +457,10 @@
                         "addon": "openai_chatgpt",
                         "name": "openai_chatgpt",
                         "property": {
-                            "base_url": "",
+                            "base_url": "${env:OPENAI_API_BASE}",
                             "api_key": "${env:OPENAI_API_KEY}",
                             "frequency_penalty": 0.9,
-                            "model": "gpt-4o-mini",
+                            "model": "${env:OPENAI_MODEL}",
                             "max_tokens": 512,
                             "prompt": "",
                             "proxy_url": "${env:OPENAI_PROXY_URL}",
@@ -662,10 +662,10 @@
                         "addon": "openai_chatgpt",
                         "name": "openai_chatgpt",
                         "property": {
-                            "base_url": "",
+                            "base_url": "${env:OPENAI_API_BASE}",
                             "api_key": "${env:OPENAI_API_KEY}",
                             "frequency_penalty": 0.9,
-                            "model": "gpt-4o-mini",
+                            "model": "${env:OPENAI_MODEL}",
                             "max_tokens": 512,
                             "prompt": "",
                             "proxy_url": "${env:OPENAI_PROXY_URL}",
@@ -1021,10 +1021,10 @@
                         "addon": "openai_chatgpt_python",
                         "name": "openai_chatgpt",
                         "property": {
-                            "base_url": "",
+                            "base_url": "${env:OPENAI_API_BASE}",
                             "api_key": "${env:OPENAI_API_KEY}",
                             "frequency_penalty": 0.9,
-                            "model": "gpt-4o-mini",
+                            "model": "${env:OPENAI_MODEL}",
                             "max_tokens": 512,
                             "prompt": "",
                             "proxy_url": "${env:OPENAI_PROXY_URL}",
@@ -1850,10 +1850,10 @@
                         "addon": "openai_chatgpt_python",
                         "name": "openai_chatgpt",
                         "property": {
-                            "base_url": "",
+                            "base_url": "${env:OPENAI_API_BASE}",
                             "api_key": "${env:OPENAI_API_KEY}",
                             "frequency_penalty": 0.9,
-                            "model": "gpt-4o",
+                            "model": "${env:OPENAI_MODEL}",
                             "max_tokens": 512,
                             "prompt": "",
                             "proxy_url": "${env:OPENAI_PROXY_URL}",