Merge branch 'lusu/agentserver-core' into lusu/agentserver-langgraph

Author: lusu-msft

doc/dev/test_proxy_troubleshooting.md

@@ -275,6 +275,9 @@ To run recorded tests successfully when recorded values are inconsistent or rand
 proxy provides a `variables` API. This makes it possible for a test to record the values of variables that were used
 during recording and use the same values in playback mode without a sanitizer.
 
+Note that the recorded variables **must** have string values. For example, trying to record an integer value for a
+variable will cause a test proxy error.
+
 For example, imagine that a test uses a randomized `table_uuid` variable when creating resources. The same random value
 for `table_uuid` can be used in playback mode by using this `variables` API.
 
@@ -293,14 +296,14 @@ class TestExample(AzureRecordedTestCase):
     @recorded_by_proxy
     def test_example(self, **kwargs):
         # In live mode, variables is an empty dictionary
-        # In playback mode, the value of variables is {"table_uuid": "random-value"}
+        # In playback mode, the value of variables is {"current_time": "<previously recorded time>"}
         variables = kwargs.pop("variables", {})
 
-        # To fetch variable values, use the `setdefault` method to look for a key ("table_uuid")
-        # and set a real value for that key if it's not present ("random-value")
-        table_uuid = variables.setdefault("table_uuid", "random-value")
+        # To fetch variable values, use the `setdefault` method to look for a key ("current_time")
+        # and set a real value for that key if it's not present (str(time.time()))
+        # Note that time.time() is converted from a float to a string to record it properly
+        current_time = variables.setdefault("current_time", str(time.time()))
 
-        # use variables["table_uuid"] when using the table UUID throughout the test
         ...
 
         # return the variables at the end of the test to record them

eng/pipelines/templates/steps/build-package-artifacts.yml

@@ -109,6 +109,7 @@ steps:
     condition: and(succeeded(), or(eq(variables['ENABLE_EXTENSION_BUILD'], 'true'), eq('${{ parameters.ArtifactSuffix }}', 'linux')))
 
   - script: |
+      sudo dpkg --configure -a
       sudo apt-get update
       sudo apt-get install -y qemu-user-static binfmt-support
       sudo update-binfmts --enable qemu-aarch64

eng/pipelines/templates/steps/install-portaudio.yml

@@ -1,6 +1,7 @@
 steps:
   - script: |
       if [[ "$AGENT_OS" == "Linux" ]]; then
+        sudo dpkg --configure -a
         sudo apt-get update
         sudo apt-get install -y portaudio19-dev libasound2-dev
       elif [[ "$AGENT_OS" == "Darwin" ]]; then

eng/tools/azure-sdk-tools/ci_tools/functions.py

@@ -57,7 +57,7 @@
 
 TEST_COMPATIBILITY_MAP = {
     "azure-ai-ml": ">=3.7",
-    "azure-ai-agentserver-core": ">=3.9", # override to allow build with python 3.9
+    "azure-ai-agentserver-core": ">=3.9",  # override to allow build with python 3.9
 }
 TEST_PYTHON_DISTRO_INCOMPATIBILITY_MAP = {
     "azure-storage-blob": "pypy",

eng/tools/azure-sdk-tools/devtools_testutils/proxy_testcase.py

@@ -114,32 +114,31 @@ def start_record_or_playback(test_id: str) -> "Tuple[str, Dict[str, str]]":
 
 
 def stop_record_or_playback(test_id: str, recording_id: str, test_variables: "Dict[str, str]") -> None:
-    try:
-        http_client = get_http_client()
-        if is_live():
-            http_client.request(
-                method="POST",
-                url=RECORDING_STOP_URL,
-                headers={
-                    "x-recording-file": test_id,
-                    "x-recording-id": recording_id,
-                    "x-recording-save": "true",
-                    "Content-Type": "application/json",
-                },
-                # tests don't record successfully unless test_variables is a dictionary
-                body=json.dumps(test_variables).encode("utf-8") if test_variables else "{}",
-            )
-        else:
-            http_client.request(
-                method="POST",
-                url=PLAYBACK_STOP_URL,
-                headers={"x-recording-id": recording_id},
-            )
-    except HTTPError as e:
+    http_client = get_http_client()
+    if is_live():
+        response = http_client.request(
+            method="POST",
+            url=RECORDING_STOP_URL,
+            headers={
+                "x-recording-file": test_id,
+                "x-recording-id": recording_id,
+                "x-recording-save": "true",
+                "Content-Type": "application/json",
+            },
+            # tests don't record successfully unless test_variables is a dictionary
+            body=json.dumps(test_variables or {}).encode("utf-8"),
+        )
+    else:
+        response = http_client.request(
+            method="POST",
+            url=PLAYBACK_STOP_URL,
+            headers={"x-recording-id": recording_id},
+        )
+    if response.status >= 400:
         raise HttpResponseError(
             "The test proxy ran into an error while ending the session. Make sure any test variables you record have "
-            "string values."
-        ) from e
+            f"string values. Full error details: {response.data}"
+        )
 
 
 def get_proxy_netloc() -> "Dict[str, str]":

