Skip to content

Commit cc0d5d3

Browse files
committed
Remove generic of OverridingEmbeddingConfiguration
1 parent 9ee64dc commit cc0d5d3

2 files changed

Lines changed: 13 additions & 12 deletions

File tree

Tool/Sources/OpenAIService/Configuration/EmbeddingConfiguration.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ public extension EmbeddingConfiguration {
2121
}
2222

2323
func overriding(
24-
_ overrides: OverridingEmbeddingConfiguration<Self>.Overriding
25-
) -> OverridingEmbeddingConfiguration<Self> {
24+
_ overrides: OverridingEmbeddingConfiguration.Overriding
25+
) -> OverridingEmbeddingConfiguration {
2626
.init(overriding: self, with: overrides)
2727
}
2828

2929
func overriding(
30-
_ update: (inout OverridingEmbeddingConfiguration<Self>.Overriding) -> Void = { _ in }
31-
) -> OverridingEmbeddingConfiguration<Self> {
32-
var overrides = OverridingEmbeddingConfiguration<Self>.Overriding()
30+
_ update: (inout OverridingEmbeddingConfiguration.Overriding) -> Void = { _ in }
31+
) -> OverridingEmbeddingConfiguration {
32+
var overrides = OverridingEmbeddingConfiguration.Overriding()
3333
update(&overrides)
3434
return .init(overriding: self, with: overrides)
3535
}

Tool/Sources/OpenAIService/Configuration/UserPreferenceEmbeddingConfiguration.swift

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ public struct UserPreferenceEmbeddingConfiguration: EmbeddingConfiguration {
77

88
public var model: EmbeddingModel? {
99
let models = UserDefaults.shared.value(for: \.embeddingModels)
10-
10+
1111
if let embeddingModelKey {
1212
let id = UserDefaults.shared.value(for: embeddingModelKey)
1313
if let model = models.first(where: { $0.id == id }) {
1414
return model
1515
}
1616
}
17-
17+
1818
let id = UserDefaults.shared.value(for: \.defaultChatFeatureEmbeddingModelId)
1919
return models.first { $0.id == id }
2020
?? models.first
@@ -39,9 +39,7 @@ public struct UserPreferenceEmbeddingConfiguration: EmbeddingConfiguration {
3939
}
4040
}
4141

42-
public class OverridingEmbeddingConfiguration<
43-
Configuration: EmbeddingConfiguration
44-
>: EmbeddingConfiguration {
42+
public class OverridingEmbeddingConfiguration: EmbeddingConfiguration {
4543
public struct Overriding {
4644
public var modelId: String?
4745
public var model: EmbeddingModel?
@@ -61,10 +59,13 @@ public class OverridingEmbeddingConfiguration<
6159
}
6260
}
6361

64-
private let configuration: Configuration
62+
private let configuration: EmbeddingConfiguration
6563
public var overriding = Overriding()
6664

67-
public init(overriding configuration: Configuration, with overrides: Overriding = .init()) {
65+
public init(
66+
overriding configuration: any EmbeddingConfiguration,
67+
with overrides: Overriding = .init()
68+
) {
6869
overriding = overrides
6970
self.configuration = configuration
7071
}

0 commit comments

Comments
 (0)