flet-web 1.0.4__tar.gz → 1.1.0.dev1__tar.gz

{flet_web-1.0.4 → flet_web-1.1.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-web
-Version: 1.0.4
+Version: 1.1.0.dev1
 Summary: Flet web client in Flutter.
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,11 +9,12 @@ Project-URL: Repository, https://github.com/flet-dev/flet
 Project-URL: Documentation, https://flet.dev/docs
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: flet==1.0.4
+Requires-Dist: flet==1.1.0.dev1
 Requires-Dist: fastapi>=0.115.12
 Requires-Dist: websockets>=13.0
 Requires-Dist: uvicorn>=0.35.0
-Requires-Dist: uvicorn[standard]>=0.35.0; sys_platform != "win32" or platform_machine != "ARM64"
+Requires-Dist: uvicorn[standard]>=0.35.0; sys_platform != "win32" or platform_machine != "ARM64" or python_version >= "3.12"
+Requires-Dist: httptools>=0.9.0; sys_platform == "win32" and platform_machine == "ARM64" and python_version >= "3.12"
 
 # Flet Web client in Flutter
 

{flet_web-1.0.4 → flet_web-1.1.0.dev1}/pyproject.toml

@@ -1,19 +1,21 @@
 [project]
 name = "flet-web"
-version = "1.0.4"
+version = "1.1.0.dev1"
 description = "Flet web client in Flutter."
 authors = [{ name = "Appveyor Systems Inc.", email = "hello@flet.dev" }]
 license = "Apache-2.0"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "flet==1.0.4",
+    "flet==1.1.0.dev1",
     "fastapi >=0.115.12",
     "websockets >=13.0",
     "uvicorn >=0.35.0",
-    # httptools, one of uvicorn's standard extras, has no wheels for Windows on ARM,
-    # where installing it needs a C++ compiler. uvicorn falls back to h11 without it.
-    "uvicorn[standard] >=0.35.0; sys_platform != 'win32' or platform_machine != 'ARM64'"
+    # On Windows ARM, uvicorn's standard extras install from wheels only on Python 3.12
+    # or later (PyYAML has none for 3.10 or 3.11) and with httptools 0.9.0 or later;
+    # otherwise they need a C++ compiler. uvicorn falls back to h11 without them.
+    "uvicorn[standard] >=0.35.0; sys_platform != 'win32' or platform_machine != 'ARM64' or python_version >= '3.12'",
+    "httptools >=0.9.0; sys_platform == 'win32' and platform_machine == 'ARM64' and python_version >= '3.12'"
 ]
 
 [project.urls]

{flet_web-1.0.4 → flet_web-1.1.0.dev1}/src/flet_web/fastapi/app.py

