flet-web 0.70.0.dev6365__tar.gz → 0.70.0.dev6555__tar.gz

{flet_web-0.70.0.dev6365 → flet_web-0.70.0.dev6555}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-web
-Version: 0.70.0.dev6365
+Version: 0.70.0.dev6555
 Summary: Flet web client in Flutter.
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0

{flet_web-0.70.0.dev6365 → flet_web-0.70.0.dev6555}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flet-web"
-version = "0.70.0.dev6365"
+version = "0.70.0.dev6555"
 description = "Flet web client in Flutter."
 authors = [{ name = "Appveyor Systems Inc.", email = "hello@flet.dev" }]
 license = "Apache-2.0"

{flet_web-0.70.0.dev6365 → flet_web-0.70.0.dev6555}/src/flet_web/fastapi/flet_app.py

@@ -325,7 +325,7 @@ class FletApp(Connection):
 
         else:
             # it's something else
-            raise Exception(f'Unknown message "{action}": {body}')
+            raise RuntimeError(f'Unknown message "{action}": {body}')
 
         if task:
             self.__running_tasks.add(task)
@@ -340,9 +340,8 @@ class FletApp(Connection):
         self.__send_queue.put_nowait(m)
 
     def get_upload_url(self, file_name: str, expires: int) -> str:
-        assert self.__upload_endpoint_path, (
-            "upload_path should be specified to enable uploads"
-        )
+        if not self.__upload_endpoint_path:
+            raise RuntimeError("upload_path should be specified to enable uploads")
         return build_upload_url(
             self.__upload_endpoint_path,
             file_name,

{flet_web-0.70.0.dev6365 → flet_web-0.70.0.dev6555}/src/flet_web/fastapi/flet_app_manager.py

@@ -6,11 +6,10 @@ from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime, timezone
 from typing import Optional
 
+import flet_web.fastapi as flet_fastapi
 from flet.messaging.connection import Connection
 from flet.messaging.session import Session
 from flet.pubsub.pubsub_hub import PubSubHub
-
-import flet_web.fastapi as flet_fastapi
 from flet_web.fastapi.oauth_state import OAuthState
 
 logger = logging.getLogger(flet_fastapi.__name__)
@@ -84,7 +83,7 @@ class FletAppManager:
             session = self.__sessions[session_id]
             await session.connect(conn)
         else:
-            raise Exception(f"Session has expired or not found: {session_id}")
+            raise RuntimeError(f"Session has expired or not found: {session_id}")
 
     async def disconnect_session(self, session_id: str, session_timeout_seconds: int):
         logger.info(f"Session disconnected: {session_id}")

{flet_web-0.70.0.dev6365 → flet_web-0.70.0.dev6555}/src/flet_web/fastapi/flet_static_files.py

@@ -6,11 +6,11 @@ from pathlib import Path
 from typing import Optional
 
 from fastapi.staticfiles import StaticFiles
-from flet.controls.types import RouteUrlStrategy, WebRenderer
-from flet.utils import Once, get_bool_env_var
 from starlette.types import Receive, Scope, Send
 
 import flet_web.fastapi as flet_fastapi
+from flet.controls.types import RouteUrlStrategy, WebRenderer
+from flet.utils import Once, get_bool_env_var
 from flet_web import (
     get_package_web_dir,
     patch_font_manifest_json,
@@ -120,7 +120,7 @@ class FletStaticFiles(StaticFiles):
         logger.info(f"Web root: {web_dir}")
 
         if not os.path.exists(web_dir):
-            raise Exception(f"Web root path not found: {web_dir}")
+            raise RuntimeError(f"Web root path not found: {web_dir}")
 
         # user-defined assets
         if self.__assets_dir:

{flet_web-0.70.0.dev6365 → flet_web-0.70.0.dev6555}/src/flet_web/fastapi/flet_upload.py

@@ -3,9 +3,10 @@ import os
 from datetime import datetime, timezone
 from typing import Optional
 
-import flet_web.fastapi as flet_fastapi
 from anyio import open_file
-from fastapi import Request
+from fastapi import HTTPException, Request, status
+
+import flet_web.fastapi as flet_fastapi
 from flet_web.uploads import build_upload_query_string, get_upload_signature
 
 logger = logging.getLogger(flet_fastapi.__name__)
@@ -18,7 +19,8 @@ class FletUpload:
     Parameters:
 
     * `upload_dir` (str) - an absolute path to a directory with uploaded files.
-    * `max_upload_size` (str, int) - maximum size of a single upload, bytes. Unlimited if `None`.
+    * `max_upload_size` (str, int) - maximum size of a single upload, bytes.
+       Unlimited if `None`.
     * `secret_key` (str, optional) - secret key to sign and verify upload requests.
     """
 
@@ -50,14 +52,24 @@ class FletUpload:
     """
 
     async def handle(self, request: Request):
-        file_name = request.query_params["f"]
-        expire_str = request.query_params["e"]
-        signature = request.query_params["s"]
+        query_params = request.query_params
+        file_name = query_params.get("f")
+        expire_str = query_params.get("e")
+        signature = query_params.get("s")
 
         if not file_name or not expire_str or not signature:
-            raise Exception("Invalid request")
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail="Missing upload parameters",
+            )
 
-        expire_date = datetime.fromisoformat(expire_str)
+        try:
+            expire_date = datetime.fromisoformat(expire_str)
+        except ValueError as e:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail="Invalid expiration parameter",
+            ) from e
 
         # verify signature
         query_string = build_upload_query_string(file_name, expire_date)
