Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/dotnet-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ jobs:
- name: Build dotnet solutions
shell: bash
run: |
export SOLUTIONS=$(find ./dotnet/ -type f -name "*.slnx" | tr '\n' ' ')
export SOLUTIONS=$(find ./dotnet/ -type f -name "*.slnx" | grep -v "MEVD.slnx" | tr '\n' ' ')
for solution in $SOLUTIONS; do
dotnet build $solution -c ${{ matrix.configuration }} --warnaserror
done

- name: Package install check
shell: bash
run: |
export SOLUTIONS=$(find ./dotnet/ -type f -name "*.slnx" | tr '\n' ' ')
export SOLUTIONS=$(find ./dotnet/ -type f -name "*.slnx" | grep -v "MEVD.slnx" | tr '\n' ' ')
for solution in $SOLUTIONS; do
dotnet pack $solution -c ${{ matrix.configuration }} --no-build --no-restore --output ./artifacts
done
Expand All @@ -115,7 +115,7 @@ jobs:
- name: Run Unit Tests
shell: bash
run: |
export UT_PROJECTS=$(find ./dotnet -type f -name "*.UnitTests.csproj" | grep -v -E "(Experimental.Orchestration.Flow.UnitTests.csproj|Experimental.Assistants.UnitTests.csproj)" | tr '\n' ' ')
export UT_PROJECTS=$(find ./dotnet -type f -name "*.UnitTests.csproj" | grep -v -E "(Experimental.Orchestration.Flow.UnitTests.csproj|Experimental.Assistants.UnitTests.csproj)" | grep -v "test/VectorData/" | tr '\n' ' ')
for project in $UT_PROJECTS; do
dotnet test -c ${{ matrix.configuration }} $project --no-build -v Normal --logger trx --collect:"XPlat Code Coverage" --results-directory:"TestResults/Coverage/" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.ExcludeByAttribute=GeneratedCodeAttribute,CompilerGeneratedAttribute,ExcludeFromCodeCoverageAttribute
done
Expand Down
11 changes: 11 additions & 0 deletions dotnet/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.2.0" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Physical" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.VectorData.Abstractions" Version="10.1.0" />
<!-- Test -->
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Moq" Version="[4.18.4]" />
Expand Down Expand Up @@ -200,6 +201,16 @@
<PackageVersion Include="Testcontainers.Redis" Version="4.6.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.2" />
<PackageVersion Include="Qdrant.Client" Version="1.15.1" />
<!-- VectorData Dependencies -->
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureAISearch" Version="1.74.0-preview" />
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.CosmosMongoDB" Version="1.74.0-preview" />
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.CosmosNoSql" Version="1.74.0-preview" />
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.InMemory" Version="1.74.0-preview" />
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.PgVector" Version="1.74.0-preview" />
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.Pinecone" Version="1.74.0-preview" />
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.Qdrant" Version="1.74.0-preview" />
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.Redis" Version="1.74.0-preview" />
<PackageVersion Include="Microsoft.SemanticKernel.Connectors.Weaviate" Version="1.74.0-preview" />
<!-- Symbols -->
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<!-- Toolset -->
Expand Down
50 changes: 0 additions & 50 deletions dotnet/MEVD.slnf

This file was deleted.

