Skip to content

Refactor apps-mcp to use shared GetDefaultWarehouse #4171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lennartkats-db wants to merge 1 commit into
base: default-warehouse-in-templates
Choose a base branch
from
+7 −52
Open

Refactor apps-mcp to use shared GetDefaultWarehouse #4171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 7 additions & 52 deletions experimental/apps-mcp/lib/middlewares/warehouse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@ package middlewares

import (
"context"
"errors"
"fmt"
"net/url"
"sort"
"sync"

"github.com/databricks/cli/experimental/apps-mcp/lib/session"
"github.com/databricks/cli/libs/databrickscfg/cfgpickers"
"github.com/databricks/cli/libs/env"
"github.com/databricks/databricks-sdk-go/httpclient"
"github.com/databricks/databricks-sdk-go/service/sql"
)

Expand Down Expand Up @@ -83,13 +80,14 @@ func GetWarehouseID(ctx context.Context) (string, error) {
}

func getDefaultWarehouse(ctx context.Context) (*sql.EndpointInfo, error) {
w, err := GetDatabricksClient(ctx)
if err != nil {
return nil, fmt.Errorf("get databricks client: %w", err)
}

// first resolve DATABRICKS_WAREHOUSE_ID env variable
warehouseID := env.Get(ctx, "DATABRICKS_WAREHOUSE_ID")
if warehouseID != "" {
w, err := GetDatabricksClient(ctx)
if err != nil {
return nil, fmt.Errorf("get databricks client: %w", err)
}
warehouse, err := w.Warehouses.Get(ctx, sql.GetWarehouseRequest{
Id: warehouseID,
})
Expand All @@ -103,48 +101,5 @@ func getDefaultWarehouse(ctx context.Context) (*sql.EndpointInfo, error) {
}, nil
}

apiClient, err := GetApiClient(ctx)
if err != nil {
return nil, err
}

apiPath := "/api/2.0/sql/warehouses"
params := url.Values{}
params.Add("skip_cannot_use", "true")
fullPath := fmt.Sprintf("%s?%s", apiPath, params.Encode())

var response sql.ListWarehousesResponse
err = apiClient.Do(ctx, "GET", fullPath, httpclient.WithResponseUnmarshal(&response))
if err != nil {
return nil, err
}

priorities := map[sql.State]int{
sql.StateRunning: 1,
sql.StateStarting: 2,
sql.StateStopped: 3,
sql.StateStopping: 4,
sql.StateDeleted: 99,
sql.StateDeleting: 99,
}

warehouses := response.Warehouses
sort.Slice(warehouses, func(i, j int) bool {
return priorities[warehouses[i].State] < priorities[warehouses[j].State]
})

if len(warehouses) == 0 {
return nil, errNoWarehouses()
}

firstWarehouse := warehouses[0]
if firstWarehouse.State == sql.StateDeleted || firstWarehouse.State == sql.StateDeleting {
return nil, errNoWarehouses()
}

return &firstWarehouse, nil
}

func errNoWarehouses() error {
return errors.New("no warehouse found. You can explicitly set the warehouse ID using the DATABRICKS_WAREHOUSE_ID environment variable")
return cfgpickers.GetDefaultWarehouse(ctx, w)
}