Revert "[MEDI] Remove collection key type workaround (#7010)"

This reverts commit a369be9.

Author: MackinnonBuck

eng/Versions.props

@@ -227,7 +227,7 @@
     <XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>
     <!-- MEVD is still part of the Semantic Kernel repo -->
     <MicrosoftExtensionsVectorDataAbstractionsVersion>9.7.0</MicrosoftExtensionsVectorDataAbstractionsVersion>
-    <MicrosoftSemanticKernelConnectorsVersion>1.67.0-preview</MicrosoftSemanticKernelConnectorsVersion>
+    <MicrosoftSemanticKernelConnectorsVersion>1.66.0-preview</MicrosoftSemanticKernelConnectorsVersion>
     <MarkdigSignedVersion>0.43.0</MarkdigSignedVersion>
   </PropertyGroup>
 </Project>

src/Libraries/Microsoft.Extensions.DataIngestion/Microsoft.Extensions.DataIngestion.csproj

@@ -29,9 +29,4 @@
     <PackageReference Include="System.Collections.Immutable" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <!-- Workaround https://github.com/microsoft/semantic-kernel/issues/13316 -->
-    <PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonVersion)" />
-  </ItemGroup>
-
 </Project>

src/Libraries/Microsoft.Extensions.DataIngestion/Writers/VectorStoreWriter.cs

@@ -26,6 +26,7 @@ public sealed class VectorStoreWriter<T> : IngestionChunkWriter<T>
     private readonly VectorStore _vectorStore;
     private readonly int _dimensionCount;
     private readonly VectorStoreWriterOptions _options;
+    private readonly bool _keysAreStrings;
 
     private VectorStoreCollection<object, Dictionary<string, object?>>? _vectorStoreCollection;
 
@@ -42,6 +43,12 @@ public VectorStoreWriter(VectorStore vectorStore, int dimensionCount, VectorStor
         _vectorStore = Throw.IfNull(vectorStore);
         _dimensionCount = Throw.IfLessThanOrEqual(dimensionCount, 0);
         _options = options ?? new VectorStoreWriterOptions();
+
+        // Not all vector store support string as the key type, examples:
+        // Qdrant: https://github.com/microsoft/semantic-kernel/blob/28ea2f4df872e8fd03ef0792ebc9e1989b4be0ee/dotnet/src/VectorData/Qdrant/QdrantCollection.cs#L104
+        // When https://github.com/microsoft/semantic-kernel/issues/13141 gets released,
+        // we need to remove this workaround.
+        _keysAreStrings = vectorStore.GetType().Name != "QdrantVectorStore";
     }
 
     /// <summary>
@@ -78,7 +85,7 @@ public override async Task WriteAsync(IAsyncEnumerable<IngestionChunk<T>> chunks
             var key = Guid.NewGuid();
             Dictionary<string, object?> record = new()
             {
-                [KeyName] = key,
+                [KeyName] = _keysAreStrings ? key.ToString() : key,
                 [ContentName] = chunk.Content,
                 [EmbeddingName] = chunk.Content,
                 [ContextName] = chunk.Context,
@@ -122,7 +129,7 @@ private VectorStoreCollectionDefinition GetVectorStoreRecordDefinition(Ingestion
         {
             Properties =
             {
-                new VectorStoreKeyProperty(KeyName, typeof(Guid)),
+                new VectorStoreKeyProperty(KeyName, _keysAreStrings ? typeof(string) : typeof(Guid)),
 
                 // By using T as the type here we allow the vector store
                 // to handle the conversion from T to the actual vector type it supports.