feat: init improvements (#174)
This commit is contained in:
@@ -18,12 +18,16 @@ package veocr
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strconv"
|
||||
|
||||
"github.com/coze-dev/coze-studio/backend/pkg/errorx"
|
||||
"github.com/coze-dev/coze-studio/backend/types/errno"
|
||||
"github.com/volcengine/volc-sdk-golang/service/visual"
|
||||
"github.com/volcengine/volcengine-go-sdk/service/arkruntime/model"
|
||||
|
||||
"github.com/coze-dev/coze-studio/backend/infra/contract/document/ocr"
|
||||
)
|
||||
@@ -52,10 +56,14 @@ func (o *ocrImpl) FromBase64(ctx context.Context, b64 string) ([]string, error)
|
||||
|
||||
resp, statusCode, err := o.config.Client.OCRNormal(form)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return nil, o.handleError(fmt.Errorf("[ve_ocr][FromBase64] OCRNormal err: %w", err))
|
||||
}
|
||||
if statusCode != http.StatusOK {
|
||||
return nil, fmt.Errorf("[FromBase64] failed, status code=%d", statusCode)
|
||||
err = fmt.Errorf("[ve_ocr][FromBase64] OCRNormal failed, status code=%d", statusCode)
|
||||
if statusCode == http.StatusBadRequest {
|
||||
return nil, errorx.WrapByCode(err, errno.ErrKnowledgeNonRetryableCode)
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return resp.Data.LineTexts, nil
|
||||
@@ -67,10 +75,14 @@ func (o *ocrImpl) FromURL(ctx context.Context, url string) ([]string, error) {
|
||||
|
||||
resp, statusCode, err := o.config.Client.OCRNormal(form)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
return nil, o.handleError(fmt.Errorf("[ve_ocr][FromURL] OCRNormal error: %w", err))
|
||||
}
|
||||
if statusCode != http.StatusOK {
|
||||
return nil, fmt.Errorf("[FromBase64] failed, status code=%d", statusCode)
|
||||
err = fmt.Errorf("[ve_ocr][FromURL] OCRNormal failed, status code=%d", statusCode)
|
||||
if statusCode == http.StatusBadRequest {
|
||||
return nil, errorx.WrapByCode(err, errno.ErrKnowledgeNonRetryableCode)
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return resp.Data.LineTexts, nil
|
||||
@@ -94,3 +106,21 @@ func (o *ocrImpl) newForm() url.Values {
|
||||
}
|
||||
return form
|
||||
}
|
||||
|
||||
func (o *ocrImpl) handleError(err error) error {
|
||||
var (
|
||||
apiErr = &model.APIError{}
|
||||
reqErr = &model.RequestError{}
|
||||
)
|
||||
if errors.As(err, &apiErr) {
|
||||
if apiErr.HTTPStatusCode >= http.StatusInternalServerError ||
|
||||
apiErr.HTTPStatusCode == http.StatusTooManyRequests {
|
||||
return err
|
||||
}
|
||||
} else if errors.As(err, &reqErr) {
|
||||
if reqErr.HTTPStatusCode >= http.StatusInternalServerError {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return errorx.WrapByCode(err, errno.ErrKnowledgeNonRetryableCode)
|
||||
}
|
||||
|
||||
@@ -18,11 +18,16 @@ package ark
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"math"
|
||||
"net/http"
|
||||
|
||||
"github.com/cloudwego/eino-ext/components/embedding/ark"
|
||||
"github.com/cloudwego/eino/components/embedding"
|
||||
"github.com/coze-dev/coze-studio/backend/pkg/errorx"
|
||||
"github.com/coze-dev/coze-studio/backend/types/errno"
|
||||
"github.com/volcengine/volcengine-go-sdk/service/arkruntime/model"
|
||||
|
||||
contract "github.com/coze-dev/coze-studio/backend/infra/contract/embedding"
|
||||
"github.com/coze-dev/coze-studio/backend/pkg/lang/slices"
|
||||
@@ -51,7 +56,21 @@ func (d embWrap) EmbedStrings(ctx context.Context, texts []string, opts ...embed
|
||||
}
|
||||
normed, err := d.slicedNormL2(partResult)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
var (
|
||||
apiErr = &model.APIError{}
|
||||
reqErr = &model.RequestError{}
|
||||
)
|
||||
if errors.As(err, &apiErr) {
|
||||
if apiErr.HTTPStatusCode >= http.StatusInternalServerError ||
|
||||
apiErr.HTTPStatusCode == http.StatusTooManyRequests {
|
||||
return nil, err
|
||||
}
|
||||
} else if errors.As(err, &reqErr) {
|
||||
if reqErr.HTTPStatusCode >= http.StatusInternalServerError {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return nil, errorx.WrapByCode(err, errno.ErrKnowledgeNonRetryableCode)
|
||||
}
|
||||
resp = append(resp, normed...)
|
||||
}
|
||||
|
||||
32
backend/infra/impl/embedding/wrap/ollama.go
Normal file
32
backend/infra/impl/embedding/wrap/ollama.go
Normal file
@@ -0,0 +1,32 @@
|
||||
/*
|
||||
* Copyright 2024 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 wrap
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/cloudwego/eino-ext/components/embedding/ollama"
|
||||
contract "github.com/coze-dev/coze-studio/backend/infra/contract/embedding"
|
||||
)
|
||||
|
||||
func NewOllamaEmbedder(ctx context.Context, config *ollama.EmbeddingConfig, dimensions int64) (contract.Embedder, error) {
|
||||
emb, err := ollama.NewEmbedder(ctx, config)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &denseOnlyWrap{dims: dimensions, Embedder: emb}, nil
|
||||
}
|
||||
@@ -24,9 +24,14 @@ import (
|
||||
"github.com/coze-dev/coze-studio/backend/infra/contract/modelmgr"
|
||||
"github.com/coze-dev/coze-studio/backend/pkg/lang/ptr"
|
||||
"github.com/coze-dev/coze-studio/backend/pkg/lang/sets"
|
||||
"github.com/coze-dev/coze-studio/backend/pkg/logs"
|
||||
)
|
||||
|
||||
func NewModelMgr(staticModels []*modelmgr.Model) (modelmgr.Manager, error) {
|
||||
if len(staticModels) == 0 {
|
||||
logs.Warnf("[NewModelMgr] no static models found, please check if the config has been loaded correctly")
|
||||
}
|
||||
|
||||
mapping := make(map[int64]*modelmgr.Model, len(staticModels))
|
||||
for i := range staticModels {
|
||||
mapping[staticModels[i].ID] = staticModels[i]
|
||||
|
||||
Reference in New Issue
Block a user