feat: move utils to internal (#76)

cloudwego · Feb 21, 2025 · f2f2f5e · f2f2f5e
1 parent 3113915
commit f2f2f5e
Show file tree

Hide file tree

Showing 26 changed files with 49 additions and 21 deletions.
diff --git a/components/tool/utils/invokable_func.go b/components/tool/utils/invokable_func.go
@@ -25,8 +25,8 @@ import (
 	"github.com/getkin/kin-openapi/openapi3gen"
 
 	"github.com/cloudwego/eino/components/tool"
+	"github.com/cloudwego/eino/internal/generic"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
 )
 
 // InvokeFunc is the function type for the tool.

diff --git a/components/tool/utils/streamable_func.go b/components/tool/utils/streamable_func.go
@@ -23,8 +23,8 @@ import (
 	"github.com/bytedance/sonic"
 
 	"github.com/cloudwego/eino/components/tool"
+	"github.com/cloudwego/eino/internal/generic"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
 )
 
 // StreamFunc is the function type for the streamable tool.

diff --git a/compose/chain.go b/compose/chain.go
@@ -28,10 +28,10 @@ import (
 	"github.com/cloudwego/eino/components/model"
 	"github.com/cloudwego/eino/components/prompt"
 	"github.com/cloudwego/eino/components/retriever"
+	"github.com/cloudwego/eino/internal/generic"
 	"github.com/cloudwego/eino/internal/gmap"
 	"github.com/cloudwego/eino/internal/gslice"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
 )
 
 // NewChain create a chain with input/output type.

diff --git a/compose/chain_branch.go b/compose/chain_branch.go
@@ -26,8 +26,8 @@ import (
 	"github.com/cloudwego/eino/components/model"
 	"github.com/cloudwego/eino/components/prompt"
 	"github.com/cloudwego/eino/components/retriever"
+	"github.com/cloudwego/eino/internal/generic"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
 )
 
 type nodeOptionsPair generic.Pair[*graphNode, *graphAddNodeOpts]

diff --git a/compose/field_mapping.go b/compose/field_mapping.go
@@ -22,9 +22,9 @@ import (
 	"runtime/debug"
 	"strings"
 
+	"github.com/cloudwego/eino/internal/generic"
+	"github.com/cloudwego/eino/internal/safe"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
-	"github.com/cloudwego/eino/utils/safe"
 )
 
 type FieldMapping struct {

diff --git a/compose/graph.go b/compose/graph.go
@@ -28,9 +28,9 @@ import (
 	"github.com/cloudwego/eino/components/model"
 	"github.com/cloudwego/eino/components/prompt"
 	"github.com/cloudwego/eino/components/retriever"
+	"github.com/cloudwego/eino/internal/generic"
 	"github.com/cloudwego/eino/internal/gmap"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
 )
 
 // START is the start node of the graph. You can add your first edge with START.

diff --git a/compose/graph_manager.go b/compose/graph_manager.go
@@ -23,7 +23,7 @@ import (
 	"runtime/debug"
 	"sync"
 
-	"github.com/cloudwego/eino/utils/safe"
+	"github.com/cloudwego/eino/internal/safe"
 )
 
 type channel interface {

diff --git a/compose/graph_node.go b/compose/graph_node.go
@@ -22,7 +22,7 @@ import (
 	"reflect"
 
 	"github.com/cloudwego/eino/components"
-	"github.com/cloudwego/eino/utils/generic"
+	"github.com/cloudwego/eino/internal/generic"
 )
 
 // the info of most original executable object directly provided by the user

diff --git a/compose/runnable.go b/compose/runnable.go
@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/cloudwego/eino/internal/generic"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
 )
 
 // Runnable is the interface for an executable object. Graph, Chain can be compiled into Runnable.

diff --git a/compose/state.go b/compose/state.go
@@ -22,8 +22,8 @@ import (
 	"reflect"
 	"sync"
 
+	"github.com/cloudwego/eino/internal/generic"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
 )
 
 // GenLocalState is a function that generates the state.

diff --git a/compose/stream_reader.go b/compose/stream_reader.go
@@ -19,8 +19,8 @@ package compose
 import (
 	"reflect"
 
+	"github.com/cloudwego/eino/internal/generic"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
 )
 
 type streamReader interface {

diff --git a/compose/tool_node.go b/compose/tool_node.go
@@ -26,8 +26,8 @@ import (
 	"github.com/cloudwego/eino/callbacks"
 	"github.com/cloudwego/eino/components"
 	"github.com/cloudwego/eino/components/tool"
+	"github.com/cloudwego/eino/internal/safe"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/safe"
 )
 
 type toolsNodeOptions struct {

diff --git a/compose/utils.go b/compose/utils.go
@@ -23,8 +23,8 @@ import (
 
 	"github.com/cloudwego/eino/callbacks"
 	icb "github.com/cloudwego/eino/internal/callbacks"
+	"github.com/cloudwego/eino/internal/generic"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
 )
 
 func mergeMap(vs []any) (any, error) {

diff --git a/compose/utils_test.go b/compose/utils_test.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/cloudwego/eino/internal/generic"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
 )
 
 func TestMergeValues(t *testing.T) {

diff --git a/compose/workflow.go b/compose/workflow.go
@@ -26,7 +26,7 @@ import (
 	"github.com/cloudwego/eino/components/model"
 	"github.com/cloudwego/eino/components/prompt"
 	"github.com/cloudwego/eino/components/retriever"
-	"github.com/cloudwego/eino/utils/generic"
+	"github.com/cloudwego/eino/internal/generic"
 )
 
 // WorkflowNode is the node of the Workflow.

diff --git a/flow/agent/multiagent/host/compose_test.go b/flow/agent/multiagent/host/compose_test.go
@@ -27,9 +27,9 @@ import (
 	"github.com/cloudwego/eino/components/prompt"
 	"github.com/cloudwego/eino/compose"
 	"github.com/cloudwego/eino/flow/agent"
+	"github.com/cloudwego/eino/internal/generic"
 	"github.com/cloudwego/eino/internal/mock/components/model"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
 )
 
 func TestHostMultiAgent(t *testing.T) {

diff --git a/internal/callbacks/inject.go b/internal/callbacks/inject.go
@@ -19,8 +19,8 @@ package callbacks
 import (
 	"context"
 
+	"github.com/cloudwego/eino/internal/generic"
 	"github.com/cloudwego/eino/schema"
-	"github.com/cloudwego/eino/utils/generic"
 )
 
 type CtxManagerKey struct{}

diff --git a/internal/concat.go b/internal/concat.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cloudwego/eino/utils/generic"
+	"github.com/cloudwego/eino/internal/generic"
 )
 
 var (

diff --git a/utils/generic/generic.go → internal/generic/generic.go b/utils/generic/generic.go → internal/generic/generic.go
diff --git a/utils/generic/generic_test.go → internal/generic/generic_test.go b/utils/generic/generic_test.go → internal/generic/generic_test.go
diff --git a/utils/generic/type_name.go → internal/generic/type_name.go b/utils/generic/type_name.go → internal/generic/type_name.go
diff --git a/utils/generic/type_name_test.go → internal/generic/type_name_test.go b/utils/generic/type_name_test.go → internal/generic/type_name_test.go
diff --git a/utils/safe/panic.go → internal/safe/panic.go b/utils/safe/panic.go → internal/safe/panic.go
diff --git a/internal/safe/panic_test.go b/internal/safe/panic_test.go
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2025 CloudWeGo 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 safe
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPanicErr(t *testing.T) {
+	err := NewPanicErr("info", []byte("stack"))
+	assert.Equal(t, "panic error: info, \nstack: stack", err.Error())
+}
diff --git a/schema/message_test.go b/schema/message_test.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/cloudwego/eino/utils/generic"
+	"github.com/cloudwego/eino/internal/generic"
 )
 
 func TestMessageTemplate(t *testing.T) {

diff --git a/schema/stream.go b/schema/stream.go
@@ -24,7 +24,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/cloudwego/eino/utils/safe"
+	"github.com/cloudwego/eino/internal/safe"
 )
 
 // ErrNoValue is used during StreamReaderWithConvert to skip a streamItem, excluding it from the converted stream.
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ import ( @@
     	"strings"
     	"time"
-    	"github.com/cloudwego/eino/utils/generic"
+    	"github.com/cloudwego/eino/internal/generic"
     )
     var (
@@ Expand Down @@