flet-web 0.86.5__tar.gz → 1.0.0.dev0__tar.gz

{flet_web-0.86.5 → flet_web-1.0.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-web
-Version: 0.86.5
+Version: 1.0.0.dev0
 Summary: Flet web client in Flutter.
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,7 +9,7 @@ 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==0.86.5
+Requires-Dist: flet==1.0.0.dev0
 Requires-Dist: fastapi>=0.115.12
 Requires-Dist: uvicorn[standard]>=0.35.0
 

{flet_web-0.86.5 → flet_web-1.0.0.dev0}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "flet-web"
-version = "0.86.5"
+version = "1.0.0.dev0"
 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==0.86.5",
+    "flet==1.0.0.dev0",
     "fastapi >=0.115.12",
     "uvicorn[standard] >=0.35.0"
 ]

{flet_web-0.86.5 → flet_web-1.0.0.dev0}/src/flet_web/fastapi/app.py

@@ -46,7 +46,8 @@ def app(
             instance :class:`~flet.Page`.
         before_main: Called after `Page` was created, but before calling `main`.
         proxy_path: URL prefix when the app is mounted under a proxy.
-        assets_dir: an absolute path to app's assets directory.
+        assets_dir: path to app's assets directory. A relative path is resolved
+            against the current working directory.
         app_name: PWA application name.
         app_short_name: PWA application short name.
         app_description: PWA application description.
@@ -64,6 +65,10 @@ def app(
             redirecting to OAuth callback URL.
     """
 
+    env_assets_dir = os.getenv("FLET_ASSETS_DIR")
+    if env_assets_dir:
+        assets_dir = env_assets_dir
+
     env_upload_dir = os.getenv("FLET_UPLOAD_DIR")
     if env_upload_dir:
         upload_dir = env_upload_dir

{flet_web-0.86.5 → flet_web-1.0.0.dev0}/src/flet_web/fastapi/flet_app.py

@@ -18,10 +18,10 @@ from flet.controls.context import _context_page, context
 from flet.controls.exceptions import FletPageDisconnectedException
 from flet.messaging.connection import Connection
 from flet.messaging.protocol import (
-    ClientAction,
-    ClientMessage,
     ControlEventBody,
     InvokeMethodResponseBody,
+    Message,
+    MessageAction,
     RegisterClientRequestBody,
     RegisterClientResponseBody,
     UpdateControlPropsBody,
@@ -259,7 +259,7 @@ class FletApp(Connection):
     async def __on_message(self, data: Any):
         """
         Handle one decoded client message and dispatch
-        by `ClientAction`.
+        by `MessageAction`.
 
         Args:
             data: Decoded message payload from msgpack transport.
@@ -268,11 +268,11 @@ class FletApp(Connection):
             RuntimeError: If message action is unknown.
         """
 
-        action = ClientAction(data[0])
+        action = MessageAction(data[0])
         body = data[1]
         transport_log.debug(f"_on_message: {action} {body}")
         task = None
-        if action == ClientAction.REGISTER_CLIENT:
+        if action == MessageAction.REGISTER_CLIENT:
             req = RegisterClientRequestBody(**body)
 
             new_session = False
@@ -335,8 +335,8 @@ class FletApp(Connection):
 
             # register response
             self.send_message(
-                ClientMessage(
-                    ClientAction.REGISTER_CLIENT,
+                Message(
+                    MessageAction.REGISTER_CLIENT,
                     RegisterClientResponseBody(
                         session_id=self.__session.id,
                         page_patch=self.__session.get_page_patch()
@@ -379,17 +379,17 @@ class FletApp(Connection):
                         }
                     )
 
-        elif action == ClientAction.CONTROL_EVENT:
+        elif action == MessageAction.CONTROL_EVENT:
             req = ControlEventBody(**body)
             task = asyncio.create_task(
                 self.__session.dispatch_event(req.target, req.name, req.data)
             )
 
-        elif action == ClientAction.UPDATE_CONTROL_PROPS:
+        elif action == MessageAction.UPDATE_CONTROL_PROPS:
             req = UpdateControlPropsBody(**body)
             self.__session.apply_patch(req.id, req.props)
 
-        elif action == ClientAction.INVOKE_METHOD:
+        elif action == MessageAction.INVOKE_METHOD:
             req = InvokeMethodResponseBody(**body)
             self.__session.handle_invoke_method_results(
                 req.control_id, req.call_id, req.result, req.error
@@ -403,7 +403,7 @@ class FletApp(Connection):
             self.__running_tasks.add(task)
             task.add_done_callback(self.__running_tasks.discard)
 
-    def send_message(self, message: ClientMessage):
+    def send_message(self, message: Message):
         """
         Serialize and enqueue a server message for transport to the client.
 

{flet_web-0.86.5 → flet_web-1.0.0.dev0}/src/flet_web/fastapi/flet_static_files.py

@@ -28,12 +28,44 @@ mimetypes.add_type("text/javascript", ".mjs")
 mimetypes.add_type("application/wasm", ".wasm")
 
 
+def resolve_assets_dir(assets_dir: Optional[str]) -> Optional[str]:
+    """
+    Resolve an app's assets directory to an existing absolute path.
+
+    A relative path is resolved against the current working directory, which
+    matches `ft.run(export_asgi_app=True)` - the other way a Flet app is served
+    from a server process started externally (e.g. by `uvicorn`).
+
+    Args:
+        assets_dir: Path to the app's assets directory, absolute or relative.
+
+    Returns:
+        The resolved absolute path, or `None` if `assets_dir` was not set or
+            does not exist.
+    """
+
+    if not assets_dir:
+        return None
+
+    path = Path(assets_dir)
+    if not path.is_absolute():
+        path = Path.cwd().joinpath(path)
+    resolved = str(path.resolve())
+
+    if not os.path.exists(resolved):
+        logger.warning(f"assets_dir does not exist: {resolved}")
+        return None
+
+    return resolved
+
+
 class FletStaticFiles(StaticFiles):
     """
     Serve Flet app static files.
 
     Args:
-        assets_dir: An absolute path to app's assets directory.
+        assets_dir: Path to app's assets directory. A relative path is resolved
+            against the current working directory.
         app_name: PWA application name.
         app_short_name: PWA application short name.
         app_description: PWA application description.
@@ -151,13 +183,7 @@ class FletStaticFiles(StaticFiles):
             raise RuntimeError(f"Web root path not found: {web_dir}")
 
         # user-defined assets
-        if self.__assets_dir:
-            if not Path(self.__assets_dir).is_absolute():
-                logger.warning("assets_dir must be absolute path.")
-                self.__assets_dir = None
-            elif not os.path.exists(self.__assets_dir):
-                logger.info(f"assets_dir does not exist: {self.__assets_dir}")
-                self.__assets_dir = None
+        self.__assets_dir = resolve_assets_dir(self.__assets_dir)
 
         logger.info(f"Assets dir: {self.__assets_dir}")
 

{flet_web-0.86.5 → flet_web-1.0.0.dev0}/src/flet_web/patch_index.py

@@ -70,7 +70,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.0)
+    # have it. All supported Pyodide versions (0.27.7 / 0.29.4 / 314.0.6)
     # ship `pyodide.mjs`.
     if pyodide_version:
         if no_cdn:
@@ -81,6 +81,13 @@ def patch_index_html(
             )
         app_config.append(f'flet.pyodideUrl="{pyodide_url}";')
 
+    # Only pinned when bundling: left unset, `flutter_bootstrap.js` lets
+    # Flutter resolve CanvasKit from gstatic and the Noto fallback fonts from
+    # Google Fonts, and `flet build`/`flet publish` skip shipping local copies.
+    if no_cdn:
+        app_config.append(f'flet.canvasKitBaseUrl="{base_url}canvaskit/";')
+        app_config.append('flet.fontFallbackBaseUrl="assets/fonts/";')
+
     app_config.append(f"flet.noCdn={str(no_cdn).lower()};")
     app_config.append(f'flet.webRenderer="{web_renderer.value}";')
     app_config.append(f'flet.routeUrlStrategy="{route_url_strategy.value}";')

flet_web-1.0.0.dev0/src/flet_web/version.py

@@ -0,0 +1 @@
+version = "1.0.0.dev0"

{flet_web-0.86.5 → flet_web-1.0.0.dev0}/src/flet_web.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-web
-Version: 0.86.5
+Version: 1.0.0.dev0
 Summary: Flet web client in Flutter.
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,7 +9,7 @@ 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==0.86.5
+Requires-Dist: flet==1.0.0.dev0
 Requires-Dist: fastapi>=0.115.12
 Requires-Dist: uvicorn[standard]>=0.35.0
 

{flet_web-0.86.5 → flet_web-1.0.0.dev0}/src/flet_web.egg-info/SOURCES.txt

@@ -18,4 +18,5 @@ src/flet_web/fastapi/flet_oauth.py
 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
+src/flet_web/fastapi/serve_fastapi_web_app.py
+tests/test_loading_logo.py

{flet_web-0.86.5 → flet_web-1.0.0.dev0}/src/flet_web.egg-info/requires.txt

@@ -1,3 +1,3 @@
-flet==0.86.5
+flet==1.0.0.dev0
 fastapi>=0.115.12
 uvicorn[standard]>=0.35.0

flet_web-1.0.0.dev0/tests/test_loading_logo.py

@@ -0,0 +1,43 @@
+import importlib
+import shutil
+from pathlib import Path
+
+import pytest
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+
+static_files = importlib.import_module("flet_web.fastapi.flet_static_files")
+CLIENT_WEB = Path(__file__).resolve().parents[5] / "client" / "web"
+
+
+@pytest.mark.parametrize("custom_logo", [False, True])
+def test_dynamic_loading_logo_respects_assets_override(
+    tmp_path, monkeypatch, custom_logo
+):
+    web = tmp_path / "web"
+    shutil.copytree(CLIENT_WEB, web)
+    # Flutter substitutes this token before packaging the dynamic client.
+    index = web / "index.html"
+    index.write_text(index.read_text().replace("$FLUTTER_BASE_HREF", "/"))
+    monkeypatch.setattr(static_files, "get_package_web_dir", lambda: str(web))
+    assets = tmp_path / "assets"
+    assets.mkdir()
+    relative = Path("icons/loading-animation.png")
+    expected = (CLIENT_WEB / relative).read_bytes()
+    if custom_logo:
+        # Serving must preserve the user's bytes instead of regenerating the logo.
+        expected = b"custom loading logo"
+        (assets / "icons").mkdir()
+        (assets / relative).write_bytes(expected)
+
+    app = FastAPI()
+    app.mount("/demo", static_files.FletStaticFiles(assets_dir=str(assets)))
+    with TestClient(app) as client:
+        page = client.get("/demo/nested/route")
+        assert page.status_code == 200
+        assert '<base href="/demo/">' in page.text
+        assert 'src="icons/loading-animation.png"' in page.text
+        assert "@keyframes" not in page.text
+        logo = client.get("/demo/icons/loading-animation.png")
+        assert logo.status_code == 200
+        assert logo.content == expected

flet_web-0.86.5/src/flet_web/version.py

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