Skip to content

Commit 43494ec

Browse files
westey-mwestey-m
committed
Remove MEVD.Abstractions from repo and point implementations to released package
1 parent bc083e9 commit 43494ec

72 files changed

Lines changed: 28 additions & 4725 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/dotnet-build-and-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ jobs:
8181
- name: Build dotnet solutions
8282
shell: bash
8383
run: |
84-
export SOLUTIONS=$(find ./dotnet/ -type f -name "*.slnx" | grep -v "MEVD.slnx" | tr '\n' ' ')
84+
export SOLUTIONS=$(find ./dotnet/ -type f -name "*.slnx" | tr '\n' ' ')
8585
for solution in $SOLUTIONS; do
8686
dotnet build $solution -c ${{ matrix.configuration }} --warnaserror
8787
done
8888
8989
- name: Package install check
9090
shell: bash
9191
run: |
92-
export SOLUTIONS=$(find ./dotnet/ -type f -name "*.slnx" | grep -v "MEVD.slnx" | tr '\n' ' ')
92+
export SOLUTIONS=$(find ./dotnet/ -type f -name "*.slnx" | tr '\n' ' ')
9393
for solution in $SOLUTIONS; do
9494
dotnet pack $solution -c ${{ matrix.configuration }} --no-build --no-restore --output ./artifacts
9595
done

‎dotnet/MEVD.slnx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<File Path="nuget/NUGET.md" />
1818
<File Path="nuget/VECTORDATA-CONNECTORS-NUGET.md" />
1919
</Folder>
20+
<Folder Name="/src/" />
2021
<Folder Name="/src/VectorData/">
2122
<File Path="src/VectorData/Directory.Build.props" />
2223
<Project Path="src/VectorData/AzureAISearch/AzureAISearch.csproj" />
@@ -32,7 +33,6 @@
3233
<Project Path="src/VectorData/Redis/Redis.csproj" />
3334
<Project Path="src/VectorData/SqliteVec/SqliteVec.csproj" />
3435
<Project Path="src/VectorData/SqlServer/SqlServer.csproj" />
35-
<Project Path="src/VectorData/VectorData.Abstractions/VectorData.Abstractions.csproj" />
3636
<Project Path="src/VectorData/Weaviate/Weaviate.csproj" />
3737
</Folder>
3838
<Folder Name="/test/" />
@@ -60,7 +60,6 @@
6060
<Project Path="test/VectorData/SqliteVec.UnitTests/SqliteVec.UnitTests.csproj" />
6161
<Project Path="test/VectorData/SqlServer.ConformanceTests/SqlServer.ConformanceTests.csproj" />
6262
<Project Path="test/VectorData/VectorData.ConformanceTests/VectorData.ConformanceTests.csproj" />
63-
<Project Path="test/VectorData/VectorData.UnitTests/VectorData.UnitTests.csproj" />
6463
<Project Path="test/VectorData/Weaviate.ConformanceTests/Weaviate.ConformanceTests.csproj" />
6564
<Project Path="test/VectorData/Weaviate.UnitTests/Weaviate.UnitTests.csproj" />
6665
</Folder>

‎dotnet/src/InternalUtilities/connectors/Memory/MongoDB/MongoModelBuilder.cs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,17 @@ internal class MongoModelBuilder() : CollectionModelBuilder(s_validationOptions)
2727
UsesExternalSerializer = true,
2828
};
2929

30-
protected override void ProcessProperty(PropertyInfo? clrProperty, VectorStoreProperty? definitionProperty, Type? type)
30+
[RequiresUnreferencedCode("Traverses the CLR type's properties with reflection, so not compatible with trimming")]
31+
protected override void ProcessTypeProperties(Type type, VectorStoreCollectionDefinition? definition)
3132
{
32-
base.ProcessProperty(clrProperty, definitionProperty, type);
33+
base.ProcessTypeProperties(type, definition);
3334

34-
if (clrProperty?.GetCustomAttribute<BsonElementAttribute>() is { } bsonElementAttribute
35-
&& this.PropertyMap.TryGetValue(clrProperty.Name, out var property))
35+
foreach (var property in this.Properties)
3636
{
37-
property.StorageName = bsonElementAttribute.ElementName;
37+
if (property.PropertyInfo?.GetCustomAttribute<BsonElementAttribute>() is { } bsonElementAttribute)
38+
{
39+
property.StorageName = bsonElementAttribute.ElementName;
40+
}
3841
}
3942
}
4043

