Skip to content
Merged
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

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 10 additions & 7 deletions aigateway/component/openai.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func (m *openaiComponentImpl) getCSGHubModels(c context.Context, userID int64) (
Created: deploy.CreatedAt.Unix(),
SupportFunctionCall: supportFunctionCall,
Task: string(deploy.Task),
DisplayName: repoName,
OfficialName: repoName,
Metadata: map[string]any{
types.MetaKeyLLMType: providerTypeFromDeployType(deploy.Type),
},
Expand All @@ -262,6 +262,9 @@ func (m *openaiComponentImpl) getCSGHubModels(c context.Context, userID int64) (
ImageID: deploy.ImageID,
RuntimeFramework: deploy.RuntimeFramework,
},
ExternalModelInfo: types.ExternalModelInfo{
NeedSensitiveCheck: true,
},
}
if deploy.Type == commontypes.ServerlessType {
m.BaseModel.OwnedBy = "OpenCSG"
Expand Down Expand Up @@ -325,12 +328,12 @@ func (m *openaiComponentImpl) getExternalModels(c context.Context) []types.Model
extModel.Metadata[types.MetaKeyLLMType] = types.ProviderTypeExternalLLM
m := types.Model{
BaseModel: types.BaseModel{
Object: "model",
ID: extModel.ModelName,
OwnedBy: extModel.Provider,
DisplayName: extModel.DisplayName,
Metadata: extModel.Metadata,
Task: task,
Object: "model",
ID: extModel.ModelName,
OwnedBy: extModel.Provider,
OfficialName: extModel.OfficialName,
Metadata: extModel.Metadata,
Task: task,
},
Endpoint: extModel.ApiEndpoint,
ExternalModelInfo: types.ExternalModelInfo{
Expand Down
100 changes: 57 additions & 43 deletions aigateway/component/openai_ce_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,15 @@ func TestOpenAIComponent_GetAvailableModels(t *testing.T) {
mockLLMConfigStore.EXPECT().Index(mock.Anything, 50, 1, mock.Anything).
Return([]*database.LLMConfig{}, 0, nil)

// Must match JSON produced by saveModelsToCache (getCSGHubModels + ForInternalUse):
// DisplayName is Repository.Name; NeedSensitiveCheck is unset (false) on CSGHub models.
expectModels := []types.Model{
{
BaseModel: types.BaseModel{
ID: "model1:svc1",
OwnedBy: "publicuser",
Object: "model",
Created: deploys[0].CreatedAt.Unix(),
Task: "text-generation",
DisplayName: deploys[0].Repository.Name,
ID: "model1:svc1",
OwnedBy: "publicuser",
Object: "model",
Created: deploys[0].CreatedAt.Unix(),
Task: "text-generation",
OfficialName: "model1",
Metadata: map[string]any{
types.MetaKeyLLMType: types.ProviderTypeInference,
},
Expand All @@ -111,16 +109,18 @@ func TestOpenAIComponent_GetAvailableModels(t *testing.T) {
SvcType: deploys[0].Type,
ImageID: deploys[0].ImageID,
},
ExternalModelInfo: types.ExternalModelInfo{
NeedSensitiveCheck: true,
},
InternalUse: true,
},
{
BaseModel: types.BaseModel{
ID: "hf-model2:svc2",
OwnedBy: "OpenCSG",
Object: "model",
Created: deploys[1].CreatedAt.Unix(),
Task: "text-to-image",
DisplayName: deploys[1].Repository.Name,
ID: "hf-model2:svc2",
OwnedBy: "OpenCSG",
Object: "model",
Created: deploys[1].CreatedAt.Unix(),
Task: "text-to-image",
Metadata: map[string]any{
types.MetaKeyLLMType: types.ProviderTypeServerless,
},
Expand All @@ -133,6 +133,9 @@ func TestOpenAIComponent_GetAvailableModels(t *testing.T) {
SvcType: deploys[1].Type,
ImageID: deploys[1].ImageID,
},
ExternalModelInfo: types.ExternalModelInfo{
NeedSensitiveCheck: true,
},
InternalUse: true,
},
}
Expand Down Expand Up @@ -211,12 +214,12 @@ func TestOpenAIComponent_GetAvailableModels(t *testing.T) {
expectModels := []types.Model{
{
BaseModel: types.BaseModel{
ID: "model1:svc1",
OwnedBy: "testuser",
Object: "model",
Created: deploys[0].CreatedAt.Unix(),
Task: "text-generation",
DisplayName: deploys[0].Repository.Name,
ID: "model1:svc1",
OwnedBy: "testuser",
Object: "model",
Created: deploys[0].CreatedAt.Unix(),
Task: "text-generation",
OfficialName: "model1",
Metadata: map[string]any{
types.MetaKeyLLMType: types.ProviderTypeInference,
},
Expand All @@ -230,16 +233,18 @@ func TestOpenAIComponent_GetAvailableModels(t *testing.T) {
SvcType: deploys[0].Type,
ImageID: deploys[0].ImageID,
},
ExternalModelInfo: types.ExternalModelInfo{
NeedSensitiveCheck: true,
},
InternalUse: true,
},
{
BaseModel: types.BaseModel{
ID: "hf-model2:svc2",
OwnedBy: "OpenCSG",
Object: "model",
Created: deploys[1].CreatedAt.Unix(),
Task: "text-to-image",
DisplayName: deploys[1].Repository.Name,
ID: "hf-model2:svc2",
OwnedBy: "OpenCSG",
Object: "model",
Created: deploys[1].CreatedAt.Unix(),
Task: "text-to-image",
Metadata: map[string]any{
types.MetaKeyLLMType: types.ProviderTypeServerless,
},
Expand All @@ -253,6 +258,9 @@ func TestOpenAIComponent_GetAvailableModels(t *testing.T) {
SvcType: deploys[1].Type,
ImageID: deploys[1].ImageID,
},
ExternalModelInfo: types.ExternalModelInfo{
NeedSensitiveCheck: true,
},
InternalUse: true,
},
}
Expand Down Expand Up @@ -325,12 +333,12 @@ func TestOpenAIComponent_GetAvailableModels(t *testing.T) {
expectModels := []types.Model{
{
BaseModel: types.BaseModel{
ID: "model3:svc3",
OwnedBy: "testuser",
Object: "model",
Created: deploys[0].CreatedAt.Unix(),
Task: "text-generation",
DisplayName: deploys[0].Repository.Name,
ID: "model3:svc3",
OwnedBy: "testuser",
Object: "model",
Created: deploys[0].CreatedAt.Unix(),
Task: "text-generation",
OfficialName: "model3",
Metadata: map[string]any{
types.MetaKeyLLMType: types.ProviderTypeInference,
},
Expand All @@ -344,6 +352,9 @@ func TestOpenAIComponent_GetAvailableModels(t *testing.T) {
SvcType: deploys[0].Type,
ImageID: deploys[0].ImageID,
},
ExternalModelInfo: types.ExternalModelInfo{
NeedSensitiveCheck: true,
},
InternalUse: true,
},
}
Expand Down Expand Up @@ -416,12 +427,11 @@ func TestOpenAIComponent_GetModelByID(t *testing.T) {
expectModels := []types.Model{
{
BaseModel: types.BaseModel{
ID: "model1:svc1",
OwnedBy: "testuser",
Object: "model",
Created: deploys[0].CreatedAt.Unix(),
Task: string(deploys[0].Task),
DisplayName: deploys[0].Repository.Name,
ID: "model1:svc1",
OwnedBy: "testuser",
Object: "model",
Created: deploys[0].CreatedAt.Unix(),
OfficialName: "model1",
Metadata: map[string]any{
types.MetaKeyLLMType: types.ProviderTypeInference,
},
Expand All @@ -435,6 +445,9 @@ func TestOpenAIComponent_GetModelByID(t *testing.T) {
SvcType: deploys[0].Type,
ImageID: deploys[0].ImageID,
},
ExternalModelInfo: types.ExternalModelInfo{
NeedSensitiveCheck: true,
},
InternalUse: true,
},
}
Expand Down Expand Up @@ -506,11 +519,12 @@ func TestOpenAIComponent_GetModelByID(t *testing.T) {
deploys[0].CreatedAt = now
expectModel := types.Model{
BaseModel: types.BaseModel{
ID: "model1:svc1",
OwnedBy: "testuser",
Object: "model",
Created: deploys[0].CreatedAt.Unix(),
Task: "text-generation",
ID: "model1:svc1",
OwnedBy: "testuser",
Object: "model",
Created: deploys[0].CreatedAt.Unix(),
Task: "text-generation",
OfficialName: "model1",
Metadata: map[string]any{
types.MetaKeyLLMType: types.ProviderTypeInference,
},
Expand Down
Loading
Loading