Revert "install scalafmt sbt plugin and reformat all files"

This reverts commit a408426.

Author: phelps-sg

.scalafmt.conf

@@ -3,73 +3,51 @@ package io.cequence.openaiscala.service
 import akka.NotUsed
 import akka.stream.scaladsl.Source
 import io.cequence.openaiscala.domain.MessageSpec
-import io.cequence.openaiscala.domain.response.{
-  ChatCompletionChunkResponse,
-  FineTuneEvent,
-  TextCompletionResponse
-}
-import io.cequence.openaiscala.domain.settings.{
-  CreateChatCompletionSettings,
-  CreateCompletionSettings
-}
+import io.cequence.openaiscala.domain.response.{ChatCompletionChunkResponse, FineTuneEvent, TextCompletionResponse}
+import io.cequence.openaiscala.domain.settings.{CreateChatCompletionSettings, CreateCompletionSettings}
+
 
 trait OpenAIServiceStreamedExtra extends OpenAIServiceConsts {
 
-  /** Creates a completion for the provided prompt and parameters with streamed
-    * results.
-    *
-    * @param prompt
-    *   The prompt(s) to generate completions for, encoded as a string, array of
-    *   strings, array of tokens, or array of token arrays. Note that
-    *   <|endoftext|> is the document separator that the model sees during
-    *   training, so if a prompt is not specified the model will generate as if
-    *   from the beginning of a new document.
-    * @param settings
-    * @return
-    *   text completion response as a stream (source)
-    *
-    * @see
-    *   <a
-    *   href="https://beta.openai.com/docs/api-reference/completions/create">OpenAI
-    *   Doc</a>
-    */
+  /**
+   * Creates a completion for the provided prompt and parameters with streamed results.
+   *
+   * @param prompt The prompt(s) to generate completions for, encoded as a string, array of strings, array of tokens, or array of token arrays.
+                   Note that <|endoftext|> is the document separator that the model sees during training,
+                   so if a prompt is not specified the model will generate as if from the beginning of a new document.
+   * @param settings
+   * @return text completion response as a stream (source)
+   *
+   * @see <a href="https://beta.openai.com/docs/api-reference/completions/create">OpenAI Doc</a>
+   */
   def createCompletionStreamed(
-      prompt: String,
-      settings: CreateCompletionSettings = DefaultSettings.CreateCompletion
+    prompt: String,
+    settings: CreateCompletionSettings = DefaultSettings.CreateCompletion
   ): Source[TextCompletionResponse, NotUsed]
 
-  /** Creates a completion for the chat message(s) with streamed results.
-    *
-    * @param messages
-    *   The messages to generate chat completions.
-    * @param settings
-    * @return
-    *   chat completion response
-    *
-    * @see
-    *   <a
-    *   href="https://platform.openai.com/docs/api-reference/chat/create">OpenAI
-    *   Doc</a>
-    */
+  /**
+   * Creates a completion for the chat message(s) with streamed results.
+   *
+   * @param messages The messages to generate chat completions.
+   * @param settings
+   * @return chat completion response
+   *
+   * @see <a href="https://platform.openai.com/docs/api-reference/chat/create">OpenAI Doc</a>
+   */
   def createChatCompletionStreamed(
-      messages: Seq[MessageSpec],
-      settings: CreateChatCompletionSettings =
-        DefaultSettings.CreateChatCompletion
+    messages: Seq[MessageSpec],
+    settings: CreateChatCompletionSettings = DefaultSettings.CreateChatCompletion
   ): Source[ChatCompletionChunkResponse, NotUsed]
 
-  /** Get fine-grained status updates for a fine-tune job with streamed results.
-    *
-    * @param fineTuneId
-    *   The ID of the fine-tune job to get events for.
-    * @return
-    *   fine tune events or None if not found as a stream (source)
-    *
-    * @see
-    *   <a
-    *   href="https://beta.openai.com/docs/api-reference/fine-tunes/events">OpenAI
-    *   Doc</a>
-    */
+  /**
+   * Get fine-grained status updates for a fine-tune job with streamed results.
+   *
+   * @param fineTuneId The ID of the fine-tune job to get events for.
+   * @return fine tune events or None if not found as a stream (source)
+   *
+   * @see <a href="https://beta.openai.com/docs/api-reference/fine-tunes/events">OpenAI Doc</a>
+   */
   def listFineTuneEventsStreamed(
-      fineTuneId: String
+    fineTuneId: String
   ): Source[FineTuneEvent, NotUsed]
 }

