Merge branch 'main' into hosted

frontend/src/App.tsx

@@ -405,11 +405,7 @@ function App({ navbarComponent }: Props) {
           </div>
 
           {/* Generation settings like stack and model */}
-          <GenerationSettings
+          <GenerationSettings settings={settings} setSettings={setSettings} />
-            settings={settings}
-            setSettings={setSettings}
-            selectedCodeGenerationModel={model}
-          />
 
           {/* Show auto updated message when older models are choosen */}
           {showBetterModelMessage && <DeprecationMessage />}

frontend/src/components/settings/GenerationSettings.tsx

@@ -2,20 +2,16 @@ import React from "react";
 import { useAppStore } from "../../store/app-store";
 import { AppState, Settings } from "../../types";
 import OutputSettingsSection from "./OutputSettingsSection";
-import ModelSettingsSection from "./ModelSettingsSection";
 import { Stack } from "../../lib/stacks";
-import { CodeGenerationModel } from "../../lib/models";
 
 interface GenerationSettingsProps {
   settings: Settings;
   setSettings: React.Dispatch<React.SetStateAction<Settings>>;
-  selectedCodeGenerationModel: CodeGenerationModel;
 }
 
 export const GenerationSettings: React.FC<GenerationSettingsProps> = ({
   settings,
   setSettings,
-  selectedCodeGenerationModel,
 }) => {
   const { appState } = useAppStore();
 
@@ -26,13 +22,6 @@ export const GenerationSettings: React.FC<GenerationSettingsProps> = ({
     }));
   }
 
-  function setCodeGenerationModel(codeGenerationModel: CodeGenerationModel) {
-    setSettings((prev: Settings) => ({
-      ...prev,
-      codeGenerationModel,
-    }));
-  }
-
   const shouldDisableUpdates =
     appState === AppState.CODING || appState === AppState.CODE_READY;
 
@@ -43,12 +32,6 @@ export const GenerationSettings: React.FC<GenerationSettingsProps> = ({
         setStack={setStack}
         shouldDisableUpdates={shouldDisableUpdates}
       />
-
-      <ModelSettingsSection
-        codeGenerationModel={selectedCodeGenerationModel}
-        setCodeGenerationModel={setCodeGenerationModel}
-        shouldDisableUpdates={shouldDisableUpdates}
-      />
     </div>
   );
 };

frontend/src/components/settings/ModelSettingsSection.tsx

@@ -1,69 +0,0 @@
-import {
-  Select,
-  SelectContent,
-  SelectGroup,
-  SelectItem,
-  SelectTrigger,
-} from "../ui/select";
-import {
-  CODE_GENERATION_MODEL_DESCRIPTIONS,
-  CodeGenerationModel,
-} from "../../lib/models";
-import { IS_RUNNING_ON_CLOUD } from "../../config";
-import { Badge } from "../ui/badge";
-
-interface Props {
-  codeGenerationModel: CodeGenerationModel;
-  setCodeGenerationModel: (codeGenerationModel: CodeGenerationModel) => void;
-  shouldDisableUpdates?: boolean;
-}
-
-function ModelSettingsSection({
-  codeGenerationModel,
-  setCodeGenerationModel,
-  shouldDisableUpdates = false,
-}: Props) {
-  return (
-    <div className="flex flex-col gap-y-2 justify-between text-sm">
-      <div className="grid grid-cols-3 items-center gap-4">
-        <span>AI Model:</span>
-        <Select
-          value={codeGenerationModel}
-          onValueChange={(value: string) =>
-            setCodeGenerationModel(value as CodeGenerationModel)
-          }
-          disabled={shouldDisableUpdates}
-        >
-          <SelectTrigger className="col-span-2" id="output-settings-js">
-            <span className="font-semibold">
-              {CODE_GENERATION_MODEL_DESCRIPTIONS[codeGenerationModel].name}
-            </span>
-          </SelectTrigger>
-          <SelectContent>
-            <SelectGroup>
-              {Object.values(CodeGenerationModel).map((model) => (
-                <SelectItem key={model} value={model}>
-                  <div className="flex flex-col">
-                    <div className="flex items-center">
-                      <span className="font-semibold">
-                        {CODE_GENERATION_MODEL_DESCRIPTIONS[model].name}
-                      </span>
-                      {!IS_RUNNING_ON_CLOUD &&
-                        CODE_GENERATION_MODEL_DESCRIPTIONS[model].inBeta && (
-                          <Badge className="ml-2" variant="secondary">
-                            Beta
-                          </Badge>
-                        )}
-                    </div>
-                  </div>
-                </SelectItem>
-              ))}
-            </SelectGroup>
-          </SelectContent>
-        </Select>
-      </div>
-    </div>
-  );
-}
-
-export default ModelSettingsSection;