flet-cli 0.84.0.dev0__py3-none-any.whl → 0.85.0.dev1__py3-none-any.whl

flet_cli/__pyinstaller/rthooks/pyi_rth_localhost_fletd.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import sys
 
 logger = logging.getLogger("flet")
 
@@ -7,3 +8,9 @@ logger = logging.getLogger("flet")
 logger.info("Running PyInstaller runtime hook for Flet...")
 
 os.environ["FLET_SERVER_IP"] = "127.0.0.1"
+
+# On Windows, set AppUserModelID so the taskbar associates the Flet client window
+# with the parent executable (a PyInstaller bundle in this case) rather than the cached
+# flet.exe. This ensures taskbar pins and shortcuts point to the correct executable.
+if sys.platform == "win32" and "FLET_APP_USER_MODEL_ID" not in os.environ:
+    os.environ["FLET_APP_USER_MODEL_ID"] = os.path.abspath(sys.executable)

flet_cli/commands/build_base.py

@@ -2272,7 +2272,13 @@ class BaseBuildCommand(BaseFlutterCommand):
         hash: HashStamp,
     ):
         """
-        Find first matching image file by base name and queue it for copy.
+        Find the best matching image file for the current target platform.
+
+        When multiple files share the same base name (e.g. `icon.icns`,
+        `icon.ico`, `icon.png`), the method filters out formats that are
+        incompatible with the build target before selecting the first match.
+        For example, `.icns` is skipped on Windows builds because
+        `flutter_launcher_icons` cannot decode it.
 
         Args:
             src_path: Source assets directory.
@@ -2285,17 +2291,30 @@ class BaseBuildCommand(BaseFlutterCommand):
             File name of matched image, or `None` if not found.
         """
 
-        images = glob.glob(str(src_path.joinpath(f"{image_name}.*")))
-        if len(images) > 0:
-            if self.verbose > 0:
-                console.log(
-                    f'Found "{image_name}" image at {images[0]}', style=verbose1_style
-                )
-            copy_ops.append((images[0], dest_path))
-            hash.update(images[0])
-            hash.update(Path(images[0]).stat().st_mtime)
-            return Path(images[0]).name
-        return None
+        # .icns is macOS-only and .ico is Windows-only; filter out
+        # incompatible formats so flutter_launcher_icons gets a decodable file.
+        images = list(
+            filter(
+                lambda p: not (
+                    (ext := Path(p).suffix.lower()) == ".icns"
+                    and self.target_platform != "macos"
+                    or ext == ".ico"
+                    and self.target_platform != "windows"
+                ),
+                glob.glob(str(src_path.joinpath(f"{image_name}.*"))),
+            )
+        )
+
+        if not images:
+            return None
+
+        best = images[0]
+        if self.verbose > 0:
+            console.log(f'Found "{image_name}" image at {best}', style=verbose1_style)
+        copy_ops.append((best, dest_path))
+        hash.update(best)
+        hash.update(Path(best).stat().st_mtime)
+        return Path(best).name
 
     def run(self, args, cwd, env: Optional[dict] = None, capture_output=True):
         """

flet_cli/commands/pack.py

@@ -2,10 +2,12 @@ import argparse
 import os
 import shutil
 import sys
+import tarfile
+import zipfile
 from pathlib import Path
 
 import flet_cli.__pyinstaller.config as hook_config
-from flet.utils import is_macos, is_windows
+from flet.utils import is_linux, is_macos, is_windows
 from flet_cli.commands.base import BaseCommand
 
 
@@ -152,6 +154,31 @@ class Command(BaseCommand):
             help="Enable non-interactive mode. All prompts will be skipped",
         )
 
+    def compress_flet_client_dir(self, temp_bin_dir: str, archive_name: str) -> None:
+        """Compress the flet/ directory into an archive and remove the original.
+
+        Args:
+            temp_bin_dir: Path to the temporary directory containing the flet/
+                subdirectory with client binaries.
+            archive_name: Target archive filename. Uses zip for `.zip`
+                extensions and gzipped tar for everything else.
+        """
+        flet_dir = os.path.join(temp_bin_dir, "flet")
+        if not os.path.isdir(flet_dir):
+            return
+        archive_path = os.path.join(temp_bin_dir, archive_name)
+        if archive_name.endswith(".zip"):  # windows
+            with zipfile.ZipFile(archive_path, "w", zipfile.ZIP_DEFLATED) as zf:
+                for root, _dirs, files in os.walk(flet_dir):
+                    for f in files:
+                        full = os.path.join(root, f)
+                        arcname = os.path.relpath(full, temp_bin_dir)
+                        zf.write(full, arcname)
+        else:
+            with tarfile.open(archive_path, "w:gz") as tar:
+                tar.add(flet_dir, arcname="flet")
+        shutil.rmtree(flet_dir)
+
     def handle(self, options: argparse.Namespace) -> None:
         """
         Package the app into a standalone desktop artifact.