66 changes: 66 additions & 0 deletions dotnet/MEVD.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<Solution>
<Folder Name="/Solution Items/">
<File Path="../.editorconfig" />
<File Path="../.github/workflows/dotnet-format.yml" />
<File Path="../.gitignore" />
<File Path="../nuget.config" />
<File Path="../README.md" />
<File Path="Directory.Build.props" />
<File Path="Directory.Build.targets" />
<File Path="Directory.Packages.props" />
<File Path="docs/EXPERIMENTS.md" />
<File Path="global.json" />
</Folder>
<Folder Name="/Solution Items/nuget/">
<File Path="nuget/icon.png" />
<File Path="nuget/nuget-package.props" />
<File Path="nuget/NUGET.md" />
<File Path="nuget/VECTORDATA-CONNECTORS-NUGET.md" />
</Folder>
<Folder Name="/src/" />
<Folder Name="/src/VectorData/">
<File Path="src/VectorData/Directory.Build.props" />
<Project Path="src/VectorData/AzureAISearch/AzureAISearch.csproj" />
<Project Path="src/VectorData/Chroma/Chroma.csproj" />
<Project Path="src/VectorData/CosmosMongoDB/CosmosMongoDB.csproj" />
<Project Path="src/VectorData/CosmosNoSql/CosmosNoSql.csproj" />
<Project Path="src/VectorData/InMemory/InMemory.csproj" />
<Project Path="src/VectorData/Milvus/Milvus.csproj" />
<Project Path="src/VectorData/MongoDB/MongoDB.csproj" />
<Project Path="src/VectorData/PgVector/PgVector.csproj" />
<Project Path="src/VectorData/Pinecone/Pinecone.csproj" />
<Project Path="src/VectorData/Qdrant/Qdrant.csproj" />
<Project Path="src/VectorData/Redis/Redis.csproj" />
<Project Path="src/VectorData/SqliteVec/SqliteVec.csproj" />
<Project Path="src/VectorData/SqlServer/SqlServer.csproj" />
<Project Path="src/VectorData/Weaviate/Weaviate.csproj" />
</Folder>
<Folder Name="/test/" />
<Folder Name="/test/VectorData/">
<Project Path="test/VectorData/AzureAISearch.ConformanceTests/AzureAISearch.ConformanceTests.csproj" />
<Project Path="test/VectorData/AzureAISearch.UnitTests/AzureAISearch.UnitTests.csproj" />
<Project Path="test/VectorData/Chroma.UnitTests/Chroma.UnitTests.csproj" />
<Project Path="test/VectorData/CosmosMongoDB.ConformanceTests/CosmosMongoDB.ConformanceTests.csproj" />
<Project Path="test/VectorData/CosmosMongoDB.UnitTests/CosmosMongoDB.UnitTests.csproj" />
<Project Path="test/VectorData/CosmosNoSql.ConformanceTests/CosmosNoSql.ConformanceTests.csproj" />
<Project Path="test/VectorData/CosmosNoSql.UnitTests/CosmosNoSql.UnitTests.csproj" />
<Project Path="test/VectorData/InMemory.ConformanceTests/InMemory.ConformanceTests.csproj" />
<Project Path="test/VectorData/InMemory.UnitTests/InMemory.UnitTests.csproj" />
<Project Path="test/VectorData/MongoDB.ConformanceTests/MongoDB.ConformanceTests.csproj" />
<Project Path="test/VectorData/MongoDB.UnitTests/MongoDB.UnitTests.csproj" />
<Project Path="test/VectorData/PgVector.ConformanceTests/PgVector.ConformanceTests.csproj" />
<Project Path="test/VectorData/PgVector.UnitTests/PgVector.UnitTests.csproj" />
<Project Path="test/VectorData/Pinecone.ConformanceTests/Pinecone.ConformanceTests.csproj" />
<Project Path="test/VectorData/Pinecone.UnitTests/Pinecone.UnitTests.csproj" />
<Project Path="test/VectorData/Qdrant.ConformanceTests/Qdrant.ConformanceTests.csproj" />
<Project Path="test/VectorData/Qdrant.UnitTests/Qdrant.UnitTests.csproj" />
<Project Path="test/VectorData/Redis.ConformanceTests/Redis.ConformanceTests.csproj" />
<Project Path="test/VectorData/Redis.UnitTests/Redis.UnitTests.csproj" />
<Project Path="test/VectorData/SqliteVec.ConformanceTests/SqliteVec.ConformanceTests.csproj" />
<Project Path="test/VectorData/SqliteVec.UnitTests/SqliteVec.UnitTests.csproj" />
<Project Path="test/VectorData/SqlServer.ConformanceTests/SqlServer.ConformanceTests.csproj" />
<Project Path="test/VectorData/VectorData.ConformanceTests/VectorData.ConformanceTests.csproj" />
<Project Path="test/VectorData/Weaviate.ConformanceTests/Weaviate.ConformanceTests.csproj" />
<Project Path="test/VectorData/Weaviate.UnitTests/Weaviate.UnitTests.csproj" />
</Folder>
</Solution>
47 changes: 0 additions & 47 deletions dotnet/SK-dotnet.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -121,24 +121,6 @@
<Project Path="src/Connectors/Connectors.OpenAI.UnitTests/Connectors.OpenAI.UnitTests.csproj" />
<Project Path="src/Connectors/Connectors.OpenAI/Connectors.OpenAI.csproj" />
</Folder>
<Folder Name="/src/VectorData/">
<File Path="src/VectorData/Directory.Build.props" />
<Project Path="src/VectorData/AzureAISearch/AzureAISearch.csproj" />
<Project Path="src/VectorData/Chroma/Chroma.csproj" />
<Project Path="src/VectorData/CosmosMongoDB/CosmosMongoDB.csproj" />
<Project Path="src/VectorData/CosmosNoSql/CosmosNoSql.csproj" />
<Project Path="src/VectorData/InMemory/InMemory.csproj" />
<Project Path="src/VectorData/Milvus/Milvus.csproj" />
<Project Path="src/VectorData/MongoDB/MongoDB.csproj" />
<Project Path="src/VectorData/PgVector/PgVector.csproj" />
<Project Path="src/VectorData/Pinecone/Pinecone.csproj" />
<Project Path="src/VectorData/Qdrant/Qdrant.csproj" />
<Project Path="src/VectorData/Redis/Redis.csproj" />
<Project Path="src/VectorData/SqliteVec/SqliteVec.csproj" />
<Project Path="src/VectorData/SqlServer/SqlServer.csproj" />
<Project Path="src/VectorData/VectorData.Abstractions/VectorData.Abstractions.csproj" />
<Project Path="src/VectorData/Weaviate/Weaviate.csproj" />
</Folder>
<Folder Name="/src/experimental/">
<Project Path="src/Experimental/Orchestration.Flow.IntegrationTests/Experimental.Orchestration.Flow.IntegrationTests.csproj" />
Comment thread
westey-m marked this conversation as resolved.
<Project Path="src/Experimental/Orchestration.Flow.UnitTests/Experimental.Orchestration.Flow.UnitTests.csproj" />
Expand Down Expand Up @@ -292,33 +274,4 @@
<Project Path="src/Plugins/Plugins.UnitTests/Plugins.UnitTests.csproj" />
<Project Path="src/Plugins/Plugins.Web/Plugins.Web.csproj" />
</Folder>
<Folder Name="/test/" />
<Folder Name="/test/VectorData/">
<Project Path="test/VectorData/AzureAISearch.ConformanceTests/AzureAISearch.ConformanceTests.csproj" />
<Project Path="test/VectorData/AzureAISearch.UnitTests/AzureAISearch.UnitTests.csproj" />
<Project Path="test/VectorData/Chroma.UnitTests/Chroma.UnitTests.csproj" />
<Project Path="test/VectorData/CosmosMongoDB.ConformanceTests/CosmosMongoDB.ConformanceTests.csproj" />
<Project Path="test/VectorData/CosmosMongoDB.UnitTests/CosmosMongoDB.UnitTests.csproj" />
<Project Path="test/VectorData/CosmosNoSql.ConformanceTests/CosmosNoSql.ConformanceTests.csproj" />
<Project Path="test/VectorData/CosmosNoSql.UnitTests/CosmosNoSql.UnitTests.csproj" />
<Project Path="test/VectorData/InMemory.ConformanceTests/InMemory.ConformanceTests.csproj" />
<Project Path="test/VectorData/InMemory.UnitTests/InMemory.UnitTests.csproj" />
<Project Path="test/VectorData/MongoDB.ConformanceTests/MongoDB.ConformanceTests.csproj" />
<Project Path="test/VectorData/MongoDB.UnitTests/MongoDB.UnitTests.csproj" />
<Project Path="test/VectorData/PgVector.ConformanceTests/PgVector.ConformanceTests.csproj" />
<Project Path="test/VectorData/PgVector.UnitTests/PgVector.UnitTests.csproj" />
<Project Path="test/VectorData/Pinecone.ConformanceTests/Pinecone.ConformanceTests.csproj" />
<Project Path="test/VectorData/Pinecone.UnitTests/Pinecone.UnitTests.csproj" />
<Project Path="test/VectorData/Qdrant.ConformanceTests/Qdrant.ConformanceTests.csproj" />
<Project Path="test/VectorData/Qdrant.UnitTests/Qdrant.UnitTests.csproj" />
<Project Path="test/VectorData/Redis.ConformanceTests/Redis.ConformanceTests.csproj" />
<Project Path="test/VectorData/Redis.UnitTests/Redis.UnitTests.csproj" />
<Project Path="test/VectorData/SqliteVec.ConformanceTests/SqliteVec.ConformanceTests.csproj" />
<Project Path="test/VectorData/SqliteVec.UnitTests/SqliteVec.UnitTests.csproj" />
<Project Path="test/VectorData/SqlServer.ConformanceTests/SqlServer.ConformanceTests.csproj" />
<Project Path="test/VectorData/VectorData.ConformanceTests/VectorData.ConformanceTests.csproj" />
<Project Path="test/VectorData/VectorData.UnitTests/VectorData.UnitTests.csproj" />
<Project Path="test/VectorData/Weaviate.ConformanceTests/Weaviate.ConformanceTests.csproj" />
<Project Path="test/VectorData/Weaviate.UnitTests/Weaviate.UnitTests.csproj" />
</Folder>
</Solution>
20 changes: 9 additions & 11 deletions dotnet/samples/Concepts/Concepts.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@
<PackageReference Include="AWSSDK.Core" />
<PackageReference Include="AWSSDK.SecurityToken" />
<PackageReference Include="Grpc.Net.ClientFactory" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureAISearch" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.CosmosMongoDB" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.InMemory" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Qdrant" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Pinecone" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.PgVector" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.Redis" />
<PackageReference Include="SharpCompress" /> <!-- Pin to patched version; overrides transitive 0.30.1 from MongoDB.Driver (GHSA-6c8g-7p36-r338) -->
<PackageReference Include="Snappier" /> <!-- Pin to patched version; overrides transitive 1.0.0 from MongoDB.Driver (GHSA-pggp-6c3x-2xmx) -->
</ItemGroup>

