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,16 @@ 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"]
+- type: breakpoint

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

@@ -23,9 +23,10 @@ test:
     locale: en-US
 - type: assertion
   invokeResponse:
-    composeExtension:
-      type: result
-      text: ["CONTAINS", "Newtonsoft.Json"]
-      attachments:
-        contentType: application/vnd.microsoft.card.thumbnail
+    body:
+      composeExtension:
+        type: result
+        text: ["CONTAINS", "Newtonsoft.Json"]
+        attachments:
+          contentType: application/vnd.microsoft.card.thumbnail
 - type: skip

dev/integration/tests/basic_agent/test_basic_agent.py

@@ -5,11 +5,13 @@
     Integration,
 )
 
+TEST_BASIC_AGENT = True
 
 @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"
+    _config_path = "agents/basic_agent/python/.env"

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_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,8 @@
     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,
 }
 

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

@@ -24,7 +24,12 @@ def _check(
     assertion, assertion_type = _parse_assertion(baseline)
 
     if assertion_type is None:
+
         if isinstance(baseline, dict):
+
+            if actual is UNSET_FIELD:
+                actual = {}
+
             for key in baseline:
                 new_field_path = f"{field_path}.{key}" if field_path else key
                 new_actual = actual.get(key, UNSET_FIELD)
@@ -38,6 +43,10 @@ def _check(
             return True, None
 
         elif isinstance(baseline, list):
+
+            if actual is UNSET_FIELD:
+                actual = []
+
             for index, item in enumerate(baseline):
                 new_field_path = (
                     f"{field_path}[{index}]" if field_path else f"[{index}]"

dev/microsoft-agents-testing/microsoft_agents/testing/cli/samples/auth_sample.py

@@ -0,0 +1,39 @@
+import os
+
+from dotenv import load_dotenv
+
+from microsoft_agents.hosting.core import AgentApplication, TurnContext, TurnState
+
+from microsoft_agents.testing.integration.core.sample import Sample
+
+
+def create_auth_route(auth_handler_id: str, agent: AgentApplication):
+    def dynamic_function(context: TurnContext, state: TurnState):
+        token = await agent.auth.get_token(context, state, auth_handler_id)
+
+        return f"Hello from {auth_handler_id}! Token: {token}"
+
+    dynamic_function.__name__ = f"auth_route_{auth_handler_id}".lower()
+    return dynamic_function
+
+
+class QuickstartSample(Sample):
+    """A quickstart sample implementation."""
+
+    @classmethod
+    async def get_config(cls) -> dict:
+        """Retrieve the configuration for the sample."""
+        load_dotenv("./src/tests/.env")
+        return dict(os.environ)
+
+    async def init_app(self):
+        """Initialize the application for the quickstart sample."""
+
+        app: AgentApplication[TurnState] = self.env.agent_application
+
+        for auth_handler in app.config.authentication_handlers:
+            app.message(
+                auth_handler.name.lower(),
+                create_auth_route(auth_handler.name),
+                auth_handlers=[auth_handler.name],
+            )

dev/microsoft-agents-testing/microsoft_agents/testing/cli/test_auth.py

@@ -0,0 +1,5 @@
+import cli
+
+
+def test_auth():
+    pass

dev/microsoft-agents-testing/microsoft_agents/testing/cli/test_auth/auth_sample.py

@@ -0,0 +1,39 @@
+import os
+
+from dotenv import load_dotenv
+
+from microsoft_agents.hosting.core import AgentApplication, TurnContext, TurnState
+
+from microsoft_agents.testing.integration.core.sample import Sample
+
+
+def create_auth_route(auth_handler_id: str, agent: AgentApplication):
+    def dynamic_function(context: TurnContext, state: TurnState):
+        token = await agent.auth.get_token(context, state, auth_handler_id)
+
+        return f"Hello from {auth_handler_id}! Token: {token}"
+
+    dynamic_function.__name__ = f"auth_route_{auth_handler_id}".lower()
+    return dynamic_function
+
+
+class QuickstartSample(Sample):
+    """A quickstart sample implementation."""
+
+    @classmethod
+    async def get_config(cls) -> dict:
+        """Retrieve the configuration for the sample."""
+        load_dotenv("./src/tests/.env")
+        return dict(os.environ)
+
+    async def init_app(self):
+        """Initialize the application for the quickstart sample."""
+
+        app: AgentApplication[TurnState] = self.env.agent_application
+
+        for auth_handler in app.config.authentication_handlers:
+            app.message(
+                auth_handler.name.lower(),
+                create_auth_route(auth_handler.name),
+                auth_handlers=[auth_handler.name],
+            )

dev/microsoft-agents-testing/microsoft_agents/testing/cli/test_auth/command.py

@@ -0,0 +1,16 @@
+import click
+
+from .auth_sample import AuthSample
+
+from microsoft_agents.testing.utils import resolve_env
+from microsoft_agents.testing.core import AiohttpEnvironment
+
+@click.command()
+def auth_test():
+    """Run authentication sample test."""
+
+    environment = AiohttpEnvironment()
+    environment.setup()
+
+    sample = AuthSample()
+    sample.run(resolve_env)