Intermediary commit. Much restructuring

Author: EricGustin

.github/actions/setup-uv-env/action.yml

@@ -0,0 +1,30 @@
+name: "setup-uv-env"
+description: "Composite action to setup the Python and uv environment."
+
+inputs:
+  python-version:
+    required: false
+    description: "The python version to use"
+    default: "3.11"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install uv
+      uses: astral-sh/uv@v5
+      with:
+        enable-cache: true
+        cache-dependency-glob: "uv.lock"
+        python-version: ${{ inputs.python-version }}
+
+    - name: Load cached venv
+      id: cached-uv-dependencies
+      uses: actions/cache@v4
+      with:
+        path: .venv
+        key: venv-${{ runner.os }}-${{ inputs.python-version }}-${{ hashFiles('uv.lock') }}
+
+    - name: Install dependencies
+      if: steps.cached-uv-dependencies.outputs.cache-hit != 'true'
+      run: uv sync --locked --dev
+      shell: bash

.github/workflows/main.yml

@@ -20,12 +20,12 @@ jobs:
           key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
 
       - name: Set up the environment
-        uses: ./.github/actions/setup-poetry-env
+        uses: ./.github/actions/setup-uv-env
 
       - name: Run checks
         run: make check
 
-  tox:
+  test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -35,30 +35,13 @@ jobs:
       - name: Check out
         uses: actions/checkout@v4
 
-      - name: Set up python
-        uses: actions/setup-python@v5
+      - name: Set up the environment
+        uses: ./.github/actions/setup-uv-env
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install Poetry
-        uses: snok/install-poetry@v1
-        with:
-          version: 1.8.5
-
-      - name: Load cached venv
-        uses: actions/cache@v4
-        with:
-          path: .tox
-          key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('arcade/poetry.lock') }}
-
-      - name: Install tox
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install tox tox-gh-actions
-
-      - name: Test with tox
-        run: cd arcade && tox
-
+      - name: Test libs
+        run: make test
       - name: Upload coverage reports to Codecov with GitHub Action on Python 3.10
         uses: codecov/codecov-action@v4.0.1
         if: ${{ matrix.python-version == '3.10' }}

.vscode/launch.json

@@ -5,7 +5,7 @@
       "name": "Debug `arcade workerup --no-auth`",
       "type": "debugpy",
       "request": "launch",
-      "program": "${workspaceFolder}/arcade/run_cli.py",
+      "program": "${workspaceFolder}/libs/arcadecli/run_cli.py",
       "args": ["workerup", "--no-auth"],
       "console": "integratedTerminal",
       "jinja": true,
@@ -16,7 +16,7 @@
       "name": "Debug `arcade chat -d -h localhost`",
       "type": "debugpy",
       "request": "launch",
-      "program": "${workspaceFolder}/arcade/run_cli.py",
+      "program": "${workspaceFolder}/libs/arcadecli/run_cli.py",
       "args": ["chat", "-d", "-h", "localhost"],
       "console": "integratedTerminal",
       "jinja": true,
@@ -27,7 +27,7 @@
       "name": "Debug `arcade dev`",
       "type": "debugpy",
       "request": "launch",
-      "program": "${workspaceFolder}/arcade/run_cli.py",
+      "program": "${workspaceFolder}/libs/arcadecli/run_cli.py",
       "args": ["dev"],
       "console": "integratedTerminal",
       "jinja": true,
@@ -38,12 +38,23 @@
       "name": "Debug `arcade evals -d` on current file",
       "type": "debugpy",
       "request": "launch",
-      "program": "${workspaceFolder}/arcade/run_cli.py",
+      "program": "${workspaceFolder}/libs/arcadecli/run_cli.py",
       "args": ["evals", "-d", "${fileDirname}", "-h", "localhost"],
       "console": "integratedTerminal",
       "jinja": true,
       "justMyCode": true,
       "cwd": ""
