Fix issues in CI pipeline

.github/workflows/continuous-integration.yml

@@ -3,9 +3,9 @@
 name: CI
 on:
   pull_request:
-    branches: [ main, '**' ]
+    branches: [ master, '**' ]
   push:
-    branches: [ main ]
+    branches: [ master ]
 
 jobs:
   validate:
@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        scala: [ '2.12.15', '2.13.10', '3.2.2' ]
+        scala: [ '2.12.15', '2.13.11', '3.2.2' ]
 
     steps:
       - uses: actions/checkout@v3
@@ -41,23 +41,17 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'corretto'
-          java-version: '8'
+          java-version: '11'
           cache: 'sbt'
 
       - name: Build & Test
-        run: sbt ++${{ matrix.scala }} testWithCoverage
-
-      - name: Upload coverage report (Cobertura)
-        uses: actions/[email protected]
-        with:
-          name: cobertura.xml
-          path: ${{github.workspace}}/target/scala-2.13/coverage-report/cobertura.xml
+        run: sbt ++${{ matrix.scala }} clean testWithCoverage
 
-      - name: Upload coverage report (HTML)
+      - name: Upload coverage report (all)
         uses: actions/[email protected]
         with:
-          name: scoverage-report-html
-          path: ${{github.workspace}}/target/scala-2.13/scoverage-report/
+          name: coverage-report-${{ matrix.scala }}
+          path: ${{github.workspace}}/target/scala-${{ matrix.scala }}/coverage-report
 
   optional-build:
     name: Build (Optional)
@@ -70,12 +64,12 @@ jobs:
       matrix:
         distribution: [ 'corretto' ]
         jdk: [ '11' ]
-        scala: [ '2.12.15', '2.13.10', '3.2.2' ]
+        scala: [ '2.12.15', '2.13.11', '3.2.2' ]
         experimental: [ false ]
         include:
           - jdk: '17'
             distribution: 'corretto'
-            scala: '2.13.10'
+            scala: '2.13.11'
             experimental: true
 
     steps:
@@ -90,35 +84,35 @@ jobs:
           cache: 'sbt'
 
       - name: Perform Build / Test
-        run: sbt ++${{ matrix.scala }} compile test
-
-  coverage:
-    name: Coverage Report
-    if: ${{ github.event.pull_request }}
-    needs: [ build ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: cobertura.xml
-
-      - name: Analyzing coverage report
-        uses: 5monkeys/cobertura-action@master
-        with:
-          path: cobertura.xml
-          only_changed_files: true
-          fail_below_threshold: true
-          show_missing: true
-          show_line: true
-          show_branch: true
-          show_class_names: true
-          link_missing_lines: true
-          minimum_coverage: 75
+        run: sbt ++${{ matrix.scala }} clean compile test
+
+#  coverage:
+#    name: Coverage Report
+#    if: ${{ github.event.pull_request }}
+#    needs: [ build ]
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/download-artifact@v3
+#        with:
+#          name: cobertura.xml
+#
+#      - name: Analyzing coverage report
+#        uses: 5monkeys/cobertura-action@master
+#        with:
+#          path: cobertura.xml
+#          only_changed_files: true
+#          fail_below_threshold: true
+#          show_missing: true
+#          show_line: true
+#          show_branch: true
+#          show_class_names: true
+#          link_missing_lines: true
+#          minimum_coverage: 75
 
   ready-to-merge:
     name: Ready to Merge
     if: ${{ github.event.pull_request }}
-    needs: [ optional-build, coverage ]
+    needs: [ optional-build ]
     runs-on: ubuntu-latest
     steps:
       - run: echo 'Ready to merge.'

build.sbt

@@ -4,25 +4,30 @@ import sbt.Keys.test
 val scala212 = "2.12.18"
 val scala213 = "2.13.11"
 val scala3 = "3.2.2"
+lazy val supportedScalaVersions = List(scala212, scala213, scala3)
 
 ThisBuild / organization := "io.cequence"
 ThisBuild / scalaVersion := scala212
 ThisBuild / version := "0.4.0"
 ThisBuild / isSnapshot := false
 
 lazy val core = (project in file("openai-core"))
+  .settings(crossScalaVersions := supportedScalaVersions)
 
 lazy val client = (project in file("openai-client"))
   .dependsOn(core)
   .aggregate(core)
+  .settings(crossScalaVersions := supportedScalaVersions)
 
 lazy val client_stream = (project in file("openai-client-stream"))
   .dependsOn(client)
   .aggregate(client)
+  .settings(crossScalaVersions := supportedScalaVersions)
 
 lazy val guice = (project in file("openai-guice"))
   .dependsOn(client)
   .aggregate(client_stream)
+  .settings(crossScalaVersions := supportedScalaVersions)
 
 // POM settings for Sonatype
 ThisBuild / homepage := Some(
@@ -86,7 +91,6 @@ addCommandAlias(
   ).mkString(";")
 )
 
-
 inThisBuild(
   List(
     scalacOptions += "-Ywarn-unused",

openai-client-stream/build.sbt

@@ -5,5 +5,5 @@ description := "Stream support for the OpenAI Scala client."
 val akkaHttpVersion = "10.5.0-M1" // TODO: migrate to 10.5.1
 
 libraryDependencies ++= Seq(
-  "com.typesafe.akka" %% "akka-http" % akkaHttpVersion  // JSON WS Streaming
-)
+  "com.typesafe.akka" %% "akka-http" % akkaHttpVersion // JSON WS Streaming
+)

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

@@ -2,53 +2,74 @@ package io.cequence.openaiscala.service
 
 import akka.NotUsed
 import akka.stream.scaladsl.Source
-import io.cequence.openaiscala.domain.{FunctionSpec, MessageSpec}
-import io.cequence.openaiscala.domain.response.{ChatCompletionChunkResponse, ChatCompletionResponse, FineTuneEvent, TextCompletionResponse}
-import io.cequence.openaiscala.domain.settings.{CreateChatCompletionSettings, CreateCompletionSettings}
-
-import scala.concurrent.Future
+import io.cequence.openaiscala.domain.MessageSpec
+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 A list of messages comprising the conversation so far.
-   * @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
+    *   A list of messages comprising the conversation so far.
+    * @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]
 }