diff --git a/reflex/app.py b/reflex/app.py index 4929457e3..0ecd3e462 100644 --- a/reflex/app.py +++ b/reflex/app.py @@ -9,9 +9,6 @@ import dataclasses import functools import inspect import io -import dill -import multiprocess -from pathos import multiprocessing, pools import os import platform import sys @@ -37,6 +34,7 @@ from fastapi import FastAPI, HTTPException, Request, UploadFile from fastapi.middleware import cors from fastapi.responses import StreamingResponse from fastapi.staticfiles import StaticFiles +from pathos import pools from rich.progress import MofNCompleteColumn, Progress, TimeElapsedColumn from socketio import ASGIApp, AsyncNamespace, AsyncServer from starlette_admin.contrib.sqla.admin import Admin @@ -50,7 +48,6 @@ from reflex.compiler import compiler from reflex.compiler import utils as compiler_utils from reflex.compiler.compiler import ( ExecutorSafeFunctions, - compile_uncompiled_page_helper, ) from reflex.components.base.app_wrap import AppWrap from reflex.components.base.error_boundary import ErrorBoundary @@ -180,7 +177,7 @@ class OverlayFragment(Fragment): class UncompiledPage: """An uncompiled page.""" - component: Component + component: Union[Component, ComponentCallable] route: str title: str description: str @@ -545,8 +542,8 @@ class App(MiddlewareMixin, LifespanMixin, Base): self.uncompiled_pages[route] = UncompiledPage( component=component, route=route, - title=title, - description=description, + title=title or constants.DefaultPage.TITLE, + description=description or constants.DefaultPage.DESCRIPTION, image=image, on_load=on_load, meta=meta, @@ -1018,7 +1015,7 @@ class App(MiddlewareMixin, LifespanMixin, Base): compile_results.append(future.get()) progress.advance(task) - for route, future in pages_futures: + for _, future in pages_futures: pages_results.append(future.get()) progress.advance(task) @@ -1027,7 +1024,7 @@ class App(MiddlewareMixin, LifespanMixin, Base): self.pages[route] = component compile_results.append(compiled_page) - for route, component in self.pages.items(): + for _, component in self.pages.items(): # Add component._get_all_imports() to all_imports. all_imports.update(component._get_all_imports()) diff --git a/reflex/compiler/compiler.py b/reflex/compiler/compiler.py index 46be10015..425132f68 100644 --- a/reflex/compiler/compiler.py +++ b/reflex/compiler/compiler.py @@ -515,7 +515,6 @@ def purge_web_pages_dir(): if TYPE_CHECKING: from reflex.app import UncompiledPage - from reflex.event import EventHandler, EventSpec def compile_uncompiled_page_helper(route: str, page: UncompiledPage) -> Component: @@ -596,6 +595,8 @@ class ExecutorSafeFunctions: Args: route: The route of the page to compile. + component: The component to compile. + state: The app state. Returns: The path and code of the compiled page. @@ -615,9 +616,13 @@ class ExecutorSafeFunctions: Args: route: The route of the page to compile. + page: The uncompiled page. + state: The app state. + style: The style of the page. + theme: The theme of the page. Returns: - The path and code of the compiled page. + The route, compiled component, and compiled page. """ component = compile_uncompiled_page_helper(route, page) component = component if isinstance(component, Component) else component() diff --git a/reflex/style.py b/reflex/style.py index b99354e35..ad605579c 100644 --- a/reflex/style.py +++ b/reflex/style.py @@ -268,8 +268,9 @@ class Style(dict): if _var is not None: # Carry the imports/hooks when setting a Var as a value. self._var_data = VarData.merge( - self._var_data if hasattr(self, "_var_data") else None, _var._get_all_var_data - ()) + self._var_data if hasattr(self, "_var_data") else None, + _var._get_all_var_data(), + ) super().__setitem__(key, value)