<PropertyGroup>
Expand All @@ -71,17 +80,6 @@
<ProjectReference Include="..\..\src\Connectors\Connectors.Onnx\Connectors.Onnx.csproj" />
<ProjectReference Include="..\..\src\Connectors\Connectors.Ollama\Connectors.Ollama.csproj" />
<ProjectReference Include="..\..\src\Connectors\Connectors.OpenAI\Connectors.OpenAI.csproj" />
<ProjectReference Include="..\..\src\VectorData\AzureAISearch\AzureAISearch.csproj" />
<ProjectReference Include="..\..\src\VectorData\CosmosMongoDB\CosmosMongoDB.csproj" />
<ProjectReference Include="..\..\src\VectorData\Chroma\Chroma.csproj" />
<ProjectReference Include="..\..\src\VectorData\InMemory\InMemory.csproj" />
<ProjectReference Include="..\..\src\VectorData\MongoDB\MongoDB.csproj" />
<ProjectReference Include="..\..\src\VectorData\Pinecone\Pinecone.csproj" />
<ProjectReference Include="..\..\src\VectorData\PgVector\PgVector.csproj" />
<ProjectReference Include="..\..\src\VectorData\Qdrant\Qdrant.csproj" />
<ProjectReference Include="..\..\src\VectorData\Redis\Redis.csproj" />
<ProjectReference Include="..\..\src\VectorData\SqliteVec\SqliteVec.csproj" />
<ProjectReference Include="..\..\src\VectorData\Weaviate\Weaviate.csproj" />
<ProjectReference Include="..\..\src\Experimental\Orchestration.Flow\Experimental.Orchestration.Flow.csproj" />
<ProjectReference Include="..\..\src\Extensions\PromptTemplates.Handlebars\PromptTemplates.Handlebars.csproj" />
<ProjectReference Include="..\..\src\Extensions\PromptTemplates.Liquid\PromptTemplates.Liquid.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Text.Json;
using Microsoft.Extensions.VectorData;
using Microsoft.SemanticKernel.Connectors.HuggingFace;
using Microsoft.SemanticKernel.Connectors.SqliteVec;
using Microsoft.SemanticKernel.Connectors.InMemory;
using Microsoft.SemanticKernel.Embeddings;