@@ -293,6 +320,12 @@ class Command(BaseCommand):
 
                         pyi_args.extend(["--version-file", version_info_path])
 
+                    # Compress the patched flet/ directory into flet-windows.zip
+                    # so ensure_client_cached() finds it at runtime.
+                    self.compress_flet_client_dir(
+                        hook_config.temp_bin_dir, "flet-windows.zip"
+                    )
+
                 elif is_macos():
                     from flet_cli.__pyinstaller.macos_utils import (
                         assemble_app_bundle,
@@ -341,12 +374,12 @@ class Command(BaseCommand):
                         copyright=options.copyright,
                     )
 
-                    # assemble
+                    # Compress the patched .app bundle back into flet-macos.tar.gz so
+                    # ensure_client_cached() finds it at runtime.
                     assemble_app_bundle(app_path, tar_path)
 
-                    # Remove everything except the tar.gz so
-                    # PyInstaller doesn't try to process loose
-                    # framework binaries.
+                    # Remove everything except the tar.gz so PyInstaller doesn't try
+                    # to process loose framework binaries.
                     for entry in os.listdir(hook_config.temp_bin_dir):
                         entry_path = os.path.join(hook_config.temp_bin_dir, entry)
                         if entry_path == tar_path:
@@ -356,7 +389,16 @@ class Command(BaseCommand):
                         else:
                             os.remove(entry_path)
 
-            # run PyInstaller!
+                elif is_linux():
+                    from flet_desktop import get_artifact_filename
+
+                    # Compress the flet/ directory into a tar.gz
+                    # so ensure_client_cached() finds it at runtime.
+                    self.compress_flet_client_dir(
+                        hook_config.temp_bin_dir, get_artifact_filename()
+                    )
+
+            # run PyInstaller
             print("Running PyInstaller:", pyi_args)
             PyInstaller.__main__.run(pyi_args)
 

flet_cli/utils/project_dependencies.py

@@ -2,8 +2,86 @@
 
 # Based on: https://pypi.org/project/toml-to-requirements/
 
+import re
 from typing import Any, Optional
 
