merge fix

Author: w-javed

sdk/cosmos/azure-cosmos/azure/cosmos/_change_feed/change_feed_state.py

@@ -383,9 +383,7 @@ def from_initial_state(
 
         feed_range: Optional[FeedRangeInternal] = None
         if change_feed_state_context.get("feedRange"):
-            feed_range_str = base64.b64decode(change_feed_state_context["feedRange"]).decode('utf-8')
-            feed_range_json = json.loads(feed_range_str)
-            feed_range = FeedRangeInternalEpk.from_json(feed_range_json)
+            feed_range = FeedRangeInternalEpk.from_json(change_feed_state_context["feedRange"])
         elif change_feed_state_context.get("partitionKey"):
             if change_feed_state_context.get("partitionKeyFeedRange"):
                 feed_range =\

sdk/cosmos/azure-cosmos/azure/cosmos/aio/_container.py

@@ -23,7 +23,7 @@
 """
 import warnings
 from datetime import datetime
-from typing import Any, Dict, Mapping, Optional, Sequence, Type, Union, List, Tuple, cast, overload
+from typing import Any, Dict, Mapping, Optional, Sequence, Type, Union, List, Tuple, cast, overload, Iterable
 from typing_extensions import Literal
 
 from azure.core import MatchConditions
@@ -534,15 +534,15 @@ def query_items_change_feed(
     def query_items_change_feed(
             self,
             *,
-            feed_range: str,
+            feed_range: Dict[str, Any],
             max_item_count: Optional[int] = None,
             start_time: Optional[Union[datetime, Literal["Now", "Beginning"]]] = None,
             priority: Optional[Literal["High", "Low"]] = None,
             **kwargs: Any
     ) -> AsyncItemPaged[Dict[str, Any]]:
         """Get a sorted list of items that were changed, in the order in which they were modified.
 
-        :keyword str feed_range: The feed range that is used to define the scope.
+        :keyword Dict[str, Any] feed_range: The feed range that is used to define the scope.
         :keyword int max_item_count: Max number of items to be returned in the enumeration operation.
         :keyword start_time: The start time to start processing chang feed items.
             Beginning: Processing the change feed items from the beginning of the change feed.
@@ -620,7 +620,7 @@ def query_items_change_feed( # pylint: disable=unused-argument
         """Get a sorted list of items that were changed, in the order in which they were modified.
 
         :keyword str continuation: The continuation token retrieved from previous response.
-        :keyword str feed_range: The feed range that is used to define the scope.
+        :keyword Dict[str, Any] feed_range: The feed range that is used to define the scope.
         :keyword partition_key: The partition key that is used to define the scope
             (logical partition or a subset of a container)
         :type partition_key: Union[str, int, float, bool, List[Union[str, int, float, bool]]]
@@ -1296,13 +1296,17 @@ async def read_feed_ranges(
             *,
             force_refresh: Optional[bool] = False,
             **kwargs: Any
-    ) -> List[str]:
+    ) -> Iterable[Dict[str, Any]]:
         """ Obtains a list of feed ranges that can be used to parallelize feed operations.
 
         :keyword bool force_refresh:
             Flag to indicate whether obtain the list of feed ranges directly from cache or refresh the cache.
         :returns: A list representing the feed ranges in base64 encoded string
-        :rtype: List[str]
+        :rtype: Iterable[Dict[str, Any]]
+
+        .. note::
+          For each feed range, even through a Dict has been returned, but in the future, the structure may change.
+          Please just treat it as opaque and do not take any dependent on it.
 
         """
         if force_refresh is True:
@@ -1315,5 +1319,7 @@ async def read_feed_ranges(
                 [Range("", "FF", True, False)],
                 **kwargs)
 
-        return [FeedRangeInternalEpk(Range.PartitionKeyRangeToRange(partitionKeyRange)).__str__()
+        feed_ranges = [FeedRangeInternalEpk(Range.PartitionKeyRangeToRange(partitionKeyRange)).to_dict()
                 for partitionKeyRange in partition_key_ranges]
+
+        return (feed_range for feed_range in feed_ranges)

sdk/cosmos/azure-cosmos/azure/cosmos/container.py

@@ -23,7 +23,7 @@
 """
 import warnings
 from datetime import datetime
-from typing import Any, Dict, List, Optional, Sequence, Union, Tuple, Mapping, Type, cast, overload
+from typing import Any, Dict, List, Optional, Sequence, Union, Tuple, Mapping, Type, cast, overload, Iterable
 from typing_extensions import Literal
 
 from azure.core import MatchConditions
@@ -354,7 +354,7 @@ def query_items_change_feed(
     def query_items_change_feed(
             self,
             *,
-            feed_range: str,
+            feed_range: Dict[str, Any],
             max_item_count: Optional[int] = None,
             start_time: Optional[Union[datetime, Literal["Now", "Beginning"]]] = None,
             priority: Optional[Literal["High", "Low"]] = None,
@@ -363,7 +363,7 @@ def query_items_change_feed(
 
         """Get a sorted list of items that were changed, in the order in which they were modified.
 
-        :keyword str feed_range: The feed range that is used to define the scope.
+        :keyword Dict[str, Any] feed_range: The feed range that is used to define the scope.
         :keyword int max_item_count: Max number of items to be returned in the enumeration operation.
         :keyword start_time: The start time to start processing chang feed items.
             Beginning: Processing the change feed items from the beginning of the change feed.
@@ -440,7 +440,7 @@ def query_items_change_feed(
         """Get a sorted list of items that were changed, in the order in which they were modified.
 
         :keyword str continuation: The continuation token retrieved from previous response.
-        :keyword str feed_range: The feed range that is used to define the scope.
+        :keyword Dict[str, Any] feed_range: The feed range that is used to define the scope.
         :keyword partition_key: The partition key that is used to define the scope
             (logical partition or a subset of a container)
         :type partition_key: Union[str, int, float, bool, List[Union[str, int, float, bool]]]
@@ -1365,14 +1365,18 @@ def read_feed_ranges(
             self,
             *,
             force_refresh: Optional[bool] = False,
-            **kwargs: Any) -> List[str]:
+            **kwargs: Any) -> Iterable[Dict[str, Any]]:
 
         """ Obtains a list of feed ranges that can be used to parallelize feed operations.
 
         :keyword bool force_refresh:
             Flag to indicate whether obtain the list of feed ranges directly from cache or refresh the cache.
         :returns: A list representing the feed ranges in base64 encoded string
-        :rtype: List[str]
+        :rtype: Iterable[Dict[str, Any]]
+
+        .. note::
+          For each feed range, even through a Dict has been returned, but in the future, the structure may change.
+          Please just treat it as opaque and do not take any dependent on it.
 
         """
         if force_refresh is True:
@@ -1384,5 +1388,6 @@ def read_feed_ranges(
                 [Range("", "FF", True, False)], # default to full range
                 **kwargs)
 
-        return [FeedRangeInternalEpk(Range.PartitionKeyRangeToRange(partitionKeyRange)).__str__()
+        feed_ranges = [FeedRangeInternalEpk(Range.PartitionKeyRangeToRange(partitionKeyRange)).to_dict()
                 for partitionKeyRange in partition_key_ranges]
+        return (feed_range for feed_range in feed_ranges)

sdk/cosmos/azure-cosmos/samples/examples.py

@@ -259,12 +259,11 @@
 
 # Get the feed ranges list from container.
 # [START read_feed_ranges]
-container.read_feed_ranges()
+feed_ranges = list(container.read_feed_ranges())
 # [END read_feed_ranges]
 
 # Query a sorted list of items that were changed for one feed range
 # [START query_items_change_feed]
-feed_ranges = container.read_feed_ranges()
 for item in container.query_items_change_feed(feed_range=feed_ranges[0]):
     print(json.dumps(item, indent=True))
 # [END query_items_change_feed]

sdk/cosmos/azure-cosmos/samples/examples_async.py

@@ -265,14 +265,13 @@ async def examples_async():
 
         # Get the feed ranges list from container.
         # [START read_feed_ranges]
-        await container.read_feed_ranges()
+        feed_ranges = list(await container.read_feed_ranges())
         # [END read_feed_ranges]
 
         # Query a sorted list of items that were changed for one feed range.
         # The asynchronous client returns asynchronous iterators for its query methods;
         # as such, we iterate over it by using an async for loop
         # [START query_items_change_feed]
-        feed_ranges = await container.read_feed_ranges()
         async for item in container.query_items_change_feed(feed_range=feed_ranges[0]):
             print(json.dumps(item, indent=True))
         # [END query_items_change_feed]

sdk/cosmos/azure-cosmos/test/test_change_feed.py

@@ -38,7 +38,7 @@ class TestChangeFeed:
     def test_get_feed_ranges(self, setup):
         created_collection = setup["created_db"].create_container("get_feed_ranges_" + str(uuid.uuid4()),
                                                               PartitionKey(path="/pk"))
-        result = created_collection.read_feed_ranges()
+        result = list(created_collection.read_feed_ranges())
         assert len(result) == 1
 
     @pytest.mark.parametrize("change_feed_filter_param", ["partitionKey", "partitionKeyRangeId", "feedRange"])
@@ -56,7 +56,7 @@ def test_query_change_feed_with_different_filter(self, change_feed_filter_param,
         elif change_feed_filter_param == "partitionKeyRangeId":
             filter_param = {"partition_key_range_id": "0"}
         elif change_feed_filter_param == "feedRange":
-            feed_ranges = created_collection.read_feed_ranges()
+            feed_ranges = list(created_collection.read_feed_ranges())
             assert len(feed_ranges) == 1
             filter_param = {"feed_range": feed_ranges[0]}
         else:

sdk/cosmos/azure-cosmos/test/test_change_feed_async.py

@@ -42,7 +42,7 @@ class TestChangeFeedAsync:
     async def test_get_feed_ranges(self, setup):
         created_collection = await setup["created_db"].create_container("get_feed_ranges_" + str(uuid.uuid4()),
                                                               PartitionKey(path="/pk"))
-        result = await created_collection.read_feed_ranges()
+        result = list(await created_collection.read_feed_ranges())
         assert len(result) == 1
 
     @pytest.mark.parametrize("change_feed_filter_param", ["partitionKey", "partitionKeyRangeId", "feedRange"])
@@ -57,7 +57,7 @@ async def test_query_change_feed_with_different_filter_async(self, change_feed_f
         elif change_feed_filter_param == "partitionKeyRangeId":
             filter_param = {"partition_key_range_id": "0"}
         elif change_feed_filter_param == "feedRange":
-            feed_ranges = await created_collection.read_feed_ranges()
+            feed_ranges = list(await created_collection.read_feed_ranges())
             assert len(feed_ranges) == 1
             filter_param = {"feed_range": feed_ranges[0]}
         else:

sdk/evaluation/azure-ai-evaluation/CHANGELOG.md

@@ -3,6 +3,24 @@
 ## 1.0.0b5 (Unreleased)
 
 ### Features Added
+- Groundedness detection in Non Adversarial Simulator via query/context pairs
+```python
+import importlib.resources as pkg_resources
+package = "azure.ai.evaluation.simulator._data_sources"
+resource_name = "grounding.json"
+custom_simulator = Simulator(model_config=model_config)
+conversation_turns = []
+with pkg_resources.path(package, resource_name) as grounding_file:
+    with open(grounding_file, "r") as file:
+        data = json.load(file)
+for item in data:
+    conversation_turns.append([item])
+outputs = asyncio.run(custom_simulator(
+    target=callback,
+    conversation_turns=conversation_turns,
+    max_conversation_turns=1,
+))
+```
 - Adding evaluator for multimodal use cases
 
 ### Breaking Changes

sdk/evaluation/azure-ai-evaluation/MANIFEST.in

@@ -4,3 +4,4 @@ include azure/__init__.py
 include azure/ai/__init__.py
 include azure/ai/evaluation/py.typed
 recursive-include azure/ai/evaluation *.prompty
+include azure/ai/evaluation/simulator/_data_sources/grounding.json

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/simulator/_data_sources/__init__.py

@@ -0,0 +1,3 @@
+# ---------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# ---------------------------------------------------------