openai-client-stream/src/main/scala/io/cequence/openaiscala/service/OpenAIServiceStreamedExtra.scala

@@ -14,62 +14,53 @@ import play.api.libs.json.JsValue
 
 import scala.concurrent.ExecutionContext
 
-/** Private impl. class of [[OpenAIService]].
-  *
-  * @param apiKey
-  * @param orgId
-  * @param ec
-  * @param materializer
-  *
-  * @since Jan
-  *   2023
-  */
-private trait OpenAIServiceStreamedExtraImpl
-    extends OpenAIServiceStreamedExtra
-    with WSStreamRequestHelper {
+/**
+ * Private impl. class of [[OpenAIService]].
+ *
+ * @param apiKey
+ * @param orgId
+ * @param ec
+ * @param materializer
+ *
+ * @since Jan 2023
+ */
+private trait OpenAIServiceStreamedExtraImpl extends OpenAIServiceStreamedExtra with WSStreamRequestHelper {
   this: OpenAIServiceImpl =>
 
   override def createCompletionStreamed(
-      prompt: String,
-      settings: CreateCompletionSettings
+    prompt: String,
+    settings: CreateCompletionSettings
   ): Source[TextCompletionResponse, NotUsed] =
     execJsonStreamAux(
       Command.completions,
       "POST",
-      bodyParams =
-        createBodyParamsForCompletion(prompt, settings, stream = true)
+      bodyParams = createBodyParamsForCompletion(prompt, settings, stream = true)
     ).map { (json: JsValue) =>
-      (json \ "error").toOption
-        .map { error =>
-          throw new OpenAIScalaClientException(error.toString())
-        }
-        .getOrElse(
-          json.asSafe[TextCompletionResponse]
-        )
+      (json \ "error").toOption.map { error =>
+        throw new OpenAIScalaClientException(error.toString())
+      }.getOrElse(
+        json.asSafe[TextCompletionResponse]
+      )
     }
 
   override def createChatCompletionStreamed(
-      messages: Seq[MessageSpec],
-      settings: CreateChatCompletionSettings =
-        DefaultSettings.CreateChatCompletion
+    messages: Seq[MessageSpec],
+    settings: CreateChatCompletionSettings = DefaultSettings.CreateChatCompletion
   ): Source[ChatCompletionChunkResponse, NotUsed] =
     execJsonStreamAux(
       Command.chat_completions,
       "POST",
-      bodyParams =
-        createBodyParamsForChatCompletion(messages, settings, stream = true)
+      bodyParams = createBodyParamsForChatCompletion(messages, settings, stream = true)
     ).map { (json: JsValue) =>
-      (json \ "error").toOption
-        .map { error =>
-          throw new OpenAIScalaClientException(error.toString())
-        }
-        .getOrElse(
-          json.asSafe[ChatCompletionChunkResponse]
-        )
+      (json \ "error").toOption.map { error =>
+        throw new OpenAIScalaClientException(error.toString())
+      }.getOrElse(
+        json.asSafe[ChatCompletionChunkResponse]
+      )
     }
 
   override def listFineTuneEventsStreamed(
-      fineTuneId: String
+    fineTuneId: String
   ): Source[FineTuneEvent, NotUsed] =
     execJsonStreamAux(
       Command.fine_tunes,
@@ -79,29 +70,21 @@ private trait OpenAIServiceStreamedExtraImpl
         Tag.stream -> Some(true)
       )
     ).map { json =>
-      (json \ "error").toOption
-        .map { error =>
-          throw new OpenAIScalaClientException(error.toString())
-        }
-        .getOrElse(
-          json.asSafe[FineTuneEvent]
-        )
+      (json \ "error").toOption.map { error =>
+        throw new OpenAIScalaClientException(error.toString())
+      }.getOrElse(
+        json.asSafe[FineTuneEvent]
+      )
     }
 }
 