+from packaging.requirements import Requirement
+
+
+def _windows_safe(req_str: str) -> str:
+    """Insert a space before bare `<` or `>` so Windows cmd.exe does not
+    interpret them as shell redirection when the string is passed via `-r`
+    to a `.BAT` subprocess."""
+    return re.sub(r"(?<=[^ ])([<>])", r" \1", req_str)
+
+
+def _poetry_version_to_pep440(version: str) -> str:
+    """Convert a Poetry version constraint to PEP 440 syntax.
+
+    - `^1.2.3` → `>=1.2.3`
+    - `~1.2.3` → `~=1.2.3`  (`~=` passes through unchanged)
+    - `*`      → `""` (no constraint)
+    - `1.2.3` (bare version) → `==1.2.3`
+    - Anything else is returned as-is (already PEP 440).
+    """
+    version = version.replace(" ", "")
+    if not version or version == "*":
+        return ""
+    if version.startswith("^"):
+        return f">={version[1:]}"
+    if version.startswith("~") and not version.startswith("~="):
+        return f"~={version[1:]}"
+    # Bare version number → pin with ==
+    if version[0].isdigit():
+        return f"=={version}"
+    return version
+
+
+def _poetry_dep_to_pep508(name: str, value: Any) -> str:
+    """Convert a single Poetry dependency entry to a PEP 508 requirement string."""
+    suffix = ""
+
+    if isinstance(value, dict):
+        version = value.get("version")
+        if version:
+            specifier = _poetry_version_to_pep440(version)
+            markers = value.get("markers")
+            if markers is not None:
+                suffix = f"; {markers}"
+            if specifier:
+                return f"{name}{specifier}{suffix}"
+            return f"{name}{suffix}"
+
+        git_url = value.get("git")
+        if git_url:
+            url = f"git+{git_url}" if not git_url.startswith("git@") else git_url
+            rev = value.get("branch") or value.get("rev") or value.get("tag")
+            if rev:
+                url = f"{url}@{rev}"
+            subdirectory = value.get("subdirectory")
+            if subdirectory:
+                url = f"{url}#subdirectory={subdirectory}"
+            markers = value.get("markers")
+            if markers is not None:
+                suffix = f"; {markers}"
+            return f"{name} @ {url}{suffix}"
+
+        path = value.get("path")
+        if path:
+            return path
+
+        url = value.get("url")
+        if url:
+            return url
+
+        raise ValueError(f"Unsupported dependency specification: {name} = {value}")
+
+    # String value
+    specifier = _poetry_version_to_pep440(value)
+    if specifier:
+        return f"{name}{specifier}"
+    return name
+
 
 def get_poetry_dependencies(
     poetry_dependencies: Optional[dict[str, Any]] = None,
@@ -17,103 +95,20 @@ def get_poetry_dependencies(
     Returns:
         Sorted requirement strings or `None` when `poetry_dependencies` is `None`.
     """
-
     if poetry_dependencies is None:
         return None
 
-    def format_dependency_version(dependency_name: str, dependency_value: Any):
-        """
-        Format a single Poetry dependency entry as a requirement specifier.
-
-        Supports version constraints, git dependencies (including branch/rev/tag
-        and subdirectory), path/url dependencies, and optional environment markers.
-
-        Args:
-            dependency_name: Dependency key in Poetry configuration.
-            dependency_value: String or mapping that describes the dependency.
-
-        Returns:
-            A requirement string consumable by pip-style tooling.
-
-        Raises:
-            ValueError: If the dependency mapping uses an unsupported shape.
-        """
-
-        sep = "@"
-        value = ""
-        suffix = ""
-
-        if isinstance(dependency_value, dict):
-            version = dependency_value.get("version")
-            if version:
-                sep = "=="
-                value = version
-            else:
-                git_url = dependency_value.get("git")
-                if git_url:
-                    value = (
-                        f"git+{git_url}" if not git_url.startswith("git@") else git_url
-                    )
-                    rev = (
-                        dependency_value.get("branch")
-                        or dependency_value.get("rev")
-                        or dependency_value.get("tag")
-                    )
-                    if rev:
-                        value = f"{value}@{rev}"
-                    subdirectory = dependency_value.get("subdirectory")
-                    if subdirectory:
-                        value = f"{value}#subdirectory={subdirectory}"
-                else:
-                    path = dependency_value.get("path")
-                    if path:
-                        value = path
-                        dependency_name = ""
-                        sep = ""
-                    else:
-                        url = dependency_value.get("url")
-                        if url:
-                            value = url
-                            dependency_name = ""
-                            sep = ""
-                        else:
-                            raise ValueError(
-                                "Unsupported dependency specification: "
-                                f"{dependency_name} = {dependency_value}"
-                            )
-
-            # markers - common for all
-            markers = dependency_value.get("markers")
-            if markers is not None:
-                suffix = f";{markers}"
-        else:
-            value = dependency_value
-            sep = "=="
-
-        if value.startswith("^"):
-            sep = ">="
-            value = value[1:]
-        elif value.startswith("~"):
-            sep = "~="
-            value = value[1:]
-            return f"{dependency_name}~={value[1:]}"
-        elif "<" in value or ">" in value:
-            sep = ""
-            value = value.replace(" ", "")
-
-        return f"{dependency_name}{sep}{value}{suffix}"
-
     dependencies: set[str] = {
-        format_dependency_version(dependency, version)
-        for dependency, version in poetry_dependencies.items()
-        if dependency != "python"
+        _windows_safe(_poetry_dep_to_pep508(dep, ver))
+        for dep, ver in poetry_dependencies.items()
+        if dep != "python"
     }
 
     return sorted(dependencies)
 
 
 def get_project_dependencies(
-    project_dependencies: Optional[dict[str, Any]] = None,
+    project_dependencies: Optional[list[str]] = None,
 ) -> Optional[list[str]]:
     """
     Normalize PEP 621 `project.dependencies` into a sorted unique list.
@@ -124,10 +119,15 @@ def get_project_dependencies(
     Returns:
         Sorted dependency strings, or `None` when input is `None`.
     """
-
     if project_dependencies is None:
         return None
 
-    dependencies = set(project_dependencies)
+    dependencies: set[str] = set()
+    for dep in project_dependencies:
+        try:
+            req = Requirement(dep)
+            dependencies.add(_windows_safe(str(req)))
+        except Exception:
+            dependencies.add(_windows_safe(dep))
 
     return sorted(dependencies)

flet_cli/version.py

@@ -1 +1 @@
-version = "0.84.0.dev0"
+version = "0.85.0.dev1"

{flet_cli-0.84.0.dev0.dist-info → flet_cli-0.85.0.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-cli
-Version: 0.84.0.dev0
+Version: 0.85.0.dev1
 Summary: Flet CLI
 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.84.0.dev0
+Requires-Dist: flet==0.85.0.dev1
 Requires-Dist: watchdog>=4.0.0
 Requires-Dist: packaging>=25.0
 Requires-Dist: qrcode>=7.4.2

{flet_cli-0.84.0.dev0.dist-info → flet_cli-0.85.0.dev1.dist-info}/RECORD

@@ -1,15 +1,15 @@
 flet_cli/cli.py,sha256=iDtpgVnrdrHapnE42bkTe7Sf_bNK724bqXISozNWTRQ,3586
-flet_cli/version.py,sha256=ExdO2qcq00sSsu6VsdowwUDFlrFM3fUIlO-2rsoFXlY,24
+flet_cli/version.py,sha256=0N8SvDXW6KRNyPCt2820vjxAHreIQ_gUW4V6OYN3Dic,24
 flet_cli/__pyinstaller/__init__.py,sha256=KJsKpQ6uSVslADmFaOKaxCu-GOZZtcVKnti-ripD-ug,164
 flet_cli/__pyinstaller/config.py,sha256=MN2IPu53K1RDyh_KE4wIcQH8El_n4Z3fD6NO2iq8y74,20
 flet_cli/__pyinstaller/hook-flet.py,sha256=RbiFE8-7VBsY4Dwt7a9-9gW0gUFQGjOLY1-OBsZm_mI,506
 flet_cli/__pyinstaller/macos_utils.py,sha256=4Y29CrZ5Uyys6CCLFEPq8qFmbTvV6wRU6A9hFiuYVSM,4423
 flet_cli/__pyinstaller/utils.py,sha256=EbGuUIM1ce_Lc0VZlaJQ2WlSAahlgTLoMFDFigibImg,1316
 flet_cli/__pyinstaller/win_utils.py,sha256=wu0G98CUMkGfloZa2LTqJE7axAZPB2-TLBOHJiYUc0Q,4428
-flet_cli/__pyinstaller/rthooks/pyi_rth_localhost_fletd.py,sha256=Bl0gi--0MbERR1Spk2-DDkFeFhTV96ukGQt_f7JMlzI,167
+flet_cli/__pyinstaller/rthooks/pyi_rth_localhost_fletd.py,sha256=Q5r19b95nWjDdF-D6civD6_M8jzSDIi26WBHlVJOhdY,584
 flet_cli/commands/base.py,sha256=6MTAuA7kKdaKIZI4AyWPM1TJfFCxmRj7kc7z2h6E_4k,3496
 flet_cli/commands/build.py,sha256=lDqO-O9ug9Cy5gU2oGUYDhj9_m8E4mkaytzNHEwJwcA,5741
-flet_cli/commands/build_base.py,sha256=_M0nO3lC8wJU1t3iUP9EnGaB5STepm6nSQQdauXwGEM,87752
+flet_cli/commands/build_base.py,sha256=-39crXtLvcpFzxSSMgO2-oJW4KjoONPWOiv5bf0pa2o,88510
 flet_cli/commands/create.py,sha256=LLgxC7Sbxhy9es21YS9nmR5oGOCJjsYDCdXWztIV44A,5305
 flet_cli/commands/debug.py,sha256=7RhwJCKLVSf9_hunWGKd9vBnR9EgujCWmgs6aOzQVr4,6656
 flet_cli/commands/devices.py,sha256=7kn56lrZLN5LuG_X3IyMdSfdFa421yE4R1otTJr5Yrc,7953
@@ -17,7 +17,7 @@ flet_cli/commands/doctor.py,sha256=uG2xUAT_FASB9cnLD9G83NTYdP9iuKhaHyQLjMB_E4c,1
 flet_cli/commands/emulators.py,sha256=2VCpu-B70JMsmqNpQoDJoXAvOV-Ex_Kkosa27D16iRk,13215
 flet_cli/commands/flutter_base.py,sha256=cvWrB_fWqb8wft7-Wr5isvOFxsgKgc0HcCHyK2IAe2w,17525
 flet_cli/commands/options.py,sha256=tSqztnV4uvXhMEk6VhYe_szoq7CGVTrYlrkdZwMK4ek,1068
-flet_cli/commands/pack.py,sha256=3Kw3hZlrCCPCgEluGvQgoTN33xnbOiJm_QemT36STAQ,14577
+flet_cli/commands/pack.py,sha256=xayvQpkKFDQvckPnxyahKYXbUpEfV8tUMEBn5y-orzk,16586
 flet_cli/commands/publish.py,sha256=scTAR9fnjdPJz48EA42AcW2fYpHRgHkx3xP8b9Lg73o,11985
 flet_cli/commands/run.py,sha256=uonKi-l40mHsN87E-nnDKq74q6o-565vhG05yOKlxek,16840
 flet_cli/commands/serve.py,sha256=YrollC80u9JvuXHbI_qQ3wxpjcqpIQwFxdD5nIOeOT4,3143
@@ -30,10 +30,10 @@ flet_cli/utils/jdk.py,sha256=8hxuptENZa8zCgumaRmx0F8ApX_ldXVQYPlx4_xiYDs,5280
 flet_cli/utils/merge.py,sha256=cZcUL1z2iaGjjFifL1KCrEj2ywLR9x6eNtOj1F2Dr6U,780
 flet_cli/utils/plist.py,sha256=oqBCkeUjUqPIf5y7XaE2seSx64FEs7yc2cukvbjFoSU,1135
 flet_cli/utils/processes.py,sha256=S0ErmI5x9S6RNMe89cf5M4ROIofMtjNZRQ29foUllJ4,2885
-flet_cli/utils/project_dependencies.py,sha256=_IhAevoZeICBxFWn3FJrlDCtI4zu-piGRI22fclDaGE,4320
+flet_cli/utils/project_dependencies.py,sha256=kC8gZZyaGk-coNXrh6cyPM6i9RhUaXcBIvZmQ50PufY,4064
 flet_cli/utils/pyproject_toml.py,sha256=o4fAWKXMyK8vdnAO41BLI7Lt3ohMlVdlwrpaifq30Cs,1408
-flet_cli-0.84.0.dev0.dist-info/METADATA,sha256=cVgzGxPQ2hIqoM3E4kVV0ZfmVHxoRAU0OBepsD1x5M0,1214
-flet_cli-0.84.0.dev0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-flet_cli-0.84.0.dev0.dist-info/entry_points.txt,sha256=UZFR426y3mfr0wgikEFPbZ6wtGwfgykif9Obw6R7Wnc,65
-flet_cli-0.84.0.dev0.dist-info/top_level.txt,sha256=4_BPVAJpcNofDe3XMxajlZLBNWzWqKhRynNSBCYTKVQ,9
-flet_cli-0.84.0.dev0.dist-info/RECORD,,
+flet_cli-0.85.0.dev1.dist-info/METADATA,sha256=XGBH7pKEenAbpSRPW-VI0VWNRhdY4pdcf21N1F5jPfs,1214
+flet_cli-0.85.0.dev1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+flet_cli-0.85.0.dev1.dist-info/entry_points.txt,sha256=UZFR426y3mfr0wgikEFPbZ6wtGwfgykif9Obw6R7Wnc,65
+flet_cli-0.85.0.dev1.dist-info/top_level.txt,sha256=4_BPVAJpcNofDe3XMxajlZLBNWzWqKhRynNSBCYTKVQ,9
+flet_cli-0.85.0.dev1.dist-info/RECORD,,