Merge branch 'main' into feature/latest-models

Author: buddypia

.env.template

@@ -0,0 +1,2 @@
+# Provide frontend configuration settings from environment variables
+SHOW_KEYS_ENABLED=true

.gitignore

@@ -1,7 +1,7 @@
 
+*env
 *api-keys.env
 **/*.ipynb_checkpoints/
-
 .DS_Store
 build/
 dist/

package.json

@@ -16,7 +16,7 @@
         "ag-grid-enterprise": "^32.0.2",
         "ag-grid-react": "^32.0.2",
         "d3": "^7.3.0",
-        "dompurify": "^3.1.7",
+        "dompurify": "^3.2.4",
         "localforage": "^1.10.0",
         "lodash": "^4.17.21",
         "markdown-to-jsx": "^7.4.0",

py-src/data_formulator/app.py

@@ -53,6 +53,7 @@
 # Load the single environment file
 load_dotenv(os.path.join(APP_ROOT, "..", "..", 'api-keys.env'))
 load_dotenv(os.path.join(APP_ROOT, 'api-keys.env'))
+load_dotenv(os.path.join(APP_ROOT, '.env'))
 
 # Configure root logger for general application logging
 logging.basicConfig(
@@ -539,6 +540,13 @@ def request_code_expl():
         expl = ""
     return expl
 
+@app.route('/app-config', methods=['GET'])
+def get_app_config():
+    """Provide frontend configuration settings from environment variables"""
+    config = {
+        "SHOW_KEYS_ENABLED": os.getenv("SHOW_KEYS_ENABLED", "true").lower() == "true"
+    }
+    return flask.jsonify(config)
 
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(description="Data Formulator")

src/app/utils.tsx

@@ -49,6 +49,8 @@ export function getUrls() {
         VEGA_DATASET_LIST: `${appConfig.serverUrl}/vega-datasets`,
         VEGA_DATASET_REQUEST_PREFIX: `${appConfig.serverUrl}/vega-dataset/`,
 
+        APP_CONFIG: `${appConfig.serverUrl}/app-config`,
+
         AUTH_INFO_PREFIX: `${appConfig.serverUrl}/.auth/`
     };
 }

src/views/ModelSelectionDialog.tsx

@@ -54,6 +54,11 @@ import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
 
 import { getUrls } from '../app/utils';
 
+// Add interface for app configuration
+interface AppConfig {
+    SHOW_KEYS_ENABLED: boolean;
+}
+
 export const GroupHeader = styled('div')(({ theme }) => ({
     position: 'sticky',
     padding: '8px 8px',
@@ -84,6 +89,19 @@ export const ModelSelectionButton: React.FC<{}> = ({ }) => {
         'ollama': []
     });
     const [isLoadingModelOptions, setIsLoadingModelOptions] = useState<boolean>(false);
+    const [appConfig, setAppConfig] = useState<AppConfig>({ SHOW_KEYS_ENABLED: true });
+
+    // Fetch app configuration
+    useEffect(() => {
+        fetch(getUrls().APP_CONFIG)
+            .then(response => response.json())
+            .then(data => {
+                setAppConfig(data);
+            })
+            .catch(error => {
+                console.error("Failed to fetch app configuration:", error);
+            });
+    }, []);
 
     let updateModelStatus = (model: ModelConfig, status: 'ok' | 'error' | 'testing' | 'unknown', message: string) => {
         dispatch(dfActions.updateModelStatus({id: model.id, status, message}));
@@ -509,10 +527,12 @@ export const ModelSelectionButton: React.FC<{}> = ({ }) => {
                 {modelTable}
             </DialogContent>
             <DialogActions>
-                <Button sx={{marginRight: 'auto'}} endIcon={showKeys ? <VisibilityOffIcon /> : <VisibilityIcon />} onClick={()=>{
-                    setShowKeys(!showKeys);}}>
-                        {showKeys ? 'hide' : 'show'} keys
-                </Button>
+                {appConfig.SHOW_KEYS_ENABLED && (
+                    <Button sx={{marginRight: 'auto'}} endIcon={showKeys ? <VisibilityOffIcon /> : <VisibilityIcon />} onClick={()=>{
+                        setShowKeys(!showKeys);}}>
+                            {showKeys ? 'hide' : 'show'} keys
+                    </Button>
+                )}
                 <Button disabled={getStatus(tempSelectedModelId) !== 'ok'} 
                     variant={(selectedModelId == tempSelectedModelId) ? 'text' : 'contained'}
                     onClick={()=>{

yarn.lock

@@ -1200,7 +1200,7 @@
   resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5"
   integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==
 
-"@types/trusted-types@*":
+"@types/trusted-types@*", "@types/trusted-types@^2.0.7":
   version "2.0.7"
   resolved "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11"
   integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==
@@ -2150,10 +2150,12 @@ dom-helpers@^5.0.1:
     "@babel/runtime" "^7.8.7"
     csstype "^3.0.2"
 
-dompurify@^3.1.7:
-  version "3.1.7"
-  resolved "https://registry.npmjs.org/dompurify/-/dompurify-3.1.7.tgz#711a8c96479fb6ced93453732c160c3c72418a6a"
-  integrity sha512-VaTstWtsneJY8xzy7DekmYWEOZcmzIe3Qb3zPd4STve1OBTa+e+WmS1ITQec1fZYXI3HCsOZZiSMpG6oxoWMWQ==
+dompurify@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.4.tgz#af5a5a11407524431456cf18836c55d13441cd8e"
+  integrity sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==
+  optionalDependencies:
+    "@types/trusted-types" "^2.0.7"
 
 emoji-regex@^8.0.0:
   version "8.0.0"