-object OpenAIServiceStreamedFactory
-    extends OpenAIServiceFactoryHelper[
-      OpenAIService with OpenAIServiceStreamedExtra
-    ] {
+object OpenAIServiceStreamedFactory extends OpenAIServiceFactoryHelper[OpenAIService with OpenAIServiceStreamedExtra] {
 
   override def apply(
-      apiKey: String,
-      orgId: Option[String] = None,
-      timeouts: Option[Timeouts] = None
-  )(implicit
-      ec: ExecutionContext,
-      materializer: Materializer
+    apiKey: String,
+    orgId: Option[String] = None,
+    timeouts: Option[Timeouts] = None)(
+    implicit ec: ExecutionContext, materializer: Materializer
   ): OpenAIService with OpenAIServiceStreamedExtra =
-    new OpenAIServiceImpl(apiKey, orgId, timeouts)
-      with OpenAIServiceStreamedExtraImpl
-}
+    new OpenAIServiceImpl(apiKey, orgId, timeouts) with OpenAIServiceStreamedExtraImpl
+}

openai-client-stream/src/main/scala/io/cequence/openaiscala/service/OpenAIServiceStreamedImpl.scala

@@ -8,22 +8,18 @@ import akka.stream.scaladsl.Framing.FramingException
 import akka.stream.scaladsl.{Flow, Framing, Source}
 import akka.util.ByteString
 import com.fasterxml.jackson.core.JsonParseException
-import io.cequence.openaiscala.{
-  OpenAIScalaClientException,
-  OpenAIScalaClientTimeoutException,
-  OpenAIScalaClientUnknownHostException
-}
+import io.cequence.openaiscala.{OpenAIScalaClientException, OpenAIScalaClientTimeoutException, OpenAIScalaClientUnknownHostException}
 import play.api.libs.json.{JsObject, JsString, JsValue, Json}
 import play.api.libs.ws.JsonBodyWritables._
 
 import java.net.UnknownHostException
 import java.util.concurrent.TimeoutException
 
