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
1 change: 1 addition & 0 deletions knip.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"@databricks/sdk-experimental",
"@databricks/sdk-files",
"@databricks/sdk-genie",
"@databricks/sdk-uc-functions",
"@databricks/sdk-jobs",
"@databricks/sdk-postgres",
"@databricks/sdk-modelserving",
Expand Down
1 change: 1 addition & 0 deletions packages/appkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"@databricks/sdk-experimental": "0.17.0",
"@databricks/sdk-files": "0.52.0",
"@databricks/sdk-genie": "0.54.0",
"@databricks/sdk-uc-functions": "0.51.0",
"@databricks/sdk-jobs": "0.57.0",
"@databricks/sdk-modelserving": "0.53.0",
"@databricks/sdk-uc-tables": "0.52.0",
Expand Down
1 change: 1 addition & 0 deletions packages/appkit/src/testing/mock-workspace-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ const FACADE_SERVICES = [
"tables",
"postgres",
"volumes",
"functions",
"statementExecution",
"modelServing",
"servingEndpoints",
Expand Down
1 change: 1 addition & 0 deletions packages/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"@databricks/sdk-experimental": "0.17.0",
"@databricks/sdk-files": "0.52.0",
"@databricks/sdk-genie": "0.54.0",
"@databricks/sdk-uc-functions": "0.51.0",
"@databricks/sdk-jobs": "0.57.0",
"@databricks/sdk-modelserving": "0.53.0",
"@databricks/sdk-uc-tables": "0.52.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/shared/src/workspace-client/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ import {
buildWarehousesClient,
buildWorkspaceAuth,
type ScimClient,
buildFunctionsClient,
buildGenieClient,
type FunctionsClient,
type GenieClient,
buildJobsClient,
type JobsClient,
Expand Down Expand Up @@ -56,6 +58,7 @@ export class AppKitWorkspaceClient implements WorkspaceClient {
#tables?: TablesClient;
#postgres?: PostgresClient;
#volumes?: VolumesClient;
#functions?: FunctionsClient;

constructor(opts: WorkspaceClientOptions) {
this.#opts = opts;
Expand Down Expand Up @@ -117,6 +120,14 @@ export class AppKitWorkspaceClient implements WorkspaceClient {
return this.#postgres;
}

// Migrated to the modular SDK — built lazily, independent of the legacy client.
get functions(): FunctionsClient {
if (!this.#functions) {
this.#functions = buildFunctionsClient(this.#opts);
}
return this.#functions;
}

// Migrated to the modular SDK — built lazily, independent of the legacy client.
get volumes(): VolumesClient {
if (!this.#volumes) {
Expand Down
17 changes: 17 additions & 0 deletions packages/shared/src/workspace-client/modular.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import type { ClientOptions } from "@databricks/sdk-options/client";
import type { PostgresClient } from "@databricks/sdk-postgres/v1";
import { ScimClient } from "@databricks/sdk-scim/v1";
import { StatementExecutionClient } from "@databricks/sdk-statementexecution/v1";
import type { FunctionsClient } from "@databricks/sdk-uc-functions/v1";
import type { TablesClient } from "@databricks/sdk-uc-tables/v1";
import type { VolumesClient } from "@databricks/sdk-uc-volumes/v1";
import type { VectorSearchClient } from "@databricks/sdk-vectorsearch/v1";
Expand Down Expand Up @@ -649,6 +650,17 @@ export function buildVolumesClient(
);
}

/** Build a modular Unity Catalog Functions client from wrapper options. */
export function buildFunctionsClient(
opts: WorkspaceClientOptions,
): FunctionsClient {
return lazyClient(
() =>
import("@databricks/sdk-uc-functions/v1").then((m) => m.FunctionsClient),
mapToClientOptions(opts),
);
}

/**
* Build a modular Lakebase Postgres (autoscaling: projects, branches,
* endpoints) client from wrapper options. Distinct from the provisioned
Expand All @@ -675,6 +687,7 @@ export type { ModelServingClient } from "@databricks/sdk-modelserving/v1";
export type { PostgresClient } from "@databricks/sdk-postgres/v1";
export type { ScimClient } from "@databricks/sdk-scim/v1";
export type { StatementExecutionClient } from "@databricks/sdk-statementexecution/v1";
export type { FunctionsClient } from "@databricks/sdk-uc-functions/v1";
export type { TablesClient } from "@databricks/sdk-uc-tables/v1";
export type { VolumesClient } from "@databricks/sdk-uc-volumes/v1";
export type { VectorSearchClient } from "@databricks/sdk-vectorsearch/v1";
Expand Down Expand Up @@ -704,6 +717,10 @@ export type {
GenieGetMessageQueryResultResponse,
GenieMessage,
} from "@databricks/sdk-genie/v1";
export type {
FunctionInfo,
GetFunctionRequest,
} from "@databricks/sdk-uc-functions/v1";
export type {
BaseRun,
CancelRunRequest,
Expand Down
34 changes: 34 additions & 0 deletions packages/shared/src/workspace-client/tests/modular.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ vi.mock("@databricks/sdk-uc-volumes/v1", () => ({
return { opts, getVolume: async () => ({}) };
}),
}));
vi.mock("@databricks/sdk-uc-functions/v1", () => ({
FunctionsClient: vi.fn().mockImplementation((opts) => {
ctorOpts.push(opts);
return { opts, getFunction: async () => ({}) };
}),
}));
vi.mock("@databricks/sdk-postgres/v1", () => ({
PostgresClient: vi.fn().mockImplementation((opts) => {
ctorOpts.push(opts);
Expand Down Expand Up @@ -136,6 +142,7 @@ vi.mock("node:child_process", () => ({

import { ApiError } from "../errors";
import {
buildFunctionsClient,
buildGenieClient,
buildModelServingClient,
buildVolumesClient,
Expand Down Expand Up @@ -423,6 +430,33 @@ describe("modular mapToClientOptions (via buildWarehousesClient)", () => {
expect(m2mOpts).toEqual([]);
});

test("functions maps host + SP M2M credentials onto the client", async () => {
process.env.DATABRICKS_CLIENT_ID = "sp-client-id";
process.env.DATABRICKS_CLIENT_SECRET = "sp-secret";
await buildFunctionsClient({
host: "my-ws.cloud.databricks.com",
} as never).getFunction({} as never);
expect(ctorOpts[0].host).toBe("https://my-ws.cloud.databricks.com");
expect(ctorOpts[0].credentials).toMatchObject({
name: expect.any(Function),
});
expect(m2mOpts).toHaveLength(1);
});

test("functions (asUser) uses the OBO token as PAT", async () => {
process.env.DATABRICKS_CLIENT_ID = "sp-client-id";
process.env.DATABRICKS_CLIENT_SECRET = "sp-secret";
await buildFunctionsClient({
token: "user-token",
host: "https://x",
} as never).getFunction({} as never);
expect(ctorOpts[0].credentials).toMatchObject({
kind: "pat",
token: "user-token",
});
expect(m2mOpts).toEqual([]);
});

test("postgres normalizes the host and passes SP M2M credentials", async () => {
process.env.DATABRICKS_HOST = "envhost.cloud.databricks.com";
process.env.DATABRICKS_CLIENT_ID = "sp-client-id";
Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/workspace-client/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import type {
FilesClient,
TablesClient,
VolumesClient,
FunctionsClient,
VectorSearchClient,
PostgresClient,
} from "./modular";
Expand Down Expand Up @@ -73,6 +74,9 @@ export interface WorkspaceClient extends WorkspaceAuth {
/** Unity Catalog Volumes (modular SDK). */
readonly volumes: VolumesClient;

/** Unity Catalog Functions (modular SDK). */
readonly functions: FunctionsClient;

/** Statement Execution (modular SDK). */
readonly statementExecution: StatementExecutionClient;

Expand Down
19 changes: 19 additions & 0 deletions pnpm-lock.yaml

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

Loading