Merge flet-core into flet, flet package extras (#4251)

* Merge flet_core into flet

* Reformat __init__

* Fix logger

* inroduce Flet extras

* Fix tests and some imports

* Fix tests

* Update markers, create flet.cli redirect

* Fix PubSubHub references

* On-demand install flet packages

* Fix verson in dependent packages

* Complete merge of main

* Fix deprecated enum metaclasses

* Fix tests

Author: FeodorFitsner

.appveyor.yml

@@ -199,9 +199,8 @@ for:
       - ps: |
           $ErrorActionPreference = "Stop"
           $env:PYPI_VER = $env:APPVEYOR_BUILD_VERSION.replace("+", ".dev")
-          $vp = "$env:flet_sdk_root/packages/flet-core/src/flet_core/version.py"; (Get-Content $vp).replace("version = `"`"", "version = `"$env:PYPI_VER`"") | Set-Content $vp
+          $vp = "$env:flet_sdk_root/packages/flet/src/flet/version.py"; (Get-Content $vp).replace("version = `"`"", "version = `"$env:PYPI_VER`"") | Set-Content $vp
       - python ci/patch_toml_versions.py %flet_sdk_root%/packages/flet-desktop/pyproject.toml %PYPI_VER%
-      - python ci/patch_toml_versions.py %flet_sdk_root%/packages/flet-core/pyproject.toml %PYPI_VER%
 
       - cd client
       - set RELEASE_DIR=build\windows\x64\runner\Release
@@ -491,11 +490,6 @@ for:
       - cd $flet_sdk_root
       - poetry install
 
-      # build "flet-core" package
-      - pushd packages/flet-core
-      - poetry build
-      - popd
-
       # build "flet-cli" package
       - pushd packages/flet-cli
       - poetry build
@@ -510,11 +504,9 @@ for:
       # publish package
       - |
           publish_to_pypi \
-            packages/flet-core/dist/*.whl \
             packages/flet-cli/dist/*.whl \
             packages/flet/dist/*.whl
 
     artifacts:
-      - path: sdk/python/packages/flet-core/dist/*
       - path: sdk/python/packages/flet-cli/dist/*
       - path: sdk/python/packages/flet/dist/*

ci/clean-pypi.sh

@@ -2,7 +2,6 @@
 #VER="0\.22\.0\.dev"
 #VER="0\.21\.1"
 pypi-cleanup -u flet -p flet -y -r $VER --do-it
-pypi-cleanup -u flet -p flet-core -y -r $VER --do-it
-pypi-cleanup -u flet -p flet-runtime -y -r $VER --do-it
-pypi-cleanup -u flet -p flet-embed -y -r $VER --do-it
-pypi-cleanup -u flet -p flet-pyodide -y -r $VER --do-it
+pypi-cleanup -u flet -p flet-cli -y -r $VER --do-it
+pypi-cleanup -u flet -p flet-desktop -y -r $VER --do-it
+pypi-cleanup -u flet -p flet-web -y -r $VER --do-it

ci/common.sh

@@ -7,10 +7,9 @@ pip install --upgrade setuptools wheel twine poetry tomlkit virtualenv
 
 function patch_python_package_versions() {
     PYPI_VER="${APPVEYOR_BUILD_VERSION/+/.dev}"
-    sed -i -e "s/version = \"\"/version = \"$PYPI_VER\"/g" $flet_sdk_root/packages/flet-core/src/flet_core/version.py
+    sed -i -e "s/version = \"\"/version = \"$PYPI_VER\"/g" $flet_sdk_root/packages/flet/src/flet/version.py
     python3 $root/ci/patch_toml_versions.py $flet_sdk_root/packages/flet/pyproject.toml $PYPI_VER
     python3 $root/ci/patch_toml_versions.py $flet_sdk_root/packages/flet-cli/pyproject.toml $PYPI_VER
-    python3 $root/ci/patch_toml_versions.py $flet_sdk_root/packages/flet-core/pyproject.toml $PYPI_VER
     python3 $root/ci/patch_toml_versions.py $flet_sdk_root/packages/flet-desktop/pyproject.toml $PYPI_VER
     python3 $root/ci/patch_toml_versions.py $flet_sdk_root/packages/flet-web/pyproject.toml $PYPI_VER
 }

ci/patch_toml_versions.py

@@ -32,7 +32,6 @@ def patch_dep(dep_name):
             deps[dep_name] = ver
 
 
-patch_dep("flet-core")
 patch_dep("flet-cli")
 patch_dep("flet-desktop")
 patch_dep("flet-web")

ci/update-flet-wheel-deps.py

@@ -38,7 +38,7 @@ def update_metadata(metadata_file, version):
             if lines[i].startswith("Requires-Dist: flet-desktop "):
                 lines.insert(
                     i + 1,
-                    f"Requires-Dist: flet-desktop-light (=={version}) ; platform_system == 'Linux' and 'embedded' not in platform_version\n",
+                    f'Requires-Dist: flet-desktop-light (=={version}) ; platform_system == "Linux" and (extra == "all" or extra == "desktop")\n',
                 )
             lines[i] = re.sub(
                 r'platform_system != "desktop-light"',

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

@@ -15,12 +15,19 @@ documentation = "https://flet.dev/docs"
 
 [tool.poetry.dependencies]
 python = "^3.8"
+flet = { version = "0.1.0" }
 watchdog = "^4.0.0"
 packaging = "*"
 qrcode = "^7.4.2"
 toml = "^0.10.2"
 cookiecutter = "^2.6.0"
 
+[tool.poetry.scripts]
+flet = "flet_cli.cli:main"
+
+[tool.poetry.plugins."pyinstaller40"]
+hook-dirs = "flet_cli.__pyinstaller:get_hook_dirs"
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

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

@@ -5,7 +5,7 @@
 import tarfile
 from pathlib import Path
 
-from flet_core.utils import safe_tar_extractall
+from flet.utils import safe_tar_extractall
 from PyInstaller.building.icon import normalize_icon_type
 
 

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

@@ -3,7 +3,7 @@
 import uuid
 from pathlib import Path
 
-from flet_core.utils import copy_tree
+from flet.utils import copy_tree
 from flet_desktop import get_package_bin_dir
 
 

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

@@ -1,6 +1,5 @@
 import argparse
 import glob
-import json
 import os
 import platform
 import re
@@ -13,16 +12,15 @@
 import flet.version
 import toml
 import yaml
+from flet.utils import copy_tree, is_windows, slugify
+from flet.utils.platform_utils import get_bool_env_var
 from flet.version import update_version
-from flet_core.utils import copy_tree, is_windows, slugify
-from flet_core.utils.platform_utils import get_bool_env_var
+from flet_cli.commands.base import BaseCommand
+from flet_cli.utils.merge import merge_dict
 from packaging import version
 from rich.console import Console, Style
 from rich.table import Column, Table
 
-from flet_cli.commands.base import BaseCommand
-from flet_cli.utils.merge import merge_dict
-
 if is_windows():
     from ctypes import windll
 

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

@@ -3,8 +3,8 @@
 from pathlib import Path
 
 import flet.version
+from flet.utils import slugify
 from flet_cli.commands.base import BaseCommand
-from flet_core.utils import slugify
 from packaging import version
 from rich import print