Merge branch 'strands-agents:main' into main

Author: philipkiely-baseten

.github/workflows/integration-test.yml

@@ -69,4 +69,4 @@ jobs:
           AWS_REGION_NAME: us-east-1 # Needed for LiteLLM
         id: tests
         run: |
-          hatch test tests-integ
+          hatch test tests_integ

.gitignore

@@ -8,4 +8,5 @@ __pycache__*
 .ruff_cache
 *.bak
 .vscode
-dist
+dist
+repl_state

pyproject.toml

@@ -35,6 +35,7 @@ dependencies = [
     "watchdog>=6.0.0,<7.0.0",
     "opentelemetry-api>=1.30.0,<2.0.0",
     "opentelemetry-sdk>=1.30.0,<2.0.0",
+    "opentelemetry-instrumentation-threading>=0.51b0,<1.00b0",
 ]
 
 [project.urls]
@@ -60,6 +61,8 @@ dev = [
     "pre-commit>=3.2.0,<4.2.0",
     "pytest>=8.0.0,<9.0.0",
     "pytest-asyncio>=0.26.0,<0.27.0",
+    "pytest-cov>=4.1.0,<5.0.0",
+    "pytest-xdist>=3.0.0,<4.0.0",
     "ruff>=0.4.4,<0.5.0",
 ]
 docs = [
@@ -85,20 +88,70 @@ openai = [
 otel = [
     "opentelemetry-exporter-otlp-proto-http>=1.30.0,<2.0.0",
 ]
+writer = [
+    "writer-sdk>=2.2.0,<3.0.0"
+]
+
 a2a = [
-    "a2a-sdk>=0.2.6",
-    "uvicorn>=0.34.2",
-    "httpx>=0.28.1",
-    "fastapi>=0.115.12",
-    "starlette>=0.46.2",
+    "a2a-sdk[sql]>=0.2.11,<1.0.0",
+    "uvicorn>=0.34.2,<1.0.0",
+    "httpx>=0.28.1,<1.0.0",
+    "fastapi>=0.115.12,<1.0.0",
+    "starlette>=0.46.2,<1.0.0",
+]
+all = [
+    # anthropic
+    "anthropic>=0.21.0,<1.0.0",
+
+    # dev
+    "commitizen>=4.4.0,<5.0.0",
+    "hatch>=1.0.0,<2.0.0",
+    "moto>=5.1.0,<6.0.0",
+    "mypy>=1.15.0,<2.0.0",
+    "pre-commit>=3.2.0,<4.2.0",
+    "pytest>=8.0.0,<9.0.0",
+    "pytest-asyncio>=0.26.0,<0.27.0",
+    "pytest-cov>=4.1.0,<5.0.0",
+    "pytest-xdist>=3.0.0,<4.0.0",
+    "ruff>=0.4.4,<0.5.0",
+
+    # docs
+    "sphinx>=5.0.0,<6.0.0",
+    "sphinx-rtd-theme>=1.0.0,<2.0.0",
+    "sphinx-autodoc-typehints>=1.12.0,<2.0.0",
+
+    # litellm
+    "litellm>=1.72.6,<1.73.0",
+
+    # llama
+    "llama-api-client>=0.1.0,<1.0.0",
+
+    # mistral
+    "mistralai>=1.8.2",
+
+    # ollama
+    "ollama>=0.4.8,<1.0.0",
+
+    # openai
+    "openai>=1.68.0,<2.0.0",
+
+    # otel
+    "opentelemetry-exporter-otlp-proto-http>=1.30.0,<2.0.0",
+
+    # a2a
+    "a2a-sdk[sql]>=0.2.11,<1.0.0",
+    "uvicorn>=0.34.2,<1.0.0",
+    "httpx>=0.28.1,<1.0.0",
+    "fastapi>=0.115.12,<1.0.0",
+    "starlette>=0.46.2,<1.0.0",
 ]
 
 [tool.hatch.version]
 # Tells Hatch to use your version control system (git) to determine the version.
 source = "vcs"
 
 [tool.hatch.envs.hatch-static-analysis]
-features = ["anthropic", "litellm", "llamaapi", "ollama", "openai", "otel","mistral"]
+features = ["anthropic", "litellm", "llamaapi", "ollama", "openai", "otel", "mistral", "writer", "a2a"]
 dependencies = [
   "mypy>=1.15.0,<2.0.0",
   "ruff>=0.11.6,<0.12.0",
@@ -114,15 +167,14 @@ format-fix = [
 ]
 lint-check = [
     "ruff check",
-    # excluding due to A2A and OTEL http exporter dependency conflict
-    "mypy -p src --exclude src/strands/multiagent"
+    "mypy -p src"
 ]
 lint-fix = [
     "ruff check --fix"
 ]
 
 [tool.hatch.envs.hatch-test]
-features = ["anthropic", "litellm", "llamaapi", "ollama", "openai", "otel","mistral"]
+features = ["anthropic", "litellm", "llamaapi", "ollama", "openai", "otel", "mistral", "writer", "a2a"]
 extra-dependencies = [
     "moto>=5.1.0,<6.0.0",
     "pytest>=8.0.0,<9.0.0",
@@ -138,35 +190,17 @@ extra-args = [
 
 [tool.hatch.envs.dev]
 dev-mode = true
-features = ["dev", "docs", "anthropic", "litellm", "llamaapi", "ollama", "otel","mistral"]
-
-[tool.hatch.envs.a2a]
-dev-mode = true
-features = ["dev", "docs", "anthropic", "litellm", "llamaapi", "ollama", "a2a"]
-
-[tool.hatch.envs.a2a.scripts]
-run = [
-    "pytest{env:HATCH_TEST_ARGS:} tests/multiagent/a2a {args}"
-]
-run-cov = [
-    "pytest{env:HATCH_TEST_ARGS:} tests/multiagent/a2a --cov --cov-config=pyproject.toml {args}"
-]
-lint-check = [
-    "ruff check",
-    "mypy -p src/strands/multiagent/a2a"
-]
+features = ["dev", "docs", "anthropic", "litellm", "llamaapi", "ollama", "otel", "mistral", "writer", "a2a"]
 
 [[tool.hatch.envs.hatch-test.matrix]]
 python = ["3.13", "3.12", "3.11", "3.10"]
 
 [tool.hatch.envs.hatch-test.scripts]
 run = [
-    # excluding due to A2A and OTEL http exporter dependency conflict
-    "pytest{env:HATCH_TEST_ARGS:} {args} --ignore=tests/multiagent/a2a"
+    "pytest{env:HATCH_TEST_ARGS:} {args}"
 ]
 run-cov = [
-    # excluding due to A2A and OTEL http exporter dependency conflict
-    "pytest{env:HATCH_TEST_ARGS:} --cov --cov-config=pyproject.toml {args} --ignore=tests/multiagent/a2a"
+    "pytest{env:HATCH_TEST_ARGS:} --cov --cov-config=pyproject.toml {args}"
 ]
 
 cov-combine = []
@@ -193,18 +227,14 @@ test = [
     "hatch test --cover --cov-report html --cov-report xml {args}"
 ]
 test-integ = [
-    "hatch test tests-integ {args}"
+    "hatch test tests_integ {args}"
 ]
 prepare = [
     "hatch fmt --linter",
     "hatch fmt --formatter",
     "hatch run test-lint",
     "hatch test --all"
 ]
-test-a2a = [
-    # required to run manually due to A2A and OTEL http exporter dependency conflict
-    "hatch -e a2a run run {args}"
-]
 
 [tool.mypy]
 python_version = "3.10"
@@ -228,7 +258,7 @@ ignore_missing_imports = true
 
 [tool.ruff]
 line-length = 120
-include = ["examples/**/*.py", "src/**/*.py", "tests/**/*.py", "tests-integ/**/*.py"]
+include = ["examples/**/*.py", "src/**/*.py", "tests/**/*.py", "tests_integ/**/*.py"]
 
 [tool.ruff.lint]
 select = [
@@ -288,4 +318,4 @@ style = [
     ["instruction", ""],
     ["text", ""],
     ["disabled", "fg:#858585 italic"]
-]
+]

src/strands/__init__.py

@@ -1,8 +1,7 @@
 """A framework for building, deploying, and managing AI agents."""
 
-from . import agent, event_loop, models, telemetry, types
+from . import agent, models, telemetry, types
 from .agent.agent import Agent
 from .tools.decorator import tool
-from .tools.thread_pool_executor import ThreadPoolExecutorWrapper
 
-__all__ = ["Agent", "ThreadPoolExecutorWrapper", "agent", "event_loop", "models", "tool", "types", "telemetry"]
+__all__ = ["Agent", "agent", "models", "tool", "types", "telemetry"]