Files
Eduard van Valkenburg 6e95517659 Python: Split type checkers by target (pyright source, 5 checkers on tests/samples) (#6443)
* Python: Split type checkers by target (pyright source, 5 checkers on tests/samples)

Rework the typing setup along the lines of the 'too many type checkers'
approach:

- Pyright (strict) is now the sole source-code type checker; mypy is
  removed from source and its [tool.mypy] block becomes a relaxed profile
  used only for tests/samples.
- Tests are checked by all five checkers (pyright relaxed, mypy, pyrefly,
  ty, zuban); samples by pyright, pyrefly, and ty. All run in a relaxed/
  basic profile so authors aren't forced into over-annotation.
- Add pyrightconfig.tests.json and bump sample pyright configs to basic.
- Unify test/sample typing onto the same parallel fan-out used by source
  pyright via run_command_items in task_runner.py.
- Make version-conditional imports symmetric: keep or drop the
  '# type: ignore' on both branches so results match across interpreter
  versions (local vs CI).
- Update SKILL.md, DEV_SETUP.md, and CODING_STANDARD.md for the five
  gating checkers and pyright on source+tests+samples.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Python: Fix merge regressions from main (typing + runtime)

Merging main into the type-checker split branch surfaced regressions that
the new five-checker test suite and unit tests caught:

Runtime fixes:
- anthropic: restore the dropped `cache_read_input_token_count` mapping in
  _parse_usage_from_anthropic (lost during merge conflict resolution).
- gemini: _get_function_calling_mode test helper returned str(enum)
  ('FunctionCallingConfigMode.AUTO') instead of the enum value ('AUTO').
- openai: _response_id_from_token test helper was an infinite self-recursion;
  return token['response_id'].
- orchestrations: reset output_events per approval iteration so the terminal
  output assertion counts only the final run.
- core: drop a stale duplicate harness test whose message ('non-negative')
  contradicted the source ('positive').
- purview: import PolicyLocation/PolicyScope/ProtectionScopeActivities/
  ExecutionMode used by the processor tests.

Type-checker fixes (tests, relaxed profile):
- core: pyright/mypy/pyrefly/ty/zuban green-ups across the harness, MCP,
  observability and types tests.
- anthropic/openai: route provider-namespaced UsageDetails keys through a
  dict cast (extra_items TypedDict unsupported by mypy/ty).
- purview: typed model constructors and cache-mock casts.
- ag-ui: annotate WorkflowContext[Any, Any] so yield_output accepts test
  payloads, guard Optional forwarded_props, and ty-ignore intentional bad args.

Source pyright (sole source checker) flagged unnecessary ignores newly
introduced by merged code in core _tools.py and declarative _declarative_base.py.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Python: Isolate per-package mypy cache in test-typing fan-out

The parallel test-typing fan-out runs many mypy processes concurrently,
all defaulting to a single shared ./.mypy_cache. Concurrent writes corrupt
the cache and mypy aborts with INTERNAL ERROR (intermittently, depending on
worker timing) -- which is why CI's Test Typing job failed on a shifting set
of packages while a single-package run was fine.

Give each mypy invocation an isolated cache dir keyed by its target paths so
incremental caching still works per package without races. Other checkers
(zuban/pyrefly/ty/pyright) maintain their own caches and are unaffected.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Python: Make lab pyright-only on source (drop source mypy)

Lab was the last package still running mypy on its source code, requiring
mypy-only `# type: ignore` comments that pyright (the sole source checker
everywhere else) flags as unnecessary. Align lab with the rest of the
monorepo:

- Remove the lab source mypy poe tasks (mypy-gaia/lightning/tau2) and the
  now-dead strict [tool.mypy] config block.
- Drop the 'Run lab mypy' CI step; lab source is type-checked by pyright only.

Lab tests remain covered by the workspace test-typing fan-out (mypy, pyrefly,
ty, zuban, pyright over tests using the relaxed root config).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Python: Fix test-typing regressions from latest main merge

A fresh merge from main brought in new test code never run under the
five-checker test-typing suite. Green up across the affected packages:

- core: narrow Optional span.attributes with 'and' guards in span filters
  and assert+cast the json.loads(...attributes[...]) reads (test_observability);
  match the existing as_agent ignore on the protocol-typed fixture (test_clients).
- openai: align new streaming tests with the established chat_options dict
  pattern (ChatOptions TypedDict isn't assignable to dict), route Optional
  .annotations[0] access through a small _first_annotation helper (mirrors the
  file's assert-not-None convention), and annotate a mapped ResponseStream.
- foundry_hosting: annotate error: dict[str, Any] = body.get(...) or {}
  (zuban needs the annotation).
- foundry: narrow ignores for the live AIProjectClient credential arg (pyrefly)
  and connections.get_default (zuban) SDK type gaps.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* updated pyright version

* pyright fix

* Python: Fix source typing for pyright 1.1.410

Pyright 1.1.410 tightened several checks. Apply the same source fixes as
upstream PR #6275:

- anthropic: import AsyncAnthropicBedrock from anthropic.lib.bedrock and
  AsyncAnthropicVertex from anthropic.lib.vertex (no longer re-exported from
  the anthropic top-level package -> reportPrivateImportUsage).
- core _types.py: cast the transform-hook result to UpdateT (reportAssignmentType).
- core _workflows/_events.py: annotate the @contextmanager helper as
  Generator[None] instead of Iterator[None] (reportDeprecated).
- redis: build the combined filter expression with an explicit loop instead of
  reduce(and_, ...), which pyright could no longer fully type (drops the now
  unused functools.reduce / operator.and_ imports).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* Python: Accept plain-text body in Azure Functions workflow/run endpoint

The workflow_orchestrator already accepts plain strings as well as JSON
objects via context.get_input(), but the start_workflow_orchestration HTTP
handler only accepted JSON and returned 400 for any non-JSON body. This made
the functions integration tests that POST text/plain to /api/workflow/run
(e.g. test_09_workflow_shared_state) fail consistently with 400 != 202.

Fall back to the raw request body (decoded as UTF-8) when the body is not
JSON, rejecting only a truly empty body. The JSON path is unchanged.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-06-18 15:06:20 +00:00

356 lines
12 KiB
Python

# Copyright (c) Microsoft. All rights reserved.
"""Unit tests for :class:`ShellEnvironmentProvider`."""
from __future__ import annotations
import asyncio
from typing import Any
import pytest
from agent_framework_tools.shell import (
ShellCommandError,
ShellEnvironmentProvider,
ShellEnvironmentProviderOptions,
ShellExecutionError,
ShellFamily,
ShellResult,
default_instructions_formatter,
)
pytestmark = pytest.mark.asyncio
class _FakeExecutor:
"""In-memory ShellExecutor stub. Maps command-prefix -> response."""
def __init__(self, responses: dict[str, ShellResult | Exception | float]) -> None:
self._responses = responses
self.start_calls = 0
self.run_calls: list[str] = []
async def start(self) -> None:
self.start_calls += 1
async def close(self) -> None: ...
async def __aenter__(self) -> _FakeExecutor:
await self.start()
return self
async def __aexit__(self, *_: object) -> None:
await self.close()
async def run(self, command: str, *, timeout: float | None = None) -> ShellResult:
self.run_calls.append(command)
for prefix, response in self._responses.items():
if command.startswith(prefix) or prefix in command:
if isinstance(response, Exception):
raise response
if isinstance(response, (int, float)):
# Honor timeout in the fake the same way a real executor
# is required to: stop sleeping when timeout elapses and
# report a timed-out result rather than blocking forever.
sleep_for = float(response)
if timeout is not None and sleep_for > timeout:
await asyncio.sleep(timeout)
return ShellResult(
stdout="",
stderr="",
exit_code=124,
duration_ms=0,
timed_out=True,
)
await asyncio.sleep(sleep_for)
return ShellResult(stdout="", stderr="", exit_code=0, duration_ms=0)
return response
return ShellResult(stdout="", stderr="", exit_code=127, duration_ms=0)
def _ok(stdout: str = "", stderr: str = "", exit_code: int = 0) -> ShellResult:
return ShellResult(stdout=stdout, stderr=stderr, exit_code=exit_code, duration_ms=1)
async def test_probe_collects_shell_version_cwd_and_tools() -> None:
executor = _FakeExecutor({
"echo": _ok(stdout="VERSION=5.2.21\nCWD=/repo\n"),
"git --version": _ok(stdout="git version 2.40.0\n"),
"node --version": _ok(stdout="v20.11.1\n"),
})
options = ShellEnvironmentProviderOptions(
probe_tools=("git", "node", "missing-tool"),
override_family=ShellFamily.POSIX,
)
provider = ShellEnvironmentProvider(executor, options)
snapshot = await provider.refresh()
assert snapshot.family is ShellFamily.POSIX
assert snapshot.shell_version == "5.2.21"
assert snapshot.working_directory == "/repo"
assert snapshot.tool_versions["git"] == "git version 2.40.0"
assert snapshot.tool_versions["node"] == "v20.11.1"
assert snapshot.tool_versions["missing-tool"] is None
assert executor.start_calls >= 1
async def test_probe_falls_back_to_stderr_for_version_when_stdout_empty() -> None:
executor = _FakeExecutor({
"echo": _ok(stdout="VERSION=unknown\nCWD=/x\n"),
"java --version": _ok(stdout="", stderr="openjdk 21 2024-09-17\n"),
})
provider = ShellEnvironmentProvider(
executor,
ShellEnvironmentProviderOptions(
probe_tools=("java",),
override_family=ShellFamily.POSIX,
),
)
snapshot = await provider.refresh()
assert snapshot.tool_versions["java"] == "openjdk 21 2024-09-17"
assert snapshot.shell_version is None # "unknown" is normalised away
async def test_probe_timeout_yields_none_field_not_exception() -> None:
executor = _FakeExecutor({
"echo": _ok(stdout="VERSION=5.0\nCWD=/r\n"),
"git --version": 5.0, # sleeps 5s, probe_timeout below is 0.05s
})
provider = ShellEnvironmentProvider(
executor,
ShellEnvironmentProviderOptions(
probe_tools=("git",),
override_family=ShellFamily.POSIX,
probe_timeout=0.05,
),
)
snapshot = await provider.refresh()
assert snapshot.tool_versions["git"] is None
async def test_probe_swallows_expected_executor_failures() -> None:
executor = _FakeExecutor({
"echo": _ok(stdout="VERSION=5\nCWD=/r\n"),
"git --version": ShellCommandError("blocked"),
"node --version": ShellExecutionError("spawn failed"),
})
provider = ShellEnvironmentProvider(
executor,
ShellEnvironmentProviderOptions(
probe_tools=("git", "node"),
override_family=ShellFamily.POSIX,
),
)
snapshot = await provider.refresh()
assert snapshot.tool_versions == {"git": None, "node": None}
async def test_unexpected_exception_propagates() -> None:
class Boom(RuntimeError): ...
executor = _FakeExecutor({"echo": Boom("kaboom")})
provider = ShellEnvironmentProvider(
executor,
ShellEnvironmentProviderOptions(
probe_tools=(),
override_family=ShellFamily.POSIX,
),
)
with pytest.raises(Boom):
await provider.refresh()
async def test_invalid_tool_name_is_rejected_before_probing() -> None:
executor = _FakeExecutor({
"echo": _ok(stdout="VERSION=5\nCWD=/r\n"),
})
provider = ShellEnvironmentProvider(
executor,
ShellEnvironmentProviderOptions(
probe_tools=("git; rm -rf /", "good", ""),
override_family=ShellFamily.POSIX,
),
)
snapshot = await provider.refresh()
assert snapshot.tool_versions["git; rm -rf /"] is None
# Verify no probe command was actually issued for the malicious entry.
assert not any("git; rm -rf /" in c for c in executor.run_calls)
async def test_duplicate_tools_are_deduplicated_case_insensitively() -> None:
executor = _FakeExecutor({
"echo": _ok(stdout="VERSION=5\nCWD=/r\n"),
"git --version": _ok(stdout="git version 2\n"),
})
provider = ShellEnvironmentProvider(
executor,
ShellEnvironmentProviderOptions(
probe_tools=("git", "GIT", "Git"),
override_family=ShellFamily.POSIX,
),
)
snapshot = await provider.refresh()
assert list(snapshot.tool_versions.keys()) == ["git"]
async def test_failed_probe_does_not_poison_subsequent_calls() -> None:
calls = {"n": 0}
class Flaky:
start_calls = 0
async def start(self) -> None:
self.start_calls += 1
async def close(self) -> None: ...
async def __aenter__(self) -> Flaky:
return self
async def __aexit__(self, *_: object) -> None: ...
async def run(self, command: str, *, timeout: float | None = None) -> ShellResult:
calls["n"] += 1
if calls["n"] == 1:
raise RuntimeError("transient")
return _ok(stdout="VERSION=5\nCWD=/r\n")
provider = ShellEnvironmentProvider(
Flaky(),
ShellEnvironmentProviderOptions(
probe_tools=(),
override_family=ShellFamily.POSIX,
),
)
with pytest.raises(RuntimeError):
await provider._get_or_probe() # type: ignore[attr-defined]
snapshot = await provider._get_or_probe() # type: ignore[attr-defined]
assert snapshot.shell_version == "5"
async def test_concurrent_first_callers_share_a_single_probe() -> None:
started = asyncio.Event()
release = asyncio.Event()
call_count = {"n": 0}
class Slow:
async def start(self) -> None: ...
async def close(self) -> None: ...
async def __aenter__(self) -> Slow:
return self
async def __aexit__(self, *_: object) -> None: ...
async def run(self, command: str, *, timeout: float | None = None) -> ShellResult:
if command.startswith("echo"):
call_count["n"] += 1
started.set()
await release.wait()
return _ok(stdout="VERSION=5\nCWD=/r\n")
return _ok()
provider = ShellEnvironmentProvider(
Slow(),
ShellEnvironmentProviderOptions(
probe_tools=(),
override_family=ShellFamily.POSIX,
),
)
a = asyncio.create_task(provider._get_or_probe()) # type: ignore[attr-defined]
b = asyncio.create_task(provider._get_or_probe()) # type: ignore[attr-defined]
await started.wait()
release.set()
s1, s2 = await asyncio.gather(a, b)
assert s1 is s2
assert call_count["n"] == 1
async def test_before_run_extends_instructions() -> None:
executor = _FakeExecutor({
"echo": _ok(stdout="VERSION=5.2.21\nCWD=/repo\n"),
"git --version": _ok(stdout="git version 2.40.0\n"),
})
provider = ShellEnvironmentProvider(
executor,
ShellEnvironmentProviderOptions(
probe_tools=("git",),
override_family=ShellFamily.POSIX,
),
)
received: list[tuple[str, Any]] = []
class FakeContext:
def extend_instructions(self, source_id: str, instructions: Any) -> None:
received.append((source_id, instructions))
await provider.before_run(
agent=None, # type: ignore[arg-type] # ty: ignore[invalid-argument-type]
session=None, # type: ignore[arg-type] # ty: ignore[invalid-argument-type]
context=FakeContext(), # type: ignore[arg-type] # ty: ignore[invalid-argument-type]
state={},
)
assert len(received) == 1
src, text = received[0]
assert src == "shell_environment"
assert "POSIX shell 5.2.21" in text
assert "Working directory: /repo" in text
assert "git (git version 2.40.0)" in text
async def test_default_formatter_powershell_block_uses_pwsh_idioms() -> None:
from agent_framework_tools.shell import ShellEnvironmentSnapshot
snapshot = ShellEnvironmentSnapshot(
family=ShellFamily.POWERSHELL,
os_description="Windows 11",
shell_version="7.4.0",
working_directory=r"C:\repo",
tool_versions={"git": "2.40", "rust": None},
)
text = default_instructions_formatter(snapshot)
assert "PowerShell 7.4.0" in text
assert "$env:NAME" in text
assert r"C:\repo" in text
assert "Available CLIs: git (2.40)" in text
assert "Not installed: rust" in text
async def test_custom_formatter_is_used_when_provided() -> None:
executor = _FakeExecutor({
"echo": _ok(stdout="VERSION=5\nCWD=/r\n"),
})
provider = ShellEnvironmentProvider(
executor,
ShellEnvironmentProviderOptions(
probe_tools=(),
override_family=ShellFamily.POSIX,
instructions_formatter=lambda snap: f"FAMILY={snap.family.value}",
),
)
received: list[tuple[str, Any]] = []
class FakeContext:
def extend_instructions(self, source_id: str, instructions: Any) -> None:
received.append((source_id, instructions))
await provider.before_run(
agent=None, # type: ignore[arg-type] # ty: ignore[invalid-argument-type]
session=None, # type: ignore[arg-type] # ty: ignore[invalid-argument-type]
context=FakeContext(), # type: ignore[arg-type] # ty: ignore[invalid-argument-type]
state={},
)
assert received[0][1] == "FAMILY=posix"