meta prompt function is ready

CHANGELOG.md

@@ -2,6 +2,10 @@
 ## v4.1.7
 * Bug修复：手机邮箱相关的注册问题 [#IB0HS5](https://gitee.com/blackfox/geekai/issues/IB0HS5)
 * Bug修复：音乐视频无法下载，思维导图下载后看不清文字[#IB0N2E](https://gitee.com/blackfox/geekai/issues/IB0N2E)
+* 功能优化：保存所有AIGC任务的原始信息，程序启动之后自动将未执行的任务加入到 redis 队列
+* 功能优化：失败的任务自动退回算力，而不需要在删除的时候再退回
+* 功能新增：支持设置一个专门的模型来翻译提示词，提供元提示词生成功能
+
 ## v4.1.6
 * 功能新增：**支持OpenAI实时语音对话功能** :rocket: :rocket: :rocket:, Beta 版，目前没有做算力计费控制，目前只有 VIP 用户可以使用。
 * 功能优化：优化MysQL容器配置文档，解决MysQL容器资源占用过高问题

api/core/types/chat.go

@@ -17,6 +17,7 @@ type ApiRequest struct {
 	Messages            []interface{} `json:"messages,omitempty"`
 	Tools               []Tool        `json:"tools,omitempty"`
 	Functions           []interface{} `json:"functions,omitempty"`       // 兼容中转平台
+	ResponseFormat      interface{}   `json:"response_format,omitempty"` // 响应格式
 
 	ToolChoice string `json:"tool_choice,omitempty"`
 

api/handler/prompt_handler.go

@@ -94,3 +94,30 @@ func (h *PromptHandler) Video(c *gin.Context) {
 
 	resp.SUCCESS(c, strings.Trim(content, `"`))
 }
+
+// MetaPrompt 生成元提示词
+func (h *PromptHandler) MetaPrompt(c *gin.Context) {
+	var data struct {
+		Prompt string `json:"prompt"`
+	}
+	if err := c.ShouldBindJSON(&data); err != nil {
+		resp.ERROR(c, types.InvalidArgs)
+		return
+	}
+	messages := make([]interface{}, 0)
+	messages = append(messages, types.Message{
+		Role:    "system",
+		Content: service.MetaPromptTemplate,
+	})
+	messages = append(messages, types.Message{
+		Role:    "user",
+		Content: "Task, Goal, or the Role to actor is:\n" + data.Prompt,
+	})
+	content, err := utils.SendOpenAIMessage(h.DB, messages, 0)
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	resp.SUCCESS(c, strings.Trim(content, `"`))
+}

api/main.go

@@ -523,6 +523,7 @@ func main() {
 			group.POST("/lyric", h.Lyric)
 			group.POST("/image", h.Image)
 			group.POST("/video", h.Video)
+			group.POST("/meta", h.MetaPrompt)
 		}),
 		fx.Invoke(func(s *core.AppServer, db *gorm.DB) {
 			go func() {

api/service/types.go

@@ -116,3 +116,51 @@ On a bright spring afternoon, an orange-striped kitten lies lazily on a balcony,
 
 The theme of the creation is:【%s】 
 `
+
+const MetaPromptTemplate = `
+Given a task description or existing prompt, produce a detailed system prompt to guide a language model in completing the task effectively.
+
+Please remember, the final output must be the same language with user’s input.
+
+# Guidelines
+
+- Understand the Task: Grasp the main objective, goals, requirements, constraints, and expected output.
+- Minimal Changes: If an existing prompt is provided, improve it only if it's simple. For complex prompts, enhance clarity and add missing elements without altering the original structure.
+- Reasoning Before Conclusions**: Encourage reasoning steps before any conclusions are reached. ATTENTION! If the user provides examples where the reasoning happens afterward, REVERSE the order! NEVER START EXAMPLES WITH CONCLUSIONS!
+    - Reasoning Order: Call out reasoning portions of the prompt and conclusion parts (specific fields by name). For each, determine the ORDER in which this is done, and whether it needs to be reversed.
+    - Conclusion, classifications, or results should ALWAYS appear last.
+- Examples: Include high-quality examples if helpful, using placeholders [in brackets] for complex elements.
+   - What kinds of examples may need to be included, how many, and whether they are complex enough to benefit from placeholders.
+- Clarity and Conciseness: Use clear, specific language. Avoid unnecessary instructions or bland statements.
+- Formatting: Use markdown features for readability. DO NOT USE  CODE BLOCKS UNLESS SPECIFICALLY REQUESTED.
+- Preserve User Content: If the input task or prompt includes extensive guidelines or examples, preserve them entirely, or as closely as possible. If they are vague, consider breaking down into sub-steps. Keep any details, guidelines, examples, variables, or placeholders provided by the user.
+- Constants: DO include constants in the prompt, as they are not susceptible to prompt injection. Such as guides, rubrics, and examples.
+- Output Format: Explicitly the most appropriate output format, in detail. This should include length and syntax (e.g. short sentence, paragraph, JSON, etc.)
+- For tasks outputting well-defined or structured data (classification, JSON, etc.) bias toward outputting a JSON.
+- JSON should never be wrapped in code blocks unless explicitly requested.
+
+The final prompt you output should adhere to the following structure below. Do not include any additional commentary, only output the completed system prompt. SPECIFICALLY, do not include any additional messages at the start or end of the prompt. (e.g. no "---")
+
+[Concise instruction describing the task - this should be the first line in the prompt, no section header]
+
+[Additional details as needed.]
+
+[Optional sections with headings or bullet points for detailed steps.]
+
+# Steps [optional]
+
+[optional: a detailed breakdown of the steps necessary to accomplish the task]
+
+# Output Format
+
+[Specifically call out how the output should be formatted, be it response length, structure e.g. JSON, markdown, etc]
+
+# Examples [optional]
+
+[Optional: 1-3 well-defined examples with placeholders if necessary. Clearly mark where examples start and end, and what the input and output are. User placeholders as necessary.]
+[If the examples are shorter than what a realistic example is expected to be, make a reference with () explaining how real examples should be longer / shorter / different. AND USE PLACEHOLDERS! ]
+
+# Notes [optional]
+
+[optional: edge cases, details, and an area to call or repeat out specific important considerations]
+`

api/utils/openai.go

@@ -57,8 +57,8 @@ func OpenAIRequest(db *gorm.DB, prompt string, modelId int) (string, error) {
 func SendOpenAIMessage(db *gorm.DB, messages []interface{}, modelId int) (string, error) {
 	var chatModel model.ChatModel
 	db.Where("id", modelId).First(&chatModel)
-	if chatModel.Name == "" {
+	if chatModel.Value == "" {
-		chatModel.Name = "gpt-4o-mini" // 默认使用 gpt-4o-mini
+		chatModel.Value = "gpt-4o" // 默认使用 gpt-4o
 	}
 	var apiKey model.ApiKey
 	session := db.Session(&gorm.Session{}).Where("type", "chat").Where("enabled", true)
@@ -80,7 +80,7 @@ func SendOpenAIMessage(db *gorm.DB, messages []interface{}, modelId int) (string
 	r, err := client.R().SetHeader("Body-Type", "application/json").
 		SetHeader("Authorization", "Bearer "+apiKey.Value).
 		SetBody(types.ApiRequest{
-			Model:       chatModel.Name,
+			Model:       chatModel.Value,
 			Temperature: 0.9,
 			MaxTokens:   1024,
 			Stream:      false,

web/src/views/Dalle.vue

@@ -60,6 +60,8 @@
                     type="textarea"
                     ref="promptRef"
                     placeholder="请在此输入绘画提示词，您也可以点击下面的提示词助手生成绘画提示词"
+                    v-loading="isGenerating"
+                    style="--el-mask-color:rgba(100, 100, 100, 0.8)"
                 />
               </div>
 

web/src/views/ImageMj.vue

@@ -185,6 +185,8 @@
                     <div class="param-line pt" style="position: relative">
                       <el-input v-model="params.prompt" :autosize="{ minRows: 4, maxRows: 6 }" type="textarea"
                                 ref="promptRef"
+                                v-loading="isGenerating"
+                                style="--el-mask-color:rgba(100, 100, 100, 0.8)"
                                 placeholder="请在此输入绘画提示词，您也可以点击下面的提示词助手生成绘画提示词"/>
                     </div>
 
@@ -271,6 +273,8 @@
                     <div class="param-line pt">
                       <el-input v-model="params.prompt" :autosize="{ minRows: 4, maxRows: 6 }" type="textarea"
                                 ref="promptRef"
+                                v-loading="isGenerating"
+                                style="--el-mask-color:rgba(100, 100, 100, 0.8)"
                                 placeholder="请在此输入绘画提示词，系统会自动翻译中文提示词，高手请直接输入英文提示词"/>
                     </div>
 

web/src/views/ImageSd.vue

@@ -251,6 +251,8 @@
                     type="textarea"
                     ref="promptRef"
                     placeholder="请在此输入绘画提示词，您也可以点击下面的提示词助手生成绘画提示词"
+                    v-loading="isGenerating"
+                    style="--el-mask-color:rgba(100, 100, 100, 0.8)"
                 />
               </div>
 

web/src/views/admin/Apps.vue

@@ -37,7 +37,7 @@
           </template>
         </el-table-column>
         <el-table-column label="打招呼信息" prop="hello_msg"/>
-        <el-table-column label="操作" width="150" align="right">
+        <el-table-column label="操作" width="150">
           <template #default="scope">
             <el-button size="small" type="primary" @click="rowEdit(scope.$index, scope.row)">编辑</el-button>
             <el-popconfirm title="确定要删除当前应用吗?" @confirm="removeRole(scope.row)" :width="200">
@@ -128,10 +128,14 @@
             <el-table :data="role.context" :border="childBorder" size="small">
               <el-table-column label="对话应用" width="120">
                 <template #default="scope">
-                  <el-input
+                  <el-select v-model="scope.row.role" placeholder="Role">
-                      v-model="scope.row.role"
+                    <el-option
-                      autocomplete="off"
+                        v-for="value in messageRoles"
+                        :key="value"
+                        :label="value"
+                        :value="value"
                     />
+                  </el-select>
                 </template>
               </el-table-column>
               <el-table-column label="对话内容">
@@ -153,11 +157,40 @@
                   <div class="context-msg-content">
                     <el-input
                         type="textarea"
-                        :rows="2"
+                        :rows="3"
                         v-model="scope.row.content"
                         autocomplete="off"
+                        v-loading="isGenerating"
                     />
-                    <span><el-icon @click="removeContext(scope.$index)"><RemoveFilled/></el-icon></span>
+                    <span class="remove-item">
+                      <el-tooltip effect="dark" content="删除当前行" placement="right">
+                        <el-button circle type="danger" size="small">
+                          <el-icon @click="removeContext(scope.$index)"><Delete /></el-icon>
+                        </el-button>
+                      </el-tooltip>
+
+                      <el-popover placement="right" :width="400" trigger="click" :visible="popoverVisible">
+                        <template #reference>
+                          <el-button type="primary" circle size="small" class="icon-btn" @click="popoverVisible = true">
+                            <i class="iconfont icon-linggan"></i>
+                          </el-button>
+                        </template>
+                        <el-input
+                            type="textarea"
+                            :rows="3"
+                            v-model="metaPrompt"
+                            autocomplete="off"
+                            placeholder="请您输入要 AI实现的目标，任务或者需要AI扮演的角色？"
+                        />
+                        <el-row class="text-line">
+                           <el-text class="mx-1" type="info" size="small">使用 AI 生成 System 预设指令</el-text>
+                          <el-button class="generate-btn" size="small" @click="generatePrompt(scope.row)" color="#5865f2" :disabled="isGenerating">
+                            <i class="iconfont icon-chuangzuo"></i>
+                            <span>立即生成</span>
+                          </el-button>
+                        </el-row>
+                      </el-popover>
+                    </span>
                   </div>
                 </template>
               </el-table-column>
@@ -182,13 +215,14 @@
 
 <script setup>
 
-import {Plus, RemoveFilled} from "@element-plus/icons-vue";
+import {Delete, Plus} from "@element-plus/icons-vue";
 import {onMounted, reactive, ref} from "vue";
 import {httpGet, httpPost} from "@/utils/http";
 import {ElMessage} from "element-plus";
 import {copyObj, removeArrayItem} from "@/utils/libs";
 import {Sortable} from "sortablejs"
 import Compressor from "compressorjs";
+import {showMessageError} from "@/utils/dialog";
 
 const showDialog = ref(false)
 const parentBorder = ref(true)
@@ -213,6 +247,7 @@ const rules = reactive({
 
 const appTypes = ref([])
 const models = ref([])
+const messageRoles = ref(["system", "user", "assistant"])
 onMounted(() => {
   fetchData()
 
@@ -354,7 +389,25 @@ const uploadImg = (file) => {
       ElMessage.error('上传失败:' + e.message)
     },
   });
-};
+}
+
+const isGenerating = ref(false)
+const popoverVisible = ref(false)
+const metaPrompt = ref("")
+const generatePrompt = (row) => {
+  if (metaPrompt.value === "") {
+    return showMessageError("请输入元提示词")
+  }
+  popoverVisible.value = false
+  isGenerating.value = true
+  httpPost("/api/prompt/meta", {prompt: metaPrompt.value}).then(res => {
+    row.content = res.data
+    isGenerating.value = false
+  }).catch(e => {
+    showMessageError("生成失败："+e.message)
+    isGenerating.value = false
+  })
+}
 </script>
 
 <style lang="stylus" scoped>
@@ -391,14 +444,20 @@ const uploadImg = (file) => {
   .context-msg-content {
     display flex
 
-    .el-icon {
+    .remove-item {
-      font-size: 20px;
+      display flex
-      margin-top 5px;
+      padding 10px
-      margin-left 5px;
+      flex-flow column
-      cursor pointer
+      align-items center
+      justify-content  center
+
+      .icon-btn {
+        margin 10px 0 0 0
       }
     }
 
+  }
+
   .el-input--small {
     width 30px;
 
@@ -421,4 +480,14 @@ const uploadImg = (file) => {
     justify-content right
   }
 }
+
+.text-line {
+  display flex
+  justify-content space-between
+  padding-top 10px
+  .iconfont {
+    margin-right 5px
+    font-size 14px
+  }
+}
 </style>