feat: Expose Flutter version in flet.version module (flutter_version ) and cli

.github/scripts/common.sh

@@ -1,16 +1,22 @@
-function patch_python_package_versions() {
+function patch_python_package_versions() (
+    set -euo pipefail
     cd "$SDK_PYTHON" || exit 1
 
     # Install dependencies
     uv sync --no-default-groups || true
 
     # Update package versions in version.py and pyproject.toml files
     for pkg in flet flet-cli flet-desktop flet-web; do
-      sed -i -e "s/version = \"\"/version = \"$PYPI_VER\"/g" packages/$pkg/src/${pkg//-/_}/version.py
+      sed -i -e "s/flet_version = \"\"/flet_version = \"$PYPI_VER\"/g" packages/$pkg/src/${pkg//-/_}/version.py
       uv version --package "$pkg" "$PYPI_VER"
       echo "Patched version for $pkg to $PYPI_VER"
     done
-}
+
+    # Get Flutter version from .fvmrc and set it in version.py
+    FLUTTER_VERSION="$( uv run "$SCRIPTS/read_fvmrc.py" "${ROOT}/.fvmrc" )"
+    sed -i -e "s/flutter_version = \"\"/flutter_version = \"$FLUTTER_VERSION\"/g" packages/flet/src/flet/version.py
+    echo "Patched Flutter SDK version to $FLUTTER_VERSION"
+)
 
 
 update_flet_wheel_deps() {

.github/scripts/read_fvmrc.py

@@ -0,0 +1,25 @@
+"""
+Reads the Flutter version from a .fvmrc file and prints it.
+
+Usage:
+    uv run read_fvmrc.py <fvmrc_file>
+"""
+
+import json
+import sys
+
+
+def main() -> None:
+    try:
+        with open(sys.argv[1], encoding="utf-8") as f:
+            v = json.load(f)["flutter"].strip()
+            if not v:
+                raise ValueError("Empty or missing 'flutter' value")
+            print(v)
+    except Exception as e:
+        print(f"Error parsing {sys.argv[1]!r}: {e}", file=sys.stderr)
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

.github/workflows/ci.yml

@@ -35,8 +35,7 @@ env:
   ROOT: "${{ github.workspace }}"
   SDK_PYTHON: "${{ github.workspace }}/sdk/python"
   SCRIPTS: "${{ github.workspace }}/.github/scripts"
-  UV_PYTHON: "3.12"
-  PYODIDE_VERSION: "0.27.7"
+  UV_PYTHON: "3.12.7"
 
 jobs:
   # ============
@@ -159,10 +158,11 @@ jobs:
 
       - name: Prepare env and patch versions
         shell: bash
+        working-directory: ${{ env.SDK_PYTHON }}
         run: |
           source "$SCRIPTS/common.sh"
           patch_python_package_versions
-          patch_toml_versions "${SDK_PYTHON}/packages/flet-desktop/pyproject.toml" "$PYPI_VER"
+          patch_toml_versions "packages/flet-desktop/pyproject.toml" "$PYPI_VER"
 
       - name: Build Flutter Windows client
         env:
@@ -497,6 +497,21 @@ jobs:
           path: '.fvmrc'
           cache: true
 
+      - name: Patch Python and Flutter versions
+        shell: bash
+        working-directory: ${{ env.SDK_PYTHON }}
+        run: |
+          source "$SCRIPTS/common.sh"
+          patch_python_package_versions
+
+      - name: Get Pyodide version
+        shell: bash
+        working-directory: ${{ env.SDK_PYTHON }}
+        run: |
+          PYODIDE_VERSION="$( uv run python -c 'import flet.version; print(flet.version.pyodide_version)' )"
+          echo "PYODIDE_VERSION=$PYODIDE_VERSION" >> "$GITHUB_ENV"
+          echo "Pyodide version: $PYODIDE_VERSION"
+
       - name: Build Web client
         shell: bash
         working-directory: client
@@ -530,8 +545,6 @@ jobs:
         shell: bash
         working-directory: ${{ env.SDK_PYTHON }}
         run: |
-          source "$SCRIPTS/common.sh"
-          patch_python_package_versions
           uv build --package flet-web --wheel
 
           rm -rf "packages/flet-web/src/flet_web/web"
@@ -639,6 +652,7 @@ jobs:
 
       - name: Build Python packages
         shell: bash
+        working-directory: ${{ env.SDK_PYTHON }}
         run: |
           source "$SCRIPTS/common.sh"
           patch_python_package_versions

sdk/python/packages/flet-charts/src/flet_charts/plotly_chart.py

@@ -53,7 +53,7 @@ class PlotlyChart(ft.Container):
     def init(self):
         _require_plotly()
         self.alignment = ft.Alignment.CENTER
-        self.__img = ft.Image(fit=ft.BoxFit.FILL)
+        self.__img = ft.Image(src="", fit=ft.BoxFit.FILL)
         self.content = self.__img
 
     def before_update(self):

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

@@ -64,16 +64,20 @@ def set_default_subparser(
 
 def get_parser() -> argparse.ArgumentParser:
     """Construct and return the CLI argument parser."""
-    parser = argparse.ArgumentParser()
+    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 flet.version.from_git(),
+        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")

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

@@ -4,6 +4,39 @@
 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"""
 
@@ -41,7 +74,7 @@ def register_to(
             name,
             description=help_text,
             help=help_text,
-            # formatter_class=PdmFormatter,
+            formatter_class=CustomArgumentDefaultsHelpFormatter,
             **kwargs,
         )
         command = cls(parser)

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

@@ -31,7 +31,6 @@
 )
 from flet_cli.utils.pyproject_toml import load_pyproject_toml
 
-PYODIDE_ROOT_URL = "https://cdn.jsdelivr.net/pyodide/v0.27.7/full"
 DEFAULT_TEMPLATE_URL = "gh:flet-dev/flet-build-template"
 
 
@@ -544,7 +543,7 @@ def add_arguments(self, parser: argparse.ArgumentParser) -> None:
             "--android-signing-key-alias",
             dest="android_signing_key_alias",
             default="upload",
-            help="Android signing key alias (default: upload)",
+            help="Android signing key alias",
         )
         parser.add_argument(
             "--build-number",
@@ -1016,11 +1015,7 @@ def create_flutter_project(self, second_pass=False):
             "tool.flet.template.ref"
         )
         if not template_ref:
-            template_ref = (
-                version.Version(flet.version.version).base_version
-                if flet.version.version
-                else flet.version.from_git()
-            )
+            template_ref = version.Version(flet.version.flet_version).base_version
         hash.update(template_ref)
 
         template_dir = self.options.template_dir or self.get_pyproject(
@@ -1622,12 +1617,7 @@ def package_python_app(self):
                     hash.update(reqs_txt_contents)
             package_args.extend(["-r", "-r", "-r", str(requirements_txt)])
         else:
-            flet_version = (
-                flet.version.version
-                if flet.version.version
-                else flet.version.from_git()
-            )
-            package_args.extend(["-r", f"flet=={flet_version}"])
+            package_args.extend(["-r", f"flet=={flet.version.flet_version}"])
 
         # site-packages variable
         if self.package_platform != "Pyodide":

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

@@ -70,13 +70,13 @@ def handle(self, options: argparse.Namespace) -> None:
 
         template_data = {
             "template_name": options.template,
-            "flet_version": flet.version.version,
+            "flet_version": flet.version.flet_version,
             "sep": os.sep,
         }
 
         template_ref = options.template_ref
-        if not template_ref and flet.version.version:
-            template_ref = version.Version(flet.version.version).base_version
+        if not template_ref:
+            template_ref = version.Version(flet.version.flet_version).base_version
 
         out_dir = Path(options.output_directory).resolve()
         template_data["out_dir"] = out_dir.name

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

@@ -34,16 +34,15 @@ def add_arguments(self, parser: argparse.ArgumentParser) -> None:
             type=int,
             default=10,
             dest="device_timeout",
-            help="Time (in seconds) to wait for devices to attach (default: 10).",
+            help="Time (in seconds) to wait for devices to attach",
         )
         parser.add_argument(
             "--device-connection",
             type=str.lower,
             choices=["both", "attached", "wireless"],
             default="both",
             dest="device_connection",
-            help="Filter devices by connection type: attached (USB) or wireless "
-            "(default: both).",
+            help="Filter devices by connection type: attached (USB) or wireless",
         )
         super().add_arguments(parser)
 

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

@@ -1,5 +1,4 @@
 import argparse
-import os
 import platform
 import sys
 
@@ -21,43 +20,20 @@ def handle(self, options: argparse.Namespace) -> None:
         """Handle the 'doctor' command."""
         verbose = options.verbose
 
-        # Step-by-step checks (No need to store results)
-        self.check_flet_version()
-        self.check_python_version()
-        self.check_os_info()
-
-        # Extra details in verbose mode
-        if verbose:
-            self.check_virtual_env()
-
-    def check_flet_version(self) -> None:
-        """Check and print Flet version."""
-        with console.status("[bold white]Checking Flet version..."):
-            flet_version = flet.version.version or "Unknown"
-            console.print(f"[green]✔ Flet Version:[/green] {flet_version}")
-
-    def check_python_version(self) -> None:
-        """Check and print Python version."""
-        with console.status("[bold white]Checking Python version..."):
-            console.print(f"[green]✔ Python Version:[/green] {sys.version}")
-
-    def check_os_info(self) -> None:
-        """Check and print OS information."""
-        with console.status("[bold white]Checking OS information..."):
-            os_info = f"{platform.system()} {platform.release()} ({platform.version()})"
-            console.print(f"[green]✔ Operating System:[/green] {os_info}")
-
-    def check_virtual_env(self) -> None:
-        """Check if a Python virtual environment is active."""
-        with console.status("[bold white]Checking Python virtual environment..."):
-            venv = os.getenv("VIRTUAL_ENV")
-            conda_env = os.getenv("CONDA_PREFIX")
-
-            if venv:
-                console.print(f"[green]✔ Virtual Environment active:[/green] {venv}")
-            elif conda_env:
-                console.print(f"[green]✔ Conda Environment active:[/green] {conda_env}")
-            else:
-                console.print(
-                    "[yellow]⚠ No virtual environment or Conda detected[/yellow]"
-                )
+        os_name = platform.system()
+        if os_name == "Darwin":
+            os_name = "macOS"
+            os_version = platform.mac_ver()[0]
+        else:
+            os_version = platform.release()
+
+        arch = platform.machine()
+        console.print(
+            f"Flet {flet.version.flet_version} on {os_name} {os_version} ({arch})"
+            if arch
+            else f"Flet {flet.version.flet_version} on {os_name} {os_version}"
+        )
+
+        console.print(f"Python {platform.python_version()} ({sys.executable})")
+
+        # TODO: output Flutter version, if installed