@@ -7,17 +7,17 @@ import (
7
7
"net/http"
8
8
"sort"
9
9
"time"
10
-
10
+
11
11
"github.com/APIParkLab/APIPark/service/service"
12
-
12
+
13
13
ai_key_dto "github.com/APIParkLab/APIPark/module/ai-key/dto"
14
-
14
+
15
15
ai_key "github.com/APIParkLab/APIPark/service/ai-key"
16
-
16
+
17
17
"github.com/eolinker/go-common/auto"
18
-
18
+
19
19
ai_api "github.com/APIParkLab/APIPark/service/ai-api"
20
-
20
+
21
21
model_runtime "github.com/APIParkLab/APIPark/ai-provider/model-runtime"
22
22
"github.com/APIParkLab/APIPark/gateway"
23
23
ai_dto "github.com/APIParkLab/APIPark/module/ai/dto"
@@ -30,7 +30,7 @@ import (
30
30
)
31
31
32
32
func newKey (key * ai_key.Key ) * gateway.DynamicRelease {
33
-
33
+
34
34
return & gateway.DynamicRelease {
35
35
BasicItem : & gateway.BasicItem {
36
36
ID : fmt .Sprintf ("%s-%s" , key .Provider , key .ID ),
@@ -91,7 +91,7 @@ func (i *imlProviderModule) Sort(ctx context.Context, input *ai_dto.Sort) error
91
91
if ! has {
92
92
continue
93
93
}
94
-
94
+
95
95
l , has := providerMap [id ]
96
96
if ! has {
97
97
continue
@@ -139,7 +139,7 @@ func (i *imlProviderModule) Sort(ctx context.Context, input *ai_dto.Sort) error
139
139
return err
140
140
}
141
141
return i .syncGateway (ctx , cluster .DefaultClusterID , offlineReleases , false )
142
-
142
+
143
143
})
144
144
}
145
145
@@ -176,7 +176,7 @@ func (i *imlProviderModule) ConfiguredProviders(ctx context.Context) ([]*ai_dto.
176
176
return nil , nil , fmt .Errorf ("create default key error:%v" , err )
177
177
}
178
178
}
179
-
179
+
180
180
p , has := model_runtime .GetProvider (l .Id )
181
181
if ! has {
182
182
continue
@@ -185,7 +185,7 @@ func (i *imlProviderModule) ConfiguredProviders(ctx context.Context) ([]*ai_dto.
185
185
if err != nil {
186
186
return nil , nil , fmt .Errorf ("get provider keys error:%v" , err )
187
187
}
188
-
188
+
189
189
keysStatus := make ([]* ai_dto.KeyStatus , 0 , len (keys ))
190
190
for _ , k := range keys {
191
191
status := ai_key_dto .ToKeyStatus (k .Status )
@@ -204,7 +204,7 @@ func (i *imlProviderModule) ConfiguredProviders(ctx context.Context) ([]*ai_dto.
204
204
sort .Slice (keysStatus , func (i , j int ) bool {
205
205
return keysStatus [i ].Priority < keysStatus [j ].Priority
206
206
})
207
-
207
+
208
208
providers = append (providers , & ai_dto.ConfiguredProviderItem {
209
209
Id : l .Id ,
210
210
Name : l .Name ,
@@ -248,7 +248,7 @@ func (i *imlProviderModule) SimpleProviders(ctx context.Context) ([]*ai_dto.Simp
248
248
return nil , err
249
249
}
250
250
providers := model_runtime .Providers ()
251
-
251
+
252
252
providerMap := utils .SliceToMap (list , func (e * ai.Provider ) string {
253
253
return e .Id
254
254
})
@@ -315,7 +315,7 @@ func (i *imlProviderModule) SimpleConfiguredProviders(ctx context.Context) ([]*a
315
315
Name : model .ID (),
316
316
},
317
317
}
318
-
318
+
319
319
items = append (items , item )
320
320
}
321
321
sort .Slice (items , func (i , j int ) bool {
@@ -426,7 +426,7 @@ func (i *imlProviderModule) Provider(ctx context.Context, id string) (*ai_dto.Pr
426
426
if info .Priority == 0 {
427
427
info .Priority = maxPriority
428
428
}
429
-
429
+
430
430
return & ai_dto.Provider {
431
431
Id : info .Id ,
432
432
Name : info .Name ,
@@ -445,12 +445,12 @@ func (i *imlProviderModule) LLMs(ctx context.Context, driver string) ([]*ai_dto.
445
445
if ! has {
446
446
return nil , nil , fmt .Errorf ("ai provider not found" )
447
447
}
448
-
448
+
449
449
llms , has := p .ModelsByType (model_runtime .ModelTypeLLM )
450
450
if ! has {
451
451
return nil , nil , fmt .Errorf ("ai provider not found" )
452
452
}
453
-
453
+
454
454
items := make ([]* ai_dto.LLMItem , 0 , len (llms ))
455
455
for _ , v := range llms {
456
456
items = append (items , & ai_dto.LLMItem {
@@ -478,7 +478,7 @@ func (i *imlProviderModule) LLMs(ctx context.Context, driver string) ([]*ai_dto.
478
478
Logo : p .Logo (),
479
479
}, nil
480
480
}
481
-
481
+
482
482
return items , & ai_dto.ProviderItem {
483
483
Id : info .Id ,
484
484
Name : info .Name ,
@@ -558,19 +558,19 @@ func (i *imlProviderModule) UpdateProviderConfig(ctx context.Context, id string,
558
558
if err != nil {
559
559
return err
560
560
}
561
-
562
- if input .Enable != nil {
563
- status = 0
564
- if * input .Enable {
565
- status = 1
566
- }
567
- pInfo .Status = & status
568
- }
561
+
562
+ // if input.Enable != nil {
563
+ // status = 0
564
+ // if *input.Enable {
565
+ // status = 1
566
+ // }
567
+ // pInfo.Status = &status
568
+ // }
569
569
err = i .providerService .Save (ctx , id , pInfo )
570
570
if err != nil {
571
571
return err
572
572
}
573
-
573
+
574
574
if * pInfo .Status == 0 {
575
575
return i .syncGateway (ctx , cluster .DefaultClusterID , []* gateway.DynamicRelease {
576
576
{
@@ -614,11 +614,11 @@ func (i *imlProviderModule) getAiProviders(ctx context.Context) ([]*gateway.Dyna
614
614
if err != nil {
615
615
return nil , err
616
616
}
617
-
617
+
618
618
providers := make ([]* gateway.DynamicRelease , 0 , len (list ))
619
619
for _ , l := range list {
620
620
// 获取当前供应商所有Key信息
621
-
621
+
622
622
driver , has := model_runtime .GetProvider (l .Id )
623
623
if ! has {
624
624
return nil , fmt .Errorf ("provider not found: %s" , l .Id )
@@ -653,7 +653,7 @@ func (i *imlProviderModule) initGateway(ctx context.Context, clusterId string, c
653
653
if err != nil {
654
654
return err
655
655
}
656
-
656
+
657
657
for _ , p := range providers {
658
658
client , err := clientDriver .Dynamic (p .Resource )
659
659
if err != nil {
@@ -664,7 +664,7 @@ func (i *imlProviderModule) initGateway(ctx context.Context, clusterId string, c
664
664
return err
665
665
}
666
666
}
667
-
667
+
668
668
return nil
669
669
}
670
670
@@ -694,7 +694,7 @@ func (i *imlProviderModule) syncGateway(ctx context.Context, clusterId string, r
694
694
return err
695
695
}
696
696
}
697
-
697
+
698
698
return nil
699
699
}
700
700
@@ -727,9 +727,9 @@ func (i *imlAIApiModule) APIs(ctx context.Context, keyword string, providerId st
727
727
Name : s .Name ,
728
728
})
729
729
serviceTeamMap [s .Id ] = s .Team
730
-
730
+
731
731
}
732
-
732
+
733
733
modelItems := utils .SliceToSlice (p .Models (), func (e model_runtime.IModel ) * ai_dto.BasicInfo {
734
734
return & ai_dto.BasicInfo {
735
735
Id : e .ID (),
@@ -752,7 +752,7 @@ func (i *imlAIApiModule) APIs(ctx context.Context, keyword string, providerId st
752
752
if err != nil {
753
753
return nil , nil , 0 , err
754
754
}
755
-
755
+
756
756
if len (apis ) <= 0 {
757
757
return nil , condition , 0 , nil
758
758
}
@@ -767,10 +767,10 @@ func (i *imlAIApiModule) APIs(ctx context.Context, keyword string, providerId st
767
767
if err != nil {
768
768
return nil , nil , 0 , err
769
769
}
770
-
770
+
771
771
apiItems := utils .SliceToSlice (results , func (e * ai_api.APIUse ) * ai_dto.APIItem {
772
772
info := apiMap [e .API ]
773
-
773
+
774
774
delete (apiMap , e .API )
775
775
return & ai_dto.APIItem {
776
776
Id : e .API ,
@@ -814,5 +814,8 @@ func (i *imlAIApiModule) APIs(ctx context.Context, keyword string, providerId st
814
814
for i := offset ; i < offset + size && i < len (sortApis ); i ++ {
815
815
apiItems = append (apiItems , sortApis [i ])
816
816
}
817
-
818
- total := int64 (len (apis ))
817
+
818
+ total := int64 (len (apis ))
819
+ return apiItems , condition , total , nil
820
+ }
821
+ }
0 commit comments