### 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>
166 lines
5.4 KiB
Python
166 lines
5.4 KiB
Python
from collections.abc import Callable
|
|
|
|
import pytest
|
|
from arcade_tdk import ToolContext
|
|
|
|
from arcade_jira.exceptions import JiraToolExecutionError
|
|
from arcade_jira.tools.priorities import list_projects_associated_with_a_priority_scheme
|
|
from arcade_jira.utils import add_pagination_to_response, clean_project_dict, paginate_all_items
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_paginate_all_items_with_zero_matches(
|
|
mock_context: ToolContext,
|
|
mock_httpx_client,
|
|
mock_httpx_response: Callable,
|
|
build_project_search_response_dict: Callable,
|
|
):
|
|
response = mock_httpx_response(200, build_project_search_response_dict([], is_last=True))
|
|
mock_httpx_client.get.return_value = response
|
|
|
|
response = await paginate_all_items(
|
|
context=mock_context,
|
|
tool=list_projects_associated_with_a_priority_scheme,
|
|
response_items_key="projects",
|
|
scheme_id="123",
|
|
)
|
|
assert response == []
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_paginate_all_items_with_one_page(
|
|
mock_context: ToolContext,
|
|
mock_httpx_client,
|
|
mock_httpx_response: Callable,
|
|
build_project_dict: Callable,
|
|
build_project_search_response_dict: Callable,
|
|
fake_cloud_name: str,
|
|
):
|
|
projects = [build_project_dict(), build_project_dict()]
|
|
response = mock_httpx_response(200, build_project_search_response_dict(projects, is_last=True))
|
|
mock_httpx_client.get.return_value = response
|
|
|
|
response = await paginate_all_items(
|
|
context=mock_context,
|
|
tool=list_projects_associated_with_a_priority_scheme,
|
|
response_items_key="projects",
|
|
scheme_id="123",
|
|
)
|
|
assert response == [clean_project_dict(project, fake_cloud_name) for project in projects]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_paginate_all_items_with_multiple_pages(
|
|
mock_context: ToolContext,
|
|
mock_httpx_client,
|
|
mock_httpx_response: Callable,
|
|
build_project_dict: Callable,
|
|
build_project_search_response_dict: Callable,
|
|
fake_cloud_name: str,
|
|
):
|
|
page1 = [build_project_dict(), build_project_dict()]
|
|
page2 = [build_project_dict(), build_project_dict()]
|
|
page3 = [build_project_dict()]
|
|
|
|
response1 = mock_httpx_response(200, build_project_search_response_dict(page1, is_last=False))
|
|
response2 = mock_httpx_response(200, build_project_search_response_dict(page2, is_last=False))
|
|
response3 = mock_httpx_response(200, build_project_search_response_dict(page3, is_last=True))
|
|
|
|
mock_httpx_client.get.side_effect = [response1, response2, response3]
|
|
|
|
response = await paginate_all_items(
|
|
context=mock_context,
|
|
tool=list_projects_associated_with_a_priority_scheme,
|
|
response_items_key="projects",
|
|
scheme_id="123",
|
|
limit=2,
|
|
)
|
|
assert response == [
|
|
clean_project_dict(project, fake_cloud_name) for project in page1 + page2 + page3
|
|
]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_paginate_all_items_when_tool_returns_error(
|
|
mock_context: ToolContext,
|
|
mock_httpx_client,
|
|
mock_httpx_response: Callable,
|
|
build_project_search_response_dict: Callable,
|
|
):
|
|
project_id = "456"
|
|
get_project_by_id_response = mock_httpx_response(404, {})
|
|
search_projects_response = mock_httpx_response(200, build_project_search_response_dict([]))
|
|
mock_httpx_client.get.side_effect = [get_project_by_id_response, search_projects_response]
|
|
|
|
with pytest.raises(JiraToolExecutionError) as exc:
|
|
await paginate_all_items(
|
|
context=mock_context,
|
|
tool=list_projects_associated_with_a_priority_scheme,
|
|
response_items_key="projects",
|
|
scheme_id="123",
|
|
project=project_id,
|
|
limit=2,
|
|
)
|
|
|
|
assert exc.value.message == f"Project not found with name/key/ID '{project_id}'"
|
|
|
|
|
|
def test_add_pagination_to_response_with_zero_items():
|
|
response = {"items": []}
|
|
items = []
|
|
limit = 10
|
|
offset = 0
|
|
add_pagination_to_response(response, items, limit, offset)
|
|
assert response["pagination"] == {"is_last_page": True, "limit": limit, "total_results": 0}
|
|
|
|
|
|
def test_add_pagination_to_response_with_last_page_false():
|
|
items = [{"id": "123"}, {"id": "456"}]
|
|
response = {"items": items, "isLast": False}
|
|
limit = 2
|
|
offset = 0
|
|
add_pagination_to_response(response, items, limit, offset)
|
|
assert response["pagination"] == {
|
|
"limit": limit,
|
|
"total_results": 2,
|
|
"next_offset": 2,
|
|
}
|
|
|
|
|
|
def test_add_pagination_to_response_with_last_page_true():
|
|
items = [{"id": "123"}, {"id": "456"}]
|
|
response = {"items": items, "isLast": True}
|
|
limit = 2
|
|
offset = 0
|
|
add_pagination_to_response(response, items, limit, offset)
|
|
assert response["pagination"] == {
|
|
"limit": limit,
|
|
"total_results": 2,
|
|
"is_last_page": True,
|
|
}
|
|
|
|
|
|
def test_add_pagination_to_response_without_last_page_and_limit_equal_items():
|
|
items = [{"id": "123"}, {"id": "456"}]
|
|
response = {"items": items}
|
|
limit = 2
|
|
offset = 0
|
|
add_pagination_to_response(response, items, limit, offset)
|
|
assert response["pagination"] == {
|
|
"limit": limit,
|
|
"total_results": 2,
|
|
"next_offset": 2,
|
|
}
|
|
|
|
|
|
def test_add_pagination_to_response_without_last_page_and_less_items_than_limit():
|
|
items = [{"id": "123"}]
|
|
response = {"items": items}
|
|
limit = 2
|
|
offset = 0
|
|
add_pagination_to_response(response, items, limit, offset)
|
|
assert response["pagination"] == {
|
|
"limit": limit,
|
|
"total_results": 1,
|
|
"is_last_page": True,
|
|
}
|