deeleeramone
diff --git a/‎.github/workflows/test-pywry.yml‎
Lines changed: 32 additions & 24 deletions b/‎.github/workflows/test-pywry.yml‎
Lines changed: 32 additions & 24 deletions
diff --git a/‎pywry/docs/requirements.txt‎
Lines changed: 2 additions & 2 deletions b/‎pywry/docs/requirements.txt‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎pywry/pyproject.toml‎
Lines changed: 8 additions & 8 deletions b/‎pywry/pyproject.toml‎
Lines changed: 8 additions & 8 deletions
diff --git a/‎pywry/pywry/chat/manager.py‎
Lines changed: 15 additions & 12 deletions b/‎pywry/pywry/chat/manager.py‎
Lines changed: 15 additions & 12 deletions
diff --git a/‎pywry/pywry/chat/providers/anthropic.py‎
Lines changed: 11 additions & 5 deletions b/‎pywry/pywry/chat/providers/anthropic.py‎
Lines changed: 11 additions & 5 deletions
diff --git a/‎pywry/pywry/chat/providers/callback.py‎
Lines changed: 8 additions & 4 deletions b/‎pywry/pywry/chat/providers/callback.py‎
Lines changed: 8 additions & 4 deletions
@@ -33,11 +33,16 @@ jobs:
           cache: 'pip'
           cache-dependency-path: pywry/pyproject.toml
 
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v6
+
       - name: Install dependencies
+        shell: bash
         run: |
           python -m pip install --upgrade pip
-          pip install -e ".[notebook,auth,mcp,acp,deepagent,openai,anthropic,magentic]"
-          pip install ruff ty pytauri-wheel plotly pandas cryptography
+          uv export --frozen --all-extras --group dev --format requirements-txt --no-hashes --output-file "$RUNNER_TEMP/ci-dev-requirements.txt"
+          pip install -r "$RUNNER_TEMP/ci-dev-requirements.txt"
+          pip install -e .
 
       - name: Run Ruff linter
         run: ruff check pywry/ tests/
@@ -57,21 +62,18 @@ jobs:
       run:
         working-directory: ${{ github.workspace }}
     outputs:
-      matrix: ${{ steps.matrix.outputs.matrix }}
+      full-matrix: ${{ steps.matrix.outputs.full-matrix }}
+      pr-matrix: ${{ steps.matrix.outputs.pr-matrix }}
       pytest-targets: ${{ steps.targets.outputs.targets }}
+      is-scoped: ${{ steps.targets.outputs.is-scoped }}
     steps:
       - id: matrix
         shell: bash
-        env:
-          IS_PR: ${{ github.event_name == 'pull_request' }}
-          HAS_FULL_LABEL: ${{ contains(github.event.pull_request.labels.*.name, 'full-test') }}
         run: |
