flet-cli 0.70.0.dev6281__tar.gz → 0.81.0.dev7173__tar.gz

{flet_cli-0.70.0.dev6281 → flet_cli-0.81.0.dev7173}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-cli
-Version: 0.70.0.dev6281
+Version: 0.81.0.dev7173
 Summary: Flet CLI
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -13,7 +13,7 @@ Requires-Dist: flet
 Requires-Dist: watchdog>=4.0.0
 Requires-Dist: packaging>=25.0
 Requires-Dist: qrcode>=7.4.2
-Requires-Dist: toml>=0.10.2
+Requires-Dist: tomli>=1.1.0; python_version < "3.11"
 Requires-Dist: cookiecutter>=2.6.0
 
 # Flet CLI

{flet_cli-0.70.0.dev6281 → flet_cli-0.81.0.dev7173}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flet-cli"
-version = "0.70.0.dev6281"
+version = "0.81.0.dev7173"
 description = "Flet CLI"
 authors = [{ name = "Appveyor Systems Inc.", email = "hello@flet.dev" }]
 license = "Apache-2.0"
@@ -11,7 +11,7 @@ dependencies = [
     "watchdog >=4.0.0",
     "packaging >=25.0",
     "qrcode >=7.4.2",
-    "toml >=0.10.2",
+    "tomli >= 1.1.0 ; python_version < '3.11'",
     "cookiecutter >=2.6.0"
 ]
 

{flet_cli-0.70.0.dev6281 → flet_cli-0.81.0.dev7173}/src/flet_cli/__pyinstaller/hook-flet.py

@@ -1,5 +1,3 @@
-import os
-
 import flet_cli.__pyinstaller.config as hook_config
 from flet_cli.__pyinstaller.utils import get_flet_bin_path
 

{flet_cli-0.70.0.dev6281 → flet_cli-0.81.0.dev7173}/src/flet_cli/cli.py

@@ -4,12 +4,14 @@ import sys
 import flet.version
 import flet_cli.commands.build
 import flet_cli.commands.create
-import flet_cli.commands.doctor  # Adding the doctor command
+import flet_cli.commands.debug
+import flet_cli.commands.devices
+import flet_cli.commands.doctor
+import flet_cli.commands.emulators
 import flet_cli.commands.pack
 import flet_cli.commands.publish
 import flet_cli.commands.run
 import flet_cli.commands.serve
-from flet.version import update_version
 
 
 # Source https://stackoverflow.com/a/26379693
