Merge pull request #178 from dlimeng/dev

fix cm-mysql.yaml
CloudOrc · Sep 17, 2023 · 012963e · 012963e
2 parents 9efc20e + 9c07f33
commit 012963e
Showing 1 changed file with 51 additions and 45 deletions.
diff --git a/deploy/kubernetes/helm-solidui/templates/cm-mysql.yaml b/deploy/kubernetes/helm-solidui/templates/cm-mysql.yaml
@@ -67,50 +67,50 @@ data:
     DROP TABLE IF EXISTS `solidui_datasource_type`;
 
     CREATE TABLE `solidui_datasource_type` (
-                                              `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-                                              `name` varchar(32) NOT NULL DEFAULT '',
-                                              `description` varchar(255) NOT NULL DEFAULT '',
-                                              `option` varchar(32) NOT NULL DEFAULT '',
-                                              `classifier` varchar(32) NOT NULL DEFAULT '',
-                                              `icon` varchar(255) NOT NULL DEFAULT '',
-                                              `layers` int(11) NOT NULL,
-                                              PRIMARY KEY (`id`)
+                                               `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+                                               `name` varchar(32) NOT NULL DEFAULT '',
+                                               `description` varchar(255) NOT NULL DEFAULT '',
+                                               `option` varchar(32) NOT NULL DEFAULT '',
+                                               `classifier` varchar(32) NOT NULL DEFAULT '',
+                                               `icon` varchar(255) NOT NULL DEFAULT '',
+                                               `layers` int(11) NOT NULL,
+                                               PRIMARY KEY (`id`)
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
     DROP TABLE IF EXISTS `solidui_datasource_type_key`;
 
     CREATE TABLE `solidui_datasource_type_key` (
-                                                  `id` int(11) NOT NULL AUTO_INCREMENT,
-                                                  `data_source_type_id` int(11) NOT NULL,
-                                                  `key` varchar(32) COLLATE utf8_bin NOT NULL,
-                                                  `name` varchar(32) COLLATE utf8_bin NOT NULL,
-                                                  `name_en` varchar(32) COLLATE utf8_bin NOT NULL,
-                                                  `default_value` varchar(50) COLLATE utf8_bin DEFAULT NULL,
-                                                  `value_type` varchar(50) COLLATE utf8_bin NOT NULL,
-                                                  `scope` varchar(50) COLLATE utf8_bin DEFAULT NULL,
-                                                  `require` tinyint(1) DEFAULT '0',
-                                                  `description` varchar(200) COLLATE utf8_bin DEFAULT NULL,
-                                                  `description_en` varchar(200) COLLATE utf8_bin DEFAULT NULL,
-                                                  `value_regex` varchar(200) COLLATE utf8_bin DEFAULT NULL,
-                                                  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                                                  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
-                                                  PRIMARY KEY (`id`)
+                                                   `id` int(11) NOT NULL AUTO_INCREMENT,
+                                                   `data_source_type_id` int(11) NOT NULL,
+                                                   `key` varchar(32) COLLATE utf8_bin NOT NULL,
+                                                   `name` varchar(32) COLLATE utf8_bin NOT NULL,
+                                                   `name_en` varchar(32) COLLATE utf8_bin NOT NULL,
+                                                   `default_value` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+                                                   `value_type` varchar(50) COLLATE utf8_bin NOT NULL,
+                                                   `scope` varchar(50) COLLATE utf8_bin DEFAULT NULL,
+                                                   `require` tinyint(1) DEFAULT '0',
+                                                   `description` varchar(200) COLLATE utf8_bin DEFAULT NULL,
+                                                   `description_en` varchar(200) COLLATE utf8_bin DEFAULT NULL,
+                                                   `value_regex` varchar(200) COLLATE utf8_bin DEFAULT NULL,
+                                                   `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                                                   `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+                                                   PRIMARY KEY (`id`)
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 
 
 
     DROP TABLE IF EXISTS `solidui_job_element`;
 
     CREATE TABLE `solidui_job_element` (
-                                          `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-                                          `project_id` int(11) NOT NULL,
-                                          `name` varchar(255) NOT NULL DEFAULT '',
-                                          `data` longtext NOT NULL,
-                                          `data_type` varchar(255) NOT NULL DEFAULT '',
-                                          `create_time` datetime NOT NULL,
-                                          `update_time` datetime NOT NULL,
-                                          PRIMARY KEY (`id`)
+                                           `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+                                           `project_id` int(11) NOT NULL,
+                                           `name` varchar(255) NOT NULL DEFAULT '',
+                                           `data` longtext NOT NULL,
+                                           `data_type` varchar(255) NOT NULL DEFAULT '',
+                                           `create_time` datetime NOT NULL,
+                                           `update_time` datetime NOT NULL,
+                                           PRIMARY KEY (`id`)
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='storage of various elements';
 
 
@@ -147,15 +147,15 @@ data:
     DROP TABLE IF EXISTS `solidui_project`;
 
     CREATE TABLE `solidui_project` (
-                                      `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-                                      `user_name` varchar(100) NOT NULL DEFAULT '',
-                                      `project_name` varchar(255) NOT NULL DEFAULT '',
-                                      `image` varchar(255) DEFAULT NULL,
-                                      `description` varchar(255) DEFAULT NULL,
-                                      `create_time` datetime DEFAULT NULL,
-                                      `update_time` datetime DEFAULT NULL,
-                                      `status` int(11) NOT NULL DEFAULT '0',
-                                      PRIMARY KEY (`id`)
+                                       `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+                                       `user_name` varchar(100) NOT NULL DEFAULT '',
+                                       `project_name` varchar(255) NOT NULL DEFAULT '',
+                                       `image` varchar(255) DEFAULT NULL,
+                                       `description` varchar(255) DEFAULT NULL,
+                                       `create_time` datetime DEFAULT NULL,
+                                       `update_time` datetime DEFAULT NULL,
+                                       `status` int(11) NOT NULL DEFAULT '0',
+                                       PRIMARY KEY (`id`)
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
@@ -177,8 +177,9 @@ data:
     CREATE TABLE `solidui_model_type` (
                                           `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
                                           `name` varchar(255) DEFAULT NULL,
+                                          `code` varchar(255) DEFAULT NULL,
                                           `type_name` varchar(255) DEFAULT NULL,
-                                          `prompt` varchar(255) DEFAULT NULL,
+                                          `prompt` text DEFAULT NULL,
                                           `token` varchar(255) DEFAULT NULL,
                                           `baseurl` varchar(255) DEFAULT NULL,
                                           PRIMARY KEY (`id`)
@@ -205,8 +206,13 @@ data:
     VALUES
     (1,'mysql','mysql','mysql','mysql','mysql',3);
 
-    INSERT INTO `solidui_model_type` (`id`, `name`, `type_name`, `prompt`, `token`, `baseurl`)
+    INSERT INTO `solidui_model_type` (`id`, `name`, `code`, `type_name`, `prompt`, `token`, `baseurl`)
     VALUES
-    (1,'gpt-3.5-turbo','gpt',NULL,NULL,NULL),
-    (2,'gpt-4','gpt',NULL,NULL,NULL),
-    (3,'chatglm_lite','chatglm',NULL,NULL,NULL);
+    (1,'gpt-3.5-turbo', 'python', 'gpt','First, here is a history of what I asked you to do earlier. The actual prompt follows after ENDOFHISTORY. History:\n\n{}ENDOFHISTORY.\n\nWrite Python code that does the following: \n\n{}\n\nNote, the code is going to be executed in a Jupyter Python kernel.\n\nLast instruction, and this is the most important, just return code. No other outputs, as your full response will directly be executed in the kernel. \n\nTeacher mode: if you want to give a download link, just print it as <a href=''/solidui/models/download?file=INSERT_FILENAME_HERE''>Download file</a>. Replace INSERT_FILENAME_HERE with the actual filename. So just print that HTML to stdout. No actual downloading of files!',NULL,NULL),
+    (2,'gpt-4','python', 'gpt','First, here is a history of what I asked you to do earlier. The actual prompt follows after ENDOFHISTORY. History:\n\n{}ENDOFHISTORY.\n\nWrite Python code that does the following: \n\n{}\n\nNote, the code is going to be executed in a Jupyter Python kernel.\n\nLast instruction, and this is the most important, just return code. No other outputs, as your full response will directly be executed in the kernel. \n\nTeacher mode: if you want to give a download link, just print it as <a href=''/solidui/models/download?file=INSERT_FILENAME_HERE''>Download file</a>. Replace INSERT_FILENAME_HERE with the actual filename. So just print that HTML to stdout. No actual downloading of files!',NULL,NULL),
+    (3,'chatglm_lite','python', 'chatglm','首先，这是我之前要求您做的事情的历史记录。实际的提示将在历史结束后呈现。历史:\n\n{}历史结束。\n\n编写以下Python代码：\n\n{}\n\n注意，代码将在Jupyter Python内核中执行。\n\n最后一条指令，这是最重要的，只返回代码。不要输出其他内容，因为您的完整响应将直接在内核中执行。\n\n教师模式：如果您想提供一个下载链接，只需将其打印为 <a href=''/solidui/models/download?file=INSERT_FILENAME_HERE''>下载文件</a >。用实际的文件名替换INSERT_FILENAME_HERE。所以只需将该HTML打印到标准输出。无需实际下载文件！',NULL,NULL),
+    (4,'gpt-3.5-turbo','html', 'gpt', 'First, here is a history of what I asked you to do earlier. The actual prompt follows after ENDOFHISTORY. History:\n\n{}ENDOFHISTORY.\n\nYour task is to generate an HTML code snippet using the specified JavaScript library (such as D3, echartjs, three.js, etc.) based on the following requirements:\n\n{}\n\nPlease note that:\n1. The HTML code will be executed in a Chrome web browser.\n2. Only return the HTML content without any additional explanatory or descriptive text.\n3. If there''s a need to provide a download link within the HTML content, format it as follows: <a href=''/solidui/models/download?file=INSERT_FILENAME_HERE''>Download file</a>, replacing INSERT_FILENAME_HERE with the actual filename.\n4. Ensure to include the necessary `<script>` tags for incorporating the JavaScript library you are using.
+    \n\nEnsure that the response contains only HTML content to be directly executed in the kernel, with no other outputs.',NULL,NULL),
+    (5,'chatglm_lite','html', 'chatglm','首先，这是我之前要求你做的事情的历史记录。实际的提示在“ENDOFHISTORY”之后。历史记录：\n\n{}ENDOFHISTORY。\n\n你的任务是根据以下要求使用指定的JavaScript库（如D3、echartjs、three.js等）生成一个HTML代码片段：\n\n{}\n\n请注意：\n\n1.HTML代码将在Chrome浏览器中执行。\n 2.只返回HTML内容，不包括任何额外的解释或描述文本。\n3.如果需要在HTML内容中提供下载链接，请按照以下格式编写：<a href=''/solidui/models/download?file=INSERT_FILENAME_HERE''>下载文件</a>，并将INSERT_FILENAME_HERE替换为实际的文件名。\n4.确保包含必要的<script>标签来引入你正在使用的JavaScript库。\n\n确保响应仅包含直接在内核中执行的HTML内容，不包含其他输出。',NULL,NULL),
+    (6,'gpt-4','html', 'gpt','First, here is a history of what I asked you to do earlier. The actual prompt follows after ENDOFHISTORY. History:\n\n{}ENDOFHISTORY.\n\nYour task is to generate an HTML code snippet using the specified JavaScript library (such as D3, echartjs, three.js, etc.) based on the following requirements:\n\n{}\n\nPlease note that:\n1. The HTML code will be executed in a Chrome web browser.\n2. Only return the HTML content without any additional explanatory or descriptive text.\n3. If there''s a need to provide a download link within the HTML content, format it as follows: <a href=''/solidui/models/download?file=INSERT_FILENAME_HERE''>Download file</a>, replacing INSERT_FILENAME_HERE with the actual filename.\n4. Ensure to include the necessary `<script>` tags for incorporating the JavaScript library you are using.
+    \n\nEnsure that the response contains only HTML content to be directly executed in the kernel, with no other outputs.',NULL,NULL);