Merge branch 'dev' into users/nguyenphong/filter-tables-and-fix-datetime-format-in-kusto

Author: Chenglong-MS

local_server.bat

@@ -6,7 +6,5 @@
 :: set http_proxy=http://127.0.0.1:7890
 :: set https_proxy=http://127.0.0.1:7890
 
-set FLASK_APP=py-src/data_formulator/app.py
 set FLASK_RUN_PORT=5000
-set FLASK_RUN_HOST=0.0.0.0
-flask run
+python -m py-src.data_formulator.app --port %FLASK_RUN_PORT% --dev

local_server.sh

@@ -5,4 +5,6 @@
 # export http_proxy=http://127.0.0.1:7890
 # export https_proxy=http://127.0.0.1:7890
 
-env FLASK_APP=py-src/data_formulator/app.py FLASK_RUN_PORT=5000 FLASK_RUN_HOST=0.0.0.0 flask run
+#env FLASK_APP=py-src/data_formulator/app.py FLASK_RUN_PORT=5000 FLASK_RUN_HOST=0.0.0.0 flask run
+export FLASK_RUN_PORT=5000
+python -m py-src.data_formulator.app --port ${FLASK_RUN_PORT} --dev

package.json

@@ -7,8 +7,8 @@
         "@emotion/react": "^11.14.0",
         "@emotion/styled": "^11.14.0",
         "@fontsource/roboto": "^4.5.5",
-        "@mui/icons-material": "^5.14.0",
-        "@mui/material": "^7.0.2",
+        "@mui/icons-material": "^7.1.1",
+        "@mui/material": "^7.1.1",
         "@reduxjs/toolkit": "^1.8.6",
         "@types/dompurify": "^3.0.5",
         "@types/validator": "^13.12.2",

py-src/data_formulator/agent_routes.py

@@ -425,8 +425,6 @@ def request_code_expl():
     if request.is_json:
         logger.info("# request data: ")
         content = request.get_json()        
-        token = content["token"]
-
         client = get_client(content['model'])
 
         # each table is a dict with {"name": xxx, "rows": [...]}

py-src/data_formulator/app.py

@@ -29,14 +29,17 @@
 from dotenv import load_dotenv
 import secrets
 import base64
-APP_ROOT = Path(os.path.join(Path(__file__).parent)).absolute()
+APP_ROOT = Path(Path(__file__).parent).absolute()
 
 import os
 
 # blueprints
 from data_formulator.tables_routes import tables_bp
 from data_formulator.agent_routes import agent_bp
+from data_formulator.sse_routes import sse_bp
 
+import queue
+from typing import Dict, Any
 
 app = Flask(__name__, static_url_path='', static_folder=os.path.join(APP_ROOT, "dist"))
 app.secret_key = secrets.token_hex(16)  # Generate a random secret key for sessions
@@ -65,6 +68,7 @@ def default(self, obj):
 # register blueprints
 app.register_blueprint(tables_bp)
 app.register_blueprint(agent_bp)
+app.register_blueprint(sse_bp)
 
 print(APP_ROOT)
 
@@ -252,6 +256,8 @@ def parse_args() -> argparse.Namespace:
         help="Whether to execute python in subprocess, it makes the app more secure (reducing the chance for the model to access the local machine), but increases the time of response")
     parser.add_argument("-d", "--disable-display-keys", action='store_true', default=False,
         help="Whether disable displaying keys in the frontend UI, recommended to turn on if you host the app not just for yourself.")
+    parser.add_argument("--dev", action='store_true', default=False,
+        help="Launch the app in development mode (prevents the app from opening the browser automatically)")
     return parser.parse_args()
 
 
@@ -264,11 +270,14 @@ def run_app():
         'disable_display_keys': args.disable_display_keys
     }
 
-    url = "http://localhost:{0}".format(args.port)
-    threading.Timer(2, lambda: webbrowser.open(url, new=2)).start()
+    if not args.dev:
+        url = "http://localhost:{0}".format(args.port)
+        threading.Timer(2, lambda: webbrowser.open(url, new=2)).start()
+
+    # Enable debug mode and auto-reload in development mode
+    debug_mode = args.dev
+    app.run(host='0.0.0.0', port=args.port, threaded=True, debug=debug_mode, use_reloader=debug_mode)
 
-    app.run(host='0.0.0.0', port=args.port, threaded=True)
-    
 if __name__ == '__main__':
     #app.run(debug=True, host='127.0.0.1', port=5000)
     #use 0.0.0.0 for public

py-src/data_formulator/data_loader/__init__.py

@@ -1,14 +1,19 @@
 from data_formulator.data_loader.external_data_loader import ExternalDataLoader
 from data_formulator.data_loader.mysql_data_loader import MySQLDataLoader
+from data_formulator.data_loader.mssql_data_loader import MSSQLDataLoader
 from data_formulator.data_loader.kusto_data_loader import KustoDataLoader
 from data_formulator.data_loader.s3_data_loader import S3DataLoader
 from data_formulator.data_loader.azure_blob_data_loader import AzureBlobDataLoader
+from data_formulator.data_loader.postgresql_data_loader import PostgreSQLDataLoader
 
 DATA_LOADERS = {
     "mysql": MySQLDataLoader,
+    "mssql": MSSQLDataLoader,
     "kusto": KustoDataLoader,
     "s3": S3DataLoader,
     "azure_blob": AzureBlobDataLoader,
+    "postgresql": PostgreSQLDataLoader
 }
 
-__all__ = ["ExternalDataLoader", "MySQLDataLoader", "KustoDataLoader", "S3DataLoader", "AzureBlobDataLoader", "DATA_LOADERS"]
+__all__ = ["ExternalDataLoader", "MySQLDataLoader", "MSSQLDataLoader", "KustoDataLoader", "S3DataLoader", "AzureBlobDataLoader","PostgreSQLDataLoader","DATA_LOADERS"]
+