-          if [[ "$IS_PR" == "true" && "$HAS_FULL_LABEL" != "true" ]]; then
-            MATRIX='{"include":[{"os":"ubuntu-24.04","python-version":"3.14"},{"os":"windows-2025","python-version":"3.14"},{"os":"macos-15-intel","python-version":"3.14"},{"os":"ubuntu-24.04-arm","python-version":"3.14"},{"os":"windows-11-arm","python-version":"3.14"},{"os":"macos-latest","python-version":"3.14"}]}'
-          else
-            MATRIX='{"include":[{"os":"ubuntu-24.04","python-version":"3.11"},{"os":"ubuntu-24.04","python-version":"3.14"},{"os":"windows-2025","python-version":"3.11"},{"os":"windows-2025","python-version":"3.14"},{"os":"macos-15-intel","python-version":"3.11"},{"os":"macos-15-intel","python-version":"3.14"},{"os":"ubuntu-24.04-arm","python-version":"3.11"},{"os":"ubuntu-24.04-arm","python-version":"3.14"},{"os":"windows-11-arm","python-version":"3.12"},{"os":"windows-11-arm","python-version":"3.14"},{"os":"macos-latest","python-version":"3.11"},{"os":"macos-latest","python-version":"3.14"}]}'
-          fi
-          echo "matrix=$MATRIX" >> "$GITHUB_OUTPUT"
+          FULL_MATRIX='{"include":[{"os":"ubuntu-24.04","python-version":"3.11"},{"os":"ubuntu-24.04","python-version":"3.14"},{"os":"windows-2025","python-version":"3.11"},{"os":"windows-2025","python-version":"3.14"},{"os":"macos-15-intel","python-version":"3.11"},{"os":"macos-15-intel","python-version":"3.14"},{"os":"ubuntu-24.04-arm","python-version":"3.11"},{"os":"ubuntu-24.04-arm","python-version":"3.14"},{"os":"windows-11-arm","python-version":"3.12"},{"os":"windows-11-arm","python-version":"3.14"},{"os":"macos-latest","python-version":"3.11"},{"os":"macos-latest","python-version":"3.14"}]}'
+          PR_MATRIX='{"include":[{"os":"ubuntu-24.04","python-version":"3.14"}]}'
+          echo "full-matrix=$FULL_MATRIX" >> "$GITHUB_OUTPUT"
+          echo "pr-matrix=$PR_MATRIX" >> "$GITHUB_OUTPUT"
 
       - name: Checkout for diff
         if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'full-test')
@@ -90,6 +92,7 @@ jobs:
           if [[ "$IS_PR" != "true" || "$HAS_FULL_LABEL" == "true" ]]; then
             echo "Full suite (dispatch or full-test label)"
             echo "targets=tests/" >> "$GITHUB_OUTPUT"
+            echo "is-scoped=false" >> "$GITHUB_OUTPUT"
             exit 0
           fi
 
@@ -107,13 +110,16 @@ jobs:
           if [[ -n "$SOURCE_NON_TEST" || -n "$WORKFLOW_SELF" || -n "$INFRA_TEST" ]]; then
             echo "Full suite (source/workflow/test-infra changes)"
             echo "targets=tests/" >> "$GITHUB_OUTPUT"
+            echo "is-scoped=false" >> "$GITHUB_OUTPUT"
           elif [[ -n "$TEST_FILES" ]]; then
             T=$(echo "$TEST_FILES" | sed 's|^pywry/||' | tr '\n' ' ' | sed 's/ *$//')
             echo "Scoped to changed test files: $T"
             echo "targets=$T" >> "$GITHUB_OUTPUT"
+            echo "is-scoped=true" >> "$GITHUB_OUTPUT"
           else
             echo "No pywry source/test changes; skipping pytest selection"
             echo "targets=__skip__" >> "$GITHUB_OUTPUT"
+            echo "is-scoped=false" >> "$GITHUB_OUTPUT"
           fi
 
   test:
@@ -125,12 +131,7 @@ jobs:
       contents: read
     strategy:
       fail-fast: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'full-test') }}
-      # ``deepagents`` (pulled in by ``.[dev]`` → ``features``) hard-
-      # requires Python >=3.11 — 3.10 can't resolve the dev extra.
-      # ``sqlcipher3`` is a source build against the SQLCipher C
-      # library installed in the ``Build SQLCipher`` step below, so
-      # any Python ABI works (no binary-wheel coverage gaps).
-      matrix: ${{ fromJSON(needs.gen-matrix.outputs.matrix) }}
+      matrix: ${{ fromJSON((github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'full-test') && needs.gen-matrix.outputs.pr-matrix) || needs.gen-matrix.outputs.full-matrix) }}
 
     steps:
       - uses: actions/checkout@v5
@@ -143,6 +144,9 @@ jobs:
           cache: 'pip'
           cache-dependency-path: pywry/pyproject.toml
 
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v6
+
       - name: Set up Rust (Linux only)
         if: runner.os == 'Linux'
         uses: dtolnay/rust-toolchain@stable
