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>
120 lines
4.8 KiB
Python
120 lines
4.8 KiB
Python
from unittest.mock import patch
|
|
|
|
import pytest
|
|
from arcade_tdk.errors import ToolExecutionError
|
|
|
|
from arcade_confluence.client import ConfluenceClientV1
|
|
|
|
|
|
@pytest.fixture
|
|
def client_v1() -> ConfluenceClientV1:
|
|
"""Fixture that provides a ConfluenceClientV1 instance with mocked cloud_id."""
|
|
with patch("arcade_confluence.client.ConfluenceClient._get_cloud_id", return_value=None):
|
|
return ConfluenceClientV1("fake-token")
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"query, enable_fuzzy, expected_cql",
|
|
[
|
|
("foo", False, '(text ~ "foo" OR title ~ "foo" OR space.title ~ "foo")'),
|
|
("foo bar", False, '(text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar")'),
|
|
("foo", True, '(text ~ "foo~" OR title ~ "foo~" OR space.title ~ "foo~")'),
|
|
("foo bar", True, '(text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar")'),
|
|
],
|
|
)
|
|
def test_build_query_cql(client_v1: ConfluenceClientV1, query, enable_fuzzy, expected_cql) -> None:
|
|
cql = client_v1._build_query_cql(query, enable_fuzzy)
|
|
assert cql == expected_cql
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"queries, enable_fuzzy, expected_cql",
|
|
[
|
|
(
|
|
["foo", "foo bar"],
|
|
False,
|
|
'((text ~ "foo" OR title ~ "foo" OR space.title ~ "foo") AND (text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar"))', # noqa: E501
|
|
),
|
|
(
|
|
["foo", "foo bar"],
|
|
True,
|
|
'((text ~ "foo~" OR title ~ "foo~" OR space.title ~ "foo~") AND (text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar"))', # noqa: E501
|
|
),
|
|
],
|
|
)
|
|
def test_build_and_cql(client_v1: ConfluenceClientV1, queries, enable_fuzzy, expected_cql) -> None:
|
|
cql = client_v1._build_and_cql(queries, enable_fuzzy)
|
|
assert cql == expected_cql
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"queries, enable_fuzzy, expected_cql",
|
|
[
|
|
(
|
|
["foo", "foo bar"],
|
|
False,
|
|
'((text ~ "foo" OR title ~ "foo" OR space.title ~ "foo") OR (text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar"))', # noqa: E501
|
|
),
|
|
(
|
|
["foo", "foo bar"],
|
|
True,
|
|
'((text ~ "foo~" OR title ~ "foo~" OR space.title ~ "foo~") OR (text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar"))', # noqa: E501
|
|
),
|
|
],
|
|
)
|
|
def test_build_or_cql(client_v1: ConfluenceClientV1, queries, enable_fuzzy, expected_cql) -> None:
|
|
cql = client_v1._build_or_cql(queries, enable_fuzzy)
|
|
assert cql == expected_cql
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
"must_contain_all, can_contain_any, enable_fuzzy, expected_cql",
|
|
[
|
|
(None, None, False, ""),
|
|
(
|
|
["foo", "foo bar"],
|
|
None,
|
|
False,
|
|
'((text ~ "foo" OR title ~ "foo" OR space.title ~ "foo") AND (text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar"))', # noqa: E501
|
|
),
|
|
(
|
|
["foo", "foo bar"],
|
|
None,
|
|
True,
|
|
'((text ~ "foo~" OR title ~ "foo~" OR space.title ~ "foo~") AND (text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar"))', # noqa: E501
|
|
),
|
|
(
|
|
None,
|
|
["foo", "foo bar"],
|
|
False,
|
|
'((text ~ "foo" OR title ~ "foo" OR space.title ~ "foo") OR (text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar"))', # noqa: E501
|
|
),
|
|
(
|
|
None,
|
|
["foo", "foo bar"],
|
|
True,
|
|
'((text ~ "foo~" OR title ~ "foo~" OR space.title ~ "foo~") OR (text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar"))', # noqa: E501
|
|
),
|
|
(
|
|
["foo", "foo bar"],
|
|
["foo", "foo bar"],
|
|
False,
|
|
'(((text ~ "foo" OR title ~ "foo" OR space.title ~ "foo") AND (text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar")) AND ((text ~ "foo" OR title ~ "foo" OR space.title ~ "foo") OR (text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar")))', # noqa: E501
|
|
),
|
|
(
|
|
["foo", "foo bar"],
|
|
["foo", "foo bar"],
|
|
True,
|
|
'(((text ~ "foo~" OR title ~ "foo~" OR space.title ~ "foo~") AND (text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar")) AND ((text ~ "foo~" OR title ~ "foo~" OR space.title ~ "foo~") OR (text ~ "foo bar" OR title ~ "foo bar" OR space.title ~ "foo bar")))', # noqa: E501
|
|
),
|
|
],
|
|
)
|
|
def test_construct_cql(
|
|
client_v1: ConfluenceClientV1, must_contain_all, can_contain_any, enable_fuzzy, expected_cql
|
|
) -> None:
|
|
if not expected_cql:
|
|
with pytest.raises(ToolExecutionError):
|
|
client_v1.construct_cql(must_contain_all, can_contain_any, enable_fuzzy)
|
|
else:
|
|
cql = client_v1.construct_cql(must_contain_all, can_contain_any, enable_fuzzy)
|
|
assert cql == expected_cql
|