Add support for shiny express apps

rsconnect/main.py

@@ -80,6 +80,7 @@
     produce_bootstrap_output,
     parse_client_response,
 )
+from .shiny_express import is_express_app
 
 server_store = ServerStore()
 future_enabled = False
@@ -1366,16 +1367,41 @@ def deploy_app(
         no_verify: bool = False,
     ):
         set_verbosity(verbose)
-        kwargs = locals()
-        kwargs["entrypoint"] = entrypoint = validate_entry_point(entrypoint, directory)
-        kwargs["extra_files"] = extra_files = validate_extra_files(directory, extra_files)
+        entrypoint = validate_entry_point(entrypoint, directory)
+        extra_files = validate_extra_files(directory, extra_files)
         environment = create_python_environment(
             directory,
             force_generate,
             python,
         )
 
-        ce = RSConnectExecutor(**kwargs)
+        if is_express_app(entrypoint + ".py", directory):
+            env_vars["SHINY_EXPRESS_APP_FILE"] = entrypoint + ".py"
+            entrypoint = "shiny.express.app"
+
+        extra_args = dict(
+            directory=directory,
+            server=server,
+            exclude=exclude,
+            new=new,
+            app_id=app_id,
+            title=title,
+            visibility=visibility,
+            disable_env_management=disable_env_management,
+            env_vars=env_vars,
+        )
+
+        ce = RSConnectExecutor(
+            name=name,
+            api_key=api_key,
+            insecure=insecure,
+            cacert=cacert,
+            account=account,
+            token=token,
+            secret=secret,
+            **extra_args,
+        )
+
         (
             ce.validate_server()
             .validate_app_mode(app_mode=app_mode)

rsconnect/shiny_express.py

@@ -0,0 +1,76 @@
+# The contents of this file are copied from:
+# https://github.com/posit-dev/py-shiny/blob/feb4cb7f872922717c39753514ae2d7fa32f10a1/shiny/express/_is_express.py
+
+from __future__ import annotations
+
+import ast
+from pathlib import Path
+
+__all__ = ("is_express_app",)
+
+
+def is_express_app(app: str, app_dir: str | None) -> bool:
+    """Detect whether an app file is a Shiny express app
+
+    Parameters
+    ----------
+    app
+        App filename, like "app.py". It may be a relative path or absolute path.
+    app_dir
+        Directory containing the app file. If this is `None`, then `app` must be an
+        absolute path.
+
+    Returns
+    -------
+    :
+        `True` if it is a Shiny express app, `False` otherwise.
+    """
+    if not app.lower().endswith(".py"):
+        return False
+
+    if app_dir is not None:
+        app_path = Path(app_dir) / app
+    else:
+        app_path = Path(app)
+
+    if not app_path.exists():
+        return False
+
+    try:
+        # Read the file, parse it, and look for any imports of shiny.express.
+        with open(app_path) as f:
+            content = f.read()
+        tree = ast.parse(content, app_path)
+        detector = DetectShinyExpressVisitor()
+        detector.visit(tree)
+
+    except Exception:
+        return False
+
+    return detector.found_shiny_express_import
+
+
+class DetectShinyExpressVisitor(ast.NodeVisitor):
+    def __init__(self):
+        super().__init__()
+        self.found_shiny_express_import = False
+
+    def visit_Import(self, node: ast.Import):
+        if any(alias.name == "shiny.express" for alias in node.names):
+            self.found_shiny_express_import = True
+
+    def visit_ImportFrom(self, node: ast.ImportFrom):
+        if node.module == "shiny.express":
+            self.found_shiny_express_import = True
+        elif node.module == "shiny" and any(
+            alias.name == "express" for alias in node.names
+        ):
+            self.found_shiny_express_import = True
+
+    # Visit top-level nodes.
+    def visit_Module(self, node: ast.Module):
+        super().generic_visit(node)
+
+    # Don't recurse into any nodes, so the we'll only ever look at top-level nodes.
+    def generic_visit(self, node: ast.AST):
+        pass