b6b4cd0a4c
### 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>
226 lines
7.2 KiB
Python
226 lines
7.2 KiB
Python
import pytest
|
|
from arcade_cli.utils import compute_base_url, compute_login_url
|
|
|
|
DEFAULT_CLOUD_HOST = "cloud.arcade.dev"
|
|
DEFAULT_ENGINE_HOST = "api.arcade.dev"
|
|
LOCALHOST = "localhost"
|
|
DEFAULT_PORT = None
|
|
DEFAULT_FORCE_TLS = False
|
|
DEFAULT_FORCE_NO_TLS = False
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"inputs, expected_output",
|
|
[
|
|
pytest.param(
|
|
{
|
|
"host_input": DEFAULT_ENGINE_HOST,
|
|
"port_input": DEFAULT_PORT,
|
|
"force_tls": DEFAULT_FORCE_TLS,
|
|
"force_no_tls": DEFAULT_FORCE_NO_TLS,
|
|
},
|
|
"https://api.arcade.dev",
|
|
id="default",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": LOCALHOST,
|
|
"port_input": DEFAULT_PORT,
|
|
"force_tls": DEFAULT_FORCE_TLS,
|
|
"force_no_tls": DEFAULT_FORCE_NO_TLS,
|
|
},
|
|
"http://localhost:9099",
|
|
id="localhost",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": DEFAULT_ENGINE_HOST,
|
|
"port_input": 9099,
|
|
"force_tls": DEFAULT_FORCE_TLS,
|
|
"force_no_tls": DEFAULT_FORCE_NO_TLS,
|
|
},
|
|
"https://api.arcade.dev:9099",
|
|
id="custom port",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": LOCALHOST,
|
|
"port_input": 9099,
|
|
"force_tls": DEFAULT_FORCE_TLS,
|
|
"force_no_tls": DEFAULT_FORCE_NO_TLS,
|
|
},
|
|
"http://localhost:9099",
|
|
id="localhost with custom port",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": DEFAULT_ENGINE_HOST,
|
|
"port_input": DEFAULT_PORT,
|
|
"force_tls": True,
|
|
"force_no_tls": DEFAULT_FORCE_NO_TLS,
|
|
},
|
|
"https://api.arcade.dev",
|
|
id="force TLS",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": LOCALHOST,
|
|
"port_input": DEFAULT_PORT,
|
|
"force_tls": True,
|
|
"force_no_tls": DEFAULT_FORCE_NO_TLS,
|
|
},
|
|
"https://localhost:9099",
|
|
id="localhost with force TLS",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": DEFAULT_ENGINE_HOST,
|
|
"port_input": 9099,
|
|
"force_tls": True,
|
|
"force_no_tls": DEFAULT_FORCE_NO_TLS,
|
|
},
|
|
"https://api.arcade.dev:9099",
|
|
id="custom port with force TLS",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": LOCALHOST,
|
|
"port_input": 9099,
|
|
"force_tls": True,
|
|
"force_no_tls": DEFAULT_FORCE_NO_TLS,
|
|
},
|
|
"https://localhost:9099",
|
|
id="localhost with custom port and force TLS",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": DEFAULT_ENGINE_HOST,
|
|
"port_input": DEFAULT_PORT,
|
|
"force_tls": DEFAULT_FORCE_TLS,
|
|
"force_no_tls": True,
|
|
},
|
|
"http://api.arcade.dev",
|
|
id="force no TLS",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": LOCALHOST,
|
|
"port_input": DEFAULT_PORT,
|
|
"force_tls": DEFAULT_FORCE_TLS,
|
|
"force_no_tls": True,
|
|
},
|
|
"http://localhost:9099",
|
|
id="localhost with force no TLS",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": DEFAULT_ENGINE_HOST,
|
|
"port_input": 9099,
|
|
"force_tls": DEFAULT_FORCE_TLS,
|
|
"force_no_tls": True,
|
|
},
|
|
"http://api.arcade.dev:9099",
|
|
id="custom port with force no TLS",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": LOCALHOST,
|
|
"port_input": 9099,
|
|
"force_tls": DEFAULT_FORCE_TLS,
|
|
"force_no_tls": True,
|
|
},
|
|
"http://localhost:9099",
|
|
id="localhost with custom port and force no TLS",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": DEFAULT_ENGINE_HOST,
|
|
"port_input": DEFAULT_PORT,
|
|
"force_tls": True,
|
|
"force_no_tls": True,
|
|
},
|
|
"http://api.arcade.dev",
|
|
id="force TLS and no TLS",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": LOCALHOST,
|
|
"port_input": DEFAULT_PORT,
|
|
"force_tls": True,
|
|
"force_no_tls": True,
|
|
},
|
|
"http://localhost:9099",
|
|
id="localhost with force TLS and no TLS",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": DEFAULT_ENGINE_HOST,
|
|
"port_input": 9099,
|
|
"force_tls": True,
|
|
"force_no_tls": True,
|
|
},
|
|
"http://api.arcade.dev:9099",
|
|
id="custom port with force TLS and no TLS",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": LOCALHOST,
|
|
"port_input": 9099,
|
|
"force_tls": True,
|
|
"force_no_tls": True,
|
|
},
|
|
"http://localhost:9099",
|
|
id="localhost with custom port, force TLS and no TLS",
|
|
),
|
|
pytest.param(
|
|
{
|
|
"host_input": "arandomhost.com",
|
|
"port_input": DEFAULT_PORT,
|
|
"force_tls": DEFAULT_FORCE_TLS,
|
|
"force_no_tls": DEFAULT_FORCE_NO_TLS,
|
|
},
|
|
"https://arandomhost.com",
|
|
id="random host",
|
|
),
|
|
],
|
|
)
|
|
def test_compute_base_url(inputs: dict, expected_output: str):
|
|
base_url = compute_base_url(
|
|
inputs["force_tls"],
|
|
inputs["force_no_tls"],
|
|
inputs["host_input"],
|
|
inputs["port_input"],
|
|
)
|
|
|
|
assert base_url == expected_output
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"inputs, expected_output",
|
|
[
|
|
pytest.param(
|
|
{"host_input": DEFAULT_CLOUD_HOST, "port_input": DEFAULT_PORT, "state": "123"},
|
|
"https://cloud.arcade.dev/api/v1/auth/cli_login?callback_uri=http%3A%2F%2Flocalhost%3A9905%2Fcallback&state=123",
|
|
id="default",
|
|
),
|
|
pytest.param(
|
|
{"host_input": "localhost", "port_input": 9099, "state": "123"},
|
|
"http://localhost:9099/api/v1/auth/cli_login?callback_uri=http%3A%2F%2Flocalhost%3A9905%2Fcallback&state=123",
|
|
id="localhost with custom port",
|
|
),
|
|
pytest.param(
|
|
{"host_input": "localhost", "port_input": DEFAULT_PORT, "state": "123"},
|
|
"http://localhost:8000/api/v1/auth/cli_login?callback_uri=http%3A%2F%2Flocalhost%3A9905%2Fcallback&state=123",
|
|
id="localhost",
|
|
),
|
|
pytest.param(
|
|
{"host_input": DEFAULT_CLOUD_HOST, "port_input": 8000, "state": "123"},
|
|
"https://cloud.arcade.dev/api/v1/auth/cli_login?callback_uri=http%3A%2F%2Flocalhost%3A9905%2Fcallback&state=123",
|
|
id="cloud host with an ignored custom port",
|
|
),
|
|
],
|
|
)
|
|
def test_compute_login_url(inputs: dict, expected_output: str):
|
|
login_url = compute_login_url(inputs["host_input"], inputs["state"], inputs["port_input"])
|
|
|
|
assert login_url == expected_output
|