From 2ab7e3011b8ad48d58add9516cd99785a093495e Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Sat, 9 Sep 2023 22:39:00 +0800 Subject: [PATCH] Rename pkg to model --- {ai => model}/embedding.go | 2 +- {ai => model}/ernie.go | 2 +- {ai => model}/huggingface.go | 2 +- {ai => model}/model.go | 2 +- {ai => model}/openai.go | 2 +- {ai => model}/openai_proxy.go | 2 +- {ai => model}/query.go | 2 +- {ai => model}/query_test.go | 7 +++---- {ai => model}/util.go | 2 +- object/provider.go | 6 +++--- object/vector_embedding.go | 8 ++++---- 11 files changed, 18 insertions(+), 19 deletions(-) rename {ai => model}/embedding.go (99%) rename {ai => model}/ernie.go (99%) rename {ai => model}/huggingface.go (99%) rename {ai => model}/model.go (98%) rename {ai => model}/openai.go (99%) rename {ai => model}/openai_proxy.go (98%) rename {ai => model}/query.go (99%) rename {ai => model}/query_test.go (86%) rename {ai => model}/util.go (99%) diff --git a/ai/embedding.go b/model/embedding.go similarity index 99% rename from ai/embedding.go rename to model/embedding.go index c84e98a..30a463f 100644 --- a/ai/embedding.go +++ b/model/embedding.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ai +package model import ( "context" diff --git a/ai/ernie.go b/model/ernie.go similarity index 99% rename from ai/ernie.go rename to model/ernie.go index 48a700d..c9e950e 100644 --- a/ai/ernie.go +++ b/model/ernie.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ai +package model import ( "context" diff --git a/ai/huggingface.go b/model/huggingface.go similarity index 99% rename from ai/huggingface.go rename to model/huggingface.go index 378e60f..321be09 100644 --- a/ai/huggingface.go +++ b/model/huggingface.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ai +package model import ( "context" diff --git a/ai/model.go b/model/model.go similarity index 98% rename from ai/model.go rename to model/model.go index d3eef23..5e0fe1a 100644 --- a/ai/model.go +++ b/model/model.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ai +package model import ( "io" diff --git a/ai/openai.go b/model/openai.go similarity index 99% rename from ai/openai.go rename to model/openai.go index 92aebf1..bf4e09e 100644 --- a/ai/openai.go +++ b/model/openai.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ai +package model import ( "context" diff --git a/ai/openai_proxy.go b/model/openai_proxy.go similarity index 98% rename from ai/openai_proxy.go rename to model/openai_proxy.go index ac26e1a..645fed6 100644 --- a/ai/openai_proxy.go +++ b/model/openai_proxy.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ai +package model import ( "github.com/casbin/casibase/proxy" diff --git a/ai/query.go b/model/query.go similarity index 99% rename from ai/query.go rename to model/query.go index e0840b0..1c23d7d 100644 --- a/ai/query.go +++ b/model/query.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ai +package model import ( "context" diff --git a/ai/query_test.go b/model/query_test.go similarity index 86% rename from ai/query_test.go rename to model/query_test.go index 559fb0b..be5c5ba 100644 --- a/ai/query_test.go +++ b/model/query_test.go @@ -15,12 +15,11 @@ //go:build !skipCi // +build !skipCi -package ai_test +package model_test import ( "testing" - "github.com/casbin/casibase/ai" "github.com/casbin/casibase/object" "github.com/casbin/casibase/proxy" "github.com/sashabaranov/go-openai" @@ -30,10 +29,10 @@ func TestRun(t *testing.T) { object.InitConfig() proxy.InitHttpClient() - text := ai.QueryAnswerSafe("", "hi") + text := model.QueryAnswerSafe("", "hi") println(text) } func TestToken(t *testing.T) { - println(ai.GetTokenSize(openai.GPT3TextDavinci003, "")) + println(model.GetTokenSize(openai.GPT3TextDavinci003, "")) } diff --git a/ai/util.go b/model/util.go similarity index 99% rename from ai/util.go rename to model/util.go index 6f7eee2..b04ffc3 100644 --- a/ai/util.go +++ b/model/util.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package ai +package model import ( "math" diff --git a/object/provider.go b/object/provider.go index c3bcba7..77cb947 100644 --- a/object/provider.go +++ b/object/provider.go @@ -17,7 +17,7 @@ package object import ( "fmt" - "github.com/casbin/casibase/ai" + "github.com/casbin/casibase/model" "github.com/casbin/casibase/util" "xorm.io/core" ) @@ -161,8 +161,8 @@ func (provider *Provider) GetId() string { return fmt.Sprintf("%s/%s", provider.Owner, provider.Name) } -func (p *Provider) GetModelProvider() (ai.ModelProvider, error) { - pProvider, err := ai.GetModelProvider(p.Type, p.SubType, p.ClientId, p.ClientSecret) +func (p *Provider) GetModelProvider() (model.ModelProvider, error) { + pProvider, err := model.GetModelProvider(p.Type, p.SubType, p.ClientId, p.ClientSecret) if err != nil { return nil, err } diff --git a/object/vector_embedding.go b/object/vector_embedding.go index 6d8f428..d53b682 100644 --- a/object/vector_embedding.go +++ b/object/vector_embedding.go @@ -20,7 +20,7 @@ import ( "path/filepath" "time" - "github.com/casbin/casibase/ai" + "github.com/casbin/casibase/model" "github.com/casbin/casibase/storage" "github.com/casbin/casibase/txt" "github.com/casbin/casibase/util" @@ -54,7 +54,7 @@ func getFilteredFileObjects(provider string, prefix string) ([]*storage.Object, } func addEmbeddedVector(authToken string, text string, storeName string, fileName string) (bool, error) { - embedding, err := ai.GetEmbeddingSafe(authToken, text) + embedding, err := model.GetEmbeddingSafe(authToken, text) if err != nil { return false, err } @@ -128,7 +128,7 @@ func getRelatedVectors(owner string) ([]*Vector, error) { } func GetNearestVectorText(authToken string, owner string, question string) (string, error) { - qVector, err := ai.GetEmbeddingSafe(authToken, question) + qVector, err := model.GetEmbeddingSafe(authToken, question) if err != nil { return "", err } @@ -146,6 +146,6 @@ func GetNearestVectorText(authToken string, owner string, question string) (stri nVectors = append(nVectors, candidate.Data) } - i := ai.GetNearestVectorIndex(qVector, nVectors) + i := model.GetNearestVectorIndex(qVector, nVectors) return vectors[i].Text, nil }