mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
3dc59c83b5
* WIP * big update to new ResponseStream model * fixed tests and typing * fixed tests and typing * fixed tools typevar import * fix * mypy fix * mypy fixes and some cleanup * fix missing quoted names * and client * fix imports agui * fix anthropic override * fix agui * fix ag ui * fix import * fix anthropic types * fix mypy * refactoring * updated typing * fix 3.11 * fixes * redid layering of chat clients and agents * redid layering of chat clients and agents * Fix lint, type, and test issues after rebase - Add @overload decorators to AgentProtocol.run() for type compatibility - Add missing docstring params (middleware, function_invocation_configuration) - Fix TODO format (TD002) by adding author tags - Fix broken observability tests from upstream: - Replace non-existent use_instrumentation with direct instantiation - Replace non-existent use_agent_instrumentation with AgentTelemetryLayer mixin - Fix get_streaming_response to use get_response(stream=True) - Add AgentInitializationError import - Update streaming exception tests to match actual behavior * Fix AgentExecutionException import error in test_agents.py - Replace non-existent AgentExecutionException with AgentRunException * Fix test import and asyncio deprecation issues - Add 'tests' to pythonpath in ag-ui pyproject.toml for utils_test_ag_ui import - Replace deprecated asyncio.get_event_loop().run_until_complete with asyncio.run * Fix azure-ai test failures - Update _prepare_options patching to use correct class path - Fix test_to_azure_ai_agent_tools_web_search_missing_connection to clear env vars * Convert ag-ui utils_test_ag_ui.py to conftest.py - Move test utilities to conftest.py for proper pytest discovery - Update all test imports to use conftest instead of utils_test_ag_ui - Remove old utils_test_ag_ui.py file - Revert pythonpath change in pyproject.toml * fix: use relative imports for ag-ui test utilities * fix agui * Rename Bare*Client to Raw*Client and BaseChatClient - Renamed BareChatClient to BaseChatClient (abstract base class) - Renamed BareOpenAIChatClient to RawOpenAIChatClient - Renamed BareOpenAIResponsesClient to RawOpenAIResponsesClient - Renamed BareAzureAIClient to RawAzureAIClient - Added warning docstrings to Raw* classes about layer ordering - Updated README in samples/getting_started/agents/custom with layer docs - Added test for span ordering with function calling * Fix layer ordering: FunctionInvocationLayer before ChatTelemetryLayer This ensures each inner LLM call gets its own telemetry span, resulting in the correct span sequence: chat -> execute_tool -> chat Updated all production clients and test mocks to use correct ordering: - ChatMiddlewareLayer (first) - FunctionInvocationLayer (second) - ChatTelemetryLayer (third) - BaseChatClient/Raw...Client (fourth) * Remove run_stream usage * Fix conversation_id propagation * Python: Add BaseAgent implementation for Claude Agent SDK (#3509) * Added ClaudeAgent implementation * Updated streaming logic * Small updates * Small update * Fixes * Small fix * Naming improvements * Updated imports * Addressed comments * Updated package versions * Update Claude agent connector layering * fix test and plugin * Store function middleware in invocation layer * Fix telemetry streaming and ag-ui tests * Remove legacy ag-ui tests folder * updates * Remove terminate flag from FunctionInvocationContext, use MiddlewareTermination instead - Remove terminate attribute from FunctionInvocationContext - Add result attribute to MiddlewareTermination to carry function results - FunctionMiddlewarePipeline.execute() now lets MiddlewareTermination propagate - _auto_invoke_function captures context.result in exception before re-raising - _try_execute_function_calls catches MiddlewareTermination and sets should_terminate - Fix handoff middleware to append to chat_client.function_middleware directly - Update tests to use raise MiddlewareTermination instead of context.terminate - Add middleware flow documentation in samples/concepts/tools/README.md - Fix ag-ui to use FunctionMiddlewarePipeline instead of removed create_function_middleware_pipeline * fix: remove references to removed terminate flag in purview tests, add type ignore * fix: move _test_utils.py from package to test folder * fix: call get_final_response() to trigger context provider notification in streaming test * fix: correct broken links in tools README * docs: clarify default middleware behavior in summary table * fix: ensure inner stream result hooks are called when using map()/from_awaitable() * Fix mypy type errors * Address PR review comments on observability.py - Remove TODO comment about unconsumed streams, add explanatory note instead - Remove redundant _close_span cleanup hook (already called in _finalize_stream) - Clarify behavior: cleanup hooks run after stream iteration, if stream is not consumed the span remains open until garbage collected * Remove gen_ai.client.operation.duration from span attributes Duration is a metrics-only attribute per OpenTelemetry semantic conventions. It should be recorded to the histogram but not set as a span attribute. * Remove duration from _get_response_attributes, pass directly to _capture_response Duration is a metrics-only attribute. It's now passed directly to _capture_response instead of being included in the attributes dict that gets set on the span. * Remove redundant _close_span cleanup hook in AgentTelemetryLayer _finalize_stream already calls _close_span() in its finally block, so adding it as a separate cleanup hook is redundant. * Use weakref.finalize to close span when stream is garbage collected If a user creates a streaming response but never consumes it, the cleanup hooks won't run. Now we register a weak reference finalizer that will close the span when the stream object is garbage collected, ensuring spans don't leak in this scenario. * Fix _get_finalizers_from_stream to use _result_hooks attribute Renamed function to _get_result_hooks_from_stream and fixed it to look for the _result_hooks attribute which is the correct name in ResponseStream class. * Add missing asyncio import in test_request_info_mixin.py * Fix leftover merge conflict marker in image_generation sample * Update integration tests * Fix integration tests: increase max_iterations from 1 to 2 Tests with tool_choice options require at least 2 iterations: 1. First iteration to get function call and execute the tool 2. Second iteration to get the final text response With max_iterations=1, streaming tests would return early with only the function call/result but no final text content. * Fix duplicate function call error in conversation-based APIs When using conversation_id (for Responses/Assistants APIs), the server already has the function call message from the previous response. We should only send the new function result message, not all messages including the function call which would cause a duplicate ID error. Fix: When conversation_id is set, only send the last message (the tool result) instead of all response.messages. * Add regression test for conversation_id propagation between tool iterations Port test from PR #3664 with updates for new streaming API pattern. Tests that conversation_id is properly updated in options dict during function invocation loop iterations. * Fix tool_choice=required to return after tool execution When tool_choice is 'required', the user's intent is to force exactly one tool call. After the tool executes, return immediately with the function call and result - don't continue to call the model again. This fixes integration tests that were failing with empty text responses because with tool_choice=required, the model would keep returning function calls instead of text. Also adds regression tests for: - conversation_id propagation between tool iterations (from PR #3664) - tool_choice=required returns after tool execution * Document tool_choice behavior in tools README - Add table explaining tool_choice values (auto, none, required) - Explain why tool_choice=required returns immediately after tool execution - Add code example showing the difference between required and auto - Update flow diagram to show the early return path for tool_choice=required * Fix tool_choice=None behavior - don't default to 'auto' Remove the hardcoded default of 'auto' for tool_choice in ChatAgent init. When tool_choice is not specified (None), it will now not be sent to the API, allowing the API's default behavior to be used. Users who want tool_choice='auto' can still explicitly set it either in default_options or at runtime. Fixes #3585 * Fix tool_choice=none should not remove tools In OpenAI Assistants client, tools were not being sent when tool_choice='none'. This was incorrect - tool_choice='none' means the model won't call tools, but tools should still be available in the request (they may be used later in the conversation). Fixes #3585 * Add test for tool_choice=none preserving tools Adds a regression test to ensure that when tool_choice='none' is set but tools are provided, the tools are still sent to the API. This verifies the fix for #3585. * Fix tool_choice=none should not remove tools in all clients Apply the same fix to OpenAI Responses client and Azure AI client: - OpenAI Responses: Remove else block that popped tool_choice/parallel_tool_calls - Azure AI: Remove tool_choice != 'none' check when adding tools When tool_choice='none', the model won't call tools, but tools should still be sent to the API so they're available for future turns. Also update README to clarify tool_choice=required supports multiple tools. Fixes #3585 * Keep tool_choice even when tools is None Move tool_choice processing outside of the 'if tools' block in OpenAI Responses client so tool_choice is sent to the API even when no tools are provided. * Update test to match new parallel_tool_calls behavior Changed test_prepare_options_removes_parallel_tool_calls_when_no_tools to test_prepare_options_preserves_parallel_tool_calls_when_no_tools to reflect that parallel_tool_calls is now preserved even when no tools are present, consistent with the tool_choice behavior. * Fix ChatMessage API and Role enum usage after rebase - Update ChatMessage instantiation to use keyword args (role=, text=, contents=) - Fix Role enum comparisons to use .value for string comparison - Add created_at to AgentResponse in error handling - Fix AgentResponse.from_updates -> from_agent_run_response_updates - Fix DurableAgentStateMessage.from_chat_message to convert Role enum to string - Add Role import where needed * Fix additional ChatMessage API and method name changes - Fix ChatMessage usage in workflow files (use text= instead of contents= for strings) - Fix AgentResponse.from_updates -> from_agent_run_response_updates in workflow files - Fix test files for ChatMessage and Role enum usage * Fix remaining ChatMessage API usage in test files * Fix more ChatMessage and Role API changes in source and test files - Fix ChatMessage in _magentic.py replan method - Fix Role enum comparison in test assertions - Fix remaining test files with old ChatMessage syntax * Fix ChatMessage and Role API changes across packages - Add Role import where missing - Fix ChatMessage signature: positional args to keyword args (role=, text=, contents=) - Fix Role enum comparisons: .role.value instead of .role string - Fix FinishReason enum usage in ag-ui event converters - Rename AgentResponse.from_updates to from_agent_run_response_updates in ag-ui Fixes API compatibility after Types API Review improvements merge * Fix ChatMessage and Role API changes in github_copilot tests * Fix ChatMessage and Role API changes in redis and github_copilot packages - Fix redis provider: Role enum comparison using .value - Fix redis tests: ChatMessage signature and Role comparisons - Fix github_copilot tests: ChatMessage signature and Role comparisons - Update docstring examples in redis chat message store * Fix ChatMessage and Role API changes in devui package - Fix executor: ChatMessage signature change - Fix conversations: Role enum to string conversion in two places - Fix tests: ChatMessage signatures and Role comparisons * Fix ChatMessage and Role API changes in a2a and lab packages - Fix a2a tests: Role comparisons and ChatMessage signatures - Fix lab tau2 source: Role enum comparison in flip_messages, log_messages, sliding_window - Fix lab tau2 tests: ChatMessage signatures and Role comparisons * Remove duplicate test files from ag-ui/tests (tests are in ag_ui_tests) * Fix ChatMessage and Role API changes across packages After rebasing on upstream/main which merged PR #3647 (Types API Review improvements), fix all packages to use the new API: - ChatMessage: Use keyword args (role=, text=, contents=) instead of positional args - Role: Compare using .value attribute since it's now an enum Packages fixed: - ag-ui: Fixed Role value extraction bugs in _message_adapters.py - anthropic: Fixed ChatMessage and Role comparisons in tests - azure-ai: Fixed Role comparison in _client.py - azure-ai-search: Fixed ChatMessage and Role in source/tests - bedrock: Fixed ChatMessage signatures in tests - chatkit: Fixed ChatMessage and Role in source/tests - copilotstudio: Fixed ChatMessage and Role in tests - declarative: Fixed ChatMessage in _executors_agents.py - mem0: Fixed ChatMessage and Role in source/tests - purview: Fixed ChatMessage in source/tests * Fix mypy errors for ChatMessage and Role API changes - durabletask: Use str() fallback in role value extraction - core: Fix ChatMessage in _orchestrator_helpers.py to use keyword args - core: Add type ignore for _conversation_state.py contents deserialization - ag-ui: Fix type ignore comments (call-overload instead of arg-type) - azure-ai-search: Fix get_role_value type hint to accept Any - lab: Move get_role_value to module level with Any type hint * Improve CI test timeout configuration - Increase job timeout from 10 to 15 minutes - Reduce per-test timeout to 60s (was 900s/300s) - Add --timeout_method thread for better timeout handling - Add --timeout-verbose to see which tests are slow - Reduce retries from 3 to 2 and delay from 10s to 5s This ensures individual test timeouts are shorter than the job timeout, providing better visibility when tests hang. With 60s timeout and 2 retries, worst case per test is ~180s. * Fix ChatMessage API usage in docstrings and source - Fix ChatMessage positional args in docstrings: _serialization.py, _threads.py, _middleware.py - Fix ChatMessage in tau2 runner.py - Fix role comparison in _orchestrator_helpers.py to use .value - Fix role comparison in _group_chat.py docstring example - Fix role assertions in test_durable_entities.py to use .value * Revert tool_choice/parallel_tool_calls changes - must be removed when no tools OpenAI API requires tool_choice and parallel_tool_calls to only be present when tools are specified. Restored the logic that removes these options when there are no tools. - Restored check in _chat_client.py to remove tool_choice and parallel_tool_calls when no tools present - Restored same logic in _responses_client.py - Reverted test to expect the correct behavior * fixed issue in tests * fix: resolve merge conflict markers in ag-ui tests * fix: restructure ag-ui tests and fix Role/FinishReason to use string types * fix: streaming function invocation and middleware termination - Refactor streaming function invocation to use get_final_response() on inner streams - Fix MiddlewareTermination to accept result parameter for passing results - Fix _AutoHandoffMiddleware to use MiddlewareTermination instead of context.terminate - Fix AgentMiddlewareLayer.run() to properly forward function/chat middleware - Remove duplicate middleware registration in AgentMiddlewareLayer.__init__ - Fix exception handling in _auto_invoke_function to properly capture termination - Fix mypy errors in core package - Update tests to use stream=True parameter for unified run API * fix all tests command * Refactor integration tests to use pytest fixtures - Merge testutils.py into conftest.py for azurefunctions integration tests - Merge dt_testutils.py into conftest.py for durabletask integration tests - Convert all integration tests to use fixtures instead of direct imports (fixes ModuleNotFoundError with --import-mode=importlib) - Add sample_helper fixture for azurefunctions tests - Add agent_client_factory and orchestration_helper fixtures for durabletask - Integration tests now skip with descriptive messages when services unavailable - Restructure devui tests into tests/devui/ with proper conftest.py - Add test organization guidelines to CODING_STANDARD.md - Remove __init__.py from test directories per pytest best practices * Fix pytest_collection_modifyitems to only skip integration tests The hook was skipping all tests in the test session, not just integration tests. Now it only skips items in the integration_tests directory. * Fix mem0 tests failing on Python 3.13 Use patch.object on the imported module instead of @patch with string path to ensure the mock takes effect regardless of import timing. * fix mem0 * another attempt for mem0 * fix for mem0 * fix mem0 * Increase worker initialization wait time in durabletask tests Increase from 2 to 8 seconds to allow time for: - Python startup and module imports - Azure OpenAI client creation - Agent registration with DTS worker - Worker connection to DTS This helps prevent test failures in CI where the first tests may run before the worker is fully ready to process requests. * Fix streaming test to use ResponseStream with finalizer The _consume_stream method now expects a ResponseStream that can provide a final AgentResponse via get_final_response(). Update the test to use ResponseStream with AgentResponse.from_updates as the finalizer. * Fix MockToolCallingAgent to use new ResponseStream API and update samples * small updates to run_stream to run * fix sub workflow * temp fix for az func test --------- Co-authored-by: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com>
610 lines
25 KiB
Python
610 lines
25 KiB
Python
# Copyright (c) Microsoft. All rights reserved.
|
|
|
|
"""Tests for Purview client."""
|
|
|
|
from collections.abc import AsyncGenerator
|
|
from unittest.mock import AsyncMock, MagicMock, patch
|
|
|
|
import httpx
|
|
import pytest
|
|
from azure.core.credentials import AccessToken
|
|
|
|
from agent_framework_purview import PurviewSettings
|
|
from agent_framework_purview._client import PurviewClient
|
|
from agent_framework_purview._exceptions import (
|
|
PurviewAuthenticationError,
|
|
PurviewPaymentRequiredError,
|
|
PurviewRateLimitError,
|
|
PurviewRequestError,
|
|
PurviewServiceError,
|
|
)
|
|
from agent_framework_purview._models import (
|
|
ContentActivitiesRequest,
|
|
ContentActivitiesResponse,
|
|
PolicyLocation,
|
|
ProcessContentRequest,
|
|
ProtectionScopesRequest,
|
|
)
|
|
|
|
|
|
class TestPurviewClient:
|
|
"""Test PurviewClient functionality."""
|
|
|
|
@pytest.fixture
|
|
def mock_credential(self) -> MagicMock:
|
|
"""Create a mock async credential."""
|
|
from azure.core.credentials_async import AsyncTokenCredential
|
|
|
|
credential = MagicMock(spec=AsyncTokenCredential)
|
|
mock_token = AccessToken("fake-token", 9999999999)
|
|
|
|
async def mock_get_token(*args, **kwargs):
|
|
return mock_token
|
|
|
|
credential.get_token = mock_get_token
|
|
return credential
|
|
|
|
@pytest.fixture
|
|
def settings(self) -> PurviewSettings:
|
|
"""Create test settings."""
|
|
return PurviewSettings(app_name="Test App", tenant_id="test-tenant", default_user_id="test-user")
|
|
|
|
@pytest.fixture
|
|
async def client(
|
|
self, mock_credential: MagicMock, settings: PurviewSettings
|
|
) -> AsyncGenerator[PurviewClient, None]:
|
|
"""Create a PurviewClient with mock credential."""
|
|
client = PurviewClient(mock_credential, settings, timeout=10.0)
|
|
yield client
|
|
await client.close()
|
|
|
|
async def test_client_initialization(self, mock_credential: MagicMock, settings: PurviewSettings) -> None:
|
|
"""Test PurviewClient initialization."""
|
|
client = PurviewClient(mock_credential, settings)
|
|
|
|
assert client._credential == mock_credential
|
|
assert client._settings == settings
|
|
assert client._graph_uri == "https://graph.microsoft.com/v1.0"
|
|
assert client._timeout == 10.0
|
|
|
|
await client.close()
|
|
|
|
async def test_get_token_async_credential(self, client: PurviewClient, mock_credential: MagicMock) -> None:
|
|
"""Test _get_token with async credential."""
|
|
token = await client._get_token(tenant_id="test-tenant")
|
|
|
|
assert token == "fake-token"
|
|
|
|
async def test_get_token_sync_credential(self, settings: PurviewSettings) -> None:
|
|
"""Test _get_token with sync credential."""
|
|
sync_credential = MagicMock()
|
|
sync_credential.get_token = MagicMock(return_value=AccessToken("sync-token", 9999999999))
|
|
|
|
client = PurviewClient(sync_credential, settings)
|
|
|
|
with patch("asyncio.get_running_loop") as mock_loop:
|
|
mock_executor = AsyncMock()
|
|
mock_executor.return_value = AccessToken("sync-token", 9999999999)
|
|
mock_loop.return_value.run_in_executor = mock_executor
|
|
|
|
token = await client._get_token(tenant_id="test-tenant")
|
|
|
|
assert token == "sync-token"
|
|
|
|
await client.close()
|
|
|
|
async def test_get_user_info_from_token(self, client: PurviewClient) -> None:
|
|
"""Test get_user_info_from_token extracts user info."""
|
|
import base64
|
|
import json
|
|
|
|
payload = {"tid": "test-tenant", "oid": "test-user", "idtyp": "user"}
|
|
payload_str = json.dumps(payload)
|
|
payload_bytes = payload_str.encode("utf-8")
|
|
payload_b64 = base64.urlsafe_b64encode(payload_bytes).decode("utf-8").rstrip("=")
|
|
fake_token = f"header.{payload_b64}.signature"
|
|
|
|
with patch.object(client, "_get_token", return_value=fake_token):
|
|
user_info = await client.get_user_info_from_token(tenant_id="test-tenant")
|
|
|
|
assert user_info["tenant_id"] == "test-tenant"
|
|
assert user_info["user_id"] == "test-user"
|
|
|
|
@pytest.mark.parametrize(
|
|
"status_code,exception_type",
|
|
[
|
|
(401, PurviewAuthenticationError),
|
|
(403, PurviewAuthenticationError),
|
|
(429, PurviewRateLimitError),
|
|
(400, PurviewRequestError),
|
|
(404, PurviewRequestError),
|
|
(500, PurviewServiceError),
|
|
(502, PurviewServiceError),
|
|
],
|
|
)
|
|
async def test_post_error_handling(
|
|
self, client: PurviewClient, content_to_process_factory, status_code: int, exception_type: type[Exception]
|
|
) -> None:
|
|
"""Test _post method handles different HTTP errors correctly."""
|
|
from agent_framework_purview._models import ProcessContentResponse
|
|
|
|
content = content_to_process_factory()
|
|
request = ProcessContentRequest(
|
|
content_to_process=content,
|
|
user_id="user-123",
|
|
tenant_id="tenant-456",
|
|
)
|
|
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = status_code
|
|
mock_response.text = "Error message"
|
|
mock_response.raise_for_status.side_effect = httpx.HTTPStatusError(
|
|
"Error", request=MagicMock(), response=mock_response
|
|
)
|
|
|
|
with patch.object(client._client, "post", return_value=mock_response), pytest.raises(exception_type):
|
|
await client._post(
|
|
"https://graph.microsoft.com/v1.0/test",
|
|
request,
|
|
ProcessContentResponse,
|
|
"fake-token",
|
|
)
|
|
|
|
async def test_process_content_success(
|
|
self, client: PurviewClient, content_to_process_factory, mock_credential: MagicMock
|
|
) -> None:
|
|
"""Test process_content method success path."""
|
|
content = content_to_process_factory("Test message")
|
|
request = ProcessContentRequest(
|
|
content_to_process=content,
|
|
user_id="user-123",
|
|
tenant_id="tenant-456",
|
|
)
|
|
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 200
|
|
mock_response.headers = {}
|
|
mock_response.json.return_value = {"id": "response-123", "protectionScopeState": "notModified"}
|
|
|
|
with patch.object(client._client, "post", return_value=mock_response):
|
|
response = await client.process_content(request)
|
|
|
|
assert response.id == "response-123"
|
|
assert response.protection_scope_state == "notModified"
|
|
|
|
async def test_get_protection_scopes_success(self, client: PurviewClient) -> None:
|
|
"""Test get_protection_scopes method success path."""
|
|
location = PolicyLocation(**{"@odata.type": "microsoft.graph.policyLocationApplication", "value": "app-id"})
|
|
request = ProtectionScopesRequest(
|
|
user_id="user-123", tenant_id="tenant-456", locations=[location], correlation_id="corr-789"
|
|
)
|
|
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 200
|
|
mock_response.headers = {} # Add headers attribute
|
|
mock_response.json.return_value = {"scopeIdentifier": "scope-123", "value": []}
|
|
|
|
with patch.object(client._client, "post", return_value=mock_response):
|
|
response = await client.get_protection_scopes(request)
|
|
|
|
assert response.scope_identifier == "scope-123"
|
|
assert response.scopes == []
|
|
|
|
async def test_get_protection_scopes_uses_etag_header_when_present(self, client: PurviewClient) -> None:
|
|
"""Test that get_protection_scopes prefers the HTTP ETag header when present."""
|
|
from agent_framework_purview._models import ProtectionScopesResponse
|
|
|
|
location = PolicyLocation(**{"@odata.type": "microsoft.graph.policyLocationApplication", "value": "app-id"})
|
|
request = ProtectionScopesRequest(
|
|
user_id="user-123", tenant_id="tenant-456", locations=[location], correlation_id="corr-789"
|
|
)
|
|
|
|
response_obj = ProtectionScopesResponse(**{"scopeIdentifier": "scope-from-body", "value": []})
|
|
|
|
with patch.object(
|
|
client,
|
|
"_post",
|
|
return_value=(response_obj, {"etag": '"etag-from-header"'}),
|
|
):
|
|
response = await client.get_protection_scopes(request)
|
|
|
|
assert response.scope_identifier == "etag-from-header"
|
|
|
|
async def test_post_402_returns_empty_response_when_ignore_payment_required_enabled(
|
|
self, mock_credential: MagicMock
|
|
) -> None:
|
|
"""Test that 402 is suppressed when ignore_payment_required=True."""
|
|
from agent_framework_purview._models import ProcessContentResponse
|
|
|
|
settings = PurviewSettings(app_name="Test App", ignore_payment_required=True)
|
|
client = PurviewClient(mock_credential, settings)
|
|
|
|
request = ProcessContentRequest(user_id="user-123", tenant_id="tenant-456", content_to_process=[])
|
|
|
|
resp = httpx.Response(402, text="Payment required", request=httpx.Request("POST", "http://test"))
|
|
|
|
with patch.object(client._client, "post", return_value=resp):
|
|
result = await client._post("http://test", request, ProcessContentResponse, token="fake-token")
|
|
|
|
assert isinstance(result, ProcessContentResponse)
|
|
await client.close()
|
|
|
|
async def test_post_sets_request_and_response_correlation_id(self, client: PurviewClient) -> None:
|
|
"""Test that correlation_id is injected into request headers and hydrated from response headers."""
|
|
from agent_framework_purview._models import ProcessContentResponse
|
|
|
|
# correlation_id is optional and should be auto-generated when empty
|
|
request = ProcessContentRequest(user_id="user-123", tenant_id="tenant-456", content_to_process=[])
|
|
request.correlation_id = "" # force auto-generation branch
|
|
|
|
captured_headers: dict[str, str] = {}
|
|
|
|
async def fake_post(url: str, json=None, headers=None):
|
|
nonlocal captured_headers
|
|
captured_headers = dict(headers or {})
|
|
return httpx.Response(
|
|
200,
|
|
json={"id": "resp-1", "protectionScopeState": "notModified"},
|
|
headers={"client-request-id": "corr-from-response"},
|
|
request=httpx.Request("POST", url),
|
|
)
|
|
|
|
with patch.object(client._client, "post", side_effect=fake_post):
|
|
result_obj, result_headers = await client._post(
|
|
"http://test",
|
|
request,
|
|
ProcessContentResponse,
|
|
token="fake-token",
|
|
return_response=True,
|
|
)
|
|
|
|
assert "client-request-id" in captured_headers
|
|
assert captured_headers["client-request-id"]
|
|
assert result_headers["client-request-id"] == "corr-from-response"
|
|
assert result_obj.correlation_id == "corr-from-response"
|
|
|
|
async def test_process_content_402_returns_empty_when_ignored(self, mock_credential: MagicMock) -> None:
|
|
"""Test that process_content returns an empty response (non-tuple path) when 402 is ignored."""
|
|
from agent_framework_purview._models import ProcessContentResponse
|
|
|
|
settings = PurviewSettings(app_name="Test App", ignore_payment_required=True)
|
|
client = PurviewClient(mock_credential, settings)
|
|
|
|
req = ProcessContentRequest(user_id="user-123", tenant_id="tenant-456", content_to_process=[])
|
|
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 402
|
|
mock_response.text = "Payment required"
|
|
|
|
with patch.object(client._client, "post", return_value=mock_response):
|
|
response = await client.process_content(req)
|
|
|
|
assert isinstance(response, ProcessContentResponse)
|
|
await client.close()
|
|
|
|
async def test_post_sets_correlation_id_attribute_on_recording_span(self, client: PurviewClient) -> None:
|
|
"""Test that correlation_id is added to the active span when recording is enabled."""
|
|
from agent_framework_purview._models import ProcessContentResponse
|
|
|
|
request = ProcessContentRequest(user_id="user-123", tenant_id="tenant-456", content_to_process=[])
|
|
request.correlation_id = "corr-123"
|
|
|
|
class RecordingSpan:
|
|
def __init__(self) -> None:
|
|
self.attributes: dict[str, str] = {}
|
|
|
|
def is_recording(self) -> bool:
|
|
return True
|
|
|
|
def set_attribute(self, key: str, value: str) -> None:
|
|
self.attributes[key] = value
|
|
|
|
span = RecordingSpan()
|
|
|
|
with (
|
|
patch("agent_framework_purview._client.trace.get_current_span", return_value=span),
|
|
patch.object(
|
|
client._client,
|
|
"post",
|
|
return_value=httpx.Response(
|
|
200,
|
|
json={"id": "resp-1", "protectionScopeState": "notModified"},
|
|
headers={},
|
|
request=httpx.Request("POST", "http://test"),
|
|
),
|
|
),
|
|
):
|
|
await client._post("http://test", request, ProcessContentResponse, token="fake-token")
|
|
|
|
assert span.attributes["correlation_id"] == "corr-123"
|
|
|
|
async def test_post_uses_constructor_when_response_type_has_no_model_validate(self, client: PurviewClient) -> None:
|
|
"""Test that _post falls back to the response type constructor when model_validate is absent."""
|
|
|
|
class DummyResponse:
|
|
def __init__(self, **data):
|
|
self.data = data
|
|
|
|
request = ProcessContentRequest(user_id="user-123", tenant_id="tenant-456", content_to_process=[])
|
|
request.correlation_id = "corr-123"
|
|
|
|
with patch.object(
|
|
client._client,
|
|
"post",
|
|
return_value=httpx.Response(
|
|
200,
|
|
json={"hello": "world"},
|
|
headers={},
|
|
request=httpx.Request("POST", "http://test"),
|
|
),
|
|
):
|
|
result = await client._post("http://test", request, DummyResponse, token="fake-token")
|
|
|
|
assert isinstance(result, DummyResponse)
|
|
assert result.data == {"hello": "world"}
|
|
|
|
async def test_send_content_activities_success(self, client: PurviewClient, content_to_process_factory) -> None:
|
|
"""Test send_content_activities success path."""
|
|
request = ContentActivitiesRequest(
|
|
user_id="user-123",
|
|
tenant_id="tenant-456",
|
|
content_to_process=content_to_process_factory("hello"),
|
|
correlation_id="corr-1",
|
|
)
|
|
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 200
|
|
mock_response.headers = {}
|
|
mock_response.json.return_value = {"error": None}
|
|
|
|
with patch.object(client._client, "post", return_value=mock_response):
|
|
resp = await client.send_content_activities(request)
|
|
|
|
assert isinstance(resp, ContentActivitiesResponse)
|
|
|
|
async def test_post_handles_invalid_json_response_body(self, client: PurviewClient) -> None:
|
|
"""Test that invalid JSON bodies fall back to an empty dict."""
|
|
request = ProcessContentRequest(user_id="user-123", tenant_id="tenant-456", content_to_process=[])
|
|
request.correlation_id = "corr-123"
|
|
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 200
|
|
mock_response.headers = {}
|
|
mock_response.json.side_effect = ValueError("not json")
|
|
|
|
with patch.object(client._client, "post", return_value=mock_response):
|
|
result = await client._post("http://test", request, ContentActivitiesResponse, token="fake-token")
|
|
|
|
assert isinstance(result, ContentActivitiesResponse)
|
|
|
|
async def test_post_deserialization_failure_raises_purview_service_error(self, client: PurviewClient) -> None:
|
|
"""Test that response deserialization errors are wrapped as PurviewServiceError."""
|
|
|
|
class BadResponseType:
|
|
@classmethod
|
|
def model_validate(cls, value):
|
|
raise RuntimeError("boom")
|
|
|
|
request = ProcessContentRequest(user_id="user-123", tenant_id="tenant-456", content_to_process=[])
|
|
request.correlation_id = "corr-123"
|
|
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 200
|
|
mock_response.headers = {}
|
|
mock_response.json.return_value = {"any": "data"}
|
|
|
|
with (
|
|
patch.object(client._client, "post", return_value=mock_response),
|
|
pytest.raises(PurviewServiceError, match="Failed to deserialize Purview response"),
|
|
):
|
|
await client._post("http://test", request, BadResponseType, token="fake-token")
|
|
|
|
async def test_client_close(self, mock_credential: AsyncMock, settings: PurviewSettings) -> None:
|
|
"""Test client properly closes HTTP client."""
|
|
client = PurviewClient(mock_credential, settings)
|
|
|
|
with patch.object(client._client, "aclose", new_callable=AsyncMock) as mock_close:
|
|
await client.close()
|
|
mock_close.assert_called_once()
|
|
|
|
async def test_invalid_jwt_token_format(self, client: PurviewClient) -> None:
|
|
"""Test that invalid JWT token format raises ValueError."""
|
|
with pytest.raises(ValueError, match="Invalid JWT token format"):
|
|
client._extract_token_info("invalid-token-without-dots")
|
|
|
|
async def test_rate_limit_error(self, client: PurviewClient) -> None:
|
|
"""Test that 429 status code raises PurviewRateLimitError."""
|
|
request = ProcessContentRequest(
|
|
user_id="test-user",
|
|
tenant_id="test-tenant",
|
|
content_to_process=[],
|
|
correlation_id="test-correlation-id",
|
|
)
|
|
|
|
with (
|
|
patch.object(client, "_get_token", return_value="fake-token"),
|
|
patch.object(
|
|
client._client,
|
|
"post",
|
|
return_value=httpx.Response(429, text="Rate limited", request=httpx.Request("POST", "http://test")),
|
|
),
|
|
pytest.raises(PurviewRateLimitError, match="Rate limited"),
|
|
):
|
|
await client.process_content(request)
|
|
|
|
async def test_generic_request_error(self, client: PurviewClient) -> None:
|
|
"""Test that non-200/201/202 status codes raise PurviewRequestError."""
|
|
request = ProcessContentRequest(
|
|
user_id="test-user",
|
|
tenant_id="test-tenant",
|
|
content_to_process=[],
|
|
correlation_id="test-correlation-id",
|
|
)
|
|
|
|
with (
|
|
patch.object(client, "_get_token", return_value="fake-token"),
|
|
patch.object(
|
|
client._client,
|
|
"post",
|
|
return_value=httpx.Response(
|
|
500, text="Internal server error", request=httpx.Request("POST", "http://test")
|
|
),
|
|
),
|
|
pytest.raises(PurviewRequestError, match="Purview request failed"),
|
|
):
|
|
await client.process_content(request)
|
|
|
|
async def test_prefer_header_sent_when_process_inline_true(
|
|
self, client: PurviewClient, content_to_process_factory
|
|
) -> None:
|
|
"""Test that Prefer: evaluateInline header is sent when process_inline is True."""
|
|
content = content_to_process_factory()
|
|
request = ProcessContentRequest(
|
|
content_to_process=content,
|
|
user_id="user-123",
|
|
tenant_id="tenant-456",
|
|
process_inline=True,
|
|
)
|
|
|
|
posted_headers = {}
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 200
|
|
mock_response.headers = {}
|
|
mock_response.json.return_value = {}
|
|
|
|
async def capture_post(url, json, headers):
|
|
posted_headers.update(headers)
|
|
return mock_response
|
|
|
|
with patch.object(client._client, "post", side_effect=capture_post):
|
|
await client.process_content(request)
|
|
|
|
assert "Prefer" in posted_headers
|
|
assert posted_headers["Prefer"] == "evaluateInline"
|
|
|
|
async def test_prefer_header_not_sent_when_process_inline_false(
|
|
self, client: PurviewClient, content_to_process_factory
|
|
) -> None:
|
|
"""Test that Prefer header is not sent when process_inline is False."""
|
|
content = content_to_process_factory()
|
|
request = ProcessContentRequest(
|
|
content_to_process=content,
|
|
user_id="user-123",
|
|
tenant_id="tenant-456",
|
|
process_inline=False,
|
|
)
|
|
|
|
posted_headers = {}
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 200
|
|
mock_response.headers = {}
|
|
mock_response.json.return_value = {}
|
|
|
|
async def capture_post(url, json, headers):
|
|
posted_headers.update(headers)
|
|
return mock_response
|
|
|
|
with patch.object(client._client, "post", side_effect=capture_post):
|
|
await client.process_content(request)
|
|
|
|
assert "Prefer" not in posted_headers
|
|
|
|
async def test_prefer_header_not_sent_when_process_inline_none(
|
|
self, client: PurviewClient, content_to_process_factory
|
|
) -> None:
|
|
"""Test that Prefer header is not sent when process_inline is None."""
|
|
content = content_to_process_factory()
|
|
request = ProcessContentRequest(
|
|
content_to_process=content,
|
|
user_id="user-123",
|
|
tenant_id="tenant-456",
|
|
process_inline=None,
|
|
)
|
|
|
|
posted_headers = {}
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 200
|
|
mock_response.headers = {}
|
|
mock_response.json.return_value = {}
|
|
|
|
async def capture_post(url, json, headers):
|
|
posted_headers.update(headers)
|
|
return mock_response
|
|
|
|
with patch.object(client._client, "post", side_effect=capture_post):
|
|
await client.process_content(request)
|
|
|
|
assert "Prefer" not in posted_headers
|
|
|
|
async def test_scope_identifier_extraction_from_etag(self, client: PurviewClient) -> None:
|
|
"""Test that scope_identifier is extracted from ETag header."""
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 200
|
|
mock_response.headers = {"etag": '"test-scope-id"'}
|
|
mock_response.json.return_value = {"value": []}
|
|
|
|
with patch.object(client._client, "post", return_value=mock_response):
|
|
req = ProtectionScopesRequest(user_id="user1", tenant_id="tenant1")
|
|
response = await client.get_protection_scopes(req)
|
|
|
|
assert response.scope_identifier == "test-scope-id"
|
|
|
|
async def test_scope_identifier_sent_as_if_none_match_header(
|
|
self, client: PurviewClient, content_to_process_factory
|
|
) -> None:
|
|
"""Test that scope_identifier is sent as If-None-Match header."""
|
|
content = content_to_process_factory()
|
|
request = ProcessContentRequest(
|
|
content_to_process=content,
|
|
user_id="user-123",
|
|
tenant_id="tenant-456",
|
|
scope_identifier="test-scope-id",
|
|
)
|
|
|
|
posted_headers = {}
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 200
|
|
mock_response.headers = {}
|
|
mock_response.json.return_value = {}
|
|
|
|
async def capture_post(url, json, headers):
|
|
posted_headers.update(headers)
|
|
return mock_response
|
|
|
|
with patch.object(client._client, "post", side_effect=capture_post):
|
|
await client.process_content(request)
|
|
|
|
assert "If-None-Match" in posted_headers
|
|
assert posted_headers["If-None-Match"] == "test-scope-id"
|
|
|
|
async def test_402_payment_required_raises_exception_by_default(self, client: PurviewClient) -> None:
|
|
"""Test that 402 raises exception when ignore_payment_required is False."""
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 402
|
|
mock_response.text = "Payment required"
|
|
|
|
with patch.object(client._client, "post", return_value=mock_response):
|
|
req = ProtectionScopesRequest(user_id="user1", tenant_id="tenant1")
|
|
|
|
with pytest.raises(PurviewPaymentRequiredError):
|
|
await client.get_protection_scopes(req)
|
|
|
|
async def test_402_payment_required_returns_empty_when_ignored(self, mock_credential: MagicMock) -> None:
|
|
"""Test that 402 returns empty response when ignore_payment_required is True."""
|
|
settings = PurviewSettings(app_name="Test App", ignore_payment_required=True)
|
|
client = PurviewClient(mock_credential, settings)
|
|
|
|
mock_response = MagicMock(spec=httpx.Response)
|
|
mock_response.status_code = 402
|
|
mock_response.text = "Payment required"
|
|
|
|
with patch.object(client._client, "post", return_value=mock_response):
|
|
req = ProtectionScopesRequest(user_id="user1", tenant_id="tenant1")
|
|
response = await client.get_protection_scopes(req)
|
|
|
|
# Should return empty response without raising
|
|
assert response is not None
|
|
assert response.scopes is None or response.scopes == []
|
|
|
|
await client.close()
|