@@ -92,6 +92,18 @@ def app(
 
     fastapi_app = FastAPI()
 
+    static_files = FletStaticFiles(
+        proxy_path=proxy_path,
+        assets_dir=assets_dir,
+        app_name=app_name,
+        app_short_name=app_short_name,
+        app_description=app_description,
+        web_renderer=web_renderer,
+        route_url_strategy=route_url_strategy,
+        websocket_endpoint_path=websocket_endpoint,
+        no_cdn=no_cdn,
+    )
+
     @fastapi_app.websocket(f"/{websocket_endpoint}")
     async def app_handler(websocket: WebSocket):
         """
@@ -109,6 +121,8 @@ def app(
             oauth_state_timeout_seconds=oauth_state_timeout_seconds,
             upload_endpoint_path=upload_endpoint_path,
             secret_key=secret_key,
+            route_url_strategy=static_files.route_url_strategy,
+            proxy_path=proxy_path,
         ).handle(websocket)
 
     if upload_dir:
@@ -133,20 +147,7 @@ def app(
         """
         return await FletOAuth().handle(request)
 
-    fastapi_app.mount(
-        path="/",
-        app=FletStaticFiles(
-            proxy_path=proxy_path,
-            assets_dir=assets_dir,
-            app_name=app_name,
-            app_short_name=app_short_name,
-            app_description=app_description,
-            web_renderer=web_renderer,
-            route_url_strategy=route_url_strategy,
-            websocket_endpoint_path=websocket_endpoint,
-            no_cdn=no_cdn,
-        ),
-    )
+    fastapi_app.mount(path="/", app=static_files)
 
     # Add middleware for custom headers
     class CustomHeadersMiddleware(BaseHTTPMiddleware):

{flet_web-1.0.4 → flet_web-1.1.0.dev1}/src/flet_web/fastapi/flet_app.py

@@ -16,6 +16,7 @@ from flet.app import AppCallable
 from flet.controls.base_control import BaseControl
 from flet.controls.context import _context_page, context
 from flet.controls.exceptions import FletPageDisconnectedException
+from flet.controls.types import RouteUrlStrategy
 from flet.messaging.connection import Connection
 from flet.messaging.protocol import (
     ControlEventBody,
@@ -59,6 +60,9 @@ class FletApp(Connection):
             and redirecting to OAuth callback URL.
         upload_endpoint_path: Absolute URL of upload endpoint, e.g. `/upload`.
         secret_key: Secret key to sign upload requests.
+        route_url_strategy: Route URL strategy of the served web client.
+        proxy_path: URL prefix that a proxy in front of the app strips, as given
+            to `flet_web.fastapi.app()`; part of the page's base path.
     """
 
     def __init__(
@@ -71,8 +75,12 @@ class FletApp(Connection):
         oauth_state_timeout_seconds: int = DEFAULT_FLET_OAUTH_STATE_TIMEOUT,
         upload_endpoint_path: Optional[str] = None,
         secret_key: Optional[str] = None,
+        route_url_strategy: RouteUrlStrategy = RouteUrlStrategy.PATH,
+        proxy_path: Optional[str] = None,
     ):
         super().__init__()
+        self.route_url_strategy = route_url_strategy
+        self.__proxy_path = proxy_path
         self.__id = random_string(8)
         logger.info(f"New FletApp: {self.__id}")
 
@@ -124,6 +132,10 @@ class FletApp(Connection):
         self.pubsubhub = app_manager.get_pubsubhub(self.__main, loop=self.loop)
         self.page_url = str(websocket.url).rsplit("/", 1)[0]
         self.page_name = websocket.url.path.rsplit("/", 1)[0].lstrip("/")
+        mount_path = (
+            (self.__proxy_path or "") + websocket.scope.get("root_path", "")
+        ).strip("/")
+        self.page_base_path = f"/{mount_path}/" if mount_path else "/"
 
         if not self.__upload_endpoint_path:
             self.__upload_endpoint_path = (
@@ -236,9 +248,14 @@ class FletApp(Connection):
                     continue
                 ptype = data[0]
                 if ptype == 0x00:
-                    await self.__on_message(
-                        msgpack.unpackb(data[1:], ext_hook=decode_ext_from_msgpack)
-                    )
+                    # One bad message must not end the loop: nothing would be
+                    # received after it and the app would freeze.
+                    try:
+                        await self.__on_message(
+                            msgpack.unpackb(data[1:], ext_hook=decode_ext_from_msgpack)
+                        )
+                    except Exception:
+                        logger.exception("Error handling a message from the client.")
                 elif ptype == 0x01:
                     if len(data) < 5:
                         logger.debug("Dropping malformed data-channel frame.")

{flet_web-1.0.4 → flet_web-1.1.0.dev1}/src/flet_web/fastapi/flet_fastapi.py

@@ -15,6 +15,8 @@ from starlette.routing import BaseRoute
 
 import flet_web.fastapi
 
+_DEFAULT_RESPONSE_CLASS = Default(JSONResponse)
+
 
 class FastAPI(fastapi.FastAPI):
     """
@@ -38,7 +40,7 @@ class FastAPI(fastapi.FastAPI):
         openapi_tags: Optional[list[dict[str, Any]]] = None,
         servers: Optional[list[dict[str, Union[str, Any]]]] = None,
         dependencies: Optional[Sequence[Depends]] = None,
-        default_response_class: type[Response] = Default(JSONResponse),
+        default_response_class: type[Response] = _DEFAULT_RESPONSE_CLASS,
         redirect_slashes: bool = True,
         docs_url: Optional[str] = "/docs",
         redoc_url: Optional[str] = "/redoc",
@@ -139,8 +141,7 @@ class FastAPI(fastapi.FastAPI):
             terms_of_service=terms_of_service,
             contact=contact,
             license_info=license_info,
-            openapi_prefix=openapi_prefix,
-            root_path=root_path,
+            root_path=root_path or openapi_prefix,
             root_path_in_servers=root_path_in_servers,
             responses=responses,
             callbacks=callbacks,

{flet_web-1.0.4 → flet_web-1.1.0.dev1}/src/flet_web/fastapi/flet_static_files.py

@@ -69,8 +69,10 @@ class FletStaticFiles(StaticFiles):
         app_name: PWA application name.
         app_short_name: PWA application short name.
         app_description: PWA application description.
-        web_renderer: Type of web renderer.
-        route_url_strategy: Routing URL strategy.
+        web_renderer: Type of web renderer, as a `WebRenderer` or its value, e.g.
+            `"canvaskit"`.
+        route_url_strategy: Routing URL strategy, as a `RouteUrlStrategy` or its
+            value, e.g. `"hash"`.
         no_cdn: Whether not load CanvasKit, Pyodide, and fonts from CDN.
         websocket_endpoint_path: Path of Flet app WebSocket handler. A path
             without a leading `/` is resolved against the app mount path.
@@ -97,8 +99,8 @@ class FletStaticFiles(StaticFiles):
         self.__app_name = app_name
         self.__app_short_name = app_short_name
         self.__app_description = app_description
-        self.__web_renderer = web_renderer
-        self.__route_url_strategy = route_url_strategy
+        self.__web_renderer = WebRenderer(web_renderer)
+        self.__route_url_strategy = RouteUrlStrategy(route_url_strategy)
         self.__no_cdn = no_cdn
         self.__websocket_endpoint_path = websocket_endpoint_path
         self.__once = Once()
@@ -119,6 +121,14 @@ class FletStaticFiles(StaticFiles):
         logger.info(f"Route URL strategy configured: {self.__route_url_strategy}")
         logger.info(f"No CDN configured: {self.__no_cdn}")
 
+    @property
+    def route_url_strategy(self) -> RouteUrlStrategy:
+        """
+        The route URL strategy written into the served `index.html`: the
+        `route_url_strategy` argument, or `FLET_WEB_ROUTE_URL_STRATEGY` if set.
+        """
+        return self.__route_url_strategy
+
     async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
         await self.__once.do(self.__config, scope["root_path"])
         await super().__call__(scope, receive, send)
@@ -126,9 +136,16 @@ class FletStaticFiles(StaticFiles):
     def lookup_path(self, path: str) -> tuple[str, Optional[os.stat_result]]:
         """Resolve a static file path, with SPA fallback for client-side routes.
 
-        Route-like paths (no extension, or `.html`) that don't match a file
-        fall back to `index.html` so the Flutter client can handle routing.
-        Asset-like paths (any other extension) resolve to a real `404`.
+        With the `path` route URL strategy, route-like paths (no extension, or
+        `.html`) that don't match a file fall back to `index.html` so the
+        Flutter client can handle routing. Asset-like paths (any other
+        extension) resolve to a real `404`.
+
+        With the `hash` strategy, routes live in the URL fragment and never
+        reach the server, so there is no fallback: any path that doesn't match
+        a file resolves to a real `404` (with a `404.html` from the assets
+        directory as its body, if there is one), while the mount root still
+        serves `index.html`.
 
         Args:
             path: Requested path, relative to the mounted static root
@@ -141,7 +158,10 @@ class FletStaticFiles(StaticFiles):
         logger.debug(f"StaticFiles.lookup_path: {self.__app_mount_path} {path}")
         full_path, stat_result = super().lookup_path(path)
 
-        if stat_result is not None:
+        if (
+            stat_result is not None
+            or self.__route_url_strategy == RouteUrlStrategy.HASH
+        ):
             return full_path, stat_result
 
         # Not found: SPA fallback only for route-like paths.

{flet_web-1.0.4 → flet_web-1.1.0.dev1}/src/flet_web/patch_index.py

@@ -85,7 +85,7 @@ def patch_index_html(
     # loads it via dynamic `import()`. We can no longer use `.js` because
     # Pyodide >= 0.29 throws "Classic web workers are not supported" inside
     # any worker that has `importScripts` available — only classic workers
-    # have it. All supported Pyodide versions (0.27.7 / 0.29.4 / 314.0.6)
+    # have it. All supported Pyodide versions (0.27.8 / 0.29.5 / 314.0.7)
     # ship `pyodide.mjs`.
     if pyodide_version:
         if no_cdn:

flet_web-1.1.0.dev1/src/flet_web/version.py

@@ -0,0 +1 @@
+version = "1.1.0.dev1"

{flet_web-1.0.4 → flet_web-1.1.0.dev1}/src/flet_web.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-web
-Version: 1.0.4
+Version: 1.1.0.dev1
 Summary: Flet web client in Flutter.
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,11 +9,12 @@ Project-URL: Repository, https://github.com/flet-dev/flet
 Project-URL: Documentation, https://flet.dev/docs
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: flet==1.0.4
+Requires-Dist: flet==1.1.0.dev1
 Requires-Dist: fastapi>=0.115.12
 Requires-Dist: websockets>=13.0
 Requires-Dist: uvicorn>=0.35.0
-Requires-Dist: uvicorn[standard]>=0.35.0; sys_platform != "win32" or platform_machine != "ARM64"
+Requires-Dist: uvicorn[standard]>=0.35.0; sys_platform != "win32" or platform_machine != "ARM64" or python_version >= "3.12"
+Requires-Dist: httptools>=0.9.0; sys_platform == "win32" and platform_machine == "ARM64" and python_version >= "3.12"
 
 # Flet Web client in Flutter
 

{flet_web-1.0.4 → flet_web-1.1.0.dev1}/src/flet_web.egg-info/SOURCES.txt

@@ -19,5 +19,6 @@ src/flet_web/fastapi/flet_static_files.py
 src/flet_web/fastapi/flet_upload.py
 src/flet_web/fastapi/oauth_state.py
 src/flet_web/fastapi/serve_fastapi_web_app.py
+tests/test_fastapi.py
 tests/test_loading_logo.py
 tests/test_patch_index.py

flet_web-1.1.0.dev1/src/flet_web.egg-info/requires.txt

@@ -0,0 +1,10 @@
+flet==1.1.0.dev1
+fastapi>=0.115.12
+websockets>=13.0
+uvicorn>=0.35.0
+
+[:sys_platform != "win32" or platform_machine != "ARM64" or python_version >= "3.12"]
+uvicorn[standard]>=0.35.0
+
+[:sys_platform == "win32" and platform_machine == "ARM64" and python_version >= "3.12"]
+httptools>=0.9.0

flet_web-1.1.0.dev1/tests/test_fastapi.py

@@ -0,0 +1,34 @@
+import pytest
+from fastapi.testclient import TestClient
+
+from flet_web.fastapi import FastAPI
+
+
+@pytest.mark.parametrize(
+    ("kwargs", "expected_root_path"),
+    [
+        ({}, ""),
+        ({"root_path": "/app"}, "/app"),
+        ({"openapi_prefix": "/legacy"}, "/legacy"),
+        ({"openapi_prefix": "/legacy", "root_path": "/app"}, "/app"),
+    ],
+)
+def test_fastapi_root_path_and_lifecycle(kwargs, expected_root_path):
+    events = []
+    app = FastAPI(
+        **kwargs,
+        on_startup=[lambda: events.append("startup")],
+        on_shutdown=[lambda: events.append("shutdown")],
+    )
+
+    @app.get("/path")
+    def get_root_path():
+        return {"root_path": app.root_path}
+
+    with TestClient(app) as client:
+        assert events == ["startup"]
+        response = client.get("/path")
+        assert response.status_code == 200
+        assert response.json() == {"root_path": expected_root_path}
+
+    assert events == ["startup", "shutdown"]

flet_web-1.0.4/src/flet_web/version.py

@@ -1 +0,0 @@
-version = "1.0.4"

flet_web-1.0.4/src/flet_web.egg-info/requires.txt

@@ -1,7 +0,0 @@
-flet==1.0.4
-fastapi>=0.115.12
-websockets>=13.0
-uvicorn>=0.35.0
-
-[:sys_platform != "win32" or platform_machine != "ARM64"]
-uvicorn[standard]>=0.35.0