Disabled Deployment Toggles From User Settings for time being

aaronba · May 22, 2024 · 71f9ec6 · 71f9ec6
1 parent 5a68f20
commit 71f9ec6
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 34 deletions.
diff --git a/webapi/Extensions/SemanticKernelExtensions.cs b/webapi/Extensions/SemanticKernelExtensions.cs
@@ -79,6 +79,7 @@ public static WebApplicationBuilder AddSemanticKernelServices(this WebApplicatio
                     }
                 }
 
+                deploymentName = null; // For now, keep null until switcher tested fully
                 var kernel = provider.GetCompletionKernel(deploymentName);
 
                 sp.GetRequiredService<RegisterFunctionsWithKernel>()(sp, kernel);

diff --git a/webapp/src/App.tsx b/webapp/src/App.tsx
@@ -126,7 +126,7 @@ const App = () => {
                         if (us.azureAISearch) dispatch(toggleFeatureFlag(FeatureKeys.AzureAISearch)); // Turn on
                         if (us.exportChatSessions) dispatch(toggleFeatureFlag(FeatureKeys.ExportChatSessions)); // Turn on
                         if (us.liveChatSessionSharing) dispatch(toggleFeatureFlag(FeatureKeys.LiveChatSessionSharing)); // Turn on
-                        if (us.feedbackFromUser) dispatch(toggleFeatureFlag(FeatureKeys.RLHF)); // Turn on
+                        // if (us.feedbackFromUser) dispatch(toggleFeatureFlag(FeatureKeys.RLHF)); // Turn on
                         if (us.deploymentGPT35) dispatch(toggleFeatureFlag(FeatureKeys.DeploymentGPT35)); // Turn on
                         if (us.deploymentGPT4) dispatch(toggleFeatureFlag(FeatureKeys.DeploymentGPT4)); // Turn on
                     }
@@ -173,7 +173,7 @@ const App = () => {
                         if (us.azureAISearch) dispatch(toggleFeatureFlag(FeatureKeys.AzureAISearch)); // Turn on
                         if (us.exportChatSessions) dispatch(toggleFeatureFlag(FeatureKeys.ExportChatSessions)); // Turn on
                         if (us.liveChatSessionSharing) dispatch(toggleFeatureFlag(FeatureKeys.LiveChatSessionSharing)); // Turn on
-                        if (us.feedbackFromUser) dispatch(toggleFeatureFlag(FeatureKeys.RLHF)); // Turn on
+                        //  if (us.feedbackFromUser) dispatch(toggleFeatureFlag(FeatureKeys.RLHF)); // Turn on
                         if (us.deploymentGPT35) dispatch(toggleFeatureFlag(FeatureKeys.DeploymentGPT35)); // Turn on
                         if (us.deploymentGPT4) dispatch(toggleFeatureFlag(FeatureKeys.DeploymentGPT4)); // Turn on
                     }

diff --git a/webapp/src/components/header/settings-dialog/SettingSection.tsx b/webapp/src/components/header/settings-dialog/SettingSection.tsx
@@ -86,29 +86,34 @@ export const SettingSection: React.FC<ISettingsSectionProps> = ({ setting, conte
                     const disableControl = !!feature.inactive;
 
                     return (
-                        <div key={key} className={classes.feature}>
-                            <Switch
-                                label={feature.label}
-                                checked={feature.enabled}
-                                disabled={
-                                    disableControl || (key === FeatureKeys.MultiUserChat && !AuthHelper.isAuthAAD())
-                                }
-                                onChange={() => {
-                                    onFeatureChange(key);
-                                }}
-                                data-testid={feature.label}
-                            />
-                            <Text
-                                className={classes.featureDescription}
-                                style={{
-                                    color: disableControl
-                                        ? tokens.colorNeutralForegroundDisabled
-                                        : tokens.colorNeutralForeground2,
-                                }}
-                            >
-                                {feature.description}
-                            </Text>
-                        </div>
+                        <>
+                            {key !== FeatureKeys.DeploymentGPT35 && key !== FeatureKeys.DeploymentGPT4 && (
+                                <div key={key} className={classes.feature}>
+                                    <Switch
+                                        label={feature.label}
+                                        checked={feature.enabled}
+                                        disabled={
+                                            disableControl ||
+                                            (key === FeatureKeys.MultiUserChat && !AuthHelper.isAuthAAD())
+                                        }
+                                        onChange={() => {
+                                            onFeatureChange(key);
+                                        }}
+                                        data-testid={feature.label}
+                                    />
+                                    <Text
+                                        className={classes.featureDescription}
+                                        style={{
+                                            color: disableControl
+                                                ? tokens.colorNeutralForegroundDisabled
+                                                : tokens.colorNeutralForeground2,
+                                        }}
+                                    >
+                                        {feature.description}
+                                    </Text>
+                                </div>
+                            )}
+                        </>
                     );
                 })}
             </div>

diff --git a/webapp/src/index.tsx b/webapp/src/index.tsx
@@ -129,15 +129,15 @@ export function renderApp() {
             store.dispatch(
                 toggleFeatureState({
                     feature: FeatureKeys.DeploymentGPT35,
-                    deactivate: lockControl,
+                    deactivate: true, // For now, leave disabled
                     enable: false,
                 }),
             );
 
             store.dispatch(
                 toggleFeatureState({
                     feature: FeatureKeys.DeploymentGPT4,
-                    deactivate: lockControl,
+                    deactivate: true, // For now, leave disabled
                     enable: false,
                 }),
             );

diff --git a/webapp/src/redux/features/app/AppState.ts b/webapp/src/redux/features/app/AppState.ts
@@ -183,18 +183,19 @@ export const Settings = [
     },
     {
         title: 'Azure AI',
-        features: [
-            FeatureKeys.AzureContentSafety,
-            FeatureKeys.AzureAISearch,
-            FeatureKeys.DeploymentGPT35,
-            FeatureKeys.DeploymentGPT4,
-        ],
+        features: [FeatureKeys.AzureContentSafety, FeatureKeys.AzureAISearch],
         stackVertically: true,
     },
     {
         title: 'Experimental',
         description: 'The related icons and menu options are hidden until you turn this on',
-        features: [FeatureKeys.BotAsDocs, FeatureKeys.MultiUserChat, FeatureKeys.RLHF],
+        features: [
+            FeatureKeys.BotAsDocs,
+            FeatureKeys.MultiUserChat,
+            FeatureKeys.RLHF,
+            FeatureKeys.DeploymentGPT35,
+            FeatureKeys.DeploymentGPT4,
+        ],
     },
 ];
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                     }
+                    deploymentName = null; // For now, keep null until switcher tested fully
                     var kernel = provider.GetCompletionKernel(deploymentName);
                     sp.GetRequiredService<RegisterFunctionsWithKernel>()(sp, kernel);
@@ Expand Down @@