From 117b63f6614c2d9c69dff5efa71daa4f993707cb Mon Sep 17 00:00:00 2001 From: shentongmartin Date: Tue, 5 Aug 2025 21:12:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20trimming=20leading=20and=20trailing=20wh?= =?UTF-8?q?itespaces=20before=20unmarshal=20LLM=20o=E2=80=A6=20(#587)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/workflow/internal/nodes/utils.go | 8 ++--- .../workflow/internal/nodes/utils_test.go | 34 +++++++++++++++++++ 2 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 backend/domain/workflow/internal/nodes/utils_test.go diff --git a/backend/domain/workflow/internal/nodes/utils.go b/backend/domain/workflow/internal/nodes/utils.go index d7f4ce75..09fc860b 100644 --- a/backend/domain/workflow/internal/nodes/utils.go +++ b/backend/domain/workflow/internal/nodes/utils.go @@ -87,15 +87,13 @@ func TemplateRender(template string, vals map[string]interface{}) (string, error } func ExtractJSONString(content string) string { + content = strings.TrimSpace(content) + if strings.HasPrefix(content, "```") && strings.HasSuffix(content, "```") { content = content[3 : len(content)-3] } - if strings.HasPrefix(content, "json") { - content = content[4:] - } - - return content + return strings.TrimPrefix(content, "json") } func ConcatTwoMaps(m1, m2 map[string]any) (map[string]any, error) { diff --git a/backend/domain/workflow/internal/nodes/utils_test.go b/backend/domain/workflow/internal/nodes/utils_test.go new file mode 100644 index 00000000..5d1c2144 --- /dev/null +++ b/backend/domain/workflow/internal/nodes/utils_test.go @@ -0,0 +1,34 @@ +/* + * Copyright 2025 coze-dev Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package nodes + +import ( + "testing" + + "github.com/stretchr/testify/assert" + + "github.com/coze-dev/coze-studio/backend/pkg/sonic" +) + +func TestExtractJSONString(t *testing.T) { + s := "\n```json{\"k\":1}```\t" + s1 := ExtractJSONString(s) + var v map[string]any + err := sonic.UnmarshalString(s1, &v) + assert.NoError(t, err) + assert.Equal(t, map[string]any{"k": int64(1)}, v) +}