Refactor version retrieval and clean up CLI commands

Replaced usage of update_version() with from_git() for dynamic version retrieval throughout CLI and desktop modules. Removed unused imports and obsolete methods from build_base.py. Updated devices.py and emulators.py to import BaseFlutterCommand from flutter_base instead of build_base for better separation of concerns.

Author: FeodorFitsner

sdk/python/packages/flet-cli/src/flet_cli/cli.py

@@ -12,7 +12,6 @@
 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
@@ -72,7 +71,9 @@ def get_parser() -> argparse.ArgumentParser:
         "--version",
         "-V",
         action="version",
-        version=flet.version.version if flet.version.version else update_version(),
+        version=flet.version.version
+        if flet.version.version
+        else flet.version.from_git(),
     )
 
     sp = parser.add_subparsers(dest="command")

sdk/python/packages/flet-cli/src/flet_cli/commands/build.py

@@ -2,7 +2,6 @@
 
 from rich.console import Group
 from rich.live import Live
-from rich.panel import Panel
 
 from flet_cli.commands.build_base import BaseBuildCommand, console
 
@@ -60,18 +59,16 @@ def handle(self, options: argparse.Namespace) -> None:
             self.cleanup(
                 0,
                 message=(
-                    Panel(
-                        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 ""
-                        )
+                    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 ""
                     )
                 ),
             )

sdk/python/packages/flet-cli/src/flet_cli/commands/build_base.py

@@ -14,8 +14,7 @@
 
 import flet.version
 import flet_cli.utils.processes as processes
-from flet.utils import copy_tree, is_windows, slugify
-from flet.version import update_version
+from flet.utils import copy_tree, slugify
 from flet_cli.commands.flutter_base import (
     BaseFlutterCommand,
     console,
@@ -50,6 +49,7 @@ def __init__(self, parser: argparse.ArgumentParser) -> None:
         self.target_platform = None
         self.package_platform = None
         self.config_platform = None
+        self.debug_platform = None
         self.flutter_dependencies = {}
         self.package_app_path = None
         self.template_data = None
@@ -1019,7 +1019,7 @@ def create_flutter_project(self, second_pass=False):
             template_ref = (
                 version.Version(flet.version.version).base_version
                 if flet.version.version
-                else update_version()
+                else flet.version.from_git()
             )
         hash.update(template_ref)
 
@@ -1623,7 +1623,9 @@ def package_python_app(self):
             package_args.extend(["-r", "-r", "-r", str(requirements_txt)])
         else:
             flet_version = (
-                flet.version.version if flet.version.version else update_version()
+                flet.version.version
+                if flet.version.version
+                else flet.version.from_git()
             )
             package_args.extend(["-r", f"flet=={flet_version}"])
 
@@ -1939,14 +1941,6 @@ def find_platform_image(
             return Path(images[0]).name
         return None
 
-    def find_flutter_batch(self, exe_filename: str):
-        batch_path = shutil.which(exe_filename)
-        if not batch_path:
-            return None
-        if is_windows() and batch_path.endswith(".file"):
-            return batch_path.replace(".file", ".bat")
-        return batch_path
-
     def run(self, args, cwd, env: Optional[dict] = None, capture_output=True):
         if self.verbose > 0:
             console.log(f"Run subprocess: {args}", style=verbose1_style)
@@ -1959,30 +1953,6 @@ def run(self, args, cwd, env: Optional[dict] = None, capture_output=True):
             log=self.log_stdout,
         )
 
-    def run_flutter_doctor(self):
-        flutter_doctor = self.run(
-            [self.flutter_exe, "doctor", "--no-version-check", "--suppress-analytics"],
-            cwd=os.getcwd(),
-            capture_output=True,
-        )
-        if flutter_doctor.returncode == 0 and flutter_doctor.stdout:
-            console.log(flutter_doctor.stdout, style=verbose1_style)
-
-    def update_status(self, status):
-        if self.no_rich_output:
-            console.log(status)
-        else:
-            self.status.update(status)
-
-    def log_stdout(self, message):
-        if self.verbose > 0:
-            console.log(
-                message,
-                end="",
-                style=verbose2_style,
-                markup=False,
-            )
-
     def load_yaml(self, path):
         with open(str(path), encoding="utf-8") as f:
             return yaml.safe_load(f)

sdk/python/packages/flet-cli/src/flet_cli/commands/devices.py

@@ -6,7 +6,7 @@
 from rich.panel import Panel
 from rich.table import Column, Table
 
-from flet_cli.commands.build_base import BaseFlutterCommand, console, verbose2_style
+from flet_cli.commands.flutter_base import BaseFlutterCommand, console, verbose2_style
 
 
 class Command(BaseFlutterCommand):
@@ -63,10 +63,6 @@ def handle(self, options: argparse.Namespace) -> None:
         )
         with Live(Group(self.status, self.progress), console=console) as self.live:
             self.initialize_command()
-            # if self.options.show_devices:
-            #     self.run_flutter_devices()
-            #     self.live.update("", refresh=True)
-            #     return
             self.run_flutter_devices()
             self.cleanup(0)
 

sdk/python/packages/flet-cli/src/flet_cli/commands/emulators.py

@@ -8,7 +8,7 @@
 from rich.panel import Panel
 from rich.table import Column, Table
 
-from flet_cli.commands.build_base import BaseFlutterCommand, console, verbose2_style
+from flet_cli.commands.flutter_base import BaseFlutterCommand, console, verbose2_style
 from flet_cli.utils.android_sdk import AndroidSDK
 
 

sdk/python/packages/flet-desktop/src/flet_desktop/__init__.py

@@ -210,9 +210,8 @@ def __download_flet_client(file_name):
     ver = flet_desktop.version.version
     if not ver:
         import flet.version
-        from flet.version import update_version
 
-        ver = flet.version.version or update_version()
+        ver = flet.version.version or flet.version.from_git()
     temp_arch = Path(tempfile.gettempdir()).joinpath(file_name)
     flet_url = f"https://github.com/flet-dev/flet/releases/download/v{ver}/{file_name}"
     logger.info(f"Downloading Flet v{ver} from {flet_url} to {temp_arch}")

sdk/python/packages/flet/src/flet/version.py

@@ -13,7 +13,7 @@
 version = ""
 
 
-def update_version():
+def from_git():
     """Try to get the version from Git tags."""
     working = Path().absolute()
     try:
@@ -64,7 +64,7 @@ def find_repo_root(start_path: Path) -> Path | None:
 if not version and not is_mobile():
     # Only try to get the version from Git if the pre-set version is empty
     # This is more likely to happen in a development/source environment
-    version = update_version() or DEFAULT_VERSION  # Fallback to a default if Git fails
+    version = from_git() or DEFAULT_VERSION  # Fallback to a default if Git fails
 
 # If 'version' is still empty after the above (e.g., in a built package
 # where CI didn't replace it), it might be appropriate to have another