‎dotnet/src/VectorData/AzureAISearch/AzureAISearch.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<ItemGroup>
2727
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
2828
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
29+
<PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" />
2930
<PackageReference Include="Azure.Search.Documents" />
3031
<PackageReference Include="System.Linq.AsyncEnumerable" />
3132
</ItemGroup>
@@ -37,8 +38,4 @@
3738
<ItemGroup>
3839
<InternalsVisibleTo Include="SemanticKernel.Connectors.AzureAISearch.UnitTests" />
3940
</ItemGroup>
40-
41-
<ItemGroup>
42-
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
43-
</ItemGroup>
4441
</Project>

‎dotnet/src/VectorData/CosmosMongoDB/CosmosMongoDB.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@
4242
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
4343
<PackageReference Include="System.Text.Json" />
4444
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
45-
</ItemGroup>
46-
47-
<ItemGroup>
48-
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
45+
<PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" />
4946
</ItemGroup>
5047

5148
</Project>

‎dotnet/src/VectorData/CosmosNoSql/CosmosNoSql.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,10 @@
3232
<ItemGroup>
3333
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
3434
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
35+
<PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" />
3536
<PackageReference Include="System.Linq.AsyncEnumerable" />
3637
</ItemGroup>
3738

38-
<ItemGroup>
39-
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
40-
</ItemGroup>
41-
4239
<ItemGroup>
4340
<InternalsVisibleTo Include="SemanticKernel.Connectors.CosmosNoSql.UnitTests" />
4441
</ItemGroup>

‎dotnet/src/VectorData/CosmosNoSql/CosmosNoSqlMapper.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public JsonObject MapFromDataToStorageModel(TRecord dataModel, int recordIndex,
4141

4242
// The key property in Azure CosmosDB NoSQL is always named 'id'.
4343
// But the external JSON serializer used just above isn't aware of that, and will produce a JSON object with another name, taking into
44-
// account e.g. naming policies. SerializedKeyName gets populated in the model builder - containing that name - once VectorStoreModelBuildingOptions.ReservedKeyPropertyName is set
45-
RenameJsonProperty(jsonObject, this._keyProperty.SerializedKeyName!, CosmosNoSqlConstants.ReservedKeyPropertyName);
44+
// account e.g. naming policies. TemporaryStorageName gets populated in the model builder - containing that name - once VectorStoreModelBuildingOptions.ReservedKeyPropertyName is set
45+
RenameJsonProperty(jsonObject, this._keyProperty.TemporaryStorageName!, CosmosNoSqlConstants.ReservedKeyPropertyName);
4646

4747
// Go over the vector properties; inject any generated embeddings to overwrite the JSON serialized above.
4848
// Also, for Embedding<T> properties we also need to overwrite with a simple array (since Embedding<T> gets serialized as a complex object).
@@ -116,7 +116,7 @@ public JsonObject MapFromDataToStorageModel(TRecord dataModel, int recordIndex,
116116
public TRecord MapFromStorageToDataModel(JsonObject storageModel, bool includeVectors)
117117
{
118118
// See above comment.
119-
RenameJsonProperty(storageModel, CosmosNoSqlConstants.ReservedKeyPropertyName, this._keyProperty.SerializedKeyName!);
119+
RenameJsonProperty(storageModel, CosmosNoSqlConstants.ReservedKeyPropertyName, this._keyProperty.TemporaryStorageName!);
120120

121121
foreach (var vectorProperty in this._model.VectorProperties)
122122
{

‎dotnet/src/VectorData/InMemory/InMemory.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@
3434
<ItemGroup>
3535
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
3636
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
37+
<PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" />
3738
<PackageReference Include="System.Linq.AsyncEnumerable" />
3839
</ItemGroup>
3940

40-
<ItemGroup>
41-
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
42-
</ItemGroup>
43-
4441
</Project>

‎dotnet/src/VectorData/MongoDB/MongoDB.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@
3737
<ItemGroup>
3838
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
3939
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
40-
</ItemGroup>
41-
42-
<ItemGroup>
43-
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
40+
<PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" />
4441
</ItemGroup>
4542

4643
<ItemGroup>

‎dotnet/src/VectorData/PgVector/PgVector.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,13 @@
3232
<ItemGroup>
3333
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
3434
<PackageReference Include="Microsoft.Extensions.AI.Abstractions" />
35+
<PackageReference Include="Microsoft.Extensions.VectorData.Abstractions" />
3536
<PackageReference Include="Npgsql">
3637
<VersionOverride Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">8.0.7</VersionOverride>
3738
</PackageReference>
3839
<PackageReference Include="Pgvector" />
3940
</ItemGroup>
4041

41-
<ItemGroup>
42-
<ProjectReference Include="..\VectorData.Abstractions\VectorData.Abstractions.csproj" />
43-
</ItemGroup>
44-
4542
<ItemGroup>
4643
<InternalsVisibleTo Include="SemanticKernel.Connectors.PgVector.UnitTests" />
4744
<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />

0 commit comments

Comments
 (0)