Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions internal/datastore/sqlite/sqlite.go
Original file line number Diff line number Diff line change
Expand Up @@ -253,15 +253,16 @@ func (ds *SQLite) Put(ctx context.Context, entity datastore.Entity) error {

updateMap := make(map[string]interface{})
for i, field := range fields {
putFlag := true
if field == "id" || field == "created_at" {
continue
}
switch values[i].(type) {
case string:
putFlag = values[i].(string) != ""
}
if putFlag {
updateMap[field] = values[i]
if values[i].(string) == "" {
continue
}
}

updateMap[field] = values[i]
}
updateMap["updated_at"] = time.Now()

Expand Down Expand Up @@ -371,9 +372,6 @@ func (ds *SQLite) List(ctx context.Context, entity datastore.Entity, options *da
list := make([]datastore.Entity, 0)
rows, err := db.Rows()
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, datastore.ErrRecordNotExist
}
return nil, datastore.NewDBError(err)
}
defer func() { _ = rows.Close() }()
Expand Down
4 changes: 4 additions & 0 deletions internal/schedule/schedule.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,10 @@ func (ss *BasicServiceScheduler) dispatch(task *ServiceTask) (*types.ServiceTarg
SortBy: sortOption,
})
if err != nil {
logger.LogicLogger.Error("[Schedule] model list err", "error", err, "model", task.Request.Model)
return nil, err
}
if len(ms) == 0 {
logger.LogicLogger.Error("[Schedule] model not found", "error", err, "model", task.Request.Model)
return nil, bcode.ErrModelRecordNotFound
}
Expand Down
6 changes: 3 additions & 3 deletions internal/server/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,12 @@ func (s *ModelImpl) CreateModelStream(ctx context.Context, request *dto.CreateMo

if resp.Completed > 0 || resp.Status == "success" {
if resp.Status == "success" {
logger.LogicLogger.Error("[Pull Model Stream] accept success label")
logger.LogicLogger.Info("[Pull Model Stream] accept success label")
m.Status = "downloaded"
err = ds.Put(ctx, m)
if err != nil {
newErrorCh <- err
logger.LogicLogger.Error("[Pull Model Stream] put model status failed")
logger.LogicLogger.Info("[Pull Model Stream] put model status failed")
return
}
if service.Status != 1 {
Expand All @@ -382,7 +382,7 @@ func (s *ModelImpl) CreateModelStream(ctx context.Context, request *dto.CreateMo
newErrorCh <- err
return
}
logger.LogicLogger.Error("[Pull Model Stream] put model status success")
logger.LogicLogger.Info("[Pull Model Stream] put model status success")

}
newDataCh <- data
Expand Down
6 changes: 5 additions & 1 deletion internal/server/service_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ func (s *ServiceProviderImpl) CreateServiceProvider(ctx context.Context, request
m := new(types.Model)
m.ModelName = mName
m.ProviderName = request.ProviderName
m.ServiceName = request.ServiceName
m.ServiceSource = request.ServiceSource
err = s.Ds.Get(ctx, m)
if err != nil && !errors.Is(err, datastore.ErrEntityInvalid) {
// todo debug log output
Expand Down Expand Up @@ -233,8 +235,10 @@ func (s *ServiceProviderImpl) CreateServiceProvider(ctx context.Context, request
generateSp.Properties = request.Properties
generateSp.CreatedAt = time.Now()
generateSp.UpdatedAt = time.Now()
if err := ds.Put(ctx, generateSp); err != nil {
return nil, err
}
}

}

return &dto.CreateServiceProviderResponse{
Expand Down
6 changes: 3 additions & 3 deletions internal/types/datastore.go
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ func (t *Model) Index() map[string]interface{} {
index["provider_name"] = t.ProviderName
}

//if t.ServiceName != "" {
// index["service_name"] = t.ServiceName
//}
if t.ServiceName != "" {
index["service_name"] = t.ServiceName
}

return index
}
Expand Down