steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add serving end point support

This commit is contained in:
Lennart Kats 2024-12-14 20:39:10 +01:00
parent 7d1f8ad19b
commit 6b5948cef9
No known key found for this signature in database
GPG Key ID: 1EB8B57673197023
1 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
bundle/config/mutator/apply_presets.go
View File

@ -190,16 +190,38 @@ func (m *applyPresets) Apply(ctx context.Context, b *bundle.Bundle) diag.Diagnos
e.Name = normalizePrefix(prefix) + e.Name e.Name = normalizePrefix(prefix) + e.Name
if t.Catalog != "" || t.Schema != "" { if t.Catalog != "" || t.Schema != "" {
// TODO: // Apply catalog & schema to inference table config if not set
// - e.AiGateway.InferenceTableConfig.CatalogName if e.CreateServingEndpoint.AiGateway != nil && e.CreateServingEndpoint.AiGateway.InferenceTableConfig != nil {
// - e.AiGateway.InferenceTableConfig.SchemaName if t.Catalog != "" && e.CreateServingEndpoint.AiGateway.InferenceTableConfig.CatalogName == "" {
// - e.Config.AutoCaptureConfig.SchemaName e.CreateServingEndpoint.AiGateway.InferenceTableConfig.CatalogName = t.Catalog
// - e.Config.AutoCaptureConfig.CatalogName }
// - e.Config.ServedEntities[0].EntityName (__catalog_name__.__schema_name__.__model_name__.) if t.Schema != "" && e.CreateServingEndpoint.AiGateway.InferenceTableConfig.SchemaName == "" {
// - e.Config.ServedModels[0].ModelName (__catalog_name__.__schema_name__.__model_name__.) e.CreateServingEndpoint.AiGateway.InferenceTableConfig.SchemaName = t.Schema
diags = diags.Extend(diag.Errorf("model serving endpoints are not supported with catalog/schema presets")) }
} }
// Apply catalog & schema to auto capture config if not set
if e.CreateServingEndpoint.Config.AutoCaptureConfig != nil {
if t.Catalog != "" && e.CreateServingEndpoint.Config.AutoCaptureConfig.CatalogName == "" {
e.CreateServingEndpoint.Config.AutoCaptureConfig.CatalogName = t.Catalog
}
if t.Schema != "" && e.CreateServingEndpoint.Config.AutoCaptureConfig.SchemaName == "" {
e.CreateServingEndpoint.Config.AutoCaptureConfig.SchemaName = t.Schema
}
}
// Fully qualify served entities and models if they are not already qualified
for i := range e.CreateServingEndpoint.Config.ServedEntities {
e.CreateServingEndpoint.Config.ServedEntities[i].EntityName = fullyQualifyName(
e.CreateServingEndpoint.Config.ServedEntities[i].EntityName, t.Catalog, t.Schema,
)
}
for i := range e.CreateServingEndpoint.Config.ServedModels {
e.CreateServingEndpoint.Config.ServedModels[i].ModelName = fullyQualifyName(
e.CreateServingEndpoint.Config.ServedModels[i].ModelName, t.Catalog, t.Schema,
)
}
}
} }
// Registered models presets // Registered models presets
@ -484,6 +506,24 @@ func recommendCatalogSchemaUsage(b *bundle.Bundle, ctx context.Context, key stri
} }
return diags return diags
}
// fullyQualifyName checks if the given name is already qualified with a catalog and schema.
// If not, and both catalog and schema are available, it prefixes the name with catalog.schema.
// If name is empty, returns name as-is.
func fullyQualifyName(name, catalog, schema string) string {
if name == "" || catalog == "" || schema == "" {
return name
}
// If it's already qualified (contains at least two '.'), we assume it's fully qualified.
parts := strings.Split(name, ".")
if len(parts) >= 3 {
// Already fully qualified
return name
}
// Otherwise, fully qualify it
return fmt.Sprintf("%s.%s.%s", catalog, schema, name)
} }
func fileIncludesPattern(ctx context.Context, filePath string, expected string) bool { func fileIncludesPattern(ctx context.Context, filePath string, expected string) bool {