Merge master into main

2026-09-13 20:23:35 +02:00
parent 18d7d56345 dce0880576
commit bbf5f191f2
7 changed files with 112 additions and 0 deletions
@@ -2,6 +2,7 @@ import Foundation

 public struct AppConfiguration: Equatable, Sendable {
    public let openAIAPIKey: String?
+<<<<<<< HEAD
    public let privateApplicationRules: PrivateApplicationRules?

    public init(
@@ -10,12 +11,21 @@ public struct AppConfiguration: Equatable, Sendable {
    ) {
        self.openAIAPIKey = openAIAPIKey
        self.privateApplicationRules = privateApplicationRules
+=======
+
+    public init(openAIAPIKey: String?) {
+        self.openAIAPIKey = openAIAPIKey
+>>>>>>> origin/master
    }

    public static func development(environment: [String: String] = ProcessInfo.processInfo.environment) -> AppConfiguration {
        AppConfiguration(
+<<<<<<< HEAD
            openAIAPIKey: environment["MUSIC_ASSISTANT_OPENAI_API_KEY"],
            privateApplicationRules: PrivateApplicationRules(content: environment["MUSIC_ASSISTANT_PRIVATE_AI_RULES"])
+=======
+            openAIAPIKey: environment["MUSIC_ASSISTANT_OPENAI_API_KEY"]
+>>>>>>> origin/master
        )
    }
 }