Feature/server generalize (#2526)

Author: dinhlongviolin1

.github/workflows/overall-tests.yml

@@ -18,7 +18,7 @@ jobs:
     uses: ./.github/workflows/partial-tests.yml
 
   coverage:
-    timeout-minutes: 50
+    timeout-minutes: 60
     runs-on: ubuntu-latest
 
     if: github.event_name == 'pull_request' && github.event.pull_request.base.repo.full_name == github.event.pull_request.head.repo.full_name

.github/workflows/partial-tests.yml

@@ -22,7 +22,7 @@ jobs:
 
   tests:
     needs: linter
-    timeout-minutes: 50
+    timeout-minutes: 70
     strategy:
       fail-fast: false
       matrix:

Pipfile

@@ -9,8 +9,8 @@ apispec-webframeworks = "==0.5.2"
 cookiecutter = "==2.1.1"
 deepdiff = "==6.7.1"
 flask = "==3.1.0"
-flask-cors = "==5.0.0"
-flask-socketio = "==5.4.1"
+flask-cors = "==5.0.1"
+flask-socketio = "==5.5.1"
 Flask-RESTful = ">=0.3.9"
 gevent = "==24.11.1"
 gevent-websocket = "==0.10.1"
@@ -72,6 +72,7 @@ types-python-dateutil = "*"
 types-pytz = "*"
 types-toml = ">=0.10.0"
 types-tzlocal = "*"
+websocket-client = "*"
 
 [requires]
 python_version = "3"

pytest.ini

@@ -11,3 +11,4 @@ markers =
     teste2e:End-to-end tests
     orchestrator_dispatcher:Orchestrator dispatcher tests
     standalone:Tests starting a standalone dispatcher thread
+    skip_if_not_server:Skip test if not running in specific server mode

taipy/_run.py

@@ -57,7 +57,7 @@ def _run(*services: _AppType, **kwargs) -> t.Optional[Flask]:
         return None
 
     if gui and rest:
-        gui._set_flask(rest._app)  # type: ignore[union-attr]
+        gui._set_web_server(rest._app)  # type: ignore[union-attr]
         return gui.run(**kwargs)
     else:
         app = rest or gui

taipy/gui/.gitignore

@@ -48,9 +48,6 @@ demo*/
 docker-compose-dev*.yml
 Dockerfile.dev
 
-# Ignore jupyter notebook files except the simple_gui.ipynb
-!simple_gui.ipynb
-
 # GUI generation
 taipy_webapp/
 

taipy/gui/_default_config.py

@@ -52,7 +52,7 @@
     "debug": False,
     "extended_status": False,
     "favicon": None,
-    "flask_log": False,
+    "server_log": False,
     "host": "127.0.0.1",
     "light_theme": None,
     "margin": "1em",

taipy/gui/config.py

@@ -16,7 +16,6 @@
 import pytz
 import tzlocal
 from dotenv import dotenv_values
-from werkzeug.serving import is_running_from_reloader
 
 from taipy.common.logger._taipy_logger import _TaipyLogger
 
@@ -27,6 +26,9 @@
 from .partial import Partial
 from .utils import _is_in_notebook, _is_true
 
+if t.TYPE_CHECKING:
+    from .gui import Gui
+
 ConfigParameter = t.Literal[
     "allow_unsafe_werkzeug",
     "async_mode",
@@ -40,7 +42,7 @@
     "debug",
     "extended_status",
     "favicon",
-    "flask_log",
+    "server_log",
     "host",
     "light_theme",
     "margin",
@@ -114,7 +116,7 @@
         "debug": bool,
         "extended_status": bool,
         "favicon": t.Optional[str],
-        "flask_log": bool,
+        "server_log": bool,
         "host": str,
         "light_theme": t.Optional[t.Dict[str, t.Any]],
         "margin": t.Optional[str],
@@ -150,13 +152,14 @@ class _Config(object):
         r"^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$"
     )
 
-    def __init__(self) -> None:
+    def __init__(self, gui: "Gui") -> None:
         self.pages: t.List[_Page] = []
         self.root_page: t.Optional[_Page] = None
         self.routes: t.List[str] = []
         self.partials: t.List[Partial] = []
         self.partial_routes: t.List[str] = []
         self.config: Config = {}
+        self._gui = gui
 
     def _load(self, config: Config) -> None:
         self.config.update(config)
@@ -290,7 +293,11 @@ def _build_config(self, root_dir, env_filename, kwargs):  # pragma: no cover
         self._handle_argparse()
 
     def __log_outside_reloader(self, logger, msg):
-        if not is_running_from_reloader():
+        if (
+            hasattr(self._gui, "_server")
+            and self._gui._server is not None
+            and not self._gui._server.is_running_from_reloader()
+        ):
             logger.info(msg)
 
     def resolve(self):