@@ -272,9 +276,13 @@ jobs:
           python -c "from cryptography.hazmat.bindings._rust import openssl; print('cryptography OK')"
 
       - name: Install dependencies
+        shell: bash
         run: |
           python -m pip install --upgrade pip
-          pip install -e ".[dev]"
+          uv export --frozen --all-extras --group dev --format requirements-txt --no-hashes --output-file "$RUNNER_TEMP/ci-dev-requirements.txt"
+          pip install -r "$RUNNER_TEMP/ci-dev-requirements.txt"
+          pip install -e .
+          pip install pytest-xdist
 
       - name: Verify Docker (Linux)
         if: runner.os == 'Linux'
@@ -327,7 +335,7 @@ jobs:
           NO_AT_BRIDGE: "1"
           PYTEST_TARGETS: ${{ needs.gen-matrix.outputs.pytest-targets }}
         run: |
-          dbus-run-session -- xvfb-run --auto-servernum --server-args="-screen 0 1920x1080x24" python -m pytest -c pytest.ini $PYTEST_TARGETS -v --tb=short
+          dbus-run-session -- xvfb-run --auto-servernum --server-args="-screen 0 1920x1080x24" python -m pytest -c pytest.ini $PYTEST_TARGETS -n auto -v --tb=short
           rc=$?
           # Exit 5 = no tests collected after platform filtering on a scoped run; treat as success.
           if [[ $rc -eq 5 && "$PYTEST_TARGETS" != "tests/" ]]; then rc=0; fi
@@ -342,7 +350,7 @@ jobs:
           PYTEST_TARGETS: ${{ needs.gen-matrix.outputs.pytest-targets }}
         shell: pwsh
         run: |
-          python -m pytest -c pytest.ini $env:PYTEST_TARGETS.Split(' ') -v --tb=short --ignore=tests/test_state_redis_integration.py --ignore=tests/test_auth_rbac_integration.py --ignore=tests/test_deploy_mode_integration.py --ignore=tests/test_e2e_deploy_mode.py --ignore=tests/test_e2e_rbac_widgets.py -m "not redis and not container"
+          python -m pytest -c pytest.ini $env:PYTEST_TARGETS.Split(' ') -n auto -v --tb=short --ignore=tests/test_state_redis_integration.py --ignore=tests/test_auth_rbac_integration.py --ignore=tests/test_deploy_mode_integration.py --ignore=tests/test_e2e_deploy_mode.py --ignore=tests/test_e2e_rbac_widgets.py -m "not redis and not container"
           if ($LASTEXITCODE -eq 5 -and $env:PYTEST_TARGETS -ne 'tests/') { exit 0 }
           exit $LASTEXITCODE
 
@@ -355,7 +363,7 @@ jobs:
           PYTEST_TARGETS: ${{ needs.gen-matrix.outputs.pytest-targets }}
         shell: pwsh
         run: |
-          python -m pytest -c pytest.ini $env:PYTEST_TARGETS.Split(' ') -v --tb=short --ignore=tests/test_state_redis_integration.py --ignore=tests/test_auth_rbac_integration.py --ignore=tests/test_deploy_mode_integration.py --ignore=tests/test_e2e_deploy_mode.py --ignore=tests/test_e2e_rbac_widgets.py --ignore=tests/test_inline_ssl.py -m "not redis and not container"
+          python -m pytest -c pytest.ini $env:PYTEST_TARGETS.Split(' ') -n auto -v --tb=short --ignore=tests/test_state_redis_integration.py --ignore=tests/test_auth_rbac_integration.py --ignore=tests/test_deploy_mode_integration.py --ignore=tests/test_e2e_deploy_mode.py --ignore=tests/test_e2e_rbac_widgets.py --ignore=tests/test_inline_ssl.py -m "not redis and not container"
           if ($LASTEXITCODE -eq 5 -and $env:PYTEST_TARGETS -ne 'tests/') { exit 0 }
           exit $LASTEXITCODE
 
