fix(internal): fix issues with imports and categories

David Meadows · stainless-app[bot] · commit 1e0a4d787c62 · 2024-10-01T16:45:52.000Z
diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionCreateParams.kt
@@ -13,7 +13,7 @@ import com.braintrustdata.api.core.NoAutoDetect
 import com.braintrustdata.api.core.getOrThrow
 import com.braintrustdata.api.core.toUnmodifiable
 import com.braintrustdata.api.errors.BraintrustInvalidDataException
-import com.braintrustdata.api.models.*
+import com.braintrustdata.api.models.CodeBundle.*
 import com.fasterxml.jackson.annotation.JsonAnyGetter
 import com.fasterxml.jackson.annotation.JsonAnySetter
 import com.fasterxml.jackson.annotation.JsonCreator
diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionReplaceParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionReplaceParams.kt
@@ -13,7 +13,7 @@ import com.braintrustdata.api.core.NoAutoDetect
 import com.braintrustdata.api.core.getOrThrow
 import com.braintrustdata.api.core.toUnmodifiable
 import com.braintrustdata.api.errors.BraintrustInvalidDataException
-import com.braintrustdata.api.models.*
+import com.braintrustdata.api.models.CodeBundle.*
 import com.fasterxml.jackson.annotation.JsonAnyGetter
 import com.fasterxml.jackson.annotation.JsonAnySetter
 import com.fasterxml.jackson.annotation.JsonCreator
diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/FunctionUpdateParams.kt
@@ -13,7 +13,7 @@ import com.braintrustdata.api.core.NoAutoDetect
 import com.braintrustdata.api.core.getOrThrow
 import com.braintrustdata.api.core.toUnmodifiable
 import com.braintrustdata.api.errors.BraintrustInvalidDataException
-import com.braintrustdata.api.models.*
+import com.braintrustdata.api.models.CodeBundle.*
 import com.fasterxml.jackson.annotation.JsonAnyGetter
 import com.fasterxml.jackson.annotation.JsonAnySetter
 import com.fasterxml.jackson.annotation.JsonCreator
diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreCreateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreCreateParams.kt
@@ -10,7 +10,6 @@ import com.braintrustdata.api.core.NoAutoDetect
 import com.braintrustdata.api.core.getOrThrow
 import com.braintrustdata.api.core.toUnmodifiable
 import com.braintrustdata.api.errors.BraintrustInvalidDataException
-import com.braintrustdata.api.models.*
 import com.fasterxml.jackson.annotation.JsonAnyGetter
 import com.fasterxml.jackson.annotation.JsonAnySetter
 import com.fasterxml.jackson.annotation.JsonProperty