sdk/ai/azure-ai-agentserver-core/MANIFEST.in

@@ -0,0 +1,8 @@
+include *.md
+include LICENSE
+recursive-include tests *.py
+recursive-include samples *.py *.md
+recursive-include doc *.rst *.md
+include azure/__init__.py
+include azure/ai/__init__.py
+include azure/ai/agentserver/__init__.py

sdk/ai/azure-ai-agentserver-core/azure/ai/agentserver/core/logger.py

@@ -1,4 +1,4 @@
-# pylint: disable=broad-exception-caught
+# pylint: disable=broad-exception-caught,dangerous-default-value
 # ---------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # ---------------------------------------------------------
@@ -52,9 +52,8 @@ def get_project_endpoint():
         account = parts[0]
         project = parts[1]
         return f"https://{account}.services.ai.azure.com/api/projects/{project}"
-    else:
-        print("environment variable AGENT_PROJECT_RESOURCE_ID not set.")
-        return None
+    print("environment variable AGENT_PROJECT_RESOURCE_ID not set.")
+    return None
 
 
 def get_application_insights_connstr():
@@ -97,6 +96,9 @@ def configure(log_config: dict = default_log_config):
     """
     Configure logging based on the provided configuration dictionary.
     The dictionary should contain the logging configuration in a format compatible with `logging.config.dictConfig`.
+
+    :param log_config: A dictionary containing logging configuration.
+    :type log_config: dict
     """
     try:
         config.dictConfig(log_config)
@@ -106,7 +108,6 @@ def configure(log_config: dict = default_log_config):
             os.environ.get(Constants.ENABLE_APPLICATION_INSIGHTS_LOGGER, "true").lower() == "true"
         )
         if application_insights_connection_string and enable_application_insights_logger:
-            from azure.monitor.opentelemetry.exporter import AzureMonitorLogExporter
             from opentelemetry._logs import set_logger_provider
             from opentelemetry.sdk._logs import (
                 LoggerProvider,
@@ -115,6 +116,8 @@ def configure(log_config: dict = default_log_config):
             from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
             from opentelemetry.sdk.resources import Resource
 
+            from azure.monitor.opentelemetry.exporter import AzureMonitorLogExporter
+
             logger_provider = LoggerProvider(resource=Resource.create({"service.name": "azure.ai.agentshosting"}))
             set_logger_provider(logger_provider)
 
@@ -135,7 +138,6 @@ def configure(log_config: dict = default_log_config):
 
     except Exception as e:
         print(f"Failed to configure logging: {e}")
-        pass
 
 
 def get_log_level():
@@ -147,8 +149,11 @@ def get_log_level():
     return log_level
 
 
-def get_logger():
+def get_logger() -> logging.Logger:
     """
     If the logger is not already configured, it will be initialized with default settings.
+
+    :return: Configured logger instance.
+    :rtype: logging.Logger
     """
     return logging.getLogger("azure.ai.agentshosting")

sdk/ai/azure-ai-agentserver-core/azure/ai/agentserver/core/models/openai/__init__.py

@@ -1,6 +1,16 @@
 # ---------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # ---------------------------------------------------------
+"""
+Re-exports of OpenAI SDK response types.
+
+This module re-exports types from the OpenAI SDK for convenience.
+These types are fully documented in the OpenAI SDK documentation.
+
+.. note::
+   This module re-exports OpenAI SDK types. For detailed documentation,
+   please refer to the `OpenAI Python SDK documentation <https://github.com/openai/openai-python>`_.
+"""
 from openai.types.responses import *  # pylint: disable=unused-wildcard-import
 
 __all__ = [name for name in globals() if not name.startswith("_")]  # type: ignore[var-annotated]

sdk/ai/azure-ai-agentserver-core/azure/ai/agentserver/core/models/projects/_enums.py

@@ -663,12 +663,12 @@ class ScheduleTaskType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
 class ServiceTier(str, Enum, metaclass=CaseInsensitiveEnumMeta):
     """Specifies the processing type used for serving the request.
     * If set to 'auto', then the request will be processed with the service tier configured in the
-          Project settings. Unless otherwise configured, the Project will use 'default'.
+      Project settings. Unless otherwise configured, the Project will use 'default'.
     * If set to 'default', then the request will be processed with the standard pricing and
-          performance for the selected model.
+      performance for the selected model.
     * If set to '[flex](/docs/guides/flex-processing)' or 'priority', then the request will be
-          processed with the corresponding service tier. [Contact
-          sales](https://openai.com/contact-sales) to learn more about Priority processing.
+      processed with the corresponding service tier. [Contact
+      sales](https://openai.com/contact-sales) to learn more about Priority processing.
     * When not set, the default behavior is 'auto'.
       When the ``service_tier`` parameter is set, the response body will include the
         ``service_tier`` value based on the processing mode actually used to serve the request. This