[Query Copilot] Phoenix Gateway flag true by default (#1595)

* Phoenix Gateway flag true by default

* Additional changes for clearness

* removal of console log

---------

Co-authored-by: Predrag Klepic <v-prklepic@microsoft.com>
This commit is contained in:
Predrag Klepic 2023-09-01 02:01:11 +02:00 committed by GitHub
parent f8ff0626d9
commit d155407b58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions

View File

@ -184,7 +184,7 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
useTabs.getState().setIsQueryErrorThrown(false); useTabs.getState().setIsQueryErrorThrown(false);
if ( if (
useQueryCopilot.getState().containerStatus.status !== ContainerStatusType.Active && useQueryCopilot.getState().containerStatus.status !== ContainerStatusType.Active &&
userContext.features.enableCopilotPhoenixGateaway !userContext.features.disableCopilotPhoenixGateaway
) { ) {
await explorer.allocateContainer(PoolIdType.QueryCopilot); await explorer.allocateContainer(PoolIdType.QueryCopilot);
} }
@ -196,9 +196,9 @@ export const QueryCopilotTab: React.FC<QueryCopilotProps> = ({ explorer }: Query
}; };
useQueryCopilot.getState().refreshCorrelationId(); useQueryCopilot.getState().refreshCorrelationId();
const serverInfo = useQueryCopilot.getState().notebookServerInfo; const serverInfo = useQueryCopilot.getState().notebookServerInfo;
const queryUri = userContext.features.enableCopilotPhoenixGateaway const queryUri = userContext.features.disableCopilotPhoenixGateaway
? createUri(serverInfo.notebookServerEndpoint, "generateSQLQuery") ? createUri("https://copilotorchestrater.azurewebsites.net/", "generateSQLQuery")
: createUri("https://copilotorchestrater.azurewebsites.net/", "generateSQLQuery"); : createUri(serverInfo.notebookServerEndpoint, "generateSQLQuery");
const response = await fetch(queryUri, { const response = await fetch(queryUri, {
method: "POST", method: "POST",
headers: { headers: {

View File

@ -50,9 +50,9 @@ describe("Query Copilot Client", () => {
forwardingId: "mocked-forwarding-id", forwardingId: "mocked-forwarding-id",
}; };
const feedbackUri = userContext.features.enableCopilotPhoenixGateaway const feedbackUri = userContext.features.disableCopilotPhoenixGateaway
? createUri(useQueryCopilot.getState().notebookServerInfo.notebookServerEndpoint, "feedback") ? createUri("https://copilotorchestrater.azurewebsites.net/", "feedback")
: createUri("https://copilotorchestrater.azurewebsites.net/", "feedback"); : createUri(useQueryCopilot.getState().notebookServerInfo.notebookServerEndpoint, "feedback");
it("should call fetch with the payload with like", async () => { it("should call fetch with the payload with like", async () => {
const mockFetch = jest.fn().mockResolvedValueOnce({}); const mockFetch = jest.fn().mockResolvedValueOnce({});

View File

@ -32,7 +32,7 @@ export const SendQueryRequest = async ({
try { try {
if ( if (
useQueryCopilot.getState().containerStatus.status !== ContainerStatusType.Active && useQueryCopilot.getState().containerStatus.status !== ContainerStatusType.Active &&
userContext.features.enableCopilotPhoenixGateaway !userContext.features.disableCopilotPhoenixGateaway
) { ) {
await explorer.allocateContainer(PoolIdType.QueryCopilot); await explorer.allocateContainer(PoolIdType.QueryCopilot);
} }
@ -40,9 +40,9 @@ export const SendQueryRequest = async ({
useQueryCopilot.getState().refreshCorrelationId(); useQueryCopilot.getState().refreshCorrelationId();
const serverInfo = useQueryCopilot.getState().notebookServerInfo; const serverInfo = useQueryCopilot.getState().notebookServerInfo;
const queryUri = userContext.features.enableCopilotPhoenixGateaway const queryUri = userContext.features.disableCopilotPhoenixGateaway
? createUri(serverInfo.notebookServerEndpoint, "generateSQLQuery") ? createUri("https://copilotorchestrater.azurewebsites.net/", "generateSQLQuery")
: createUri("https://copilotorchestrater.azurewebsites.net/", "generateSQLQuery"); : createUri(serverInfo.notebookServerEndpoint, "generateSQLQuery");
const payload = { const payload = {
containerSchema: userContext.features.enableCopilotFullSchema containerSchema: userContext.features.enableCopilotFullSchema
@ -113,14 +113,14 @@ export const SubmitFeedback = async ({
}; };
if ( if (
useQueryCopilot.getState().containerStatus.status !== ContainerStatusType.Active && useQueryCopilot.getState().containerStatus.status !== ContainerStatusType.Active &&
userContext.features.enableCopilotPhoenixGateaway !userContext.features.disableCopilotPhoenixGateaway
) { ) {
await explorer.allocateContainer(PoolIdType.QueryCopilot); await explorer.allocateContainer(PoolIdType.QueryCopilot);
} }
const serverInfo = useQueryCopilot.getState().notebookServerInfo; const serverInfo = useQueryCopilot.getState().notebookServerInfo;
const feedbackUri = userContext.features.enableCopilotPhoenixGateaway const feedbackUri = userContext.features.disableCopilotPhoenixGateaway
? createUri(serverInfo.notebookServerEndpoint, "feedback") ? createUri("https://copilotorchestrater.azurewebsites.net/", "feedback")
: createUri("https://copilotorchestrater.azurewebsites.net/", "feedback"); : createUri(serverInfo.notebookServerEndpoint, "feedback");
await fetch(feedbackUri, { await fetch(feedbackUri, {
method: "POST", method: "POST",
headers: { headers: {

View File

@ -38,7 +38,7 @@ export type Features = {
readonly enableCopilot: boolean; readonly enableCopilot: boolean;
readonly enablePriorityBasedThrottling: boolean; readonly enablePriorityBasedThrottling: boolean;
readonly copilotVersion?: string; readonly copilotVersion?: string;
readonly enableCopilotPhoenixGateaway: boolean; readonly disableCopilotPhoenixGateaway: boolean;
readonly enableCopilotFullSchema: boolean; readonly enableCopilotFullSchema: boolean;
// can be set via both flight and feature flag // can be set via both flight and feature flag
@ -110,7 +110,7 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
enablePriorityBasedThrottling: "true" === get("enableprioritybasedthrottling"), enablePriorityBasedThrottling: "true" === get("enableprioritybasedthrottling"),
enableCopilot: "true" === get("enablecopilot"), enableCopilot: "true" === get("enablecopilot"),
copilotVersion: get("copilotversion") ?? "v1.0", copilotVersion: get("copilotversion") ?? "v1.0",
enableCopilotPhoenixGateaway: "true" === get("enablecopilotphoenixgateaway"), disableCopilotPhoenixGateaway: "true" === get("disablecopilotphoenixgateaway"),
enableCopilotFullSchema: "true" === get("enablecopilotfullschema"), enableCopilotFullSchema: "true" === get("enablecopilotfullschema"),
}; };
} }