Integration package refinements

dev/integration/samples/__init__.py

@@ -1,7 +1,5 @@
-from .basic_sample import BasicSample
 from .quickstart_sample import QuickstartSample
 
 __all__ = [
-    "BasicSample",
     "QuickstartSample",
 ]

dev/integration/tests/basic_agent/directline/SendActivity_SendsHi5_Returns5HiActivities.yaml

@@ -14,6 +14,7 @@ test:
       name: Test Bot
     text: hi 5
     locale: en-US
+- skip
 - type: assertion
   quantifier: one
   activity:

dev/integration/tests/basic_agent/directline/SendActivity_SendsSeattleTodayWeather_ReturnsWeather.yaml

@@ -13,12 +13,12 @@ test:
       name: Bot
     text: 'w: What''s the weather in Seattle today?'
     locale: en-US
-- type: skip
 - type: assertion
   selector:
-    index: -1
+    activity:
+      attachments:
+        - contentType: application/vnd.microsoft.card.adaptive
   activity:
     type: message
     attachments:
-    - contentType: application/vnd.microsoft.card.adaptive
-      content: ["RE_MATCH", "(�|\\u00B0|Missing temperature inside adaptive card:)"]
+    - content: ["RE_MATCH", "(�|\\u00B0|Missing temperature inside adaptive card:)"]

dev/integration/tests/basic_agent/directline/SendActivity_SendsText_ReturnsPoem.yaml

@@ -13,16 +13,15 @@ test:
       name: Bot
     text: poem
     locale: en-US
-- type: skip
-# - type: assertion
-#   selector:
-#     activity:
-#       type: typing
-#   activity:
-#     text: ["CONTAINS", "Hold on for an awesome poem about Apollo"]
-# - type: assertion
-#   selector:
-#     index: -1
-#   activity:
-#     text: ["CONTAINS", "Apollo"]
-# - type: breakpoint
+- type: assertion
+  selector:
+    activity:
+      type: typing
+  quantifier: any
+  activity:
+    text: ["CONTAINS", "Hold on for an awesome poem about Apollo"]
+- type: assertion
+  selector:
+    index: -1
+  activity:
+    text: ["CONTAINS", "Apollo"]

dev/integration/tests/basic_agent/directline/SendExpectedRepliesActivity_SendsSeattleTodayWeather_ReturnsWeather.yaml

@@ -14,12 +14,12 @@ test:
       name: Bot
     text: 'w: What''s the weather in Seattle today?'''
     locale: en-US
-- type: skip
 - type: assertion
   selector:
-    index: -1
+    activity:
+      attachments:
+      - contentType: application/vnd.microsoft.card.adaptive
   activity:
     type: message
     attachments:
-    - contentType: application/vnd.microsoft.card.adaptive
       content: ["RE_MATCH", "(�|\\u00B0|Missing temperature inside adaptive card:)"]

dev/integration/tests/basic_agent/directline/SendInvoke_SelectItem_ReceiveItem.yaml

@@ -22,10 +22,12 @@ test:
     name: composeExtension/selectItem
     locale: en-US
 - type: assertion
-  invokeResponse:
-    composeExtension:
-      type: result
-      text: ["CONTAINS", "Newtonsoft.Json"]
-      attachments:
-        contentType: application/vnd.microsoft.card.thumbnail
-- type: skip
+  activity:
+    type: invoke_response
+    value:
+      body:
+        composeExtension:
+          type: result
+          text: ["CONTAINS", "Newtonsoft.Json"]
+          attachments:
+            contentType: application/vnd.microsoft.card.thumbnail

dev/integration/tests/basic_agent/directline/SendInvoke_SendBasicInvokeActivity_ReceiveInvokeResponse.yaml