@@ -60,30 +62,47 @@ def set_default_subparser(
         args.insert(index, name)
 
 
-def main():
-    parser = argparse.ArgumentParser()
+def get_parser() -> argparse.ArgumentParser:
+    """Construct and return the CLI argument parser."""
+    parser = argparse.ArgumentParser(
+        formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+
+    # add version flag
     parser.add_argument(
         "--version",
         "-V",
         action="version",
-        version=flet.version.version if flet.version.version else update_version(),
+        version=(
+            f"Flet: {flet.version.flet_version}\n"
+            f"Flutter: {flet.version.flutter_version}\n"
+            f"Pyodide: {flet.version.pyodide_version}"
+        ),
     )
 
     sp = parser.add_subparsers(dest="command")
 
+    # register subcommands
     flet_cli.commands.create.Command.register_to(sp, "create")
     flet_cli.commands.run.Command.register_to(sp, "run")
     flet_cli.commands.build.Command.register_to(sp, "build")
+    flet_cli.commands.debug.Command.register_to(sp, "debug")
     flet_cli.commands.pack.Command.register_to(sp, "pack")
     flet_cli.commands.publish.Command.register_to(sp, "publish")
     flet_cli.commands.serve.Command.register_to(sp, "serve")
-    flet_cli.commands.doctor.Command.register_to(
-        sp, "doctor"
-    )  # Register the doctor command
+    flet_cli.commands.emulators.Command.register_to(sp, "emulators")
+    flet_cli.commands.devices.Command.register_to(sp, "devices")
+    flet_cli.commands.doctor.Command.register_to(sp, "doctor")
 
     # set "run" as the default subparser
     set_default_subparser(parser, name="run", index=1)
 
+    return parser
+
+
+def main():
+    parser = get_parser()
+
     # print usage/help if called without arguments
     if len(sys.argv) == 1:
         parser.print_help(sys.stdout)

{flet_cli-0.70.0.dev6281 → flet_cli-0.81.0.dev7173}/src/flet_cli/commands/base.py

@@ -1,9 +1,42 @@
 import argparse
-from typing import Any, List, Optional
+from typing import Any, Optional
 
 from flet_cli.commands.options import Option, verbose_option
 
 
+class CustomArgumentDefaultsHelpFormatter(argparse.HelpFormatter):
+    """
+    An argparse help formatter that appends default values to help text
+    selectively.
+
+    Defaults are added only when they are informative and not already
+    present in the help string. Noisy or redundant defaults (such as
+    None, empty lists, booleans for flag arguments, or suppressed values)
+    are omitted.
+    """
+
+    def _get_help_string(self, action: argparse.Action) -> str:
+        help_text = action.help or ""
+        default = action.default
+
+        # skip appending a default
+        if (
+            default is None
+            or default == []
+            or isinstance(default, bool)  # store_true / store_false flags
+            or default is argparse.SUPPRESS
+            or any(token in help_text for token in ("%(default)", "(default:"))
+        ):
+            return help_text
+
+        # only add defaults for optionals or for nargs implying optional values
+        defaulting_nargs = (argparse.OPTIONAL, argparse.ZERO_OR_MORE)
+        if action.option_strings or action.nargs in defaulting_nargs:
+            help_text += " (default: %(default)s)"
+
+        return help_text
+
+
 class BaseCommand:
     """A CLI subcommand"""
 
@@ -13,7 +46,7 @@ class BaseCommand:
     description: Optional[str] = None
     # A list of pre-defined options which will be loaded on initializing
     # Rewrite this if you don't want the default ones
-    arguments: List[Option] = [verbose_option]
+    arguments: list[Option] = [verbose_option]
 
     def __init__(self, parser: argparse.ArgumentParser) -> None:
         for arg in self.arguments:
@@ -25,14 +58,15 @@ class BaseCommand:
         cls,
         subparsers: argparse._SubParsersAction,
         name: Optional[str] = None,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> None:
         """Register a subcommand to the subparsers,
         with an optional name of the subcommand.
         """
         help_text = cls.description or cls.__doc__
         name = name or cls.name or ""
-        # Remove the existing subparser as it will raises an error on Python 3.11+
+
+        # Remove the existing subparser as it will raise an error on Python 3.11+
         subparsers._name_parser_map.pop(name, None)
         subactions = subparsers._get_subactions()
         subactions[:] = [action for action in subactions if action.dest != name]
@@ -40,7 +74,7 @@ class BaseCommand:
             name,
             description=help_text,
             help=help_text,
-            # formatter_class=PdmFormatter,
+            formatter_class=CustomArgumentDefaultsHelpFormatter,
             **kwargs,
         )
         command = cls(parser)

flet_cli-0.81.0.dev7173/src/flet_cli/commands/build.py

@@ -0,0 +1,136 @@
+import argparse
+
+from rich.console import Group
+from rich.live import Live
+
+from flet_cli.commands.build_base import BaseBuildCommand, console
+
+
+class Command(BaseBuildCommand):
+    """
+    Build a Flet Python app into a platform-specific executable or
+    installable bundle. It supports building for desktop (macOS, Linux, Windows), web,
+    Android (APK/AAB), and iOS (IPA), with a wide range of customization options for
+    metadata, assets, splash screens, and signing.
+    """
+
+    def __init__(self, parser: argparse.ArgumentParser) -> None:
+        super().__init__(parser)
+
+    def add_arguments(self, parser: argparse.ArgumentParser) -> None:
+        parser.add_argument(
+            "target_platform",
+            type=str.lower,
+            choices=["macos", "linux", "windows", "web", "apk", "aab", "ipa"],
+            help="The target platform or type of package to build",
+        )
+        parser.add_argument(
+            "-o",
+            "--output",
+            dest="output_dir",
+            required=False,
+            help="Output directory for the final executable/bundle "
+            "(default: <python_app_path>/build/<target_platform>)",
+        )
+        super().add_arguments(parser)
+
+    def handle(self, options: argparse.Namespace) -> None:
+        super().handle(options)
+        assert self.target_platform
+        self.status = console.status(
+            f"[bold blue]Initializing {self.target_platform} build...",
+            spinner="bouncingBall",
+        )
+        with Live(Group(self.status, self.progress), console=console) as self.live:
+            self.initialize_command()
+            self.validate_target_platform()
+            self.validate_entry_point()
+            self.setup_template_data()
+            self.create_flutter_project()
+            self.package_python_app()
+            self.register_flutter_extensions()
+            if self.create_flutter_project(second_pass=True):
+                self.update_flutter_dependencies()
+            self.customize_icons()
+            self.customize_splash_images()
+            self.run_flutter()
+            self.copy_build_output()
+
+            self.cleanup(
+                0,
+                message=(
+                    f"Successfully built your [cyan]"
+                    f"{self.platforms[self.target_platform]['status_text']}"
+                    f"[/cyan]! {self.emojis['success']} "
+                    f"Find it in [cyan]{self.rel_out_dir}[/cyan] directory. "
+                    f"{self.emojis['directory']}"
+                    + (
+                        "\nRun [cyan]flet serve[/cyan] command to "
+                        "start a web server with your app. "
+                        if self.target_platform == "web"
+                        else ""
+                    )
+                ),
+            )
+
+    def add_flutter_command_args(self, args: list[str]):
+        assert self.options
+        assert self.build_dir
+        assert self.get_pyproject
+        assert self.template_data
+        assert self.target_platform
+
+        args.extend(
+            ["build", self.platforms[self.target_platform]["flutter_build_command"]]
+        )
+
+        if self.target_platform in "apk" and self.template_data["split_per_abi"]:
+            args.append("--split-per-abi")
+
+        if self.target_platform in ["ipa"]:
+            if self.template_data["ios_provisioning_profile"]:
+                args.extend(
+                    [
+                        "--export-options-plist",
+                        "ios/exportOptions.plist",
+                    ]
+                )
+            else:
+                args.append("--no-codesign")
+
+        build_number = self.options.build_number or self.get_pyproject(
+            "tool.flet.build_number"
+        )
+        if build_number:
+            args.extend(["--build-number", str(build_number)])
+
+        build_version = (
+            self.options.build_version
+            or self.get_pyproject("project.version")
+            or self.get_pyproject("tool.poetry.version")
+        )
+        if build_version:
+            args.extend(["--build-name", build_version])
+
+        for arg in (
+            self.get_pyproject(f"tool.flet.{self.config_platform}.flutter.build_args")
+            or self.get_pyproject("tool.flet.flutter.build_args")
+            or []
+        ):
+            args.append(arg)
+
+    def run_flutter(self):
+        assert self.platforms
+        assert self.target_platform
+
+        self.update_status(
+            f"[bold blue]Building [cyan]"
+            f"{self.platforms[self.target_platform]['status_text']}[/cyan]..."
+        )
+
+        self._run_flutter_command()
+
+        console.log(
+            f"Built [cyan]{self.platforms[self.target_platform]['status_text']}"
+            f"[/cyan] {self.emojis['checkmark']}",
+        )