Revert "install scalafix plugin and run scalafix on all source files"

This reverts commit 61052fa.

Author: phelps-sg

.scalafix.conf

@@ -24,27 +24,16 @@ lazy val guice = (project in file("openai-guice"))
   .dependsOn(client)
   .aggregate(client_stream)
 
+
 // POM settings for Sonatype
-ThisBuild / homepage := Some(
-  url("https://github.com/cequence-io/openai-scala-client")
-)
+ThisBuild / homepage := Some(url("https://github.com/cequence-io/openai-scala-client"))
 
 ThisBuild / sonatypeProfileName := "io.cequence"
 
-ThisBuild / scmInfo := Some(
-  ScmInfo(
-    url("https://github.com/cequence-io/openai-scala-client"),
-    "scm:[email protected]:cequence-io/openai-scala-client.git"
-  )
-)
+ThisBuild / scmInfo := Some(ScmInfo(url("https://github.com/cequence-io/openai-scala-client"), "scm:[email protected]:cequence-io/openai-scala-client.git"))
 
 ThisBuild / developers := List(
-  Developer(
-    "bnd",
-    "Peter Banda",
-    "[email protected]",
-    url("https://peterbanda.net")
-  )
+  Developer("bnd", "Peter Banda", "[email protected]", url("https://peterbanda.net"))
 )
 
 ThisBuild / licenses += "MIT" -> url("https://opensource.org/licenses/MIT")
@@ -85,13 +74,3 @@ addCommandAlias(
     "coverageReport"
   ).mkString(";")
 )
-
-
-inThisBuild(
-  List(
-    scalacOptions += "-Ywarn-unused",
-    scalaVersion := "2.12.15",
-    semanticdbEnabled := true,
-    semanticdbVersion := scalafixSemanticdb.revision
-  )
-)

build.sbt

@@ -3,9 +3,10 @@ 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.response.{ChatCompletionChunkResponse, ChatCompletionResponse, FineTuneEvent, TextCompletionResponse}
 import io.cequence.openaiscala.domain.settings.{CreateChatCompletionSettings, CreateCompletionSettings}
 
+import scala.concurrent.Future
 
 trait OpenAIServiceStreamedExtra extends OpenAIServiceConsts {
 

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

@@ -10,7 +10,7 @@ import io.cequence.openaiscala.domain.response._
 import io.cequence.openaiscala.service.ws.{Timeouts, WSStreamRequestHelper}
 import io.cequence.openaiscala.OpenAIScalaClientException
 import io.cequence.openaiscala.domain.MessageSpec
-import play.api.libs.json.JsValue
+import play.api.libs.json.{JsValue, Json}
 
 import scala.concurrent.ExecutionContext
 

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

@@ -1,15 +1,15 @@
 package io.cequence.openaiscala.service.ws
 
 import akka.NotUsed
-import akka.http.scaladsl.common.EntityStreamingSupport
+import akka.http.scaladsl.common.{EntityStreamingSupport, JsonEntityStreamingSupport}
 import akka.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller}
 import akka.stream.Materializer
 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 play.api.libs.json.{JsObject, JsString, JsValue, Json}
+import play.api.libs.json.{JsNull, JsObject, JsString, JsValue, Json}
 import play.api.libs.ws.JsonBodyWritables._
 
 import java.net.UnknownHostException
