feat: make beeai-cli use frozen versions, split uv.lock (#909)

Signed-off-by: Jan Pokorný <[email protected]>

Author: JanPokorny

CONTRIBUTING.md

@@ -43,7 +43,7 @@ Starting up the platform using the CLI (`beeai platform start`, even `mise beeai
 Build a local `ghcr.io/i-am-bee/beeai-platform/beeai-server:local` image using:
 
 ```sh
-mise beeai-server:image:build
+mise beeai-server:build
 ```
 
 Then, start the platform using:
@@ -156,7 +156,7 @@ To run BeeAI components in development mode (ensuring proper rebuilding), use th
 #### Server
 Build image and run the platform using:
 ```shell
-mise run beeai-server:image:build
+mise run beeai-server:build
 mise run beeai-cli:run -- platform start --import ghcr.io/i-am-bee/beeai-platform/beeai-server:local --set image.tag=local
 ```
 Or use development setup described in [Running and debugging individual components](#running-and-debugging-individual-components)

apps/beeai-cli/pyproject.toml

@@ -22,9 +22,12 @@ dependencies = [
     "typer~=0.16.0",
 ]
 
-[tool.uv.sources]
-beeai-server = { workspace = true }
-beeai-sdk = { workspace = true }
+[dependency-groups]
+dev = [
+    "pyright>=1.1.399",
+    "pytest>=8.3.4",
+    "ruff>=0.8.5",
+]
 
 [project.scripts]
 beeai = "beeai_cli:app"
@@ -36,3 +39,28 @@ build-backend = "uv_build"
 
 [tool.uv.build-backend]
 source-include = ["src/beeai_cli/data"]
+
+[tool.ruff]
+line-length = 120
+target-version = "py313"
+lint.select = [
+    "E",     # pycodestyle errors
+    "W",     # pycodestyle warnings
+    "F",     # pyflakes
+    "UP",    # pyupgrade
+    "I",     # isort
+    "B",     # bugbear
+    "N",     # pep8-naming
+    "C4",    # Comprehensions
+    "Q",     # Quotes
+    "SIM",   # Simplify
+    "RUF",   # Ruff
+    "TID",   # tidy-imports
+    "ASYNC", # async
+# TODO: add "DTZ",   # DatetimeZ
+# TODO: add "ANN",   # annotations
+]
+lint.ignore = [
+    "E501" # line lenght (annyoing)
+]
+force-exclude = true

apps/beeai-cli/src/beeai_cli/utils.py

@@ -12,7 +12,7 @@
 from copy import deepcopy
 from enum import Enum
 from io import BytesIO
-from typing import TYPE_CHECKING, Any, Optional, TypeVar, cast
+from typing import TYPE_CHECKING, Any, Optional, cast
 
 import anyio
 import typer
@@ -71,18 +71,11 @@ def check_json(value: Any) -> dict[str, Any]:
         raise typer.BadParameter(f"Invalid JSON '{value}'") from e
 
 
-DictType = TypeVar("DictType", bound=dict)
-
-
-def omit[DictType](dict: DictType, keys: Iterable[str]) -> DictType:
+def omit[DictType: dict](dict: DictType, keys: Iterable[str]) -> DictType:
     return {key: value for key, value in dict.items() if key not in keys}
 
 
-T = TypeVar("T")
-V = TypeVar("V")
-
-
-def filter_dict(map: dict[str, T | V], value_to_exclude: V = None) -> dict[str, V]:
+def filter_dict[T, V](map: dict[str, T | V], value_to_exclude: V = None) -> dict[str, V]:
     """Remove entries with unwanted values (None by default) from dictionary."""
     return {filter: value for filter, value in map.items() if value is not value_to_exclude}
 

apps/beeai-cli/tasks.toml

@@ -1,17 +1,25 @@
+# setup
+
+["beeai-cli:setup"]
+dir = "{{config_root}}/apps/beeai-cli"
+run = "uv sync --all-extras --dev"
+sources = ["uv.lock", "pyproject.toml"]
+outputs = { auto = true }
+
 # check
 
 ["beeai-cli:check"]
 depends = ["beeai-cli:check:*"]
 
 ["beeai-cli:check:ruff-check"]
-depends = ["setup:uv"]
+depends = ["beeai-cli:setup"]
 dir = "{{config_root}}/apps/beeai-cli"
 run = "uv run python -m ruff check --quiet"
 sources = ["src/**/*.py"]
 outputs = { auto = true }
 
 ["beeai-cli:check:ruff-format"]
-depends = ["setup:uv"]
+depends = ["beeai-cli:setup"]
 dir = "{{config_root}}/apps/beeai-cli"
 run = "uv run python -m ruff format --quiet --check"
 sources = ["src/**/*.py"]
@@ -30,14 +38,14 @@ outputs = { auto = true }
 depends = ["beeai-cli:fix:*"]
 
 ["beeai-cli:fix:ruff-check"]
-depends = ["setup:uv"]
+depends = ["beeai-cli:setup"]
 dir = "{{config_root}}/apps/beeai-cli"
 run = "uv run python -m ruff check --quiet --fix"
 sources = ["src/**/*.py"]
 outputs = { auto = true }
 
 ["beeai-cli:fix:ruff-format"]
-depends = ["setup:uv"]
+depends = ["beeai-cli:setup"]
 dir = "{{config_root}}/apps/beeai-cli"
 run = "uv run python -m ruff format --quiet"
 sources = ["src/**/*.py"]
@@ -47,8 +55,8 @@ outputs = { auto = true }
 
 ["beeai-cli:run"]
 description = "NOTE: Use double dash to pass extra args, like `mise beeai-cli:run -- provider list`"
-depends = ["setup:uv", "beeai-cli:build:copy-helm-chart"]
-dir = "{{cwd}}"
+depends = ["beeai-cli:setup", "beeai-cli:build:copy-helm-chart"]
+dir = "{{config_root}}/apps/beeai-cli"
 run = "uv run beeai"
 
 # build
@@ -75,21 +83,34 @@ sources = ["{{config_root}}/helm/dist/beeai-platform-*.tgz"]
 outputs = ["./src/beeai_cli/data/helm-chart.tgz"]
 
 ["beeai-cli:build"]
-depends = ["setup:uv", "beeai-cli:build:*"]
+depends = ["beeai-cli:setup", "beeai-cli:build:*"]
 dir = "{{config_root}}/apps/beeai-cli"
 sources = ["src/**/*", "hatch_build.py", "pyproject.toml", "vendor/lima/**/*"]
 outputs = ["dist/**/*"]
 run = '''
 #!/usr/bin/env bash
 set -euo pipefail
 
+# Build sdist and wheel
 rm -rf ./dist
 uv build -q --out-dir ./dist
-
 export lima_version=$(yq -r '.tools["asdf:CrouchingMuppet/asdf-lima"]' ../../mise.toml)
 export version="$(yq -r '.project.version' pyproject.toml | tr -d -)"
 export universal_wheel=$(realpath "./dist/beeai_cli-$version-py3-none-any.whl")
 
+# Pin versions from uv.lock in wheel
+tmpdir="$(mktemp -d)"
+unzip -q "$universal_wheel" "beeai_cli-${version}.dist-info/METADATA" -d "$tmpdir"
+insert_line=$(awk '/^Requires-Dist:/ {print FNR-1; exit}' "$tmpdir/beeai_cli-${version}.dist-info/METADATA" | cut -d: -f1)
+(
+  head -n $insert_line "$tmpdir/beeai_cli-${version}.dist-info/METADATA"
+  uv export --no-hashes --no-emit-workspace --format requirements-txt | awk '/^[[:space:]]*#/ {next} NF {print "Requires-Dist: " $0 }'
+  awk -v insert_line="$insert_line" 'NR > insert_line && $0 !~ /^Requires-Dist:/' "$tmpdir/beeai_cli-${version}.dist-info/METADATA"
+) > "$tmpdir/beeai_cli-${version}.dist-info/METADATA.new"
+mv "$tmpdir/beeai_cli-${version}.dist-info/METADATA.new" "$tmpdir/beeai_cli-${version}.dist-info/METADATA"
+(cd "$tmpdir" && zip -q "$universal_wheel" "beeai_cli-${version}.dist-info/METADATA")
+
+# Make platform-specific wheels by bundling limactl
 build_wheel() {
   wheel_tag="$1"
   hostagent_arch="$2"
@@ -104,12 +125,10 @@ build_wheel() {
   (cd "$tmpdir" && zip -q "$platform_wheel" -r .)
   rm -rf "$tmpdir"
 }
-
 build_wheel manylinux_2_28_x86_64  x86_64  &
 build_wheel manylinux_2_28_aarch64 aarch64 &
 build_wheel macosx_12_0_x86_64     x86_64  &
 build_wheel macosx_12_0_arm64      aarch64 &
-
 for job in $(jobs -p); do wait $job; done
 '''