Skip to content

Commit 6f935ad

Browse files
peterbandapeterbanda
committed
Examples - adapter package renamed to adapters + little fix in OpenAIChatCompletionExtra.handleOutputJsonSchema
1 parent ceece5f commit 6f935ad

13 files changed

+13
-13
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ class MyCompletionService extends OpenAICountTokensHelper {
522522

523523
**III. Using adapters**
524524

525-
Adapters for OpenAI services (chat completion, core, or full) are provided by [OpenAIServiceAdapters](./openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/OpenAIServiceAdapters.scala). The adapters are used to distribute the load between multiple services, retry on transient errors, route, or provide additional functionality. See [examples](./openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapter) for more details.
525+
Adapters for OpenAI services (chat completion, core, or full) are provided by [OpenAIServiceAdapters](./openai-core/src/main/scala/io/cequence/openaiscala/service/adapter/OpenAIServiceAdapters.scala). The adapters are used to distribute the load between multiple services, retry on transient errors, route, or provide additional functionality. See [examples](./openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapters) for more details.
526526

527527
Note that the adapters can be arbitrarily combined/stacked.
528528

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ object OpenAIChatCompletionExtra {
184184

185185
val (settingsFinal, addJsonToPrompt) = {
186186
// to be more robust we also match models with a suffix
187-
if (jsonSchemaModels.contains((model: String) => (settings.model == model) || (settings.model.endsWith("-" + model)))) {
187+
if (jsonSchemaModels.exists(model => settings.model.equals(model) || settings.model.endsWith("-" + model))) {
188188
logger.debug(
189189
s"Using OpenAI json schema mode for ${taskNameForLogging} and the model '${settings.model}' - name: ${jsonSchemaDef.name}, strict: ${jsonSchemaDef.strict}, structure:\n${jsonSchemaString}"
190190
)

‎openai-examples/src/main/resources/logback.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<logger name="PlayWSStreamClientEngine" level="INFO"/>
1717

18-
<logger name="OpenAIChatCompletionExtra" level="INFO"/>
18+
<logger name="OpenAIChatCompletionExtra" level="DEBUG"/>
1919

2020
<!--
2121
<logger name="com.ning.http.client" level="INFO"/>

‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapter/ChatCompletionInputAdapterForFireworksAI.scala renamed to ‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapters/ChatCompletionInputAdapterForFireworksAI.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.cequence.openaiscala.examples.adapter
1+
package io.cequence.openaiscala.examples.adapters
22

33
import com.typesafe.scalalogging.Logger
44
import io.cequence.openaiscala.domain._

‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapter/ChatCompletionRouterAdapterExample.scala renamed to ‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapters/ChatCompletionRouterAdapterExample.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.cequence.openaiscala.examples.adapter
1+
package io.cequence.openaiscala.examples.adapters
22

33
import io.cequence.openaiscala.anthropic.service.AnthropicServiceFactory
44
import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings

‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapter/ChatCompletionRouterAdapterWithMappedModelsExample.scala renamed to ‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapters/ChatCompletionRouterAdapterWithMappedModelsExample.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.cequence.openaiscala.examples.adapter
1+
package io.cequence.openaiscala.examples.adapters
22

33
import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
44
import io.cequence.openaiscala.domain.{ModelId, NonOpenAIModelId, SystemMessage, UserMessage}

‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapter/ChatCompletionStreamedRouterExample.scala renamed to ‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapters/ChatCompletionStreamedRouterExample.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.cequence.openaiscala.examples.adapter
1+
package io.cequence.openaiscala.examples.adapters
22

33
import akka.stream.scaladsl.Sink
44
import io.cequence.openaiscala.anthropic.service.AnthropicServiceFactory

‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapter/ChatCompletionStreamedRouterWithFullServiceExample.scala renamed to ‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapters/ChatCompletionStreamedRouterWithFullServiceExample.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.cequence.openaiscala.examples.adapter
1+
package io.cequence.openaiscala.examples.adapters
22

33
import akka.stream.scaladsl.Sink
44
import io.cequence.openaiscala.anthropic.service.AnthropicServiceFactory

‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapter/ChatCompletionStreamedRouterWithMappedModelsExample.scala renamed to ‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapters/ChatCompletionStreamedRouterWithMappedModelsExample.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.cequence.openaiscala.examples.adapter
1+
package io.cequence.openaiscala.examples.adapters
22

33
import akka.stream.scaladsl.Sink
44
import io.cequence.openaiscala.domain._

‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapter/ChatToCompletionAdapterExample.scala renamed to ‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapters/ChatToCompletionAdapterExample.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.cequence.openaiscala.examples.adapter
1+
package io.cequence.openaiscala.examples.adapters
22

33
import io.cequence.openaiscala.domain._
44
import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings

‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapter/RandomOrderAdapterExample.scala renamed to ‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapters/RandomOrderAdapterExample.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.cequence.openaiscala.examples.adapter
1+
package io.cequence.openaiscala.examples.adapters
22

33
import akka.stream.scaladsl.{Sink, Source}
44
import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings

‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapter/RetryAdapterExample.scala renamed to ‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapters/RetryAdapterExample.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.cequence.openaiscala.examples.adapter
1+
package io.cequence.openaiscala.examples.adapters
22

33
import io.cequence.openaiscala.RetryHelpers.RetrySettings
44
import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings

‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapter/RoundRobinAdapterExample.scala renamed to ‎openai-examples/src/main/scala/io/cequence/openaiscala/examples/adapters/RoundRobinAdapterExample.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.cequence.openaiscala.examples.adapter
1+
package io.cequence.openaiscala.examples.adapters
22

33
import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
44
import io.cequence.openaiscala.domain.{ModelId, SystemMessage, UserMessage}

0 commit comments

Comments
 (0)