@@ -26,7 +26,8 @@ trait WSStreamRequestHelper {
   private val itemPrefix = "data: "
   private val endOfStreamToken = "[DONE]"
 
-  EntityStreamingSupport.json()
+  private implicit val jsonStreamingSupport: JsonEntityStreamingSupport =
+    EntityStreamingSupport.json()
 
   private implicit val jsonMarshaller: Unmarshaller[ByteString, JsValue] =
     Unmarshaller.strict[ByteString, JsValue] { byteString =>

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

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

openai-client/src/main/scala/io/cequence/openaiscala/ConfigImplicits.scala

@@ -3,20 +3,21 @@ package io.cequence.openaiscala
 import io.cequence.openaiscala.JsonUtil.JsonOps
 import io.cequence.openaiscala.domain.ChatRole
 
+import java.{util => ju}
 import io.cequence.openaiscala.domain.response._
 import play.api.libs.functional.syntax._
 import play.api.libs.json.{Format, Json, _}
 
 object JsonFormats {
-  JsonUtil.SecDateFormat
+  private implicit val dateFormat: Format[ju.Date] = JsonUtil.SecDateFormat
 
   implicit val PermissionFormat: Format[Permission] = Json.format[Permission]
   implicit val modelSpecFormat: Format[ModelInfo] = Json.format[ModelInfo]
 
   implicit val usageInfoFormat: Format[UsageInfo] = Json.format[UsageInfo]
 
-  JsonUtil.StringDoubleMapFormat
-  JsonUtil.StringStringMapFormat
+  private implicit val stringDoubleMapFormat: Format[Map[String, Double]] = JsonUtil.StringDoubleMapFormat
+  private implicit val stringStringMapFormat: Format[Map[String, String]] = JsonUtil.StringStringMapFormat
 
   implicit val logprobsInfoFormat: Format[LogprobsInfo] = Json.format[LogprobsInfo]
   implicit val textCompletionChoiceInfoFormat: Format[TextCompletionChoiceInfo] = Json.format[TextCompletionChoiceInfo]

openai-client/src/main/scala/io/cequence/openaiscala/JsonFormats.scala

@@ -8,10 +8,10 @@ import java.util.Date
 object JsonUtil {
 
   implicit class JsonOps(val json: JsValue) {
-    def asSafe[T](implicit fjs: Reads[T]): T =
+    def asSafe[T](implicit fjs: Reads[T]) =
       try {
         json.validate[T] match {
-          case JsSuccess(value, _) => value
+          case JsSuccess(value, path) => value
           case JsError(errors) =>
             val errorString = errors.map { case (path, pathErrors) => s"JSON at path '${path}' contains the following errors: ${pathErrors.map(_.message).mkString(";")}" }.mkString("\n")
             throw new OpenAIScalaClientException(s"Unexpected JSON:\n'${Json.prettyPrint(json)}'. Cannot be parsed due to: $errorString")

openai-client/src/main/scala/io/cequence/openaiscala/JsonUtil.scala

@@ -8,6 +8,7 @@ import io.cequence.openaiscala.JsonFormats._
 import io.cequence.openaiscala.OpenAIScalaClientException
 import io.cequence.openaiscala.domain.settings._
 import io.cequence.openaiscala.domain.response._
+import io.cequence.openaiscala.ConfigImplicits._
 import io.cequence.openaiscala.domain.MessageSpec
 import io.cequence.openaiscala.service.ws.{Timeouts, WSRequestHelper}
 
@@ -76,7 +77,7 @@ private class OpenAIServiceImpl(
     prompt: String,
     settings: CreateCompletionSettings,
     stream: Boolean
-  ): Seq[(Tag, Option[JsValue])] =
+  ) =
     jsonBodyParams(
       Tag.prompt -> Some(prompt),
       Tag.model -> Some(settings.model),
@@ -119,7 +120,7 @@ private class OpenAIServiceImpl(
     messages: Seq[MessageSpec],
     settings: CreateChatCompletionSettings,
     stream: Boolean
-  ): Seq[(Tag, Option[JsValue])] = {
+  ) = {
     assert(messages.nonEmpty, "At least one message expected.")
 
     val messageJsons = messages.map { case MessageSpec(role, content) =>
@@ -494,14 +495,14 @@ private class OpenAIServiceImpl(
     endPoint: Option[PEP],
     endPointParam: Option[String],
     params: Seq[(PT, Option[Any])] = Nil
-  ): StandaloneWSRequest#Self =
+  ) =
     addHeaders(super.getWSRequestOptional(endPoint, endPointParam, params))
 
   override protected def getWSRequest(
     endPoint: Option[PEP],
     endPointParam: Option[String],
     params: Seq[(PT, Any)] = Nil
-  ): StandaloneWSRequest#Self =
+  ) =
     addHeaders(super.getWSRequest(endPoint, endPointParam, params))
 
   private def addHeaders(request: StandaloneWSRequest) = {

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

@@ -36,6 +36,6 @@ trait WSHelper {
     client
   }
 
-  def close: Unit =
+  def close =
     client.close()
 }

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

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonParseException
 import com.fasterxml.jackson.databind.JsonMappingException
 import io.cequence.openaiscala.JsonUtil.toJson
 import io.cequence.openaiscala.{OpenAIScalaClientException, OpenAIScalaClientTimeoutException, OpenAIScalaClientUnknownHostException, OpenAIScalaTokenCountExceededException}
-import play.api.libs.json.{JsObject, JsValue}
+import play.api.libs.json.{JsObject, JsValue, Json}
 import play.api.libs.ws.{BodyWritable, StandaloneWSRequest}
 import play.api.libs.ws.JsonBodyWritables._
 import play.api.libs.ws.JsonBodyReadables._
@@ -180,7 +180,7 @@ trait WSRequestHelper extends WSHelper {
     body: T,
     endPointForLogging: Option[PEP], // only for logging
     acceptableStatusCodes: Seq[Int] = defaultAcceptableStatusCodes
-  ): Future[RichJsResponse] =
+  ) =
     execRequestJsonAux(
       request, _.post(body),
       acceptableStatusCodes,
@@ -192,7 +192,7 @@ trait WSRequestHelper extends WSHelper {
     body: T,
     endPointForLogging: Option[PEP], // only for logging
     acceptableStatusCodes: Seq[Int] = defaultAcceptableStatusCodes
-  ): Future[RichStringResponse] =
+  ) =
     execRequestStringAux(
       request, _.post(body),
       acceptableStatusCodes,
@@ -319,10 +319,10 @@ trait WSRequestHelper extends WSHelper {
 
   protected def jsonBodyParams(
     params: (PT, Option[Any])*
-  ): Seq[(PT, Option[JsValue])] =
+  ) =
     params.map { case (paramName, value) => (paramName, value.map(toJson)) }
 
-  protected def handleErrorResponse[T](response: RichResponse[T]): T =
+  protected def handleErrorResponse[T](response: RichResponse[T]) =
     response match {
       case Left(data) => data
 
@@ -344,13 +344,13 @@ trait WSRequestHelper extends WSHelper {
         if (errorCode == 404) None else throw new OpenAIScalaClientException(s"Code ${errorCode} : ${message}")
     }
 
-  protected def paramsAsString(params: Seq[(PT, Any)]): String = {
+  protected def paramsAsString(params: Seq[(PT, Any)]) = {
     val string = params.map { case (tag, value) => s"$tag=$value" }.mkString("&")
 
     if (string.nonEmpty) s"?$string" else ""
   }
 
-  protected def paramsOptionalAsString(params: Seq[(PT, Option[Any])]): String = {
+  protected def paramsOptionalAsString(params: Seq[(PT, Option[Any])]) = {
     val string = params.collect { case (tag, Some(value)) => s"$tag=$value" }.mkString("&")
 
     if (string.nonEmpty) s"?$string" else ""
@@ -359,12 +359,12 @@ trait WSRequestHelper extends WSHelper {
   protected def createUrl(
     endpoint: Option[PEP],
     value: Option[String] = None
-  ): String =
+  ) =
     coreUrl + endpoint.map(_.toString).getOrElse("") + value.map("/" + _).getOrElse("")
 
   protected def toOptionalParams(
     params: Seq[(PT, Any)]
-  ): Seq[(PT, Some[Any])] =
+  ) =
     params.map { case (a, b) => (a, Some(b)) }
 
   // close

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

@@ -1,5 +1,5 @@
 package io.cequence.openaiscala.domain
 
 abstract class EnumValue(value: String = "") {
-  override def toString: String = if (value.nonEmpty) value else getClass.getSimpleName.stripSuffix("$")
+  override def toString = if (value.nonEmpty) value else getClass.getSimpleName.stripSuffix("$")
 }