+    },
+    {
+      "name": "Debug `arcade serve --reload`",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "${workspaceFolder}/libs/arcadecli/run_cli.py",
+      "args": ["serve", "--reload"],
+      "console": "integratedTerminal",
+      "jinja": true,
+      "justMyCode": true,
+      "cwd": ""
     }
   ]
 }

CONTRIBUTING.md

@@ -53,7 +53,7 @@ Please note this documentation assumes you already have `uv` and `Git` installed
 
 ```bash
 cd <directory_in_which_repo_should_be_created>
-git clone git@github.com:YOUR_NAME/arcade-ai.git
+git clone git@github.com:YOUR_GITHUB_USERNAME/arcade-ai.git
 ```
 
 3. Now we need to install the environment. Navigate into the directory
@@ -62,10 +62,10 @@ git clone git@github.com:YOUR_NAME/arcade-ai.git
 cd arcade-ai
 ```
 
-If you are using `pyenv`, select a version to use locally. (See installed versions with `pyenv versions`)
+Create your virtual environment
 
 ```bash
-pyenv local <x.y.z>
+uv venv --python 3.11.6
 ```
 
 4. Install the development environment and dependencies:
@@ -139,8 +139,7 @@ Before you submit a pull request, check that it meets these guidelines:
 
 1. The pull request should include tests.
 
-2. If the pull request adds functionality, the docs should be updated.
-   Put your new functionality into a function with a docstring, and add the feature to the list in `README.md`.
+2. If the pull request adds functionality, the [docs](https://github.com/ArcadeAI/docs) should be updated.
 
 3. If making contributions to multiple toolkits (i.e. Google and Slack, etc.), submit a separate pull request for each.
    This helps us segregate the changes during the review process making it more efficient.

Makefile

@@ -15,7 +15,7 @@ install-toolkits: ## Install dependencies for all toolkits
 	for dir in toolkits/*/ ; do \
 		if [ -d "$$dir" ] && [ -f "$$dir/pyproject.toml" ]; then \
 			echo "📦 Installing dependencies for $$dir"; \
-			if (cd $$dir && uv sync --dev); then \
+			if (cd $$dir && uv sync --extra dev); then \
 				successful=$$((successful + 1)); \
 			else \
 				echo "❌ Failed to install dependencies for $$dir"; \
@@ -43,15 +43,15 @@ check: ## Run code quality tools.
 	@echo "🚀 Linting code: Running pre-commit"
 	@uv run pre-commit run -a
 	@echo "🚀 Static type checking: Running mypy on libs"
-	@for lib in libs/arcade-*/ ; do \
+	@for lib in libs/arcade*/ ; do \
 		echo "🔍 Type checking $$lib"; \
 		(cd $$lib && uv run mypy . || true); \
 	done
 
 .PHONY: check-libs
 check-libs: ## Run code quality tools for each lib package
 	@echo "🚀 Running checks on each lib package"
-	@for lib in libs/arcade-*/ ; do \
+	@for lib in libs/arcade*/ ; do \
 		echo "🛠️ Checking lib $$lib"; \
 		(cd $$lib && uv run pre-commit run -a || true); \
 		(cd $$lib && uv run mypy . || true); \
@@ -63,7 +63,7 @@ check-toolkits: ## Run code quality tools for each toolkit that has a Makefile
 	@for dir in toolkits/*/ ; do \
 		if [ -f "$$dir/Makefile" ]; then \
 			echo "🛠️ Checking toolkit $$dir"; \
-			(cd "$$dir" && make check); \
+			(cd "$$dir" && uv run --active pre-commit run -a && uv run --active mypy --config-file=pyproject.toml); \
 		else \
 			echo "🛠️ Skipping toolkit $$dir (no Makefile found)"; \
 		fi; \
@@ -72,12 +72,12 @@ check-toolkits: ## Run code quality tools for each toolkit that has a Makefile
 .PHONY: test
 test: ## Test the code with pytest
 	@echo "🚀 Testing libs: Running pytest"
-	@cd libs/tests && uv run pytest -W ignore -v --cov --cov-config=../../pyproject.toml --cov-report=xml
+	@uv run pytest -W ignore -v --cov=libs/tests --cov-config=pyproject.toml --cov-report=xml
 
 .PHONY: test-libs
 test-libs: ## Test each lib package individually
 	@echo "🚀 Testing each lib package"
-	@for lib in libs/arcade-*/ ; do \
+	@for lib in libs/arcade*/ ; do \
 		echo "🧪 Testing $$lib"; \
 		(cd $$lib && uv run pytest -W ignore -v || true); \
 	done
@@ -86,36 +86,38 @@ test-libs: ## Test each lib package individually
 test-toolkits: ## Iterate over all toolkits and run pytest on each one
 	@echo "🚀 Testing code in toolkits: Running pytest"
 	@for dir in toolkits/*/ ; do \
-		(cd $$dir && uv run pytest -W ignore -v --cov --cov-config=../../pyproject.toml --cov-report=xml || exit 1); \
+		toolkit_name=$$(basename "$$dir"); \
+		echo "🧪 Testing $$toolkit_name toolkit"; \
+		(cd $$dir && uv run pytest -W ignore -v --cov=arcade_$$toolkit_name --cov-report=xml || exit 1); \
 	done
 
 .PHONY: coverage
 coverage: ## Generate coverage report
 	@echo "coverage report"
-	@cd libs/tests && uv run coverage report
+	@uv run coverage report
 	@echo "Generating coverage report"
-	@cd libs/tests && uv run coverage html
+	@uv run coverage html
 
 .PHONY: set-version
 set-version: ## Set the version in all lib pyproject.toml files
 	@echo "🚀 Setting version to $(VERSION) in all lib packages"
-	@for lib in libs/arcade-*/ ; do \
+	@for lib in libs/arcade*/ ; do \
 		echo "Setting version in $$lib"; \
 		(cd $$lib && sed -i.bak 's/version = "[^"]*"/version = "$(VERSION)"/' pyproject.toml && rm pyproject.toml.bak); \
 	done
 
 .PHONY: unset-version
 unset-version: ## Reset version to 0.1.0 in all lib pyproject.toml files
 	@echo "🚀 Resetting version to 0.1.0 in all lib packages"
-	@for lib in libs/arcade-*/ ; do \
+	@for lib in libs/arcade*/ ; do \
 		echo "Resetting version in $$lib"; \
 		(cd $$lib && sed -i.bak 's/version = "[^"]*"/version = "0.1.0"/' pyproject.toml && rm pyproject.toml.bak); \
 	done
 
 .PHONY: build
 build: clean-build ## Build wheel files using uv
 	@echo "🚀 Creating wheel files for all lib packages"
-	@for lib in libs/arcade-*/ ; do \
+	@for lib in libs/arcade*/ ; do \
 		echo "🛠️ Building $$lib"; \
 		(cd $$lib && uv build); \
 	done
@@ -155,14 +157,14 @@ build-toolkits: ## Build wheel files for all toolkits
 .PHONY: clean-build
 clean-build: ## clean build artifacts
 	@echo "🗑️ Cleaning build artifacts"
-	@for lib in libs/arcade-*/ ; do \
+	@for lib in libs/arcade*/ ; do \
 		(cd $$lib && rm -rf dist); \
 	done
 
 .PHONY: publish
 publish: ## publish a release to pypi.
 	@echo "🚀 Publishing all lib packages to PyPI"
-	@for lib in libs/arcade-*/ ; do \
+	@for lib in libs/arcade*/ ; do \
 		echo "📦 Publishing $$lib"; \
 		(cd $$lib && uv publish --token $(PYPI_TOKEN) || true); \
 	done
@@ -211,7 +213,7 @@ full-dist: clean-dist ## Build all projects and copy wheels to ./dist
 	@mkdir -p dist
 
 	# Build all lib packages in dependency order
-	@for lib in arcade-core arcade-tdk arcade-serve arcade-evals arcade-cli ; do \
+	@for lib in arcade-core arcade-tdk arcade-serve arcade-evals arcadecli ; do \
 		echo "🛠️ Building libs/$$lib wheel..."; \
 		(cd libs/$$lib && uv build); \
 		cp libs/$$lib/dist/*.whl dist/; \
@@ -235,7 +237,7 @@ clean-dist: ## Clean all built distributions
 	@echo "🗑️ Cleaning dist directory"
 	@rm -rf dist
 	@echo "🗑️ Cleaning libs/*/dist directories"
-	@for lib in libs/arcade-*/ ; do \
+	@for lib in libs/arcade*/ ; do \
 		rm -rf "$$lib"/dist; \
 	done
 	@echo "🗑️ Cleaning toolkits/*/dist directory"

README.md

@@ -44,11 +44,11 @@ Arcade is a developer platform that lets you build, deploy, and manage tools for
 
 This repository contains the core Arcade libraries, organized as separate packages for maximum flexibility and modularity:
 
--   **`arcade-core`** - Core platform functionality and schemas
--   **`arcade-tdk`** - Tool Development Kit with the `@tool` decorator
--   **`arcade-serve`** - Serving infrastructure for workers and MCP servers
--   **`arcade-evals`** - Evaluation framework for testing tool performance
--   **`arcade-cli`** - Command-line interface for the Arcade platform
+-   [**`arcade-core`**](libs/arcade-core) - Core platform functionality and schemas
+-   [**`arcade-tdk`**](libs/arcade-tdk) - Tool Development Kit with the `@tool` decorator
+-   [**`arcade-serve`**](libs/arcade-serve) - Serving infrastructure for workers and MCP servers
+-   [**`arcade-evals`**](libs/arcade-evals) - Evaluation framework for testing tool performance
+-   [**`arcadecli`**](libs/arcadecli) - Command-line interface for the Arcade platform
 
 ![diagram](https://github.com/user-attachments/assets/1a567e5f-d6b4-4b1e-9918-c401ad232ebb)
 
@@ -77,10 +77,10 @@ make install
 For production use, install individual packages as needed:
 
 ```bash
