Skip to content

Commit

Permalink
Allow usage of proposed API (#16389)
Browse files Browse the repository at this point in the history
  • Loading branch information
DonJayamanne authored Jan 20, 2025
1 parent 2071e85 commit d190195
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/platform/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const NOTEBOOK_SELECTOR = [
export const CodespaceExtensionId = 'GitHub.codespaces';
export const JVSC_EXTENSION_ID = 'ms-toolsai.jupyter';
export const DATA_WRANGLER_EXTENSION_ID = 'ms-toolsai.datawrangler';
export const PROPOSED_API_ALLOWED_PUBLISHERS = ['donjayamanne'];
export const POWER_TOYS_EXTENSION_ID = 'ms-toolsai.vscode-jupyter-powertoys';
export const JUPYTER_HUB_EXTENSION_ID = 'ms-toolsai.jupyter-hub';
export const AppinsightsKey = '0c6ae279ed8443289764825290e4f9e2-1a736e7c-1324-4338-be46-fc2a58ae4d14-7255';
Expand Down
11 changes: 9 additions & 2 deletions src/standalone/api/kernels/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import { ServiceContainer } from '../../../platform/ioc/container';
import { IKernel, IKernelProvider } from '../../../kernels/types';
import { createKernelApiForExtension as createKernelApiForExtension } from './kernel';
import { Telemetry, sendTelemetryEvent } from '../../../telemetry';
import { DATA_WRANGLER_EXTENSION_ID, JVSC_EXTENSION_ID } from '../../../platform/common/constants';
import {
DATA_WRANGLER_EXTENSION_ID,
JVSC_EXTENSION_ID,
PROPOSED_API_ALLOWED_PUBLISHERS
} from '../../../platform/common/constants';
import { initializeInteractiveOrNotebookTelemetryBasedOnUserAction } from '../../../kernels/telemetry/helper';
import { IDisposableRegistry } from '../../../platform/common/types';

Expand Down Expand Up @@ -47,7 +51,10 @@ export function getKernelsApi(extensionId: string): Kernels {
return getWrappedKernel(kernel, extensionId);
},
get onDidStart() {
if (![JVSC_EXTENSION_ID, DATA_WRANGLER_EXTENSION_ID].includes(extensionId)) {
if (
![JVSC_EXTENSION_ID, DATA_WRANGLER_EXTENSION_ID].includes(extensionId) &&
!PROPOSED_API_ALLOWED_PUBLISHERS.includes(extensionId.split('.')[0])
) {
throw new Error(`Proposed API is not supported for extension ${extensionId}`);
}

Expand Down
6 changes: 5 additions & 1 deletion src/standalone/api/kernels/kernel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import {
DATA_WRANGLER_EXTENSION_ID,
JVSC_EXTENSION_ID,
POWER_TOYS_EXTENSION_ID,
PROPOSED_API_ALLOWED_PUBLISHERS,
PYTHON_LANGUAGE
} from '../../../platform/common/constants';
import { ChatMime, generatePythonCodeToInvokeCallback } from '../../../kernels/chat/generator';
Expand Down Expand Up @@ -263,7 +264,10 @@ class WrappedKernelPerExtension extends DisposableBase implements Kernel {
},
onDidChangeStatus: that.onDidChangeStatus.bind(this),
get onDidReceiveDisplayUpdate() {
if (![JVSC_EXTENSION_ID, POWER_TOYS_EXTENSION_ID, DATA_WRANGLER_EXTENSION_ID].includes(extensionId)) {
if (
![JVSC_EXTENSION_ID, POWER_TOYS_EXTENSION_ID, DATA_WRANGLER_EXTENSION_ID].includes(extensionId) &&
!PROPOSED_API_ALLOWED_PUBLISHERS.includes(extensionId.split('.')[0])
) {
throw new Error(`Proposed API is not supported for extension ${extensionId}`);
}

Expand Down

0 comments on commit d190195

Please sign in to comment.