reflex 0.7.14a4__py3-none-any.whl → 0.7.14a6__py3-none-any.whl

reflex/app.py

@@ -1293,15 +1293,6 @@ class App(MiddlewareMixin, LifespanMixin):
         # Track imports found.
         all_imports = {}
 
-        # This has to happen before compiling stateful components as that
-        # prevents recursive functions from reaching all components.
-        for component in self._pages.values():
-            # Add component._get_all_imports() to all_imports.
-            all_imports.update(component._get_all_imports())
-
-            # Add the app wrappers from this component.
-            app_wrappers.update(component._get_all_app_wrap_components())
-
         if (toaster := self.toaster) is not None:
             from reflex.components.component import memo
 
@@ -1319,6 +1310,25 @@ class App(MiddlewareMixin, LifespanMixin):
             if component is not None:
                 app_wrappers[key] = component
 
+        # Compile custom components.
+        (
+            custom_components_output,
+            custom_components_result,
+            custom_components_imports,
+        ) = compiler.compile_components(dict.fromkeys(CUSTOM_COMPONENTS.values()))
+        compile_results.append((custom_components_output, custom_components_result))
+        all_imports.update(custom_components_imports)
+        progress.advance(task)
+
+        # This has to happen before compiling stateful components as that
+        # prevents recursive functions from reaching all components.
+        for component in self._pages.values():
+            # Add component._get_all_imports() to all_imports.
+            all_imports.update(component._get_all_imports())
+
+            # Add the app wrappers from this component.
+            app_wrappers.update(component._get_all_app_wrap_components())
+
         if self.error_boundary:
             from reflex.compiler.compiler import into_component
 
@@ -1465,16 +1475,6 @@ class App(MiddlewareMixin, LifespanMixin):
         )
         progress.advance(task)
 
-        # Compile custom components.
-        (
-            custom_components_output,
-            custom_components_result,
-            custom_components_imports,
-        ) = compiler.compile_components(dict.fromkeys(CUSTOM_COMPONENTS.values()))
-        compile_results.append((custom_components_output, custom_components_result))
-        all_imports.update(custom_components_imports)
-
-        progress.advance(task)
         progress.stop()
 
         if dry_run:

reflex/components/base/bare.py

@@ -141,17 +141,29 @@ class Bare(Component):
                 custom_code |= component._get_all_custom_code()
         return custom_code
 
-    def _get_all_app_wrap_components(self) -> dict[tuple[int, str], Component]:
+    def _get_all_app_wrap_components(
+        self, *, ignore_ids: set[int] | None = None
+    ) -> dict[tuple[int, str], Component]:
         """Get the components that should be wrapped in the app.
 
+        Args:
+            ignore_ids: The ids to ignore when collecting components.
+
         Returns:
             The components that should be wrapped in the app.
         """
-        app_wrap_components = super()._get_all_app_wrap_components()
+        ignore_ids = ignore_ids or set()
+        app_wrap_components = super()._get_all_app_wrap_components(
+            ignore_ids=ignore_ids
+        )
         if isinstance(self.contents, Var):
             for component in _components_from_var(self.contents):
-                if isinstance(component, Component):
-                    app_wrap_components |= component._get_all_app_wrap_components()
+                component_id = id(component)
+                if isinstance(component, Component) and component_id not in ignore_ids:
+                    ignore_ids.add(component_id)
+                    app_wrap_components |= component._get_all_app_wrap_components(
+                        ignore_ids=ignore_ids
+                    )
         return app_wrap_components
 
     def _get_all_refs(self) -> set[str]:

reflex/components/component.py

@@ -1976,24 +1976,38 @@ class Component(BaseComponent, ABC):
         """
         return {}
 
-    def _get_all_app_wrap_components(self) -> dict[tuple[int, str], Component]:
+    def _get_all_app_wrap_components(
+        self, *, ignore_ids: set[int] | None = None
+    ) -> dict[tuple[int, str], Component]:
         """Get the app wrap components for the component and its children.
 
