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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ internal class MongoModelBuilder() : CollectionModelBuilder(s_validationOptions)
private static readonly CollectionModelBuildingOptions s_validationOptions = new()
{
RequiresAtLeastOneVector = false,
SupportsMultipleKeys = false,
SupportsMultipleVectors = true,
UsesExternalSerializer = true,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ internal class AzureAISearchDynamicModelBuilder() : CollectionModelBuilder(s_mod
internal static readonly CollectionModelBuildingOptions s_modelBuildingOptions = new()
{
RequiresAtLeastOneVector = false,
SupportsMultipleKeys = false,
SupportsMultipleVectors = true,
UsesExternalSerializer = true
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ internal class AzureAISearchModelBuilder() : CollectionJsonModelBuilder(s_modelB
internal static readonly CollectionModelBuildingOptions s_modelBuildingOptions = new()
{
RequiresAtLeastOneVector = false,
SupportsMultipleKeys = false,
SupportsMultipleVectors = true,
UsesExternalSerializer = true
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ internal class CosmosNoSqlModelBuilder() : CollectionJsonModelBuilder(s_modelBui
private static readonly CollectionModelBuildingOptions s_modelBuildingOptions = new()
{
RequiresAtLeastOneVector = false,
SupportsMultipleKeys = false,
SupportsMultipleVectors = true,
UsesExternalSerializer = true,
ReservedKeyStorageName = CosmosNoSqlConstants.ReservedKeyPropertyName
Expand Down
1 change: 0 additions & 1 deletion dotnet/src/VectorData/InMemory/InMemoryModelBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ internal class InMemoryModelBuilder() : CollectionModelBuilder(ValidationOptions
internal static readonly CollectionModelBuildingOptions ValidationOptions = new()
{
RequiresAtLeastOneVector = false,
SupportsMultipleKeys = false,
SupportsMultipleVectors = true
};

Expand Down
1 change: 0 additions & 1 deletion dotnet/src/VectorData/PgVector/PostgresModelBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ internal class PostgresModelBuilder() : CollectionModelBuilder(PostgresModelBuil
public static readonly CollectionModelBuildingOptions ModelBuildingOptions = new()
{
RequiresAtLeastOneVector = false,
SupportsMultipleKeys = false,
SupportsMultipleVectors = true,
};

Expand Down
1 change: 0 additions & 1 deletion dotnet/src/VectorData/Pinecone/PineconeModelBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ internal class PineconeModelBuilder() : CollectionModelBuilder(s_validationOptio
private static readonly CollectionModelBuildingOptions s_validationOptions = new()
{
RequiresAtLeastOneVector = true,
SupportsMultipleKeys = false,
SupportsMultipleVectors = false,
};

Expand Down
1 change: 0 additions & 1 deletion dotnet/src/VectorData/Qdrant/QdrantModelBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ private static CollectionModelBuildingOptions GetModelBuildOptions(bool hasNamed
=> new()
{
RequiresAtLeastOneVector = !hasNamedVectors,
SupportsMultipleKeys = false,
SupportsMultipleVectors = hasNamedVectors,
};

Expand Down
1 change: 0 additions & 1 deletion dotnet/src/VectorData/Redis/RedisHashSetCollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public class RedisHashSetCollection<TKey, TRecord> : VectorStoreCollection<TKey,
internal static readonly CollectionModelBuildingOptions ModelBuildingOptions = new()
{
RequiresAtLeastOneVector = false,
SupportsMultipleKeys = false,
SupportsMultipleVectors = true
};

Expand Down
1 change: 0 additions & 1 deletion dotnet/src/VectorData/Redis/RedisJsonCollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ public class RedisJsonCollection<TKey, TRecord> : VectorStoreCollection<TKey, TR
internal static readonly CollectionModelBuildingOptions ModelBuildingOptions = new()
{
RequiresAtLeastOneVector = false,
SupportsMultipleKeys = false,
SupportsMultipleVectors = true,
UsesExternalSerializer = true
};
Expand Down
1 change: 0 additions & 1 deletion dotnet/src/VectorData/SqlServer/SqlServerModelBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ internal class SqlServerModelBuilder() : CollectionModelBuilder(s_modelBuildingO
private static readonly CollectionModelBuildingOptions s_modelBuildingOptions = new()
{
RequiresAtLeastOneVector = false,
SupportsMultipleKeys = false,
SupportsMultipleVectors = true,
};

Expand Down
1 change: 0 additions & 1 deletion dotnet/src/VectorData/SqliteVec/SqliteModelBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ internal class SqliteModelBuilder() : CollectionModelBuilder(s_modelBuildingOpti
private static readonly CollectionModelBuildingOptions s_modelBuildingOptions = new()
{
RequiresAtLeastOneVector = false,
SupportsMultipleKeys = false,
SupportsMultipleVectors = true,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ internal CollectionModel(

/// <summary>
/// Returns the single key property in the model, and throws if there are multiple key properties.
/// Suitable for connectors where validation is in place for single keys only (<see cref="CollectionModelBuildingOptions.SupportsMultipleKeys"/>).
/// </summary>
public KeyPropertyModel KeyProperty => this._singleKeyProperty ??= this.KeyProperties.Single();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,7 @@ public abstract class CollectionModelBuilder
/// Constructs a new <see cref="CollectionModelBuilder"/>.
/// </summary>
protected CollectionModelBuilder(CollectionModelBuildingOptions options)
{
if (options.SupportsMultipleKeys && options.ReservedKeyStorageName is not null)
{
throw new ArgumentException($"{nameof(CollectionModelBuildingOptions.ReservedKeyStorageName)} cannot be set when {nameof(CollectionModelBuildingOptions.SupportsMultipleKeys)} is set.");
}

this.Options = options;
}
=> this.Options = options;

/// <summary>
/// Builds and returns an <see cref="CollectionModel"/> from the given <paramref name="type"/> and <paramref name="definition"/>.
Expand Down Expand Up @@ -419,7 +412,7 @@ protected virtual void Customize()
/// </summary>
protected virtual void Validate(Type? type, VectorStoreCollectionDefinition? definition)
{
if (!this.Options.SupportsMultipleKeys && this.KeyProperties.Count > 1)
if (this.KeyProperties.Count > 1)
{
throw new NotSupportedException($"Multiple key properties found on {TypeMessage()}the provided {nameof(VectorStoreCollectionDefinition)} while only one is supported.");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ namespace Microsoft.Extensions.VectorData.ProviderServices;
[Experimental("MEVD9001")]
public sealed class CollectionModelBuildingOptions
{
/// <summary>
/// Gets a value that indicates whether multiple key properties are supported.
/// </summary>
public required bool SupportsMultipleKeys { get; init; }

/// <summary>
/// Gets a value that indicates whether multiple vector properties are supported.
/// </summary>
Expand Down
1 change: 0 additions & 1 deletion dotnet/src/VectorData/Weaviate/WeaviateModelBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ private static CollectionModelBuildingOptions GetModelBuildingOptions(bool hasNa
return new()
{
RequiresAtLeastOneVector = !hasNamedVectors,
SupportsMultipleKeys = false,
SupportsMultipleVectors = hasNamedVectors
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@ private sealed class CustomModelBuilder(CollectionModelBuildingOptions? options
{
private static readonly CollectionModelBuildingOptions s_defaultOptions = new()
{
SupportsMultipleKeys = false,
SupportsMultipleVectors = true,
RequiresAtLeastOneVector = false
};
Expand Down
Loading