-pip install arcade-core arcade-tdk  # Core + Tool Development Kit
+pip install arcade-core arcade-tdk   # Core + Tool Development Kit
 pip install arcade-serve             # Serving infrastructure
 pip install arcade-evals             # Evaluation framework
-pip install arcade-cli               # Command-line interface
+pip install arcadecli               # Command-line interface
 ```
 
 ### Development

examples/serving-tools/modal/run-arcade-worker.py

@@ -13,8 +13,8 @@
 @app.function(image=image)
 @asgi_app()
 def fastapi_app():
-    from arcade_core.toolkit import Toolkit
     from arcade_serve.fastapi.worker import FastAPIWorker
+    from arcade_tdk import Toolkit
     from fastapi import FastAPI
 
     web_app = FastAPI()

libs/arcade-cli/arcade_cli/__init__.py libs/arcade-core/arcade_core/py.typedlibs/arcade-cli/arcade_cli/__init__.py renamed to libs/arcade-core/arcade_core/py.typed

@@ -15,6 +15,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 requires-python = ">=3.10"
 dependencies = [

libs/arcade-core/pyproject.toml

@@ -84,7 +84,6 @@ suite = EvalSuite(cases=[case1], rubric=rubric)
 ## Dependencies
 
 - `arcade-core>=1.1.0` - Core Arcade functionality
-- `arcade-tdk>=1.1.0` - Tool development kit
 - `scipy>=1.14.0` - Scientific computing
 - `numpy>=2.0.0` - Numerical computing
 - `scikit-learn>=1.5.0` - Machine learning utilities