@@ -298,7 +297,7 @@ constructor(
         fun categories(categories: Categories) = apply { this.categories = categories }
 
         /** For categorical-type project scores, the list of all categories */
-        fun categories(projectScoreCategories: List<ProjectScoreCategory>) = apply {
+        fun projectScoreCategories(projectScoreCategories: List<ProjectScoreCategory>) = apply {
             this.categories = Categories.ofProjectScoreCategories(projectScoreCategories)
         }
 
diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreReplaceParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreReplaceParams.kt
@@ -10,7 +10,6 @@ import com.braintrustdata.api.core.NoAutoDetect
 import com.braintrustdata.api.core.getOrThrow
 import com.braintrustdata.api.core.toUnmodifiable
 import com.braintrustdata.api.errors.BraintrustInvalidDataException
-import com.braintrustdata.api.models.*
 import com.fasterxml.jackson.annotation.JsonAnyGetter
 import com.fasterxml.jackson.annotation.JsonAnySetter
 import com.fasterxml.jackson.annotation.JsonProperty
@@ -298,7 +297,7 @@ constructor(
         fun categories(categories: Categories) = apply { this.categories = categories }
 
         /** For categorical-type project scores, the list of all categories */
-        fun categories(projectScoreCategories: List<ProjectScoreCategory>) = apply {
+        fun projectScoreCategories(projectScoreCategories: List<ProjectScoreCategory>) = apply {
             this.categories = Categories.ofProjectScoreCategories(projectScoreCategories)
         }
 
diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreUpdateParams.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ProjectScoreUpdateParams.kt
@@ -10,7 +10,6 @@ import com.braintrustdata.api.core.NoAutoDetect
 import com.braintrustdata.api.core.getOrThrow
 import com.braintrustdata.api.core.toUnmodifiable
 import com.braintrustdata.api.errors.BraintrustInvalidDataException
-import com.braintrustdata.api.models.*
 import com.fasterxml.jackson.annotation.JsonAnyGetter
 import com.fasterxml.jackson.annotation.JsonAnySetter
 import com.fasterxml.jackson.annotation.JsonProperty
@@ -285,7 +284,7 @@ constructor(
         fun categories(categories: Categories) = apply { this.categories = categories }
 
         /** For categorical-type project scores, the list of all categories */
-        fun categories(projectScoreCategories: List<ProjectScoreCategory>) = apply {
+        fun projectScoreCategories(projectScoreCategories: List<ProjectScoreCategory>) = apply {
             this.categories = Categories.ofProjectScoreCategories(projectScoreCategories)
         }
 
diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptData.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/PromptData.kt
@@ -955,7 +955,7 @@ private constructor(
                             tryDeserialize(node, jacksonTypeRef<Auto>())?.let {
                                 return FunctionCall(auto = it, _json = json)
                             }
-                            tryDeserialize(node, jacksonTypeRef<None>())?.let {
+                            tryDeserialize(node, jacksonTypeRef<FunctionCall.None>())?.let {
                                 return FunctionCall(none = it, _json = json)
                             }
                             tryDeserialize(node, jacksonTypeRef<Function>()) { it.validate() }
diff --git a/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ToolChoice.kt b/braintrust-java-core/src/main/kotlin/com/braintrustdata/api/models/ToolChoice.kt
@@ -136,7 +136,7 @@ private constructor(
             tryDeserialize(node, jacksonTypeRef<Auto>())?.let {
                 return ToolChoice(auto = it, _json = json)
             }
-            tryDeserialize(node, jacksonTypeRef<None>())?.let {
+            tryDeserialize(node, jacksonTypeRef<ToolChoice.None>())?.let {
                 return ToolChoice(none = it, _json = json)
             }
             tryDeserialize(node, jacksonTypeRef<Function>()) { it.validate() }
diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreCreateParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreCreateParamsTest.kt
@@ -14,10 +14,8 @@ class ProjectScoreCreateParamsTest {
             .name("name")
             .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
             .scoreType(ProjectScoreType.SLIDER)
-            .categories(
-                ProjectScoreCreateParams.Categories.ofList<ProjectScoreCategory>(
-                    listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
-                )
+            .projectScoreCategories(
+                listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
             )
             .config(
                 ProjectScoreConfig.builder()
@@ -53,10 +51,8 @@ class ProjectScoreCreateParamsTest {
                 .name("name")
                 .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
                 .scoreType(ProjectScoreType.SLIDER)
-                .categories(
-                    ProjectScoreCreateParams.Categories.ofList<ProjectScoreCategory>(
-                        listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
-                    )
+                .projectScoreCategories(
+                    listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
                 )
                 .config(
                     ProjectScoreConfig.builder()
@@ -92,7 +88,7 @@ class ProjectScoreCreateParamsTest {
         assertThat(body.scoreType()).isEqualTo(ProjectScoreType.SLIDER)
         assertThat(body.categories())
             .isEqualTo(
-                ProjectScoreCreateParams.Categories.ofList<ProjectScoreCategory>(
+                ProjectScoreCreateParams.Categories.ofProjectScoreCategories(
                     listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
                 )
             )
diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreListParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreListParamsTest.kt
@@ -56,9 +56,7 @@ class ProjectScoreListParamsTest {
         expected.put(
             "score_type",
             listOf(
-                ProjectScoreListParams.ScoreType.ofProjectScoreType(
-                        ProjectScoreType.SLIDER.toString()
-                    )
+                ProjectScoreListParams.ScoreType.ofProjectScoreType(ProjectScoreType.SLIDER)
                     .toString()
             )
         )
diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreReplaceParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreReplaceParamsTest.kt
@@ -14,10 +14,8 @@ class ProjectScoreReplaceParamsTest {
             .name("name")
             .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
             .scoreType(ProjectScoreType.SLIDER)
-            .categories(
-                ProjectScoreReplaceParams.Categories.ofList<ProjectScoreCategory>(
-                    listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
-                )
+            .projectScoreCategories(
+                listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
             )
             .config(
                 ProjectScoreConfig.builder()
@@ -53,10 +51,8 @@ class ProjectScoreReplaceParamsTest {
                 .name("name")
                 .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
                 .scoreType(ProjectScoreType.SLIDER)
-                .categories(
-                    ProjectScoreReplaceParams.Categories.ofList<ProjectScoreCategory>(
-                        listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
-                    )
+                .projectScoreCategories(
+                    listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
                 )
                 .config(
                     ProjectScoreConfig.builder()
@@ -92,7 +88,7 @@ class ProjectScoreReplaceParamsTest {
         assertThat(body.scoreType()).isEqualTo(ProjectScoreType.SLIDER)
         assertThat(body.categories())
             .isEqualTo(
-                ProjectScoreReplaceParams.Categories.ofList<ProjectScoreCategory>(
+                ProjectScoreReplaceParams.Categories.ofProjectScoreCategories(
                     listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
                 )
             )
diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreTest.kt
@@ -18,7 +18,7 @@ class ProjectScoreTest {
                 .scoreType(ProjectScoreType.SLIDER)
                 .userId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
                 .categories(
-                    ProjectScore.Categories.ofList<ProjectScoreCategory>(
+                    ProjectScore.Categories.ofProjectScoreCategories(
                         listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
                     )
                 )
@@ -59,7 +59,7 @@ class ProjectScoreTest {
         assertThat(projectScore.userId()).isEqualTo("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
         assertThat(projectScore.categories())
             .contains(
-                ProjectScore.Categories.ofList<ProjectScoreCategory>(
+                ProjectScore.Categories.ofProjectScoreCategories(
                     listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
                 )
             )
diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreUpdateParamsTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/models/ProjectScoreUpdateParamsTest.kt
@@ -12,10 +12,8 @@ class ProjectScoreUpdateParamsTest {
     fun createProjectScoreUpdateParams() {
         ProjectScoreUpdateParams.builder()
             .projectScoreId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
-            .categories(
-                ProjectScoreUpdateParams.Categories.ofList<ProjectScoreCategory>(
-                    listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
-                )
+            .projectScoreCategories(
+                listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
             )
             .config(
                 ProjectScoreConfig.builder()
@@ -51,10 +49,8 @@ class ProjectScoreUpdateParamsTest {
         val params =
             ProjectScoreUpdateParams.builder()
                 .projectScoreId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
-                .categories(
-                    ProjectScoreUpdateParams.Categories.ofList<ProjectScoreCategory>(
-                        listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
-                    )
+                .projectScoreCategories(
+                    listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
                 )
                 .config(
                     ProjectScoreConfig.builder()
@@ -89,7 +85,7 @@ class ProjectScoreUpdateParamsTest {
         assertThat(body).isNotNull
         assertThat(body.categories())
             .isEqualTo(
-                ProjectScoreUpdateParams.Categories.ofList<ProjectScoreCategory>(
+                ProjectScoreUpdateParams.Categories.ofProjectScoreCategories(
                     listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
                 )
             )
diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/services/blocking/EnvVarServiceTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/services/blocking/EnvVarServiceTest.kt
@@ -82,7 +82,6 @@ class EnvVarServiceTest {
             envVarService.list(
                 EnvVarListParams.builder()
                     .envVarName("env_var_name")
-                    .ids(EnvVarListParams.Ids.ofString("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e"))
                     .limit(123L)
                     .objectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
                     .objectType(EnvVarListParams.ObjectType.ORGANIZATION)
diff --git a/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/services/blocking/ProjectScoreServiceTest.kt b/braintrust-java-core/src/test/kotlin/com/braintrustdata/api/services/blocking/ProjectScoreServiceTest.kt
@@ -26,10 +26,8 @@ class ProjectScoreServiceTest {
                     .name("name")
                     .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
                     .scoreType(ProjectScoreType.SLIDER)
-                    .categories(
-                        ProjectScoreCreateParams.Categories.ofList<ProjectScoreCategory>(
-                            listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
-                        )
+                    .projectScoreCategories(
+                        listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
                     )
                     .config(
                         ProjectScoreConfig.builder()
@@ -94,10 +92,8 @@ class ProjectScoreServiceTest {
             projectScoreService.update(
                 ProjectScoreUpdateParams.builder()
                     .projectScoreId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
-                    .categories(
-                        ProjectScoreUpdateParams.Categories.ofList<ProjectScoreCategory>(
-                            listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
-                        )
+                    .projectScoreCategories(
+                        listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
                     )
                     .config(
                         ProjectScoreConfig.builder()
@@ -179,10 +175,8 @@ class ProjectScoreServiceTest {
                     .name("name")
                     .projectId("182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e")
                     .scoreType(ProjectScoreType.SLIDER)
-                    .categories(
-                        ProjectScoreReplaceParams.Categories.ofList<ProjectScoreCategory>(
-                            listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
-                        )
+                    .projectScoreCategories(
+                        listOf(ProjectScoreCategory.builder().name("name").value(42.23).build())
                     )
                     .config(
                         ProjectScoreConfig.builder()

Original file line number	Diff line number	Diff line change
`@@ -955,7 +955,7 @@ private constructor(`
`955`	`955`	`tryDeserialize(node, jacksonTypeRef<Auto>())?.let {`
`956`	`956`	`return FunctionCall(auto = it, _json = json)`
`957`	`957`	`}`
`958`		`- tryDeserialize(node, jacksonTypeRef<None>())?.let {`
	`958`	`+ tryDeserialize(node, jacksonTypeRef<FunctionCall.None>())?.let {`
`959`	`959`	`return FunctionCall(none = it, _json = json)`
`960`	`960`	`}`
`961`	`961`	`tryDeserialize(node, jacksonTypeRef<Function>()) { it.validate() }`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private constructor(`
`136`	`136`	`tryDeserialize(node, jacksonTypeRef<Auto>())?.let {`
`137`	`137`	`return ToolChoice(auto = it, _json = json)`
`138`	`138`	`}`
`139`		`- tryDeserialize(node, jacksonTypeRef<None>())?.let {`
	`139`	`+ tryDeserialize(node, jacksonTypeRef<ToolChoice.None>())?.let {`
`140`	`140`	`return ToolChoice(none = it, _json = json)`
`141`	`141`	`}`
`142`	`142`	`tryDeserialize(node, jacksonTypeRef<Function>()) { it.validate() }`
Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,7 @@ class ProjectScoreListParamsTest {`
`56`	`56`	`expected.put(`
`57`	`57`	`"score_type",`
`58`	`58`	`listOf(`
`59`		`- ProjectScoreListParams.ScoreType.ofProjectScoreType(`
`60`		`- ProjectScoreType.SLIDER.toString()`
`61`		`- )`
	`59`	`+ ProjectScoreListParams.ScoreType.ofProjectScoreType(ProjectScoreType.SLIDER)`
`62`	`60`	`.toString()`
`63`	`61`	`)`
`64`	`62`	`)`