fix: whitespace-only properties cannot be editable (#361)

* more robust fix * fix: environment example and property json to better support custom openai key & model
TEN-framework · Oct 28, 2024 · d8be05b · d8be05b
1 parent 928546c
commit d8be05b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/.env.example b/.env.example
@@ -85,7 +85,9 @@ LITELLM_MODEL=gpt-4o-mini
 
 # Extension: openai_chatgpt
 # OpenAI API key
+OPENAI_API_BASE=https://api.openai.com/v1
 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
@@ -154,15 +154,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"
                     },
@@ -236,10 +236,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}",
@@ -415,10 +415,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}",
@@ -600,10 +600,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}",
@@ -924,10 +924,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}",
@@ -1678,10 +1678,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}",

diff --git a/playground/src/platform/pc/chat/table/index.tsx b/playground/src/platform/pc/chat/table/index.tsx
@@ -141,8 +141,8 @@ const EditableTable: React.FC<EditableTableProps> = ({ initialData, onUpdate, me
                     </Form.Item>
                 ) : (
                     <div onClick={() => edit(record)} style={{ cursor: 'pointer' }}>
-                        {record.value !== null && record.value !== undefined && record.value !== ''
-                            ? record.value
+                        {record.value != null && String(record.value).trim() !== ''
+                            ? String(record.value)
                             : <span style={{ color: 'gray' }}>Click to edit</span>}
                     </div>
                 );