Run isFinished

Author: bburdiliak

build.sbt

@@ -7,7 +7,7 @@ val scala3 = "3.2.2"
 
 ThisBuild / organization := "io.cequence"
 ThisBuild / scalaVersion := scala212
-ThisBuild / version := "1.1.1.RC.8"
+ThisBuild / version := "1.1.1.RC.9"
 ThisBuild / isSnapshot := false
 
 lazy val commonSettings = Seq(

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

@@ -1166,7 +1166,7 @@ object JsonFormats {
         case c: JsonSchema.Boolean =>
           Json.toJson(c).as[JsObject]
 
-        case c: JsonSchema.Null =>
+        case _: JsonSchema.Null =>
           Json.obj()
 
         case c: JsonSchema.Object =>

openai-core/src/main/scala/io/cequence/openaiscala/domain/Run.scala

@@ -74,7 +74,9 @@ case class Run(
   usage: Option[UsageInfo]
   //  tool_choice: Either[String, Any], // Replace Any with the actual type when available
   //  response_format: Either[String, Any] // Replace Any with the actual type when available
-)
+) {
+  def isFinished: Boolean = RunStatus.finishedStates.contains(status)
+}
 
 object Run {
 

openai-examples/src/main/scala/io/cequence/openaiscala/examples/CreateBatch.scala

@@ -8,13 +8,11 @@ object CreateBatch extends Example {
   override protected def run: Future[_] =
     for {
       assistant <- service.createBatch(
-//        inputFileId = "file-mjdvW9DTeWDXO2g6sks1kvuQ",
-//        inputFileId = "file-bRFkk72miUWa48tDrE9b2lnL",
-        inputFileId = "file-8v4jKZa0cviulgJLnEofCW1N",
+        inputFileId = "file-xyz",
         endpoint = BatchEndpoint.`/v1/chat/completions`,
         completionWindow = CompletionWindow.`24h`,
         metadata = Map(
-          "customer_id" -> "user_123456789",
+          "customer_id" -> "user_abc",
           "batch_description" -> "Nightly eval job"
         )
       )

openai-examples/src/main/scala/io/cequence/openaiscala/examples/CreateChatCompletion.scala

@@ -1,9 +1,6 @@
 package io.cequence.openaiscala.examples
 
-import io.cequence.openaiscala.domain.settings.{
-  ChatCompletionResponseFormatType,
-  CreateChatCompletionSettings
-}
+import io.cequence.openaiscala.domain.settings.CreateChatCompletionSettings
 import io.cequence.openaiscala.domain._
 
 import scala.concurrent.Future

openai-examples/src/main/scala/io/cequence/openaiscala/examples/CreateRunWithCodeInterpretation.scala

@@ -53,13 +53,11 @@ object CreateRunWithCodeInterpretation extends Example with PollingHelper {
       )
 
       // poll until done
-      runNew <- pollUntilDone((run: Run) => RunStatus.finishedStates.contains(run.status)) {
+      runNew <- pollUntilDone((run: Run) => run.isFinished) {
         service
           .retrieveRun(thread.id, run.id)
           .map(
-            _.getOrElse(
-              throw new IllegalStateException(s"Run with id ${run.id} not found.")
-            )
+            _.getOrElse(throw new IllegalStateException(s"Run with id ${run.id} not found."))
           )
       }
 

openai-examples/src/main/scala/io/cequence/openaiscala/examples/RetrieveBatch.scala

@@ -9,9 +9,7 @@ import scala.concurrent.Future
 object RetrieveBatch extends Example {
 
   override protected def run: Future[Option[Unit]] =
-//    service.retrieveBatch("batch_zb1dpz3HcFjOdo058gEg8iPn").map { maybeBatch =>
-//    service.retrieveBatch("batch_wDuIbjt22f2vpjpn0ulU5xI1").map { maybeBatch =>
-    service.retrieveBatch("batch_Ghy5a9EEXDLFqBcJqANpr17F").map { maybeBatch =>
+    service.retrieveBatch("batch_xyz").map { maybeBatch =>
       println(maybeBatch)
 
       maybeBatch.map { batch =>

openai-examples/src/main/scala/io/cequence/openaiscala/examples/RetrieveBatchResponses.scala

@@ -6,8 +6,7 @@ object RetrieveBatchResponses extends Example {
 
   override protected def run: Future[_] =
     for {
-//      maybeBatchResponses <- service.retrieveBatchResponses("file-A9V1zO4XpjjqBke8Kdp78vMU")
-      maybeBatchResponses <- service.retrieveBatchResponses("batch_Ghy5a9EEXDLFqBcJqANpr17F")
+      maybeBatchResponses <- service.retrieveBatchResponses("batch_xyz")
     } yield {
       maybeBatchResponses match {
         case Some(batchResponses) =>

openai-examples/src/main/scala/io/cequence/openaiscala/examples/RetrieveFile.scala

@@ -6,7 +6,7 @@ object RetrieveFile extends Example {
 
   override protected def run: Future[_] =
     for {
-      assistant <- service.retrieveFile("file-2bZn9Vu6WicoTMOAEGW92pml")
+      assistant <- service.retrieveFile("file-xyz")
     } yield {
       println(assistant)
     }

openai-examples/src/main/scala/io/cequence/openaiscala/examples/fixtures/TestFixtures.scala

@@ -14,7 +14,7 @@ trait TestFixtures {
 
   val capitalsSchemaDef2 = capitalsSchemaDefAux(Right(capitalsSchema2))
 
-  def capitalsSchemaDefAux(schema: Either[JsonSchema, Map[String, Any]]) =
+  def capitalsSchemaDefAux(schema: Either[JsonSchema, Map[String, Any]]): JsonSchemaDef =
     JsonSchemaDef(
       name = "capitals_response",
       strict = true,

openai-examples/src/main/scala/io/cequence/openaiscala/examples/scenario/CreateThreadAndRunScenario.scala

@@ -56,20 +56,16 @@ object CreateThreadAndRunScenario extends Example with PollingHelper {
         stream = false
       )
 
-      runNew <- pollUntilDone((run: Run) => RunStatus.finishedStates.contains(run.status)) {
+      runNew <- pollUntilDone((run: Run) => run.isFinished) {
         service
           .retrieveRun(run.thread_id, run.id)
           .map(
-            _.getOrElse(
-              throw new IllegalStateException(s"Run with id ${run.id} not found.")
-            )
+            _.getOrElse(throw new IllegalStateException(s"Run with id ${run.id} not found."))
           )
       }
 
-      _ = println(s"Run status: ${runNew.status}")
-
       // get the messages
-      threadMessages <- service.listThreadMessages(run.thread_id)
+      threadMessages <- service.listThreadMessages(runNew.thread_id)
 
     } yield {
       println(s"File created: ${fileInfo.id}")