@@ -67,17 +79,26 @@ class FletUpload:
             )
             != signature
         ):
-            raise Exception("Invalid request")
+            raise HTTPException(
+                status_code=status.HTTP_403_FORBIDDEN,
+                detail="Invalid upload signature",
+            )
 
         # check expiration date
         if datetime.now(timezone.utc) >= expire_date:
-            raise Exception("Invalid request")
+            raise HTTPException(
+                status_code=status.HTTP_410_GONE,
+                detail="Upload URL has expired",
+            )
 
         # build/validate dest path
         joined_path = os.path.join(self.__upload_dir, file_name)
         full_path = os.path.realpath(joined_path)
         if os.path.commonpath([full_path, self.__upload_dir]) != self.__upload_dir:
-            raise Exception("Invalid request")
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail="Invalid upload destination",
+            )
 
         # create directory if not exists
         dest_dir = os.path.dirname(full_path)
@@ -89,7 +110,9 @@ class FletUpload:
             async for chunk in request.stream():
                 size += len(chunk)
                 if self.__max_upload_size and size > self.__max_upload_size:
-                    raise Exception(
-                        f"Max upload size reached: {self.__max_upload_size}"
+                    raise HTTPException(
+                        status_code=status.HTTP_413_REQUEST_ENTITY_TOO_LARGE,
+                        detail="Max upload size exceeded: "
+                        f"{self.__max_upload_size} bytes",
                     )
                 await f.write(chunk)

{flet_web-0.70.0.dev6365 → flet_web-0.70.0.dev6555}/src/flet_web/uploads.py

@@ -39,8 +39,9 @@ def get_upload_signature(
     if env_secret_key:
         secret_key = env_secret_key
     if not secret_key:
-        raise Exception(
-            "Specify secret_key parameter or set FLET_SECRET_KEY environment variable to enable uploads."
+        raise RuntimeError(
+            "Specify secret_key parameter or set FLET_SECRET_KEY environment "
+            "variable to enable uploads."
         )
     signing_key = hmac.new(
         secret_key.encode("utf-8"),
@@ -49,6 +50,6 @@ def get_upload_signature(
     ).digest()
     return hmac.new(
         signing_key,
-        f"{upload_endpoint_path.strip('/')}{query_string}".encode("utf-8"),
+        f"{upload_endpoint_path.strip('/')}{query_string}".encode(),
         hashlib.sha256,
     ).hexdigest()

flet_web-0.70.0.dev6555/src/flet_web/version.py

@@ -0,0 +1 @@
+version = "0.70.0.dev6555"

{flet_web-0.70.0.dev6365 → flet_web-0.70.0.dev6555}/src/flet_web.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-web
-Version: 0.70.0.dev6365
+Version: 0.70.0.dev6555
 Summary: Flet web client in Flutter.
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0

flet_web-0.70.0.dev6365/src/flet_web/version.py

@@ -1 +0,0 @@
-version = "0.70.0.dev6365"