Poetry 2.0 support, Flutter and JDK installation fixes (flet-dev#4748)

* Switch to `[project]`, remove python ver upper limit * Fix Flutter installation by supporting zip unpacking with symlinks * Configure JDK path for Flutter Close flet-dev#4727

Author: FeodorFitsner

sdk/python/packages/flet-cli/pyproject.toml

@@ -1,11 +1,13 @@
-[tool.poetry]
+[project]
 name = "flet-cli"
 version = "0.1.0"
 description = "Flet CLI"
-authors = ["Appveyor Systems Inc. <hello@flet.dev>"]
+authors = [{name = "Appveyor Systems Inc.", email ="hello@flet.dev"}]
 license = "Apache-2.0"
 readme = "README.md"
+requires-python = ">=3.9"
 
+[tool.poetry]
 packages = [{ include = "flet_cli", from = "src" }]
 
 [tool.poetry.urls]
@@ -14,7 +16,6 @@ Repository = "https://github.com/flet-dev/flet"
 Documentation = "https://flet.dev/docs"
 
 [tool.poetry.dependencies]
-python = "^3.9"
 flet = { version = "0.1.0" }
 watchdog = "^4.0.0"
 packaging = "*"

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

@@ -11,7 +11,7 @@
 import flet.version
 import flet_cli.utils.processes as processes
 import yaml
-from flet.utils import copy_tree, is_windows, slugify
+from flet.utils import cleanup_path, copy_tree, is_windows, slugify
 from flet.utils.platform_utils import get_bool_env_var
 from flet.version import update_version
 from flet_cli.commands.base import BaseCommand
@@ -681,9 +681,35 @@ def install_flutter(self):
  ext = ".bat" if platform.system() == "Windows" else ""
  self.flutter_exe = os.path.join(flutter_dir, "bin", f"flutter{ext}")
  self.dart_exe = os.path.join(flutter_dir, "bin", f"dart{ext}")
- self.env["PATH"] = os.pathsep.join(
- [os.path.join(flutter_dir, "bin"), os.environ.get("PATH", "")]
+ path_env = cleanup_path(
+ cleanup_path(os.environ.get("PATH", ""), "flutter"), "dart"
  )
+ self.env["PATH"] = os.pathsep.join([os.path.join(flutter_dir, "bin"), path_env])
+
+ # desktop mode
+ if self.config_platform in ["macos", "windows", "linux"]:
+ if self.verbose > 0:
+ console.log(
+ f"Ensure Flutter has desktop support enabled",
+ style=verbose1_style,
+ )
+ config_result = self.run(
+ [
+ self.flutter_exe,
+ "config",
+ "--suppress-analytics",
+ f"--enable-{self.config_platform}-desktop",
+ ],
+ cwd=os.getcwd(),
+ capture_output=self.verbose < 1,
+ )
+ if config_result.returncode != 0:
+ if config_result.stdout:
+ console.log(config_result.stdout, style=verbose1_style)
+ if config_result.stderr:
+ console.log(config_result.stderr, style=error_style)
+ self.cleanup(config_result.returncode)
+
  console.log(
  f"Flutter {MINIMAL_FLUTTER_VERSION} installed {self.emojis['checkmark']}"
  )
@@ -692,7 +718,32 @@ def install_jdk(self):
  from flet_cli.utils.jdk import install_jdk
 
  self.status.update(f"[bold blue]Installing JDK...")
- self.env["JAVA_HOME"] = install_jdk(self.log_stdout, progress=self.progress)
+ jdk_dir = install_jdk(self.log_stdout, progress=self.progress)
+ self.env["JAVA_HOME"] = jdk_dir
+
+ # config flutter's JDK dir
+ if self.verbose > 0:
+ console.log(
+ f"Configuring Flutter's path to JDK",
+ style=verbose1_style,
+ )
+ config_result = self.run(
+ [
+ self.flutter_exe,
+ "config",
+ "--suppress-analytics",
+ f"--jdk-dir={jdk_dir}",
+ ],
+ cwd=os.getcwd(),
+ capture_output=self.verbose < 1,
+ )
+ if config_result.returncode != 0:
+ if config_result.stdout:
+ console.log(config_result.stdout, style=verbose1_style)
+ if config_result.stderr:
+ console.log(config_result.stderr, style=error_style)
+ self.cleanup(config_result.returncode)
+
  console.log(f"JDK installed {self.emojis['checkmark']}")
 
  def install_android_sdk(self):

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

@@ -27,36 +27,61 @@ def download_with_progress(url, dest_path, progress: Optional[Progress] = None):
 def extract_with_progress(
  archive_path, extract_to, progress: Optional[Progress] = None
 ):
- """Extracts an archive with a progress bar and preserves file attributes."""
+ """Extracts an archive with a progress bar and preserves file attributes, including symbolic links."""
  if archive_path.endswith(".zip"):
  with zipfile.ZipFile(archive_path, "r") as archive:
  total_files = len(archive.namelist())
  if progress:
  task = progress.add_task("Extracting...", total=total_files)
  for member in archive.namelist():
- member = archive.getinfo(member)
- archive.extract(member, extract_to)
+ member_info = archive.getinfo(member)
+ # Check if the member is a symbolic link
+ is_symlink = (member_info.external_attr >> 16) & 0o120000 == 0o120000
+ extracted_path = os.path.join(extract_to, member_info.filename)
+
+ if is_symlink:
+ # Read the target of the symlink from the archive
+ with archive.open(member_info) as target_file:
+ target = target_file.read().decode("utf-8")
+ # Create the symbolic link
+ os.symlink(target, extracted_path)
+ else:
+ # Extract regular files and directories
+ archive.extract(member_info, extract_to)
+
+ # Preserve permissions
+ if member_info.external_attr > 0xFFFF:
+ os.chmod(extracted_path, member_info.external_attr >> 16)
+
  if progress:
  progress.update(task, advance=1)
- # preserve permissions
- extracted_path = os.path.join(extract_to, member.filename)
- if member.external_attr > 0xFFFF:
- os.chmod(extracted_path, member.external_attr >> 16)
  if progress:
  progress.remove_task(task)
+
  elif archive_path.endswith(".tar.xz") or archive_path.endswith(".tar.gz"):
  with tarfile.open(archive_path, "r:*") as archive:
  members = archive.getmembers()
  total_files = len(members)
  if progress:
  task = progress.add_task("Extracting...", total=total_files)
  for member in members:
- archive.extract(member, extract_to)
- if progress:
- progress.update(task, advance=1)
- # Preserve permissions (executable flags, etc.)
  extracted_path = os.path.join(extract_to, member.name)
- if member.isfile():
+
+ if member.issym():
+ # Create symbolic link manually
+ os.symlink(member.linkname, extracted_path)
+ elif member.islnk():
+ # Create hard link manually
+ os.link(os.path.join(extract_to, member.linkname), extracted_path)
+ else:
+ # Extract regular files and directories
+ archive.extract(member, extract_to)
+
+ # Preserve permissions
+ if member.isfile() or member.isdir():
  os.chmod(extracted_path, member.mode)
+
+ if progress:
+ progress.update(task, advance=1)
  if progress:
  progress.remove_task(task)

sdk/python/packages/flet-desktop/pyproject.toml

@@ -1,11 +1,13 @@
-[tool.poetry]
+[project]
 name = "flet-desktop"
 version = "0.1.0"
 description = "Flet Desktop client in Flutter"
-authors = ["Appveyor Systems Inc. <hello@flet.dev>"]
+authors = [{name = "Appveyor Systems Inc.", email ="hello@flet.dev"}]
 license = "Apache-2.0"
 readme = "README.md"
+requires-python = ">=3.9"
 
+[tool.poetry]
 packages = [
  { include = "flet_desktop", from = "src" },
 ]
@@ -20,7 +22,6 @@ Repository = "https://github.com/flet-dev/flet"
 Documentation = "https://flet.dev/docs"
 
 [tool.poetry.dependencies]
-python = "^3.9"
 flet = { version = "0.1.0" }
 
 [tool.poetry.group.dev.dependencies]

sdk/python/packages/flet-web/pyproject.toml

@@ -1,11 +1,13 @@
-[tool.poetry]
+[project]
 name = "flet-web"
 version = "0.1.0"
 description = "Flet web client in Flutter."
-authors = ["Appveyor Systems Inc. <hello@flet.dev>"]
+authors = [{name = "Appveyor Systems Inc.", email ="hello@flet.dev"}]
 license = "Apache-2.0"
 readme = "README.md"
+requires-python = ">=3.9"
 
+[tool.poetry]
 packages = [{ include = "flet_web", from = "src" }]
 
 include = [{ path = "src/flet_web/web/**/*", format = ["sdist", "wheel"] }]
@@ -16,7 +18,6 @@ Repository = "https://github.com/flet-dev/flet"
 Documentation = "https://flet.dev/docs"
 
 [tool.poetry.dependencies]
-python = "^3.9"
 flet = { version = "0.1.0" }
 fastapi = "*"
 uvicorn = { extras = ["standard"], version = "*" }

sdk/python/packages/flet/pyproject.toml

@@ -1,11 +1,13 @@
-[tool.poetry]
+[project]
 name = "flet"
 version = "0.1.0"
 description = "Flet for Python - easily build interactive multi-platform apps in Python"
-authors = ["Appveyor Systems Inc. <hello@flet.dev>"]
+authors = [{name = "Appveyor Systems Inc.", email ="hello@flet.dev"}]
 license = "Apache-2.0"
 readme = "README.md"
+requires-python = ">=3.9"
 
+[tool.poetry]
 packages = [{ include = "flet", from = "src" }]
 
 [tool.poetry.urls]
@@ -14,7 +16,6 @@ Repository = "https://github.com/flet-dev/flet"
 Documentation = "https://flet.dev/docs"
 
 [tool.poetry.dependencies]
-python = "^3.9"
 flet-cli = { version = "0.1.0", optional = true }
 flet-desktop = { version = "0.1.0", optional = true, markers = "platform_system == 'Darwin' or platform_system == 'Windows'" }
 flet-web = { version = "0.1.0", optional = true }

sdk/python/packages/flet/src/flet/utils/__init__.py

@@ -2,6 +2,7 @@
 from flet.utils.classproperty import classproperty
 from flet.utils.deprecated import deprecated
 from flet.utils.files import (
+ cleanup_path,
  copy_tree,
  get_current_script_dir,
  is_within_directory,

sdk/python/packages/flet/src/flet/utils/files.py

@@ -42,6 +42,21 @@ def is_exe(fpath):
 
  return None
 
+
+def cleanup_path(path: str, executable: str):
+ cleaned_dirs = []
+ for path_dir in path.split(os.pathsep):
+ found = False
+ for file_name in [executable, f"{executable}.bat", f"{executable}.cmd"]:
+ if os.path.isfile(os.path.join(path_dir, file_name)):
+ found = True
+ break
+ if not found:
+ cleaned_dirs.append(path_dir)
+
+ return os.pathsep.join(cleaned_dirs)
+
+
 def get_current_script_dir():
  pathname = os.path.dirname(sys.argv[0])
- return os.path.abspath(pathname)
+ return os.path.abspath(pathname)