build tests

BoundaryML · Jun 20, 2024 · ec5ebc9 · ec5ebc9
1 parent 67ab411
commit ec5ebc9
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 168 deletions.
diff --git a/engine/baml-lib/jinja/src/lib.rs b/engine/baml-lib/jinja/src/lib.rs
@@ -493,6 +493,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::from([("ROLE".to_string(), BamlValue::String("john doe".into()))]),
@@ -542,6 +543,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::from([("ROLE".to_string(), BamlValue::String("john doe".into()))]),
@@ -588,6 +590,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::from([("ROLE".to_string(), BamlValue::String("john doe".into()))]),
@@ -644,6 +647,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::from([("ROLE".to_string(), BamlValue::String("john doe".into()))]),
@@ -708,6 +712,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::from([("ROLE".to_string(), BamlValue::String("john doe".into()))]),
@@ -747,6 +752,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::from([("ROLE".to_string(), BamlValue::String("john doe".into()))]),
@@ -775,6 +781,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::from([("ROLE".to_string(), BamlValue::String("john doe".into()))]),
@@ -803,6 +810,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::from([("ROLE".to_string(), BamlValue::String("john doe".into()))]),
@@ -831,6 +839,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::from([("ROLE".to_string(), BamlValue::String("john doe".into()))]),
@@ -881,6 +890,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::from([("ROLE".to_string(), BamlValue::String("john doe".into()))]),
@@ -930,6 +940,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::from([("ROLE".to_string(), BamlValue::String("john doe".into()))]),
@@ -993,6 +1004,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::from([("ROLE".to_string(), BamlValue::String("john doe".into()))]),
@@ -1035,6 +1047,7 @@ mod render_tests {
                 client: RenderContext_Client {
                     name: "gpt4".to_string(),
                     provider: "openai".to_string(),
+                    default_role: "system".to_string(),
                 },
                 output_format: OutputFormatContent::new_string(),
                 tags: HashMap::new(),

diff --git a/integ-tests/python/baml_client/client.py b/integ-tests/python/baml_client/client.py
@@ -341,28 +341,6 @@ async def ExtractResume2(
       mdl = create_model("ExtractResume2ReturnType", inner=(types.Resume, ...))
       return coerce(mdl, raw.parsed())
 
-    async def ExtractResume5(
-        self,
-        resume_text: baml_py.Image,
-        baml_options: BamlCallOptions = {},
-    ) -> types.Character:
-      __tb__ = baml_options.get("tb", None)
-      if __tb__ is not None:
-        tb = __tb__._tb
-      else:
-        tb = None
-
-      raw = await self.__runtime.call_function(
-        "ExtractResume5",
-        {
-          "resume_text": resume_text,
-        },
-        self.__ctx_manager.get(),
-        tb,
-      )
-      mdl = create_model("ExtractResume5ReturnType", inner=(types.Character, ...))
-      return coerce(mdl, raw.parsed())
-
     async def FnClassOptionalOutput(
         self,
         input: str,
@@ -1761,38 +1739,6 @@ def ExtractResume2(
         tb,
       )
 
-    def ExtractResume5(
-        self,
-        resume_text: baml_py.Image,
-        baml_options: BamlCallOptions = {},
-    ) -> baml_py.BamlStream[partial_types.Character, types.Character]:
-      __tb__ = baml_options.get("tb", None)
-      if __tb__ is not None:
-        tb = __tb__._tb
-      else:
-        tb = None
-
-      raw = self.__runtime.stream_function(
-        "ExtractResume5",
-        {
-          "resume_text": resume_text,
-        },
-        None,
-        self.__ctx_manager.get(),
-        tb,
-      )
-
-      mdl = create_model("ExtractResume5ReturnType", inner=(types.Character, ...))
-      partial_mdl = create_model("ExtractResume5PartialReturnType", inner=(partial_types.Character, ...))
-
-      return baml_py.BamlStream[partial_types.Character, types.Character](
-        raw,
-        lambda x: coerce(partial_mdl, x),
-        lambda x: coerce(mdl, x),
-        self.__ctx_manager.get(),
-        tb,
-      )
-
     def FnClassOptionalOutput(
         self,
         input: str,

diff --git a/integ-tests/python/baml_client/inlinedbaml.py b/integ-tests/python/baml_client/inlinedbaml.py
diff --git a/integ-tests/python/baml_client/partial_types.py b/integ-tests/python/baml_client/partial_types.py
@@ -33,12 +33,6 @@ class Blah(BaseModel):
 
     prop4: Optional[str] = None
 
-class Character(BaseModel):
-
-
-    color: Optional[str] = None
-    clothing: Optional[str] = None
-
 class ClassOptionalOutput(BaseModel):
 
 

diff --git a/integ-tests/python/baml_client/type_builder.py b/integ-tests/python/baml_client/type_builder.py
@@ -19,7 +19,7 @@
 class TypeBuilder(_TypeBuilder):
     def __init__(self):
         super().__init__(classes=set(
-          ["Blah","Character","ClassOptionalOutput","ClassOptionalOutput2","ClassWithImage","DynamicClassOne","DynamicClassTwo","DynamicOutput","Education","Email","Event","FakeImage","InnerClass","InnerClass2","NamedArgsSingleClass","OptionalTest_Prop1","OptionalTest_ReturnType","OrderInfo","Person","RaysData","Resume","SearchParams","SomeClassNestedDynamic","TestClassAlias","TestClassNested","TestClassWithEnum","TestOutputClass","UnionTest_ReturnType","WithReasoning",]
+          ["Blah","ClassOptionalOutput","ClassOptionalOutput2","ClassWithImage","DynamicClassOne","DynamicClassTwo","DynamicOutput","Education","Email","Event","FakeImage","InnerClass","InnerClass2","NamedArgsSingleClass","OptionalTest_Prop1","OptionalTest_ReturnType","OrderInfo","Person","RaysData","Resume","SearchParams","SomeClassNestedDynamic","TestClassAlias","TestClassNested","TestClassWithEnum","TestOutputClass","UnionTest_ReturnType","WithReasoning",]
         ), enums=set(
           ["Category","Category2","Category3","Color","DataType","DynEnumOne","DynEnumTwo","EnumInClass","EnumOutput","Hobby","NamedArgsSingleEnum","NamedArgsSingleEnumList","OptionalTest_CategoryType","OrderStatus","Tag","TestEnum",]
         ))

diff --git a/integ-tests/python/baml_client/types.py b/integ-tests/python/baml_client/types.py
@@ -124,12 +124,6 @@ class Blah(BaseModel):
 
     prop4: Optional[str] = None
 
-class Character(BaseModel):
-
-
-    color: str
-    clothing: str
-
 class ClassOptionalOutput(BaseModel):
 
 

diff --git a/integ-tests/ruby/baml_client/client.rb b/integ-tests/ruby/baml_client/client.rb
@@ -309,26 +309,6 @@ def ExtractResume2(
       (raw.parsed_using_types(Baml::Types))
     end
 
-    sig {
-
-      params(
-        resume_text: Baml::Image,
-      ).returns(Baml::Types::Character)
-
-    }
-    def ExtractResume5(
-        resume_text:
-    )
-      raw = @runtime.call_function(
-        "ExtractResume5",
-        {
-          "resume_text" => resume_text,
-        },
-        @ctx_manager,
-      )
-      (raw.parsed_using_types(Baml::Types))
-    end
-
     sig {
 
       params(
@@ -1489,27 +1469,6 @@ def ExtractResume2(
       )
     end
 
-    sig {
-      params(
-        resume_text: Baml::Image,
-      ).returns(Baml::BamlStream[Baml::Types::Character])
-    }
-    def ExtractResume5(
-        resume_text:
-    )
-      raw = @runtime.stream_function(
-        "ExtractResume5",
-        {
-          "resume_text" => resume_text,
-        },
-        @ctx_manager,
-      )
-      Baml::BamlStream[Baml::PartialTypes::Character, Baml::Types::Character].new(
-        ffi_stream: raw,
-        ctx_manager: @ctx_manager
-      )
-    end
-
     sig {
       params(
         input: String,

diff --git a/integ-tests/ruby/baml_client/inlined.rb b/integ-tests/ruby/baml_client/inlined.rb
diff --git a/integ-tests/ruby/baml_client/partial-types.rb b/integ-tests/ruby/baml_client/partial-types.rb
@@ -22,7 +22,6 @@ module Baml
 
   module PartialTypes
     class Blah < T::Struct; end
-    class Character < T::Struct; end
     class ClassOptionalOutput < T::Struct; end
     class ClassOptionalOutput2 < T::Struct; end
     class ClassWithImage < T::Struct; end
@@ -54,11 +53,6 @@ class Blah < T::Struct
       include T::Struct::ActsAsComparable
       const :prop4, T.nilable(String)
     end
-    class Character < T::Struct
-      include T::Struct::ActsAsComparable
-      const :color, T.nilable(String)
-      const :clothing, T.nilable(String)
-    end
     class ClassOptionalOutput < T::Struct
       include T::Struct::ActsAsComparable
       const :prop1, T.nilable(String)

diff --git a/integ-tests/ruby/baml_client/types.rb b/integ-tests/ruby/baml_client/types.rb
@@ -132,7 +132,6 @@ class TestEnum < T::Enum
       end
     end
     class Blah < T::Struct; end
-    class Character < T::Struct; end
     class ClassOptionalOutput < T::Struct; end
     class ClassOptionalOutput2 < T::Struct; end
     class ClassWithImage < T::Struct; end
@@ -164,11 +163,6 @@ class Blah < T::Struct
       include T::Struct::ActsAsComparable
       const :prop4, T.nilable(String)
     end
-    class Character < T::Struct
-      include T::Struct::ActsAsComparable
-      const :color, String
-      const :clothing, String
-    end
     class ClassOptionalOutput < T::Struct
       include T::Struct::ActsAsComparable
       const :prop1, String

diff --git a/integ-tests/typescript/baml_client/client.ts b/integ-tests/typescript/baml_client/client.ts
@@ -16,7 +16,7 @@ $ pnpm add @boundaryml/baml
 // biome-ignore format: autogenerated code
 /* eslint-disable */
 import { BamlRuntime, FunctionResult, BamlCtxManager, BamlStream, Image } from "@boundaryml/baml"
-import {Blah, Character, ClassOptionalOutput, ClassOptionalOutput2, ClassWithImage, DynamicClassOne, DynamicClassTwo, DynamicOutput, Education, Email, Event, FakeImage, InnerClass, InnerClass2, NamedArgsSingleClass, OptionalTest_Prop1, OptionalTest_ReturnType, OrderInfo, Person, RaysData, Resume, SearchParams, SomeClassNestedDynamic, TestClassAlias, TestClassNested, TestClassWithEnum, TestOutputClass, UnionTest_ReturnType, WithReasoning, Category, Category2, Category3, Color, DataType, DynEnumOne, DynEnumTwo, EnumInClass, EnumOutput, Hobby, NamedArgsSingleEnum, NamedArgsSingleEnumList, OptionalTest_CategoryType, OrderStatus, Tag, TestEnum} from "./types"
+import {Blah, ClassOptionalOutput, ClassOptionalOutput2, ClassWithImage, DynamicClassOne, DynamicClassTwo, DynamicOutput, Education, Email, Event, FakeImage, InnerClass, InnerClass2, NamedArgsSingleClass, OptionalTest_Prop1, OptionalTest_ReturnType, OrderInfo, Person, RaysData, Resume, SearchParams, SomeClassNestedDynamic, TestClassAlias, TestClassNested, TestClassWithEnum, TestOutputClass, UnionTest_ReturnType, WithReasoning, Category, Category2, Category3, Color, DataType, DynEnumOne, DynEnumTwo, EnumInClass, EnumOutput, Hobby, NamedArgsSingleEnum, NamedArgsSingleEnumList, OptionalTest_CategoryType, OrderStatus, Tag, TestEnum} from "./types"
 import TypeBuilder from "./type_builder"
 
 export type RecursivePartialNull<T> = T extends object
@@ -232,21 +232,6 @@ export class BamlClient {
     return raw.parsed() as Resume
   }
 
-  async ExtractResume5(
-      resume_text: Image,
-      __baml_options__?: { tb?: TypeBuilder }
-  ): Promise<Character> {
-    const raw = await this.runtime.callFunction(
-      "ExtractResume5",
-      {
-        "resume_text": resume_text
-      },
-      this.ctx_manager.get(),
-      __baml_options__?.tb?.__tb(),
-    )
-    return raw.parsed() as Character
-  }
-
   async FnClassOptionalOutput(
       input: string,
       __baml_options__?: { tb?: TypeBuilder }
@@ -1199,28 +1184,6 @@ class BamlStreamClient {
     )
   }
 
-  ExtractResume5(
-      resume_text: Image,
-      __baml_options__?: { tb?: TypeBuilder }
-  ): BamlStream<RecursivePartialNull<Character>, Character> {
-    const raw = this.runtime.streamFunction(
-      "ExtractResume5",
-      {
-        "resume_text": resume_text
-      },
-      undefined,
-      this.ctx_manager.get(),
-      __baml_options__?.tb?.__tb(),
-    )
-    return new BamlStream<RecursivePartialNull<Character>, Character>(
-      raw,
-      (a): a is RecursivePartialNull<Character> => a,
-      (a): a is Character => a,
-      this.ctx_manager.get(),
-      __baml_options__?.tb?.__tb(),
-    )
-  }
-
   FnClassOptionalOutput(
       input: string,
       __baml_options__?: { tb?: TypeBuilder }

diff --git a/integ-tests/typescript/baml_client/inlinedbaml.ts b/integ-tests/typescript/baml_client/inlinedbaml.ts
diff --git a/integ-tests/typescript/baml_client/type_builder.ts b/integ-tests/typescript/baml_client/type_builder.ts
@@ -44,7 +44,7 @@ export default class TypeBuilder {
     constructor() {
         this.tb = new _TypeBuilder({
           classes: new Set([
-            "Blah","Character","ClassOptionalOutput","ClassOptionalOutput2","ClassWithImage","DynamicClassOne","DynamicClassTwo","DynamicOutput","Education","Email","Event","FakeImage","InnerClass","InnerClass2","NamedArgsSingleClass","OptionalTest_Prop1","OptionalTest_ReturnType","OrderInfo","Person","RaysData","Resume","SearchParams","SomeClassNestedDynamic","TestClassAlias","TestClassNested","TestClassWithEnum","TestOutputClass","UnionTest_ReturnType","WithReasoning",
+            "Blah","ClassOptionalOutput","ClassOptionalOutput2","ClassWithImage","DynamicClassOne","DynamicClassTwo","DynamicOutput","Education","Email","Event","FakeImage","InnerClass","InnerClass2","NamedArgsSingleClass","OptionalTest_Prop1","OptionalTest_ReturnType","OrderInfo","Person","RaysData","Resume","SearchParams","SomeClassNestedDynamic","TestClassAlias","TestClassNested","TestClassWithEnum","TestOutputClass","UnionTest_ReturnType","WithReasoning",
           ]),
           enums: new Set([
             "Category","Category2","Category3","Color","DataType","DynEnumOne","DynEnumTwo","EnumInClass","EnumOutput","Hobby","NamedArgsSingleEnum","NamedArgsSingleEnumList","OptionalTest_CategoryType","OrderStatus","Tag","TestEnum",

diff --git a/integ-tests/typescript/baml_client/types.ts b/integ-tests/typescript/baml_client/types.ts
@@ -121,12 +121,6 @@ export interface Blah {
 
 }
 
-export interface Character {
-  color: string
-  clothing: string
-
-}
-
 export interface ClassOptionalOutput {
   prop1: string
   prop2: string