@@ -365,7 +373,7 @@ jobs:
           PYWRY_HEADLESS: "1"
           PYTEST_TARGETS: ${{ needs.gen-matrix.outputs.pytest-targets }}
         run: |
-          python -m pytest -c pytest.ini $PYTEST_TARGETS -v --tb=short
+          python -m pytest -c pytest.ini $PYTEST_TARGETS -n auto -v --tb=short
           rc=$?
           if [[ $rc -eq 5 && "$PYTEST_TARGETS" != "tests/" ]]; then rc=0; fi
           exit $rc
@@ -377,7 +385,7 @@ jobs:
           PYWRY_DEPLOY__STATE_BACKEND: "memory"
           PYTEST_TARGETS: ${{ needs.gen-matrix.outputs.pytest-targets }}
         run: |
-          python -m pytest -c pytest.ini $PYTEST_TARGETS -v --tb=short --ignore=tests/test_state_redis_integration.py --ignore=tests/test_auth_rbac_integration.py --ignore=tests/test_deploy_mode_integration.py --ignore=tests/test_e2e_deploy_mode.py --ignore=tests/test_e2e_rbac_widgets.py -m "not redis and not container"
+          python -m pytest -c pytest.ini $PYTEST_TARGETS -n auto -v --tb=short --ignore=tests/test_state_redis_integration.py --ignore=tests/test_auth_rbac_integration.py --ignore=tests/test_deploy_mode_integration.py --ignore=tests/test_e2e_deploy_mode.py --ignore=tests/test_e2e_rbac_widgets.py -m "not redis and not container"
           rc=$?
           if [[ $rc -eq 5 && "$PYTEST_TARGETS" != "tests/" ]]; then rc=0; fi
           exit $rc
 
@@ -5,7 +5,7 @@ mkdocs-autorefs>=1.4.4
 
 # Auto-generated API documentation from source
 mkdocstrings[python]>=1.0.4
-griffe>=2.0.2
+griffe>=2.1.0
 
 # For cross-references
 mkdocs-gen-files>=0.6.1
@@ -14,4 +14,4 @@ mkdocs-section-index>=0.3.12
 
 # Needed for building docs (dependencies of pywry)
 pydantic>=2.13.4
-pydantic-settings>=2.14.1
+pydantic-settings>=2.14.2
@@ -1,11 +1,11 @@
 [project]
 name = "pywry"
-version = "2.0.4"
+version = "2.0.5"
 description = "A lightweight and blazingly fast, cross-platform, WebView rendering engine and desktop UI toolkit for Python. Batteries included."
 authors = [{ name = "PyWry", email = "pywry2@gmail.com" }]
 license = { text = "Apache 2.0" }
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.10,<3.15"
 classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
@@ -33,7 +33,7 @@ dependencies = [
     "uvicorn>=0.40.0",
     "watchdog>=3.0.0",
     "setproctitle>=1.3.0",
-    "websockets>=16.0.0",
+    "websockets>=15.0.0",
 ]
 
 [project.scripts]
