Expose WSGI application interface via main Mesop module

Author: wwwillchen

mesop/__init__.py

@@ -1,4 +1,6 @@
-from typing import Any, TypeVar, cast
+import sys
+import types
+from typing import Any, Callable, TypeVar, cast
 
 from mesop.commands.navigate import navigate as navigate
 from mesop.component_helpers import (
@@ -112,7 +114,17 @@
 from mesop.key import Key as Key
 from mesop.runtime import runtime
 from mesop.server.colab_run import colab_run as colab_run
-from mesop.server.create_app import create_app as create_app
+from mesop.server.wsgi_app import wsgi_app
+
+
+class _WsgiAppModule(types.ModuleType):
+  def __call__(
+    self, environ: dict[Any, Any], start_response: Callable[..., Any]
+  ):
+    return wsgi_app(environ, start_response)
+
+
+sys.modules[__name__].__class__ = _WsgiAppModule
 
 _T = TypeVar("_T")
 

mesop/bin/bin.py

@@ -1,60 +1,50 @@
 import os
 import sys
-from typing import Any, Callable, Sequence
+from typing import Sequence
 
 from absl import app, flags
-from flask import Flask
 
 import mesop.protos.ui_pb2 as pb
 from mesop.cli.execute_module import execute_module, get_module_name_from_path
 from mesop.exceptions import format_traceback
-from mesop.runtime import enable_debug_mode, runtime
-from mesop.server.constants import EDITOR_PACKAGE_PATH, PROD_PACKAGE_PATH
-from mesop.server.flags import port
-from mesop.server.logging import log_startup
-from mesop.server.server import configure_flask_app
-from mesop.server.static_file_serving import configure_static_file_serving
+from mesop.runtime import runtime
+from mesop.server.wsgi_app import create_app
 
 FLAGS = flags.FLAGS
 
 flags.DEFINE_bool(
   "prod", False, "set to true for prod mode; otherwise editor mode."
 )
-flags.DEFINE_bool("verbose", False, "set to true for verbose logging.")
 
 
-class App:
-  _flask_app: Flask
-
-  def __init__(self, flask_app: Flask):
-    self._flask_app = flask_app
-
-  def run(self):
-    log_startup(port=port())
-    self._flask_app.run(host="0.0.0.0", port=port(), use_reloader=False)
+def main(argv: Sequence[str]):
+  if len(argv) < 2:
+    print(
+      """\u001b[31mERROR: missing command-line argument to Mesop application.\u001b[0m
 
-  def __call__(
-    self, environ: dict[Any, Any], start_response: Callable[..., Any]
-  ) -> Any:
-    """Wrapper around Flask API so that a WGSI server can call this application."""
-    return self._flask_app.wsgi_app(environ, start_response)  # type: ignore
+Example command:
+$\u001b[35m mesop file.py\u001b[0m"""
+    )
+    sys.exit(1)
 
+  if len(argv) > 2:
+    print(
+      f"""\u001b[31mERROR: Too many command-line arguments.\u001b[0m
 
-def make_path_absolute(file_path: str):
-  if os.path.isabs(file_path):
-    return file_path
-  # Otherwise, make the relative path absolute by joining
-  # with current working dir.
-  absolute_path = os.path.join(os.getcwd(), file_path)
-  return absolute_path
+Actual:
+$\u001b[35m mesop {" ".join(argv[1:])}\u001b[0m
 
+Re-run with:
+$\u001b[35m mesop {argv[1]}\u001b[0m"""
+    )
+    sys.exit(1)
 
-def create_app(path_arg: str) -> App:
-  flask_app = configure_flask_app()
+  create_app(
+    prod_mode=FLAGS.prod, run_block=lambda: execute_main_module(argv[1])
+  ).run()
 
-  if FLAGS.prod:
-    enable_debug_mode()
 
+def execute_main_module(path_arg: str):
   try:
     absolute_path = make_path_absolute(path_arg)
     execute_module(
@@ -69,38 +59,14 @@ def create_app(path_arg: str) -> App:
     # Always raise an error to make it easy to debug
     raise e
 
-  configure_static_file_serving(
-    flask_app,
-    static_file_runfiles_base=PROD_PACKAGE_PATH
-    if FLAGS.prod
-    else EDITOR_PACKAGE_PATH,
-  )
-
-  return App(flask_app=flask_app)
-
 
-def main(argv: Sequence[str]):
-  if len(argv) < 2:
-    print(
-      """\u001b[31mERROR: missing command-line argument to Mesop application.\u001b[0m
-
-Example command:
-$\u001b[35m mesop file.py\u001b[0m"""
-    )
-    sys.exit(1)
-
-  if len(argv) > 2:
-    print(
-      f"""\u001b[31mERROR: Too many command-line arguments.\u001b[0m
-
-Actual:
-$\u001b[35m mesop {" ".join(argv[1:])}\u001b[0m
-
-Re-run with:
-$\u001b[35m mesop {argv[1]}\u001b[0m"""
-    )
-    sys.exit(1)
-  create_app(argv[1]).run()
+def make_path_absolute(file_path: str):
+  if os.path.isabs(file_path):
+    return file_path
+  # Otherwise, make the relative path absolute by joining
+  # with current working dir.
+  absolute_path = os.path.join(os.getcwd(), file_path)
+  return absolute_path
 
 
 def run_main():

mesop/server/create_app.py mesop/server/wsgi_app.py

@@ -4,6 +4,7 @@
 
 from mesop.runtime import enable_debug_mode
 from mesop.server.constants import EDITOR_PACKAGE_PATH, PROD_PACKAGE_PATH
+from mesop.server.flags import port
 from mesop.server.logging import log_startup
 from mesop.server.server import configure_flask_app
 from mesop.server.static_file_serving import configure_static_file_serving
@@ -15,23 +16,23 @@ class App:
   def __init__(self, flask_app: Flask):
     self._flask_app = flask_app
 
-  def run(self, port: int = 32123):
-    log_startup(port=port)
-    self._flask_app.run(host="0.0.0.0", port=port, use_reloader=False)
+  def run(self):
+    log_startup(port=port())
+    self._flask_app.run(host="0.0.0.0", port=port(), use_reloader=False)
 
-  def __call__(
-    self, environ: dict[Any, Any], start_response: Callable[..., Any]
-  ) -> Any:
-    """Wrapper around Flask API so that a WGSI server can call this application."""
-    return self._flask_app.wsgi_app(environ, start_response)  # type: ignore
 
-
-def create_app(*, prod_mode: bool = True) -> App:
+def create_app(
+  prod_mode: bool,
+  run_block: Callable[..., None] | None = None,
+) -> App:
   flask_app = configure_flask_app()
 
   if prod_mode:
     enable_debug_mode()
 
+  if run_block is not None:
+    run_block()
+
   configure_static_file_serving(
     flask_app,
     static_file_runfiles_base=PROD_PACKAGE_PATH
@@ -40,3 +41,8 @@ def create_app(*, prod_mode: bool = True) -> App:
   )
 
   return App(flask_app=flask_app)
+
+
+def wsgi_app(environ: dict[Any, Any], start_response: Callable[..., Any]):
+  app = create_app(prod_mode=True)
+  return app._flask_app.wsgi_app(environ, start_response)  # type: ignore

scripts/pip.sh

@@ -32,4 +32,4 @@ cp -r ./scripts/smoketest_app /tmp/mesoprelease-test && \
 cd /tmp/mesoprelease-test/ && \
 tar -xzf mesop.tar.gz && \
 pip install --upgrade /tmp/mesoprelease-test/mesop*.whl && \
-cd smoketest_app && mesop --path main.py
+cd smoketest_app && mesop main.py