#pragma warning disable CS8602 // Dereference of a possibly null reference.
Expand Down Expand Up @@ -32,12 +32,11 @@ public async Task RunInferenceApiEmbeddingCustomHttpHandlerAsync()
})
);

var sqliteCollection = new SqliteCollection<string, Record>(
"Data Source=./../../../Sqlite.sqlite",
var inMemoryCollection = new InMemoryCollection<string, Record>(
name: "Test",
new() { EmbeddingGenerator = hf.AsEmbeddingGenerator() });

await sqliteCollection.UpsertAsync(new Record
await inMemoryCollection.UpsertAsync(new Record
{
Id = "1",
Text = "THIS IS A SAMPLE",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<ItemGroup>
<PackageReference Include="Aspire.Azure.AI.OpenAI" />
<PackageReference Include="Aspire.Azure.Search.Documents" />
<PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureAISearch" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\src\Agents\Core\Agents.Core.csproj" />
<ProjectReference Include="..\..\..\..\src\Connectors\Connectors.AzureOpenAI\Connectors.AzureOpenAI.csproj" />
<ProjectReference Include="..\..\..\..\src\Connectors\Connectors.OpenAI\Connectors.OpenAI.csproj" />
<ProjectReference Include="..\..\..\..\src\VectorData\AzureAISearch\AzureAISearch.csproj" />
<ProjectReference Include="..\..\..\..\src\Extensions\PromptTemplates.Handlebars\PromptTemplates.Handlebars.csproj" />
<ProjectReference Include="..\..\..\..\src\Functions\Functions.Yaml\Functions.Yaml.csproj" />
<ProjectReference Include="..\..\..\..\src\SemanticKernel.Abstractions\SemanticKernel.Abstractions.csproj" />
Expand Down
Loading
Loading