@@ -30,9 +30,12 @@ test:
       parameters:
       - value: hi`
 - type: assertion
-  invokeResponse:
-    message: ["EQUALS", "Invoke received."]
-    status: 200
-    data:
-      parameters:
-      - value: ["CONTAINS", "hi"]
+  activity:
+    value:
+      body:
+        composeExtension:
+          message: ["EQUALS", "Invoke received."]
+          status: 200
+          data:
+            parameters:
+            - value: ["CONTAINS", "hi"]

dev/integration/tests/basic_agent/msteams/SendActivity_SendsText_ReturnsPoem.yaml

@@ -38,5 +38,4 @@ test:
   selector:
     index: -1
   activity:
-    text: ["CONTAINS", "Apollo"]
-- type: breakpoint
+    text: ["CONTAINS", "Apollo"]

dev/integration/tests/basic_agent/test_basic_agent.py

@@ -5,11 +5,16 @@
     Integration,
 )
 
+TEST_BASIC_AGENT = False
+
 
 @ddt("tests/basic_agent/directline", prefix="directline")
-@ddt("tests/basic_agent/webchat", prefix="webchat")
-@ddt("tests/basic_agent/msteams", prefix="msteams")
-class TestBasicAgent(Integration):
+# @ddt("tests/basic_agent/webchat", prefix="webchat")
+# @ddt("tests/basic_agent/msteams", prefix="msteams")
+@pytest.mark.skipif(
+    not TEST_BASIC_AGENT, reason="Skipping external agent tests for now."
+)
+class TestBasicAgentExternal(Integration):
     _agent_url = "http://localhost:3978/"
     _service_url = "http://localhost:8001/"
     _config_path = "agents/basic_agent/python/.env"

dev/integration/tests/quickstart/directline/conversation_update.yaml

@@ -33,4 +33,4 @@ test:
         type: message
     activity:
       type: message
-      text: ["CONTAINS", "Welcome to the empty agent!"]
+      text: ["CONTAINS", "Welcome"]

dev/integration/tests/quickstart/test_quickstart_sample.py

@@ -13,8 +13,3 @@
 class TestQuickstartDirectline(Integration):
     _sample_cls = QuickstartSample
     _environment_cls = AiohttpEnvironment
-
-
-@ddt("tests/quickstart/directline")
-@pytest.mark.skipif(True, reason="Skipping external agent tests for now.")
-class TestQuickstartExternalDirectline(Integration): ...

dev/integration/tests/test_copilot_client.py

@@ -0,0 +1,115 @@
+import pytest
+
+from typing import Awaitable, Callable, Iterable
+
+from aiohttp.web import Request, Response, Application, StreamResponse
+
+from microsoft_agents.activity import Activity
+
+from microsoft_agents.copilotstudio.client import (
+    CopilotClient,
+    ConnectionSettings,
+    PowerPlatformEnvironment,
+)
+
+from microsoft_agents.testing.integration.core import AiohttpRunner
+
+
+def mock_mcs_handler(activity: Activity) -> Callable[[Request], Awaitable[Response]]:
+    """Creates a mock handler for MCS endpoint returning the given activity."""
+
+    async def handler(request: Request) -> Response:
+        activity_data = activity.model_dump_json(exclude_unset=True)
+        return Response(body=activity_data)
+
+    return handler
+
+
+def mock_mcs_handler(
+    activities: Iterable[Activity],
+) -> Callable[[Request], Awaitable[StreamResponse]]:
+    """Creates a mock handler for MCS endpoint returning SSE-formatted activity."""
+
+    async def handler(request: Request) -> StreamResponse:
+        response = StreamResponse(status=200)
+        response.headers["Content-Type"] = "text/event-stream"
+        response.headers["x-ms-conversationid"] = "test-conv-id"
+        # response.headers['Content-Length'] = str(len(activity_data))
+        await response.prepare(request)
+
+        # Proper SSE format
+        for activity in activities:
+            activity_data = activity.model_dump_json(exclude_unset=True)
+            await response.write(b"event: activity\n")
+            await response.write(f"data: {activity_data}\n\n".encode("utf-8"))
+
+        await response.write_eof()
+        return response
+
+    return handler
+
+
+def mock_mcs_endpoint(
+    mocker, activities: Iterable[Activity], path: str, port: int
+) -> AiohttpRunner:
+    """Mock MCS responses for testing."""
+
+    PowerPlatformEnvironment.get_copilot_studio_connection_url = mocker.MagicMock(
+        return_value=f"http://localhost:{port}{path}"
+    )
+
+    app = Application()
+    app.router.add_post(path, mock_mcs_handler(activities))
+
+    return AiohttpRunner(app, port=port)
+
+
+@pytest.mark.asyncio
+async def test_start_conversation_and_ask_question_large_message(mocker):
+
+    activity = Activity(
+        type="message", text="*" * 1_000_000, conversation={"id": "conv-id"}
+    )
+
+    runner = mock_mcs_endpoint(mocker, [activity], "/mcs-endpoint", port=8081)
+
+    async with runner:
+        settings = ConnectionSettings("environment-id", "agent-id")
+        client = CopilotClient(settings=settings, token="test-token")
+
+        with pytest.raises(Exception, match="Chunk too big"):
+            async for conv_activity in client.start_conversation():
+                assert conv_activity.type == "message"
+
+        # with pytest.raises(Exception, match="Chunk too big"):
+        #     async for question_activity in client.ask_question("Hello!", "conv-id"):
+        #         assert question_activity.type == "message"
+
+
+def activity_generator(activity: Activity, n: int) -> Iterable[Activity]:
+    for i in range(n):
+        yield activity
+
+
+@pytest.mark.asyncio
+async def test_start_conversation_many(mocker):
+
+    activity = Activity(type="message", conversation={"id": "conv-id"})
+    activities = activity_generator(activity, 100_000)
+
+    runner = mock_mcs_endpoint(mocker, activities, "/mcs-endpoint", port=8081)
+
+    async with runner:
+        settings = ConnectionSettings("environment-id", "agent-id")
+        client = CopilotClient(settings=settings, token="test-token")
+
+        for i in range(100):
+            # try:
+            async for conv_activity in client.start_conversation():
+                assert conv_activity.type == "message"
+            # except Exception as e:
+            #     assert str(e) == "Chunk too big"
+
+        # with pytest.raises(Exception, match="Chunk too big"):
+        #     async for question_activity in client.ask_question("Hello!", "conv-id"):
+        #         assert question_activity.type == "message"

dev/integration/tests/test_expect_replies.py

@@ -1,5 +1,4 @@
 import pytest
-import logging
 
 from microsoft_agents.activity import Activity
 
@@ -9,20 +8,11 @@
     AiohttpEnvironment,
 )
 
-from ..samples import BasicSample
+from ..samples import QuickstartSample
 
 
-class BasicSampleWithLogging(BasicSample):
-
-    async def init_app(self):
-
-        logging.getLogger("microsoft_agents").setLevel(logging.DEBUG)
-
-        await super().init_app()
-
-
-class TestBasicDirectline(Integration):
-    _sample_cls = BasicSampleWithLogging
+class TestExpectReplies(Integration):
+    _sample_cls = QuickstartSample
     _environment_cls = AiohttpEnvironment
 
     @pytest.mark.asyncio
@@ -36,12 +26,12 @@ async def test_expect_replies_without_service_url(
             conversation={"id": "conv-id"},
             channel_id="test",
             from_property={"id": "from-id"},
-            to={"id": "to-id"},
+            recipient={"id": "to-id"},
             delivery_mode="expectReplies",
             locale="en-US",
         )
 
         res = await agent_client.send_expect_replies(activity)
 
-        breakpoint()
-        res = Activity.model_validate(res)
+        assert len(res) > 0
+        assert isinstance(res[0], Activity)

dev/microsoft-agents-testing/microsoft_agents/testing/__init__.py

@@ -5,7 +5,7 @@
 
 from .assertions import (
     ModelAssertion,
-    Selector,
+    ModelSelector,
     AssertionQuantifier,
     assert_model,
     assert_field,
@@ -31,6 +31,8 @@
     DataDrivenTest,
 )
 
+from .cli import cli
+
 __all__ = [
     "SDKConfig",
     "generate_token",
@@ -45,7 +47,7 @@
     "populate_activity",
     "get_host_and_port",
     "ModelAssertion",
-    "Selector",
+    "ModelSelector",
     "AssertionQuantifier",
     "assert_model",
     "assert_field",
@@ -56,4 +58,5 @@
     "FieldAssertionType",
     "ddt",
     "DataDrivenTest",
+    "cli",
 ]

dev/microsoft-agents-testing/microsoft_agents/testing/assertions/check_field.py

@@ -13,8 +13,10 @@
     or (a is UNSET_FIELD and b is not None),
     FieldAssertionType.GREATER_THAN: lambda a, b: a > b,
     FieldAssertionType.LESS_THAN: lambda a, b: a < b,
-    FieldAssertionType.CONTAINS: lambda a, b: b in a,
-    FieldAssertionType.NOT_CONTAINS: lambda a, b: b not in a,
+    FieldAssertionType.CONTAINS: lambda a, b: b in a if a is not UNSET_FIELD else False,
+    FieldAssertionType.NOT_CONTAINS: lambda a, b: (
+        b not in a if a is not UNSET_FIELD else True
+    ),
     FieldAssertionType.RE_MATCH: lambda a, b: re.match(b, a) is not None,
 }