add async

conf/replicate_models_version.yaml

@@ -23,6 +23,11 @@ meta-llama-3-8b-instruct:
   url: "https://api.replicate.com/v1/models/meta/meta-llama-3-8b-instruct/predictions"
   stream: false
 
+meta-llama-3-70b-instruct:
+  version: ""
+  url: "https://api.replicate.com/v1/models/meta/meta-llama-3-70b-instruct/predictions"
+  stream: false
+
 stable-diffusion-3:
   version: ""
   url: "https://api.replicate.com/v1/models/stability-ai/stable-diffusion-3/predictions"
@@ -41,4 +46,19 @@ sadtalker:
 stable-diffusion:
   version: "ac732df83cea7fff18b8472768c88ad041fa750ff7682a21affe81863cbe77e4"
   url: "https://api.replicate.com/v1/predictions"
+  stream: false
+
+qwen1.5-72b:
+  version: "f919d3c43a8758de744cf2908426dd744154120f0a22e457a3fa647acdfe33be"
+  url: "https://api.replicate.com/v1/predictions"
+  stream: false
+
+qwen1.5-7b:
+  version: "f85bec5b21ba0860e0f200be6ef5af9d5a65b974b9f99e36eb036d21eab884de"
+  url: "https://api.replicate.com/v1/predictions"
+  stream: false
+
+llava-13b:
+  version: "b5f6212d032508382d61ff00469ddda3e32fd8a0e75dc39d8a4191bb742157fb"
+  url: "https://api.replicate.com/v1/predictions"
   stream: false
\ No newline at end of file

lastupdate.tmp

-{"/Users/brent/Documents/wubanWork/aon_app_server/controllers":1719995732323745955}
+{"/Users/brent/Documents/wubanWork/aon_app_server/controllers":1720592962344996898}
\ No newline at end of file

main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	_ "aon_app_server/routers"
+	"github.com/beego/beego/v2/core/logs"
 	beego "github.com/beego/beego/v2/server/web"
 	"github.com/beego/beego/v2/server/web/filter/cors"
 )
@@ -10,10 +11,12 @@ func init() {
 	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
 		AllowAllOrigins:  true,
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
-		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-Xsrf-Token"},
-		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-Xsrf-Token", "Authorization"},
+		AllowHeaders:     []string{"Origin", "Authorization", "Async", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-Xsrf-Token"},
+		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type", "X-Xsrf-Token", "Authorization", "Async"},
 		AllowCredentials: true,
 	}))
+	timeout := beego.BConfig.Listen.ServerTimeOut
+	logs.Debug("timeout = ", timeout)
 }
 
 func main() {

models/task.go

@@ -60,6 +60,7 @@ type TaskReturn struct {
 	TaskError string `json:"task_error"`
 	ExecCode  int    `json:"exec_code"`
 	ExecError string `json:"exec_error"`
+	Async     bool   `json:"async"`
 	ApiError  struct {
 		RequestId string `json:"request_id"`
 		Message   string `json:"message"`

models/template.go

+package models
+
+//type Position int
+//
+//const (
+//	TOPLEFT Position = iota + 1
+//	TOPRIGHT
+//	TOPMIDDLE
+//	LEFTMIDDLE
+//	LEFTBOTTOM
+//	BOTTOMMIDDLE
+//	RIGHTBOTTOM
+//	RIGHTMIDDLE
+//	CENTER
+//)
+
+type Position struct {
+	X int `json:"x,omitempty" bson:"x"`
+	Y int `json:"y,omitempty" bson:"y"`
+}
+
+type Template struct {
+	Id                interface{} `json:"id" bson:"_id,omitempty"`
+	Logo              string      `json:"logo,omitempty" bson:"logo"`                             // 海报图片上展示的logo，非 应用logo
+	Image             string      `json:"image,omitempty" bson:"image"`                           //模版展示的图片
+	Brand             string      `json:"brand,omitempty" bson:"brand"`                           // 海报图片上展示的文字，非 应用标题
+	Watermark         string      `json:"watermark,omitempty" bson:"watermark"`                   //商家 的 水印
+	WatermarkPosition Position    `json:"watermark_position,omitempty" bson:"watermark_position"` //商家 的 水印位置
+	Platform          string      `json:"platform,omitempty" bson:"platform"`                     //平台 的 水印
+	PlatformPosition  Position    `json:"platform_position,omitempty" bson:"platform_position"`
+	Prompt            string      `json:"prompt" bson:"prompt"`
+}