+        Args:
+            ignore_ids: A set of component IDs to ignore. Used to avoid duplicates.
+
         Returns:
             The app wrap components.
         """
+        ignore_ids = ignore_ids or set()
         # Store the components in a set to avoid duplicates.
         components = self._get_app_wrap_components()
 
         for component in tuple(components.values()):
-            components.update(component._get_all_app_wrap_components())
+            component_id = id(component)
+            if component_id in ignore_ids:
+                continue
+            ignore_ids.add(component_id)
+            components.update(
+                component._get_all_app_wrap_components(ignore_ids=ignore_ids)
+            )
 
         # Add the app wrap components for the children.
         for child in self.children:
+            child_id = id(child)
             # Skip BaseComponent and StatefulComponent children.
-            if not isinstance(child, Component):
+            if not isinstance(child, Component) or child_id in ignore_ids:
                 continue
-            components.update(child._get_all_app_wrap_components())
+            ignore_ids.add(child_id)
+            components.update(child._get_all_app_wrap_components(ignore_ids=ignore_ids))
 
         # Return the components.
         return components
@@ -2206,13 +2220,23 @@ class CustomComponent(Component):
         component._add_style_recursive(style)
         return component
 
-    def _get_all_app_wrap_components(self) -> dict[tuple[int, str], Component]:
+    def _get_all_app_wrap_components(
+        self, *, ignore_ids: set[int] | None = None
+    ) -> dict[tuple[int, str], Component]:
         """Get the app wrap components for the custom component.
 
