### Overview Major restructuring from monolithic `arcade-ai` package to modular library architecture with standardized uv-based dependency management.  ### New Package Structure - **`arcade-tdk`** - Lightweight toolkit development kit (core decorators, auth) - **`arcade-core`** - Core execution engine and catalog functionality - **`arcade-serve`** - FastAPI/MCP server components - **`arcade-ai`** - Meta package that includes CLI functionality. Optionally include evals via the `evals` extra. Optionally include all packages via the `all` extra. ### Key Benefits - **Lighter Dependencies**: Toolkits now depend only on `arcade-tdk` (~2 deps) vs full `arcade-ai` (~30+ deps) - **Faster Builds**: uv provides 10-100x faster dependency resolution and installation - **Better Modularity**: Clear separation of concerns, consumers import only what they need - **Standard Tooling**: Eliminates custom poetry scripts, uses standard Python packaging ### Migration Impact - All 20 toolkits converted from poetry → uv with `arcade-tdk` dependencies plus `arcade-ai[evals]` and `arcade-serve` dev dependencies. When developing locally, devs should install toolkits via `make install-local`. - Modern Python 3.10+ type hints throughout - Standardized build system with hatchling backend - Enhanced Makefile with robust toolkit management commands - Removed `arcade dev` CLI command - Reduce the number of files created by `arcade new` and add an option to not generate a tests and evals folder. This foundation enables faster development cycles and cleaner dependency chains for the growing toolkit ecosystem. ### Todo After this PR is merged - [ ] Post-merge workflow(s) (release & publish containers, etc) - [ ] Release order plan. @EricGustin suggests releasing in the following order: 1. `arcade-core` version 0.1.0 2. `arcade-serve` version 0.1.0 and `arcade-tdk` version 0.1.0 3. `arcade-ai` version 2.0.0 4. Patch release for all toolkits (all changes in toolkits are internal refactors) - [ ] [Update docs](https://github.com/ArcadeAI/docs/pull/318) --------- Co-authored-by: Eric Gustin <eric@arcade.dev> Co-authored-by: Eric Gustin <34000337+EricGustin@users.noreply.github.com>
236 lines
7.5 KiB
Python
236 lines
7.5 KiB
Python
# Ignore hardcoded secret linting
|
|
# ruff: noqa: S105
|
|
# ruff: noqa: S106
|
|
import json
|
|
import os
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
from arcade_cli.deployment import (
|
|
Config,
|
|
Deployment,
|
|
LocalPackages,
|
|
Package,
|
|
PackageRepository,
|
|
Pypi,
|
|
Secret,
|
|
Worker,
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def test_dir():
|
|
return Path(__file__).parent
|
|
|
|
|
|
def test_invalid_toml_path(test_dir):
|
|
with pytest.raises(FileNotFoundError):
|
|
Deployment.from_toml(test_dir / "test_files" / "invalid.toml")
|
|
|
|
|
|
def test_missing_fields(test_dir):
|
|
with pytest.raises(ValueError):
|
|
Deployment.from_toml(test_dir / "test_files" / "invalid.fields.worker.toml")
|
|
|
|
|
|
def test_deployment_parsing(test_dir):
|
|
config_path = test_dir / "test_files" / "full.worker.toml"
|
|
deployment = Deployment.from_toml(config_path)
|
|
|
|
# Test config section
|
|
assert deployment.worker[0].config.id == "test"
|
|
assert deployment.worker[0].config.enabled is True
|
|
assert deployment.worker[0].config.timeout == 10
|
|
assert deployment.worker[0].config.retries == 3
|
|
assert deployment.worker[0].config.secret == Secret(value="test-secret", pattern=None)
|
|
|
|
# Test pypi section
|
|
assert deployment.worker[0].pypi_source.packages == [Package(name="arcade-x")]
|
|
|
|
# Test local_packages section
|
|
assert deployment.worker[0].local_source.packages == ["./mock_toolkit"]
|
|
|
|
# Test custom_repositories section
|
|
repo = deployment.worker[0].custom_source[0]
|
|
assert repo.index == "pypi"
|
|
assert repo.index_url == "https://pypi.org/simple"
|
|
assert repo.trusted_host == "pypi.org"
|
|
assert repo.packages == [Package(name="arcade-ai", specifier=">=1.0.0")]
|
|
|
|
repo = deployment.worker[0].custom_source[1]
|
|
assert repo.index == "pypi2"
|
|
assert repo.index_url == "https://pypi2.org/simple"
|
|
assert repo.trusted_host == "pypi2.org"
|
|
assert repo.packages == [Package(name="arcade-slack")]
|
|
|
|
|
|
def test_specifier():
|
|
from packaging.requirements import Requirement
|
|
|
|
req = Requirement("arcade-ai>=1.0.0")
|
|
assert req.name == "arcade-ai"
|
|
assert req.specifier == ">=1.0.0"
|
|
|
|
|
|
def test_deployment_dict(test_dir):
|
|
config_path = test_dir / "test_files" / "full.worker.toml"
|
|
deployment = Deployment.from_toml(config_path)
|
|
expected = json.loads("""{
|
|
"name": "test",
|
|
"secret": "test-secret",
|
|
"enabled": true,
|
|
"timeout": 10,
|
|
"retries": 3,
|
|
"wait": false,
|
|
"pypi": {
|
|
"packages": [
|
|
{
|
|
"name": "arcade-x",
|
|
"specifier": null
|
|
}
|
|
],
|
|
"index": "pypi",
|
|
"index_url": "https://pypi.org/simple",
|
|
"trusted_host": "pypi.org"
|
|
},
|
|
"custom_repositories": [
|
|
{
|
|
"packages": [
|
|
{
|
|
"name": "arcade-ai",
|
|
"specifier": ">=1.0.0"
|
|
}
|
|
],
|
|
"index": "pypi",
|
|
"index_url": "https://pypi.org/simple",
|
|
"trusted_host": "pypi.org"
|
|
},
|
|
{
|
|
"packages": [
|
|
{
|
|
"name": "arcade-slack",
|
|
"specifier": null
|
|
}
|
|
],
|
|
"index": "pypi2",
|
|
"index_url": "https://pypi2.org/simple",
|
|
"trusted_host": "pypi2.org"
|
|
}
|
|
],
|
|
"local_packages": [
|
|
{
|
|
"name": "mock_toolkit",
|
|
"content": "H4sIAOgdymcC/+2XwWuDMBTGPftXZDltMNIkJtrCOrpbL4PdSxmiKXNVIzHt6n+/OAvtNrqbMur7Xd7j5YGH5Ps+JBMyWbzEh6WKU2W8XqAdlyqlgTj17ZxRzriHDt4A7GobG/d5b5zwKSpsVqg5iwRjs6kMBJEzMYtC7nvA1VPoZPtqtc63mZ14/ek/krKrYVcp/655JtyLY4wHNHL6D5iMPCSH1H+dGtX84YBubbO5vvsn4P/g/+f+LyihPBSUSfD/sfl/EWclqZo+9B8Kcdn/eXTyf+bmTAjp9E+H1P9I/b8yWWlv8VLlub5HH9rk6Q2+A+mPhf+R/8Hv/GeQ/4Pkf/Qj/3lEpAgCOQUPGF3+V01l9LtKLLG6yAfLf07F2f9fq/+QhhTyfwhW7d2TSitrmrVfxoVCc4TPXwX298rUmS7bA0oYodhPVZ2YrLLH6bNbR8d1tNEGPZnExQn2451906Z2OyvczdBDqvaL+Ksnrn3EazAaAAAAAAAAAAAAAAAAAOiJT7MTVu0AKAAA"
|
|
}
|
|
]
|
|
}""")
|
|
got = deployment.worker[0].request().model_dump(mode="json")
|
|
# Remove encoding part that contains the content
|
|
got["local_packages"][0].pop("content")
|
|
expected["local_packages"][0].pop("content")
|
|
|
|
assert got == expected
|
|
|
|
|
|
def test_invalid_secret_parsing(test_dir):
|
|
config_path = test_dir / "test_files" / "invalid.secret.worker.toml"
|
|
with pytest.raises(ValueError):
|
|
Deployment.from_toml(config_path)
|
|
|
|
|
|
def test_missing_local_package(test_dir):
|
|
config_path = test_dir / "test_files" / "invalid.localfile.worker.toml"
|
|
deployment = Deployment.from_toml(config_path)
|
|
with pytest.raises(FileNotFoundError):
|
|
deployment.worker[0].request()
|
|
|
|
|
|
def test_invalid_local_package(test_dir):
|
|
config_path = test_dir / "test_files" / "invalid.localfile.worker.toml"
|
|
deployment = Deployment.from_toml(config_path)
|
|
with pytest.raises(FileNotFoundError):
|
|
deployment.worker[1].request()
|
|
|
|
|
|
def test_unconfigured_local_package(test_dir):
|
|
config_path = test_dir / "test_files" / "invalid.localfile.worker.toml"
|
|
deployment = Deployment.from_toml(config_path)
|
|
with pytest.raises(ValueError):
|
|
deployment.worker[2].request()
|
|
|
|
|
|
def test_duplicate_pypi_packages():
|
|
worker = Worker(
|
|
toml_path=Path(__file__),
|
|
config=Config(id="test", secret=Secret(value="test-secret", pattern=None)),
|
|
pypi_source=Pypi(packages=["arcade-slack", "arcade-slack"]),
|
|
)
|
|
with pytest.raises(ValueError):
|
|
worker.validate_packages()
|
|
|
|
|
|
def test_duplicate_custom_repository_packages():
|
|
worker = Worker(
|
|
toml_path=Path(__file__),
|
|
config=Config(id="test", secret=Secret(value="test-secret", pattern=None)),
|
|
custom_source=[
|
|
PackageRepository(
|
|
index="pypi",
|
|
index_url="https://pypi.org/simple",
|
|
trusted_host="pypi.org",
|
|
packages=["arcade-slack", "arcade-slack"],
|
|
)
|
|
],
|
|
)
|
|
with pytest.raises(ValueError):
|
|
worker.validate_packages()
|
|
|
|
|
|
def test_duplicate_local_packages():
|
|
worker = Worker(
|
|
toml_path=Path(__file__),
|
|
config=Config(id="test", secret=Secret(value="test-secret", pattern=None)),
|
|
local_source=LocalPackages(packages=["./mock_toolkit", "./mock_toolkit"]),
|
|
)
|
|
with pytest.raises(ValueError):
|
|
worker.validate_packages()
|
|
|
|
|
|
def test_duplicate_all_typed_packages():
|
|
worker = Worker(
|
|
toml_path=Path(__file__),
|
|
config=Config(id="test", secret=Secret(value="test-secret", pattern=None)),
|
|
pypi_source=Pypi(packages=["arcade-slack"]),
|
|
custom_source=[
|
|
PackageRepository(
|
|
index="pypi",
|
|
index_url="https://pypi.org/simple",
|
|
trusted_host="pypi.org",
|
|
packages=["arcade-slack", "arcade-x"],
|
|
)
|
|
],
|
|
local_source=LocalPackages(packages=["./arcade-x"]),
|
|
)
|
|
with pytest.raises(ValueError):
|
|
worker.validate_packages()
|
|
|
|
|
|
def test_duplicate_worker_names():
|
|
worker = Worker(
|
|
toml_path=Path(__file__),
|
|
config=Config(id="test", secret=Secret(value="test-secret", pattern=None)),
|
|
)
|
|
worker2 = Worker(
|
|
toml_path=Path(__file__),
|
|
config=Config(id="test", secret=Secret(value="test-secret", pattern=None)),
|
|
)
|
|
with pytest.raises(ValueError):
|
|
Deployment(workers=[worker, worker2])
|
|
|
|
|
|
def test_secret_parsing(test_dir):
|
|
os.environ["TEST_WORKER_SECRET"] = "test-secret"
|
|
deployment = Deployment.from_toml(test_dir / "test_files" / "env.secret.worker.toml")
|
|
assert deployment.worker[0].config.secret == Secret(
|
|
value="test-secret", pattern="TEST_WORKER_SECRET"
|
|
)
|