Fix circulat import

Author: Kellprog

reflex/app.py

@@ -86,7 +86,7 @@
 from reflex.utils import codespaces, console, exceptions, format, prerequisites, types
 from reflex.utils.exec import is_prod_mode, is_testing_env, should_skip_compile
 from reflex.utils.imports import ImportVar
-from sitemap import serve_sitemap
+from .sitemap import serve_sitemap
 
 # Define custom types.
 ComponentCallable = Callable[[], Component]
@@ -271,7 +271,6 @@ def __init__(self, **kwargs):
             )
         super().__init__(**kwargs)
         base_state_subclasses = BaseState.__subclasses__()
-        self.add_sitemap()
 
         # Special case to allow test cases have multiple subclasses of rx.BaseState.
         if not is_testing_env() and len(base_state_subclasses) > 1:
@@ -288,6 +287,9 @@ def __init__(self, **kwargs):
         self._add_cors()
         self._add_default_endpoints()
 
+        # Add sitemap
+        self.add_sitemap()
+
         for clz in App.__mro__:
             if clz == App:
                 continue
@@ -304,7 +306,7 @@ def __init__(self, **kwargs):
             from reflex.utils.compat import windows_hot_reload_lifespan_hack
 
             self.register_lifespan_task(windows_hot_reload_lifespan_hack)
-    
+
     def add_sitemap(self):
         @self.api.get("/sitemap.xml")
         async def sitemap():
@@ -540,12 +542,13 @@ def add_page(
             component.sitemap_changefreq = sitemap_changefreq
 
         # Auto-detect priority if not explicitly set
-        if not hasattr(component, 'sitemap_priority'):
+        if not hasattr(component, "sitemap_priority"):
             component.sitemap_priority = self._auto_detect_priority(route)
-        
+
         # Set default changefreq if not explicitly set
-        if not hasattr(component, 'sitemap_changefreq'):
+        if not hasattr(component, "sitemap_changefreq"):
             component.sitemap_changefreq = "weekly"
+
         # Ensure state is enabled if this page uses state.
         if self.state is None:
             if on_load or component._has_stateful_event_triggers():
@@ -591,14 +594,13 @@ def add_page(
                 on_load = [on_load]
             self.load_events[route] = on_load
 
-
     def _auto_detect_priority(self, route: Optional[str]) -> float:
         """Auto detect sitemap priority"""
         if route is None or route == "/" or route == "index":
             return 1.0
         depth = route.count("/")
         return max(0.1, 1.0 - (depth * 0.2))
-    
+
     def get_load_events(self, route: str) -> list[EventHandler | EventSpec]:
         """Get the load events for a route.
 

reflex/sitemap.py

@@ -5,6 +5,8 @@
 from fastapi import Response
 from xml.etree.ElementTree import Element, SubElement, tostring
 from xml.dom import minidom
+import reflex as rx
+
 
 def generate_xml(links: List[Dict[str, Any]]) -> str:
     urlset = Element("urlset", xmlns="https://www.sitemaps.org/schemas/sitemap/0.9")
@@ -20,27 +22,29 @@ def generate_xml(links: List[Dict[str, Any]]) -> str:
     reparsed = minidom.parseString(rough_string)
     return reparsed.toprettyxml(indent="  ")
 
-def generate_sitemap(app: rx.App) -> str:
+
+def generate_sitemap(app: "rx.App") -> str:
+    import reflex as rx
+
     links = []
     for route, component in app.pages.items():
         # Ignore dynamic routes for now
         if "[" in route and "]" in route:
             continue
-        
+
         # Handle the index route
         if route == "index":
             route = "/"
-        
-        
+
         # Check for explicit sitemap settings
         sitemap_priority = getattr(component, "sitemap_priority", None)
         sitemap_changefreq = getattr(component, "sitemap_changefreq", "weekly")
-        
+
         # Calculate priority if not explicitly set
         if sitemap_priority is None:
             depth = route.count("/")
             sitemap_priority = max(0.5, 1.0 - (depth * 0.1))
-        
+
         links.append(
             {
                 "loc": f"{{{{ BASE_URL}}}}{route}",
@@ -50,13 +54,17 @@ def generate_sitemap(app: rx.App) -> str:
         )
     return generate_xml(links)
 
-async def serve_sitemap(app: rx.App) -> Response:
+
+async def serve_sitemap(app: "rx.App") -> Response:
+    import reflex as rx
+
     sitemap_content = generate_sitemap(app)
     domain = get_config().deploy_url or "http://localhost:3000"
     modified_sitemap = sitemap_content.replace("{{ BASE_URL }}", domain)
     return Response(content=modified_sitemap, media_type="application/xml")
 
-def add_sitemap_to_app(app: rx.App):
+
+def add_sitemap_to_app(app: "rx.App"):
     @app.api.get("/sitemap.xml")
     async def sitemap():
-        return await serve_sitemap(app)
+        return await serve_sitemap(app)