+        Args:
+            ignore_ids: A set of IDs to ignore to avoid infinite recursion.
+
         Returns:
             The app wrap components.
         """
-        return self.get_component()._get_all_app_wrap_components()
+        ignore_ids = ignore_ids or set()
+        component = self.get_component()
+        if id(component) in ignore_ids:
+            return {}
+        ignore_ids.add(id(component))
+        return self.get_component()._get_all_app_wrap_components(ignore_ids=ignore_ids)
 
 
 CUSTOM_COMPONENTS: dict[str, CustomComponent] = {}

{reflex-0.7.14a4.dist-info → reflex-0.7.14a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reflex
-Version: 0.7.14a4
+Version: 0.7.14a6
 Summary: Web apps in pure Python.
 Project-URL: homepage, https://reflex.dev
 Project-URL: repository, https://github.com/reflex-dev/reflex

{reflex-0.7.14a4.dist-info → reflex-0.7.14a6.dist-info}/RECORD

@@ -2,7 +2,7 @@ reflex/__init__.py,sha256=wMrUAcxHI0Th4EwHIVm9G5zT-zNgO1JX6yWejx0IvvQ,10380
 reflex/__init__.pyi,sha256=SDnppfexuPej7E5zD2fHKq1gppvvZHBUqqS0tX2Wj-g,11391
 reflex/__main__.py,sha256=6cVrGEyT3j3tEvlEVUatpaYfbB5EF3UVY-6vc_Z7-hw,108
 reflex/admin.py,sha256=Nbc38y-M8iaRBvh1W6DQu_D3kEhO8JFvxrog4q2cB_E,434
-reflex/app.py,sha256=s6B2kru4D1k4wIOjTL0bBGXIlc6NzcilcOuL-JalJR8,77071
+reflex/app.py,sha256=Mq68jw8kSZRGLUNyTk9aWehBPhHjWmuZ7XX9-dp3Yt0,77071
 reflex/assets.py,sha256=l5O_mlrTprC0lF7Rc_McOe3a0OtSLnRdNl_PqCpDCBA,3431
 reflex/base.py,sha256=GYu-PvZ28BVRfnivcAh7s0QiqzxhlDkcugTI4dPMShc,3901
 reflex/config.py,sha256=S0gEO0vT2GPm2Gof79BT7Qv04dvzq9E-qM1_68lUkVA,19555
@@ -62,7 +62,7 @@ reflex/compiler/templates.py,sha256=SKFIJtL_ozEvEHhiMj34tBwBN1CWSYy_-VzlojZMG44,
 reflex/compiler/utils.py,sha256=NYvNedrkqoh8i86QL8tOjFZ60JabOM1wBXNkY1ORtiQ,16549
 reflex/components/__init__.py,sha256=zbIXThv1WPI0FdIGf9G9RAmGoCRoGy7nHcSZ8K5D5bA,624
 reflex/components/__init__.pyi,sha256=qoj1zIWaitcZOGcJ6k7wuGJk_GAJCE9Xtx8CeRVrvoE,861
-reflex/components/component.py,sha256=5bnI90s6EINL8ls_HlcMLaj-t26ABn01P7QEX_sGaIU,99015
+reflex/components/component.py,sha256=reVBK5rshxXictncMa1krjvLdUd_5mtMQYC_esumtzY,99873
 reflex/components/dynamic.py,sha256=rDPSyoeAWAe7pxA9ZpuamKfBispOrxR-Y2DP8KfwRq8,7404
 reflex/components/literals.py,sha256=hogLnwTJxFJODIvqihg-GD9kFZVsEBDoYzaRit56Nuk,501
 reflex/components/props.py,sha256=pte-hBXbwsvB2fS7vYtiyxbHWlWYcDNg8baCfDaOvBE,2699
@@ -70,7 +70,7 @@ reflex/components/base/__init__.py,sha256=QIOxOPT87WrSE4TSHAsZ-358VzvUXAe1w8vWog
 reflex/components/base/__init__.pyi,sha256=c-8lUF9MAgAo9OHMjKIrV2ScM5S0fg8gTXp3iYFwVKU,1055
 reflex/components/base/app_wrap.py,sha256=5K_myvYvHPeAJbm3BdEX17tKvdNEj6SV9RYahbIQBAQ,514
 reflex/components/base/app_wrap.pyi,sha256=-qdsW5SDxROhV11q4TIgnm_1CHx8_AZHHhsnmkdiv18,1915
-reflex/components/base/bare.py,sha256=f9e9cW48mjyf7fh6BgsIUV71vSdbK-Xs-SAjngAufg4,7315
+reflex/components/base/bare.py,sha256=jv6HStlixsBTPR6Q_PQnd7MtQDz3ncktcLYUODqwog0,7733
 reflex/components/base/body.py,sha256=KLPOhxVsKyjPwrY9AziCOOG_c9ckOqIhI4n2i3_Q3NU,129
 reflex/components/base/body.pyi,sha256=4gWLicS47-WND25iWoj_oOg7i_0oqb36f26vID7NZH8,8665
 reflex/components/base/document.py,sha256=L5kRdI1bvPQ9dTpHkeG6kqyDvzqZ4uZG4QSj3GMLBuM,551
@@ -401,8 +401,8 @@ reflex/vars/number.py,sha256=tO7pnvFaBsedq1HWT4skytnSqHWMluGEhUbjAUMx8XQ,28190
 reflex/vars/object.py,sha256=BDmeiwG8v97s_BnR1Egq3NxOKVjv9TfnREB3cz0zZtk,17322
 reflex/vars/sequence.py,sha256=1kBrqihspyjyQ1XDqFPC8OpVGtZs_EVkOdIKBro5ilA,55249
 scripts/hatch_build.py,sha256=-4pxcLSFmirmujGpQX9UUxjhIC03tQ_fIQwVbHu9kc0,1861
-reflex-0.7.14a4.dist-info/METADATA,sha256=M0L66VwQh_yM3B_9wIjk2D5S5nMBbq7WEKrzzIf5U7Y,11837
-reflex-0.7.14a4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reflex-0.7.14a4.dist-info/entry_points.txt,sha256=Rxt4dXc7MLBNt5CSHTehVPuSe9Xqow4HLX55nD9tQQ0,45
-reflex-0.7.14a4.dist-info/licenses/LICENSE,sha256=dw3zLrp9f5ObD7kqS32vWfhcImfO52PMmRqvtxq_YEE,11358
-reflex-0.7.14a4.dist-info/RECORD,,
+reflex-0.7.14a6.dist-info/METADATA,sha256=gyfumI5O81ICNXvRhPnH1qasASk9rRq6RJwrBI5njbc,11837
+reflex-0.7.14a6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reflex-0.7.14a6.dist-info/entry_points.txt,sha256=Rxt4dXc7MLBNt5CSHTehVPuSe9Xqow4HLX55nD9tQQ0,45
+reflex-0.7.14a6.dist-info/licenses/LICENSE,sha256=dw3zLrp9f5ObD7kqS32vWfhcImfO52PMmRqvtxq_YEE,11358
+reflex-0.7.14a6.dist-info/RECORD,,