Config stuff taken out

Author: peterbanda

openai-core/src/main/scala/io/cequence/openaiscala/service/HasOpenAIConfig.scala

@@ -0,0 +1,30 @@
+package io.cequence.openaiscala.service
+
+import com.typesafe.config.{Config, ConfigFactory}
+
+/**
+ * Trait providing OpenAI configuration loading capabilities.
+ *
+ * Configuration can be customized via the OPENAI_SCALA_CLIENT_CONFIG_FILE environment
+ * variable. If not set, defaults to "openai-scala-client.conf".
+ */
+trait HasOpenAIConfig {
+
+  /**
+   * The configuration prefix used for all OpenAI client settings.
+   */
+  protected val configPrefix = "openai-scala-client"
+
+  /**
+   * The configuration file name. Can be overridden via the OPENAI_SCALA_CLIENT_CONFIG_FILE
+   * environment variable.
+   */
+  protected val configFileName: String =
+    sys.env.getOrElse("OPENAI_SCALA_CLIENT_CONFIG_FILE", "openai-scala-client.conf")
+
+  /**
+   * The loaded OpenAI client configuration from the specified config file.
+   */
+  protected lazy val clientConfig: Config =
+    ConfigFactory.load(configFileName)
+}

openai-core/src/main/scala/io/cequence/openaiscala/service/OpenAIChatCompletionExtra.scala

@@ -17,12 +17,11 @@ import play.api.libs.json.{Format, JsObject, JsValue, Json}
 
 import scala.concurrent.{ExecutionContext, Future}
 import com.fasterxml.jackson.core.JsonProcessingException
-import com.typesafe.config.Config
 import io.cequence.openaiscala.OpenAIScalaClientException
 import io.cequence.openaiscala.domain.JsonSchema.JsonSchemaOrMap
 import io.cequence.wsclient.JsonUtil
 
-object OpenAIChatCompletionExtra extends OpenAIServiceConsts {
+object OpenAIChatCompletionExtra extends OpenAIServiceConsts with HasOpenAIConfig {
 
   protected val logger: Logger =
     LoggerFactory.getLogger(this.getClass.getSimpleName.stripSuffix("$"))
@@ -129,7 +128,6 @@ object OpenAIChatCompletionExtra extends OpenAIServiceConsts {
       retryOnAnyError: Boolean = false,
       taskNameForLogging: Option[String] = None,
       jsonSchemaModels: Seq[String] = Nil,
-      config: Option[Config] = None,
       enforceJsonSchemaMode: Boolean = false,
       parseJson: String => JsValue = defaultParseJsonOrRepair
     )(
@@ -146,7 +144,6 @@ object OpenAIChatCompletionExtra extends OpenAIServiceConsts {
           settings,
           taskNameForLoggingFinal,
           jsonSchemaModels,
-          config,
           enforceJsonSchemaMode
         )
       } else {
@@ -206,41 +203,30 @@ object OpenAIChatCompletionExtra extends OpenAIServiceConsts {
       }
   }
 
-  private lazy val defaultConfig = loadDefaultConfig()
-
-  private def getJsonSchemaModels(
-    jsonSchemaModels: Seq[String],
-    config: Option[Config]
-  ): Seq[String] = {
+  private def getJsonSchemaModelsFromConfig(): Seq[String] = {
     import scala.collection.JavaConverters._
-    val cfg = config.getOrElse(defaultConfig)
     val configPath = s"$configPrefix.models-supporting-json-schema"
-    val configModels = if (cfg.hasPath(configPath)) {
-      cfg.getStringList(configPath).asScala.toSeq
+    if (clientConfig.hasPath(configPath)) {
+      clientConfig.getStringList(configPath).asScala.toSeq
     } else {
       Nil
     }
-
-    if (jsonSchemaModels.isEmpty) {
-      configModels
-    } else if (config.isDefined) {
-      // Both explicit models and custom config provided - merge and deduplicate
-      (jsonSchemaModels ++ configModels).distinct
-    } else {
-      // Only explicit models provided
-      jsonSchemaModels
-    }
   }
 
   def handleOutputJsonSchema(
     messages: Seq[BaseMessage],
     settings: CreateChatCompletionSettings,
     taskNameForLogging: String,
     jsonSchemaModels: Seq[String] = Nil,
-    config: Option[Config] = None,
     enforceJsonSchemaMode: Boolean = false
   ): (Seq[BaseMessage], CreateChatCompletionSettings) = {
-    val jsonSchemaModelsFinal = getJsonSchemaModels(jsonSchemaModels, config)
+    // Use explicitly provided JSON schema models if available,
+    // otherwise fall back to models configured in openai-scala-client.conf
+    val jsonSchemaModelsFinal =
+      if (jsonSchemaModels.nonEmpty)
+        jsonSchemaModels
+      else
+        getJsonSchemaModelsFromConfig()
 
     val jsonSchemaDef = settings.jsonSchema.getOrElse(
       throw new IllegalArgumentException("JSON schema is not defined but expected.")

openai-core/src/main/scala/io/cequence/openaiscala/service/OpenAIServiceConsts.scala

@@ -1,6 +1,5 @@
 package io.cequence.openaiscala.service
 
-import com.typesafe.config.{Config, ConfigFactory}
 import io.cequence.openaiscala.domain.ModelId
 import io.cequence.openaiscala.domain.settings._
 import io.cequence.openaiscala.domain.responsesapi.{
@@ -15,13 +14,6 @@ trait OpenAIServiceConsts {
 
   protected val defaultCoreUrl = "https://api.openai.com/v1/"
 
-  protected val configPrefix = "openai-scala-client"
-
-  protected val configFileName = "openai-scala-client.conf"
-
-  protected def loadDefaultConfig(): Config =
-    ConfigFactory.load(configFileName)
-
   object DefaultSettings {
 
     val CreateJsonCompletion = CreateCompletionSettings(