Merge pull request #722 from trheyi/main

feat: Integrate AIGC & OpenAI with Moapi service

aigc/aigc.go

@@ -99,7 +99,7 @@ func (ai *DSL) newAI() (AI, error) {
 
 	if ai.Connector == "" || strings.HasPrefix(ai.Connector, "moapi") {
 		model := "gpt-3.5-turbo"
-		if ai.Connector != "" {
+		if strings.HasPrefix(ai.Connector, "moapi:") {
 			model = strings.TrimPrefix(ai.Connector, "moapi:")
 		}
 

neo/neo.go

@@ -343,12 +343,16 @@ func (neo *DSL) write(msg *message.JSON, w io.Writer, ctx command.Context, messa
 	args := []interface{}{ctx, messages, msg, string(content)}
 	p, err := process.Of(neo.Write, args...)
 	if err != nil {
-		return err
+		log.Error("Neo custom write process error: %s", err.Error())
+		msg.Write(w)
+		return nil
 	}
 
 	res, err := p.WithSID(ctx.Sid).Exec()
 	if err != nil {
-		return err
+		log.Error("Neo custom write error: %s", err.Error())
+		msg.Write(w)
+		return nil
 	}
 
 	if res == nil {
@@ -549,7 +553,7 @@ func (neo *DSL) newAI() error {
 
 	if neo.Connector == "" || strings.HasPrefix(neo.Connector, "moapi") {
 		model := "gpt-3.5-turbo"
-		if neo.Connector != "" {
+		if strings.HasPrefix(neo.Connector, "moapi:") {
 			model = strings.TrimPrefix(neo.Connector, "moapi:")
 		}
 

openai/openai.go

@@ -35,6 +35,16 @@ type OpenAI struct {
 
 // New create a new OpenAI instance by connector id
 func New(id string) (*OpenAI, error) {
+
+	// Moapi integration
+	if id == "" || strings.HasPrefix(id, "moapi") {
+		model := "gpt-3.5-turbo"
+		if strings.HasPrefix(id, "moapi:") {
+			model = strings.TrimPrefix(id, "moapi:")
+		}
+		return NewMoapi(model)
+	}
+
 	c, err := connector.Select(id)
 	if err != nil {
 		return nil, err

utils/fmt/fmt.go

@@ -0,0 +1,77 @@
+package fmt
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/fatih/color"
+	"github.com/yaoapp/gou/process"
+)
+
+// ProcessPrintf utils.fmt.Printf
+func ProcessPrintf(process *process.Process) interface{} {
+	process.ValidateArgNums(1)
+	format := process.ArgsString(0)
+	if process.NumOfArgs() == 1 {
+		fmt.Print(format)
+		return nil
+	}
+	args := process.Args[1:]
+	fmt.Printf(format, args...)
+	return nil
+}
+
+// ProcessColorPrintf utils.fmt.GreenPrintf
+func ProcessColorPrintf(process *process.Process) interface{} {
+	process.ValidateArgNums(2)
+	colorName := strings.ToLower(process.ArgsString(0))
+	format := process.ArgsString(1)
+	if process.NumOfArgs() == 1 {
+		fmt.Print(format)
+		return nil
+	}
+
+	args := []interface{}{}
+	if process.NumOfArgs() > 2 {
+		args = process.Args[2:]
+	}
+
+	switch colorName {
+	case "red":
+		fmt.Print(color.RedString(fmt.Sprintf(format, args...)))
+	case "green":
+		fmt.Print(color.GreenString(fmt.Sprintf(format, args...)))
+	case "yellow":
+		fmt.Print(color.YellowString(fmt.Sprintf(format, args...)))
+	case "blue":
+		fmt.Print(color.BlueString(fmt.Sprintf(format, args...)))
+	case "magenta":
+		fmt.Print(color.MagentaString(fmt.Sprintf(format, args...)))
+	case "cyan":
+		fmt.Print(color.CyanString(fmt.Sprintf(format, args...)))
+	case "white":
+		fmt.Print(color.WhiteString(fmt.Sprintf(format, args...)))
+	case "black":
+		fmt.Print(color.BlackString(fmt.Sprintf(format, args...)))
+	case "hired":
+		fmt.Print(color.HiRedString(fmt.Sprintf(format, args...)))
+	case "higreen":
+		fmt.Print(color.HiGreenString(fmt.Sprintf(format, args...)))
+	case "hiyellow":
+		fmt.Print(color.HiYellowString(fmt.Sprintf(format, args...)))
+	case "hiblue":
+		fmt.Print(color.HiBlueString(fmt.Sprintf(format, args...)))
+	case "himagenta":
+		fmt.Print(color.HiMagentaString(fmt.Sprintf(format, args...)))
+	case "hicyan":
+		fmt.Print(color.HiCyanString(fmt.Sprintf(format, args...)))
+	case "hiwhite":
+		fmt.Print(color.HiWhiteString(fmt.Sprintf(format, args...)))
+	case "hiblack":
+		fmt.Print(color.HiBlackString(fmt.Sprintf(format, args...)))
+	default:
+		fmt.Print(fmt.Sprintf(format, args...))
+	}
+
+	return nil
+}

utils/process.go

@@ -3,6 +3,7 @@ package utils
 import (
 	"github.com/yaoapp/gou/process"
 	"github.com/yaoapp/yao/utils/datetime"
+	"github.com/yaoapp/yao/utils/fmt"
 	"github.com/yaoapp/yao/utils/json"
 	"github.com/yaoapp/yao/utils/str"
 	"github.com/yaoapp/yao/utils/tree"
@@ -20,6 +21,8 @@ func Init() {
 
 	// FMT
 	process.Alias("xiang.helper.Print", "utils.fmt.Print")
+	process.Register("utils.fmt.Printf", fmt.ProcessPrintf)
+	process.Register("utils.fmt.ColorPrintf", fmt.ProcessColorPrintf)
 
 	// ENV
 	process.Alias("xiang.helper.EnvSet", "utils.env.Set")