-/** Stream request support specifically tailored for OpenAI API.
-  *
-  * @since Feb
-  *   2023
-  */
+/**
+ * Stream request support specifically tailored for OpenAI API.
+ *
+ * @since Feb 2023
+ */
 trait WSStreamRequestHelper {
   this: WSRequestHelper =>
 
@@ -35,18 +31,16 @@ trait WSStreamRequestHelper {
   private implicit val jsonMarshaller: Unmarshaller[ByteString, JsValue] =
     Unmarshaller.strict[ByteString, JsValue] { byteString =>
       val data = byteString.utf8String.stripPrefix(itemPrefix)
-      if (data.equals(endOfStreamToken)) JsString(endOfStreamToken)
-      else Json.parse(data)
+      if (data.equals(endOfStreamToken)) JsString(endOfStreamToken) else Json.parse(data)
     }
 
   protected def execJsonStreamAux(
-      endPoint: PEP,
-      method: String,
-      endPointParam: Option[String] = None,
-      params: Seq[(PT, Option[Any])] = Nil,
-      bodyParams: Seq[(PT, Option[JsValue])] = Nil
-  )(implicit
-      materializer: Materializer
+    endPoint: PEP,
+    method: String,
+    endPointParam: Option[String] = None,
+    params: Seq[(PT, Option[Any])] = Nil,
+    bodyParams: Seq[(PT, Option[JsValue])] = Nil)(
+    implicit materializer: Materializer
   ): Source[JsValue, NotUsed] = {
     val source = execStreamRequestAux[JsValue](
       endPoint,
@@ -56,14 +50,8 @@ trait WSStreamRequestHelper {
       bodyParams,
       Framing.delimiter(ByteString("\n\n"), 1000, allowTruncation = true),
       {
-        case e: JsonParseException =>
-          throw new OpenAIScalaClientException(
-            s"$serviceName.$endPoint: 'Response is not a JSON. ${e.getMessage}."
-          )
-        case e: FramingException =>
-          throw new OpenAIScalaClientException(
-            s"$serviceName.$endPoint: 'Response is not a JSON. ${e.getMessage}."
-          )
+        case e: JsonParseException => throw new OpenAIScalaClientException(s"$serviceName.$endPoint: 'Response is not a JSON. ${e.getMessage}.")
+        case e: FramingException => throw new OpenAIScalaClientException(s"$serviceName.$endPoint: 'Response is not a JSON. ${e.getMessage}.")
       }
     )
 
@@ -72,41 +60,32 @@ trait WSStreamRequestHelper {
   }
 
   protected def execStreamRequestAux[T](
-      endPoint: PEP,
-      method: String,
-      endPointParam: Option[String],
-      params: Seq[(PT, Option[Any])],
-      bodyParams: Seq[(PT, Option[JsValue])],
-      framing: Flow[ByteString, ByteString, NotUsed],
-      recoverBlock: PartialFunction[Throwable, T]
-  )(implicit
-      um: Unmarshaller[ByteString, T],
-      materializer: Materializer
+    endPoint: PEP,
+    method: String,
+    endPointParam: Option[String],
+    params: Seq[(PT, Option[Any])],
+    bodyParams: Seq[(PT, Option[JsValue])],
+    framing: Flow[ByteString, ByteString, NotUsed],
+    recoverBlock: PartialFunction[Throwable, T])(
+    implicit um: Unmarshaller[ByteString, T], materializer: Materializer
   ): Source[T, NotUsed] = {
     val request = getWSRequestOptional(Some(endPoint), endPointParam, params)
 
     val requestWithBody = if (bodyParams.nonEmpty) {
-      val bodyParamsX = bodyParams.collect { case (fieldName, Some(jsValue)) =>
-        (fieldName.toString, jsValue)
-      }
+      val bodyParamsX = bodyParams.collect { case (fieldName, Some(jsValue)) => (fieldName.toString, jsValue) }
       request.withBody(JsObject(bodyParamsX))
     } else
       request
 
     val source =
       requestWithBody.withMethod(method).stream().map { response =>
-        response.bodyAsSource
+        response
+          .bodyAsSource
           .via(framing)
-          .mapAsync(1)(bytes => Unmarshal(bytes).to[T]) // unmarshal one by one
+          .mapAsync(1)(bytes => Unmarshal(bytes).to[T])  // unmarshal one by one
           .recover {
-            case e: TimeoutException =>
-              throw new OpenAIScalaClientTimeoutException(
-                s"$serviceName.$endPoint timed out: ${e.getMessage}."
-              )
-            case e: UnknownHostException =>
-              throw new OpenAIScalaClientUnknownHostException(
-                s"$serviceName.$endPoint cannot resolve a host name: ${e.getMessage}."
-              )
+            case e: TimeoutException => throw new OpenAIScalaClientTimeoutException(s"$serviceName.$endPoint timed out: ${e.getMessage}.")
+            case e: UnknownHostException => throw new OpenAIScalaClientUnknownHostException(s"$serviceName.$endPoint cannot resolve a host name: ${e.getMessage}.")
           }
           .recover(recoverBlock) // extra recover
       }

openai-client-stream/src/main/scala/io/cequence/openaiscala/service/ws/WSStreamRequestHelper.scala

@@ -5,14 +5,12 @@ import com.typesafe.config.Config
 object ConfigImplicits {
   implicit class ConfigExt(config: Config) {
     def optionalString(configPath: String): Option[String] =
-      if (config.hasPath(configPath)) Some(config.getString(configPath))
-      else None
+      if (config.hasPath(configPath)) Some(config.getString(configPath)) else None
 
     def optionalInt(configPath: String): Option[Int] =
       if (config.hasPath(configPath)) Some(config.getInt(configPath)) else None
 
     def optionalBoolean(configPath: String): Option[Boolean] =
-      if (config.hasPath(configPath)) Some(config.getBoolean(configPath))
-      else None
+      if (config.hasPath(configPath)) Some(config.getBoolean(configPath)) else None
   }
 }