Skip to content

Optimise imports #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Optimise imports #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cc179e
remove unused imports
phelps-sg Jun 9, 2023
47b09cc
remove unused imports
phelps-sg Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...nt-stream/src/main/scala/io/cequence/openaiscala/service/OpenAIServiceStreamedExtra.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ 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, ChatCompletionResponse, FineTuneEvent, TextCompletionResponse}
import io.cequence.openaiscala.domain.response.{ChatCompletionChunkResponse, FineTuneEvent, TextCompletionResponse}
import io.cequence.openaiscala.domain.settings.{CreateChatCompletionSettings, CreateCompletionSettings}

import scala.concurrent.Future

trait OpenAIServiceStreamedExtra extends OpenAIServiceConsts {

/**
Expand Down
10 changes: 5 additions & 5 deletions ...ent-stream/src/main/scala/io/cequence/openaiscala/service/OpenAIServiceStreamedImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ package io.cequence.openaiscala.service
import akka.NotUsed
import akka.stream.Materializer
import akka.stream.scaladsl.Source
import io.cequence.openaiscala.JsonUtil.JsonOps
import io.cequence.openaiscala.JsonFormats._
import io.cequence.openaiscala.domain.settings._
import io.cequence.openaiscala.domain.response._
import io.cequence.openaiscala.service.ws.{Timeouts, WSStreamRequestHelper}
import io.cequence.openaiscala.JsonUtil.JsonOps
import io.cequence.openaiscala.OpenAIScalaClientException
import io.cequence.openaiscala.domain.MessageSpec
import play.api.libs.json.{JsValue, Json}
import io.cequence.openaiscala.domain.response._
import io.cequence.openaiscala.domain.settings._
import io.cequence.openaiscala.service.ws.{Timeouts, WSStreamRequestHelper}
import play.api.libs.json.JsValue

import scala.concurrent.ExecutionContext

Expand Down
2 changes: 1 addition & 1 deletion ...ient-stream/src/main/scala/io/cequence/openaiscala/service/ws/WSStreamRequestHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ 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.{JsNull, JsObject, JsString, JsValue, Json}
import play.api.libs.json.{JsObject, JsString, JsValue, Json}
import play.api.libs.ws.JsonBodyWritables._

import java.net.UnknownHostException
Expand Down
4 changes: 2 additions & 2 deletions openai-client/src/main/scala/io/cequence/openaiscala/JsonFormats.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ 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, _}

import java.{util => ju}

object JsonFormats {
private implicit val dateFormat: Format[ju.Date] = JsonUtil.SecDateFormat

Expand Down
2 changes: 1 addition & 1 deletion openai-client/src/main/scala/io/cequence/openaiscala/JsonUtil.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.cequence.openaiscala

import java.{util => ju}
import play.api.libs.json._

import java.util.Date
import java.{util => ju}

object JsonUtil {

Expand Down
2 changes: 1 addition & 1 deletion ...ai-client/src/main/scala/io/cequence/openaiscala/service/OpenAIServiceFactoryHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package io.cequence.openaiscala.service

import akka.stream.Materializer
import com.typesafe.config.{Config, ConfigFactory}
import io.cequence.openaiscala.service.ws.Timeouts
import io.cequence.openaiscala.ConfigImplicits._
import io.cequence.openaiscala.service.ws.Timeouts

import scala.concurrent.ExecutionContext

Expand Down
11 changes: 5 additions & 6 deletions openai-client/src/main/scala/io/cequence/openaiscala/service/OpenAIServiceImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package io.cequence.openaiscala.service

import akka.stream.Materializer
import play.api.libs.ws.StandaloneWSRequest
import play.api.libs.json.{JsArray, JsObject, JsValue, Json}
import io.cequence.openaiscala.JsonUtil.JsonOps
import io.cequence.openaiscala.JsonFormats._
import io.cequence.openaiscala.JsonUtil.JsonOps
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.domain.response._
import io.cequence.openaiscala.domain.settings._
import io.cequence.openaiscala.service.ws.{Timeouts, WSRequestHelper}
import play.api.libs.json.{JsArray, JsObject, JsValue, Json}
import play.api.libs.ws.StandaloneWSRequest

import java.io.File
import scala.concurrent.{ExecutionContext, Future}
Expand Down
9 changes: 5 additions & 4 deletions openai-client/src/main/scala/io/cequence/openaiscala/service/ws/WSRequestHelper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ package io.cequence.openaiscala.service.ws
import com.fasterxml.jackson.core.JsonParseException
import com.fasterxml.jackson.databind.JsonMappingException
import io.cequence.openaiscala.JsonUtil.toJson
import io.cequence.openaiscala.service.ws.MultipartWritable.writeableOf_MultipartFormData
import io.cequence.openaiscala.{OpenAIScalaClientException, OpenAIScalaClientTimeoutException, OpenAIScalaClientUnknownHostException, OpenAIScalaTokenCountExceededException}
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.json.{JsObject, JsValue}
import play.api.libs.ws.JsonBodyReadables._
import MultipartWritable.writeableOf_MultipartFormData
import play.api.libs.ws.JsonBodyWritables._
import play.api.libs.ws.{BodyWritable, StandaloneWSRequest}

import java.io.File
import java.net.UnknownHostException
import java.util.concurrent.TimeoutException
Expand Down
2 changes: 1 addition & 1 deletion openai-core/src/main/scala/io/cequence/openaiscala/service/OpenAIService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.cequence.openaiscala.service

import io.cequence.openaiscala.domain.MessageSpec
import io.cequence.openaiscala.domain.settings._
import io.cequence.openaiscala.domain.response._
import io.cequence.openaiscala.domain.settings._

import java.io.File
import scala.concurrent.Future
Expand Down
1 change: 0 additions & 1 deletion openai-core/src/main/scala/io/cequence/openaiscala/service/OpenAIServiceWrapper.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import io.cequence.openaiscala.domain.MessageSpec
import io.cequence.openaiscala.domain.settings._

import java.io.File
import java.util.concurrent.atomic.AtomicInteger
import scala.concurrent.Future

trait OpenAIServiceWrapper extends OpenAIService {
Expand Down
2 changes: 1 addition & 1 deletion openai-guice/src/main/scala/io/cequence/openaiscala/service/AkkaModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.cequence.openaiscala.service

import akka.actor.ActorSystem
import akka.stream.Materializer
import com.google.inject.{AbstractModule, Injector, Provider}
import com.google.inject.{AbstractModule, Provider}
import com.typesafe.config.Config
import net.codingwell.scalaguice.ScalaModule

Expand Down
1 change: 0 additions & 1 deletion openai-guice/src/main/scala/io/cequence/openaiscala/service/BaseOpenAIClientApp.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package io.cequence.openaiscala.service

import akka.actor.ActorSystem
import akka.stream.Materializer
import org.slf4j.LoggerFactory

import scala.concurrent.ExecutionContext

Expand Down
2 changes: 1 addition & 1 deletion openai-guice/src/main/scala/io/cequence/openaiscala/service/GuiceContainer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import akka.actor.ActorSystem
import com.google.inject.{Guice, Injector, Module}
import com.typesafe.config.Config
import net.codingwell.scalaguice.InjectorExtensions._
import scala.concurrent.duration._

import scala.concurrent.duration._
import scala.concurrent.{Await, Future}

trait GuiceContainer {
Expand Down