@@ -79,7 +79,7 @@ features = [
     "anywidget>=0.9.0",
     "authlib>=1.3.0",
     "cryptography>=46.0.0",
-    "deepagents>=0.1.0; python_version >= '3.11'",
+    "deepagents>=0.6.12; python_version >= '3.11'",
     "fastmcp>=3.2.2",
     "ipykernel>=7.2.0",
     "keyring>=24.0",
@@ -89,7 +89,7 @@ features = [
     "pandas>=1.5.3",
     "plotly>=6.5.0",
     "sqlcipher3>=0.5.4",
-    "websockets>=16.0.0",
+    "websockets>=15.0.0",
 ]
 dev = [
     { include-group = "test" },
@@ -129,11 +129,11 @@ dev = [
     "magentic>=0.39.0",
     "openai>=1.0.0",
     "pyinstaller>=6.0",
-    "websockets>=16.0.0",
+    "websockets>=15.0.0",
     "pandas>=1.5.3",
     "sqlcipher3>=0.5.4",
     "agent-client-protocol>=0.1.0",
-    "deepagents>=0.1.0; python_version >= '3.11'",
+    "deepagents>=0.6.12; python_version >= '3.11'",
     "langchain-mcp-adapters>=0.1.0",
 ]
 openai = [
@@ -173,7 +173,7 @@ all = [
     "anthropic>=0.34.0",
     "anywidget>=0.9.0",
     "authlib>=1.3.0",
-    "deepagents>=0.1.0; python_version >= '3.11'",
+    "deepagents>=0.6.12; python_version >= '3.11'",
     "fastmcp>=3.2.2",
     "ipykernel>=7.2.0",
     "keyring>=24.0",
 
@@ -1160,23 +1160,26 @@ async def _handle_async_stream(
         """Stream from an async generator."""
         state = _StreamState(message_id)
         typing_hidden = False
-        async for item in agen:
+        try:
+            async for item in agen:
+                if not typing_hidden:
+                    typing_hidden = True
+                    self._emit(
+                        "chat:typing-indicator",
+                        {"typing": False, "threadId": thread_id},
+                    )
+                if cancel.is_set():
+                    self._handle_cancel(state, thread_id)
+                    return
+                self._process_handler_item(item, state, thread_id, ctx)
             if not typing_hidden:
-                typing_hidden = True
                 self._emit(
                     "chat:typing-indicator",
                     {"typing": False, "threadId": thread_id},
                 )
-            if cancel.is_set():
-                self._handle_cancel(state, thread_id)
-                return
-            self._process_handler_item(item, state, thread_id, ctx)
-        if not typing_hidden:
-            self._emit(
-                "chat:typing-indicator",
-                {"typing": False, "threadId": thread_id},
-            )
-        self._finalize_stream(state, thread_id)
+            self._finalize_stream(state, thread_id)
+        finally:
+            await agen.aclose()
 
     def _inject_context(
         self,
 
@@ -16,7 +16,7 @@
 if TYPE_CHECKING:
     import asyncio
 
-    from collections.abc import AsyncIterator
+    from collections.abc import AsyncIterator, Awaitable, Callable
 
     from ..models import ContentBlock
     from ..session import AgentCapabilities, ClientCapabilities
@@ -137,10 +137,16 @@ async def prompt(
             temperature=session.get("temperature", 0.7),
             max_tokens=session.get("max_tokens", 4096),
         ) as stream:
-            async for text in stream.text_stream:
-                if cancel_event and cancel_event.is_set():
-                    raise GenerationCancelledError()
-                yield AgentMessageUpdate(text=text)
+            text_stream = stream.text_stream
+            try:
+                async for text in text_stream:
+                    if cancel_event and cancel_event.is_set():
+                        raise GenerationCancelledError()
+                    yield AgentMessageUpdate(text=text)
+            finally:
+                close_stream = getattr(text_stream, "aclose", None)
+                if close_stream is not None:
+                    await cast("Callable[[], Awaitable[None]]", close_stream)()
 
     async def cancel(self, session_id: str) -> None:
         """Cancel is handled cooperatively via ``cancel_event``.
 
@@ -143,10 +143,14 @@ def _wrap(item: Any) -> Any:
             return AgentMessageUpdate(text=item) if isinstance(item, str) else item
 
         if hasattr(result, "__aiter__"):
-            async for item in result:
-                if cancel_event and cancel_event.is_set():
-                    raise GenerationCancelledError()
-                yield _wrap(item)
+            try:
+                async for item in result:
+                    if cancel_event and cancel_event.is_set():
+                        raise GenerationCancelledError()
+                    yield _wrap(item)
+            finally:
+                if hasattr(result, "aclose"):
+                    await result.aclose()
         elif hasattr(result, "__iter__"):
             for item in result:
                 if cancel_event and cancel_event.is_set():