Merge remote-tracking branch 'upstream/main'

Author: Xiting Zhang

eng/emitter-package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "dist/src/index.js",
   "dependencies": {
-    "@azure-tools/typespec-python": "0.51.2"
+    "@azure-tools/typespec-python": "0.52.0"
   },
   "devDependencies": {
     "@typespec/compiler": "^1.4.0",
@@ -17,7 +17,7 @@
     "@azure-tools/typespec-azure-resource-manager": "~0.60.0",
     "@azure-tools/typespec-autorest": "~0.60.0",
     "@azure-tools/typespec-azure-rulesets": "~0.60.0",
-    "@azure-tools/typespec-client-generator-core": "0.60.2",
+    "@azure-tools/typespec-client-generator-core": "~0.60.2",
     "@azure-tools/typespec-liftr-base": "0.10.0"
   }
 }

eng/emitter-package.json

@@ -76,6 +76,3 @@ pytyped = ["py.typed"]
 [tool.pytest.ini_options]
 asyncio_default_fixture_loop_scope = "function"
 asyncio_mode = "auto"
-
-[tool.azure-sdk-build]
-whl_no_aio = false

sdk/ai/azure-ai-voicelive/pyproject.toml

@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+- Fixed repeated import attempts of cchardet and chardet when charset_normalizer is used #43092
+
 ### Other Changes
 
 - Updated `BearerTokenCredentialPolicy` and `AsyncBearerTokenCredentialPolicy` to set the `enable_cae` parameter to `True` by default. This change enables Continuous Access Evaluation (CAE) for all token requests made through these policies.  #42941

sdk/core/azure-core/CHANGELOG.md

@@ -24,9 +24,12 @@
 #
 # --------------------------------------------------------------------------
 from __future__ import annotations
+from functools import cache
 import sys
 from typing import (
     Any,
+    Callable,
+    NoReturn,
     Optional,
     AsyncIterator as AsyncIteratorType,
     TYPE_CHECKING,
@@ -35,6 +38,7 @@
     Union,
     Type,
     MutableMapping,
+    Mapping,
 )
 from types import TracebackType
 from collections.abc import AsyncIterator
@@ -88,6 +92,31 @@
     class ConnectionTimeoutError(Exception): ...  # type: ignore[no-redef]
 
 
+@cache
+def _get_detect() -> Callable[[bytes], Mapping[str, Any]]:
+    try:
+        from cchardet import detect
+
+        return detect
+    except ImportError:  # pragma: no cover
+        try:
+            from chardet import detect
+
+            return detect
+        except ImportError:  # pragma: no cover
+            try:
+                from charset_normalizer import detect
+
+                return detect
+            except ImportError as e:  # pragma: no cover
+                charset_import_err = e
+
+                def error_detect(_: bytes) -> NoReturn:
+                    raise charset_import_err
+
+                return error_detect
+
+
 class AioHttpTransport(AsyncHttpTransport):
     """AioHttp HTTP sender implementation.
 
@@ -525,16 +554,7 @@ def text(self, encoding: Optional[str] = None) -> str:
             elif body is None:
                 raise RuntimeError("Cannot guess the encoding of a not yet read body")
             else:
-                try:
-                    import cchardet as chardet
-                except ImportError:  # pragma: no cover
-                    try:
-                        import chardet  # type: ignore
-                    except ImportError:  # pragma: no cover
-                        import charset_normalizer as chardet  # type: ignore[no-redef]
-                # While "detect" can return a dict of float, in this context this won't happen
-                # The cast is for pyright to be happy
-                encoding = cast(Optional[str], chardet.detect(body)["encoding"])
+                encoding = _get_detect()(body)["encoding"]
         if encoding == "utf-8" or encoding is None:
             encoding = "utf-8-sig"
 

sdk/core/azure-core/azure/core/pipeline/transport/_aiohttp.py

@@ -18,6 +18,7 @@
 
 from azure.ai.evaluation._common.math import list_mean_nan_safe, apply_transform_nan_safe
 from azure.ai.evaluation._common.utils import validate_azure_ai_project, is_onedp_project
+from azure.ai.evaluation._evaluators._common._base_eval import EvaluatorBase
 from azure.ai.evaluation._exceptions import ErrorBlame, ErrorCategory, ErrorTarget, EvaluationException
 
 from azure.ai.evaluation._aoai.aoai_grader import AzureOpenAIGrader
@@ -317,6 +318,9 @@ def _aggregate_metrics(df: pd.DataFrame, evaluators: Dict[str, Callable]) -> Dic
     # For rest of metrics, we will calculate mean
     df.drop(columns=handled_columns, inplace=True)
 
+    # Convert "not applicable" strings to None to allow proper numeric aggregation
+    df = df.replace(EvaluatorBase._NOT_APPLICABLE_RESULT, None)
+
     # NOTE: nan/None values don't count as as booleans, so boolean columns with
     # nan/None values won't have a mean produced from them.
     # This is different from label-based known evaluators, which have special handling.