Merge branch 'main' into feature-vector-search

microsoft · Oct 2, 2024 · 7710e36 · 7710e36
2 parents 2b94b08 + d8eee17
commit 7710e36
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/dotnet/Directory.Packages.props b/dotnet/Directory.Packages.props
@@ -38,7 +38,7 @@
     <PackageVersion Include="System.Memory.Data" Version="8.0.0" />
     <PackageVersion Include="System.Numerics.Tensors" Version="8.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.4" />
-    <PackageVersion Include="OllamaSharp" Version="3.0.1" />
+    <PackageVersion Include="OllamaSharp" Version="3.0.8" />
     <!-- Tokenizers -->
     <PackageVersion Include="Microsoft.ML.Tokenizers" Version="0.22.0-preview.24378.1" />
     <PackageVersion Include="Microsoft.DeepDev.TokenizerLib" Version="1.3.3" />

diff --git a/dotnet/samples/GettingStartedWithProcesses/README.md b/dotnet/samples/GettingStartedWithProcesses/README.md
@@ -21,8 +21,8 @@ The getting started with agents examples include:
 
 Example|Description
 ---|---
-[Step01_Processes](https://github.com/microsoft/semantic-kernel/blob/main/dotnet/samples/GettingStartedWithProcesses/Step01_Processes.cs)|How to create a simple process with a loop and a conditional exit
-[Step02_AccountOpening](https://github.com/microsoft/semantic-kernel/blob/main/dotnet/samples/GettingStartedWithProcesses/Step02_AccountOpening.cs)|Showcasing processes cycles, fan in, fan out for opening an account.
+[Step01_Processes](https://github.com/microsoft/semantic-kernel/blob/main/dotnet/samples/GettingStartedWithProcesses/Step01/Step01_Processes.cs)|How to create a simple process with a loop and a conditional exit
+[Step02_AccountOpening](https://github.com/microsoft/semantic-kernel/blob/main/dotnet/samples/GettingStartedWithProcesses/Step02/Step02_AccountOpening.cs)|Showcasing processes cycles, fan in, fan out for opening an account.
 
 ### Step01_Processes
 

diff --git a/python/pyproject.toml b/python/pyproject.toml
@@ -79,7 +79,7 @@ notebooks = [
     "ipykernel ~= 6.29"
 ]
 milvus = [
-    "pymilvus >= 2.3,<2.4",
+    "pymilvus >= 2.3,< 2.5",
     "milvus >= 2.3,<2.3.8; platform_system != 'Windows'"
 ]
 mistralai = [

diff --git a/python/semantic_kernel/contents/streaming_content_mixin.py b/python/semantic_kernel/contents/streaming_content_mixin.py
@@ -49,10 +49,11 @@ def _merge_items_lists(self, other_items: list[Any]) -> list[Any]:
                             new_item = item + other_item  # type: ignore
                             new_items_list[id] = new_item
                             added = True
-                        except (ValueError, ContentAdditionException):
-                            logger.warning("Could not add item %s to %s. Skipping...", other_item, item)
+                        except (ValueError, ContentAdditionException) as ex:
+                            logger.debug(f"Could not add item {other_item} to {item}.", exc_info=ex)
                             continue
                 if not added:
+                    logger.debug(f"Could not add item {other_item} to any item in the list. Adding it as a new item.")
                     new_items_list.append(other_item)
 
         return new_items_list