Merge pull request #508 from trheyi/main

[add] sui build IgnoreDocument support & neo local model support
YaoApp · Nov 30, 2023 · 3a44464 · 3a44464
2 parents 5ab5361 + 59dfe49
commit 3a44464
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 37 deletions.
diff --git a/neo/message/json.go b/neo/message/json.go
@@ -27,10 +27,10 @@ func NewOpenAI(data []byte) *JSON {
 	}
 
 	msg := makeMessage()
-	data = []byte(strings.TrimPrefix(string(data), "data: "))
+	text := string(data)
+	data = []byte(strings.TrimPrefix(text, "data: "))
 	switch {
-
-	case strings.Contains(string(data), `"delta":{"content"`):
+	case strings.Contains(text, `"delta":{`) && strings.Contains(text, `"content":`):
 		var message openai.Message
 		err := jsoniter.Unmarshal(data, &message)
 		if err != nil {
@@ -43,12 +43,12 @@ func NewOpenAI(data []byte) *JSON {
 		}
 		break
 
-	case strings.Contains(string(data), `[DONE]`):
+	case strings.Contains(text, `[DONE]`):
 		msg.Done = true
 		break
 
 	default:
-		msg.Error = string(data)
+		msg.Error = text
 	}
 
 	return &JSON{msg}

diff --git a/neo/neo.go b/neo/neo.go
@@ -257,32 +257,32 @@ func (neo *DSL) Answer(ctx command.Context, question string, answer Answer) erro
 
 			return !msg.IsDone()
 
-		case <-ctx.Done():
-			if err := ctx.Err(); err != nil {
-				message.New().Text(err.Error()).Write(w)
-			}
-
-			if len(errorMsg) > 0 {
-
-				var errData openai.ErrorMessage
-				err := jsoniter.Unmarshal(errorMsg, &errData)
-				if err == nil {
-					msg := errData.Error.Message
-					if msg == "" {
-						msg = fmt.Sprintf("OpenAI error: %s", errData.Error.Code)
-					}
-					message.New().Text(msg).Write(w)
-					message.New().Done().Write(w)
-					return false
-				}
-
-				message.New().Text(string(errorMsg)).Write(w)
-				message.New().Done().Write(w)
-				return false
-			}
-
-			message.New().Done().Write(w)
-			return false
+			// case <-ctx.Done():
+			// 	if err := ctx.Err(); err != nil {
+			// 		message.New().Text(err.Error()).Write(w)
+			// 	}
+
+			// 	if len(errorMsg) > 0 {
+
+			// 		var errData openai.ErrorMessage
+			// 		err := jsoniter.Unmarshal(errorMsg, &errData)
+			// 		if err == nil {
+			// 			msg := errData.Error.Message
+			// 			if msg == "" {
+			// 				msg = fmt.Sprintf("OpenAI error: %s", errData.Error.Code)
+			// 			}
+			// 			message.New().Text(msg).Write(w)
+			// 			message.New().Done().Write(w)
+			// 			return false
+			// 		}
+
+			// 		message.New().Text(string(errorMsg)).Write(w)
+			// 		message.New().Done().Write(w)
+			// 		return false
+			// 	}
+
+			// 	message.New().Done().Write(w)
+			// 	return false
 		}
 	})
 

diff --git a/sui/core/build.go b/sui/core/build.go
@@ -41,9 +41,13 @@ func (page *Page) Build(option *BuildOption) (*goquery.Document, []string, error
 // BuildHTML build the html
 func (page *Page) BuildHTML(option *BuildOption) (string, error) {
 
-	html := string(page.Document)
-	if page.Codes.HTML.Code != "" {
-		html = strings.Replace(html, "{{ __page }}", page.Codes.HTML.Code, 1)
+	html := string(page.Codes.HTML.Code)
+
+	if !option.IgnoreDocument {
+		html = string(page.Document)
+		if page.Codes.HTML.Code != "" {
+			html = strings.Replace(html, "{{ __page }}", page.Codes.HTML.Code, 1)
+		}
 	}
 
 	if !option.IgnoreAssetRoot {

diff --git a/sui/core/editor.go b/sui/core/editor.go
@@ -42,6 +42,7 @@ func (page *Page) EditorRender() (*ResponseEditorRender, error) {
 	doc, warnings, err := page.Build(&BuildOption{
 		SSR:             true,
 		IgnoreAssetRoot: true,
+		IgnoreDocument:  true,
 	})
 
 	if err != nil {

diff --git a/sui/core/page_test.go b/sui/core/page_test.go
@@ -72,9 +72,27 @@ func testPage(t *testing.T) *Page {
 				  <div>{{ idx }} {{ article.title }}</div>
 				  <div>{{ article.desc }}</div>
 				  <div>{{ article.type == "article" ? "article" : "others"}}</div>
-				  <div s:if="article.type == 'article'">article</div>
-				  <div s:elif="article.type == 'image'">image</div>
-				  <div s:else>others</div>
+
+				  <div class="mt-10">IF</div>
+				  <div class="p-5">
+					<div s:if="article.type == 'article'">article</div>
+					<div s:elif="article.type == 'image'">image</div>
+					<div s:else>others</div>
+				  </div>
+			  
+				  <div class="mt-10">Nested</div>
+				  <div
+					s:for="article.images"
+					s:for-item="image"
+					s:for-index="imgIndex"
+					class="p-5"
+				  >
+					<div s:if="imgIndex == 1 || imgIndex == 2" class="p-5">
+					  {{ imgIndex }} {{ image }}
+					</div>
+				  </div>
+				</div>
+				
 				</div>
 				<div class="mt-10">IF</div>
 				<div s:if="len(articles) > 0" :name="input.data">

diff --git a/sui/core/parser_test.go b/sui/core/parser_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/yaoapp/kun/utils"
 )
 
 func TestRender(t *testing.T) {
@@ -29,6 +30,8 @@ func TestRender(t *testing.T) {
 		t.Fatalf("Render error: %v", err)
 	}
 
+	utils.Dump(html)
+
 	assert.NotEmpty(t, html)
 	assert.Contains(t, html, "hello space")
 	assert.Equal(t, 0, len(parser.errors))

diff --git a/sui/core/types.go b/sui/core/types.go
@@ -140,6 +140,7 @@ type BuildOption struct {
 	UpdateAll       bool   `json:"update_all"`
 	AssetRoot       string `json:"asset_root,omitempty"`
 	IgnoreAssetRoot bool   `json:"ignore_asset_root,omitempty"`
+	IgnoreDocument  bool   `json:"ignore_document,omitempty"`
 }
 
 // Request is the struct for the request