Restore integ tests

BoundaryML · Dec 12, 2024 · 10f4999 · 10f4999
1 parent 11fd332
commit 10f4999
Show file tree

Hide file tree

Showing 18 changed files with 5 additions and 392 deletions.
diff --git a/integ-tests/baml_src/test-files/aliases/antonio.baml b/integ-tests/baml_src/test-files/aliases/antonio.baml
diff --git a/integ-tests/python/baml_client/async_client.py b/integ-tests/python/baml_client/async_client.py
@@ -1959,29 +1959,6 @@ async def ReturnMalformedConstraints(
       )
       return cast(types.MalformedConstraints, raw.cast_to(types, types))
 
-    async def RunFoo2(
-        self,
-        input: types.Foo3,
-        baml_options: BamlCallOptions = {},
-    ) -> types.Foo2:
-      __tb__ = baml_options.get("tb", None)
-      if __tb__ is not None:
-        tb = __tb__._tb # type: ignore (we know how to use this private attribute)
-      else:
-        tb = None
-      __cr__ = baml_options.get("client_registry", None)
-
-      raw = await self.__runtime.call_function(
-        "RunFoo2",
-        {
-          "input": input,
-        },
-        self.__ctx_manager.get(),
-        tb,
-        __cr__,
-      )
-      return cast(types.Foo2, raw.cast_to(types, types))
-
     async def SchemaDescriptions(
         self,
         input: str,
@@ -5500,36 +5477,6 @@ def ReturnMalformedConstraints(
         self.__ctx_manager.get(),
       )
 
-    def RunFoo2(
-        self,
-        input: types.Foo3,
-        baml_options: BamlCallOptions = {},
-    ) -> baml_py.BamlStream[partial_types.Foo2, types.Foo2]:
-      __tb__ = baml_options.get("tb", None)
-      if __tb__ is not None:
-        tb = __tb__._tb # type: ignore (we know how to use this private attribute)
-      else:
-        tb = None
-      __cr__ = baml_options.get("client_registry", None)
-
-      raw = self.__runtime.stream_function(
-        "RunFoo2",
-        {
-          "input": input,
-        },
-        None,
-        self.__ctx_manager.get(),
-        tb,
-        __cr__,
-      )
-
-      return baml_py.BamlStream[partial_types.Foo2, types.Foo2](
-        raw,
-        lambda x: cast(partial_types.Foo2, x.cast_to(types, partial_types)),
-        lambda x: cast(types.Foo2, x.cast_to(types, types)),
-        self.__ctx_manager.get(),
-      )
-
     def SchemaDescriptions(
         self,
         input: str,

diff --git a/integ-tests/python/baml_client/inlinedbaml.py b/integ-tests/python/baml_client/inlinedbaml.py
@@ -27,7 +27,6 @@
     "fiddle-examples/symbol-tuning.baml": "enum Category3 {\n    Refund @alias(\"k1\")\n    @description(\"Customer wants to refund a product\")\n\n    CancelOrder @alias(\"k2\")\n    @description(\"Customer wants to cancel an order\")\n\n    TechnicalSupport @alias(\"k3\")\n    @description(\"Customer needs help with a technical issue unrelated to account creation or login\")\n\n    AccountIssue @alias(\"k4\")\n    @description(\"Specifically relates to account-login or account-creation\")\n\n    Question @alias(\"k5\")\n    @description(\"Customer has a question\")\n}\n\nfunction ClassifyMessage3(input: string) -> Category {\n  client GPT4\n\n  prompt #\"\n    Classify the following INPUT into ONE\n    of the following categories:\n\n    INPUT: {{ input }}\n\n    {{ ctx.output_format }}\n\n    Response:\n  \"#\n}",
     "generators.baml": "generator lang_python {\n  output_type python/pydantic\n  output_dir \"../python\"\n  version \"0.70.1\"\n}\n\ngenerator lang_typescript {\n  output_type typescript\n  output_dir \"../typescript\"\n  version \"0.70.1\"\n}\n\ngenerator lang_ruby {\n  output_type ruby/sorbet\n  output_dir \"../ruby\"\n  version \"0.70.1\"\n}\n\n// generator openapi {\n//   output_type rest/openapi\n//   output_dir \"../openapi\"\n//   version \"0.70.1\"\n//   on_generate \"rm .gitignore\"\n// }\n",
     "test-files/aliases/aliased-inputs.baml": "\nclass InputClass {\n  key string @alias(\"color\")\n  key2 string\n}\n\n\nclass InputClassNested {\n  key string\n  nested InputClass @alias(\"interesting-key\")\n}\n \n\nfunction AliasedInputClass(input: InputClass) -> string {\n  client GPT35\n  prompt #\"\n\n    {{input}}\n\n    This is a test. What's the name of the first json key above? Remember, tell me the key, not value.\n  \"#\n}\n \nfunction AliasedInputClass2(input: InputClass) -> string {\n  client GPT35\n  prompt #\"\n\n    {# making sure we can still access the original key #}\n    {%if input.key == \"tiger\"%}\n      Repeat this value back to me, and nothing else: {{input.key}}\n    {%endif%}\n  \"#\n}\n \n function AliasedInputClassNested(input: InputClassNested) -> string {\n  client GPT35\n  prompt #\"\n    {{ _.role(\"user\")}}\n\n    {{input}}\n\n    This is a test. What's the name of the second json key above? Remember, tell me the key, not value.\n  \"#\n }\n\n\nenum AliasedEnum {\n  KEY_ONE @alias(\"tiger\")\n  KEY_TWO\n}\n\nfunction AliasedInputEnum(input: AliasedEnum) -> string {\n  client GPT4o\n  prompt #\"\n    {{ _.role(\"user\")}}\n\n\n    Write out this word only in your response, in lowercase:\n    ---\n    {{input}}\n    ---\n    Answer:\n  \"#\n}\n\n\nfunction AliasedInputList(input: AliasedEnum[]) -> string {\n  client GPT35\n  prompt #\"\n    {{ _.role(\"user\")}}\n    Given this array:\n    ---\n    {{input}}\n    ---\n\n    Return the first element in the array:\n  \"#\n}\n\n",
-    "test-files/aliases/antonio.baml": "class Foo2 {\n    bar int\n    baz string\n    sub Subthing @assert( {{ this.bar == 10}} ) | null\n}\n\nclass Foo3 {\n    bar int\n    baz string\n    sub Foo3 | null\n}\n\ntype Subthing = Foo2 @assert( {{ this.bar == 10 }})\n\nfunction RunFoo2(input: Foo3) -> Foo2 {\n    client Claude\n    prompt #\"Generate a Foo2 wrapping 30. Use {{ input }}.\n       {{ ctx.output_format }}\n    \"#\n}",
     "test-files/aliases/classes.baml": "class TestClassAlias {\n  key string @alias(\"key-dash\") @description(#\"\n    This is a description for key\n    af asdf\n  \"#)\n  key2 string @alias(\"key21\")\n  key3 string @alias(\"key with space\")\n  key4 string //unaliased\n  key5 string @alias(\"key.with.punctuation/123\")\n}\n\nfunction FnTestClassAlias(input: string) -> TestClassAlias {\n  client GPT35\n  prompt #\"\n    {{ctx.output_format}}\n  \"#\n}\n\ntest FnTestClassAlias {\n  functions [FnTestClassAlias]\n  args {\n    input \"example input\"\n  }\n}\n",
     "test-files/aliases/enums.baml": "enum TestEnum {\n  A @alias(\"k1\") @description(#\"\n    User is angry\n  \"#)\n  B @alias(\"k22\") @description(#\"\n    User is happy\n  \"#)\n  // tests whether k1 doesnt incorrectly get matched with k11\n  C @alias(\"k11\") @description(#\"\n    User is sad\n  \"#)\n  D @alias(\"k44\") @description(\n    User is confused\n  )\n  E @description(\n    User is excited\n  )\n  F @alias(\"k5\") // only alias\n  \n  G @alias(\"k6\") @description(#\"\n    User is bored\n    With a long description\n  \"#)\n   \n  @@alias(\"Category\")\n}\n\nfunction FnTestAliasedEnumOutput(input: string) -> TestEnum {\n  client GPT35\n  prompt #\"\n    Classify the user input into the following category\n      \n    {{ ctx.output_format }}\n\n    {{ _.role('user') }}\n    {{input}}\n\n    {{ _.role('assistant') }}\n    Category ID:\n  \"#\n}\n\ntest FnTestAliasedEnumOutput {\n  functions [FnTestAliasedEnumOutput]\n  args {\n    input \"mehhhhh\"\n  }\n}",
     "test-files/comments/comments.baml": "// add some functions, classes, enums etc with comments all over.",

diff --git a/integ-tests/python/baml_client/partial_types.py b/integ-tests/python/baml_client/partial_types.py
@@ -141,16 +141,6 @@ class FlightConfirmation(BaseModel):
     arrivalTime: Optional[str] = None
     seatNumber: Optional[str] = None
 
-class Foo2(BaseModel):
-    bar: Optional[int] = None
-    baz: Optional[str] = None
-    sub: Optional[Union[Optional["Foo2"], Optional[None]]] = None
-
-class Foo3(BaseModel):
-    bar: Optional[int] = None
-    baz: Optional[str] = None
-    sub: Optional[Union["Foo3", Optional[None]]] = None
-
 class FooAny(BaseModel):
     planetary_age: Optional[Union["Martian", "Earthling"]] = None
     certainty: Checked[Optional[int],Literal["unreasonably_certain"]]

diff --git a/integ-tests/python/baml_client/sync_client.py b/integ-tests/python/baml_client/sync_client.py
@@ -1956,29 +1956,6 @@ def ReturnMalformedConstraints(
       )
       return cast(types.MalformedConstraints, raw.cast_to(types, types))
 
-    def RunFoo2(
-        self,
-        input: types.Foo3,
-        baml_options: BamlCallOptions = {},
-    ) -> types.Foo2:
-      __tb__ = baml_options.get("tb", None)
-      if __tb__ is not None:
-        tb = __tb__._tb # type: ignore (we know how to use this private attribute)
-      else:
-        tb = None
-      __cr__ = baml_options.get("client_registry", None)
-
-      raw = self.__runtime.call_function_sync(
-        "RunFoo2",
-        {
-          "input": input,
-        },
-        self.__ctx_manager.get(),
-        tb,
-        __cr__,
-      )
-      return cast(types.Foo2, raw.cast_to(types, types))
-
     def SchemaDescriptions(
         self,
         input: str,
@@ -5498,36 +5475,6 @@ def ReturnMalformedConstraints(
         self.__ctx_manager.get(),
       )
 
-    def RunFoo2(
-        self,
-        input: types.Foo3,
-        baml_options: BamlCallOptions = {},
-    ) -> baml_py.BamlSyncStream[partial_types.Foo2, types.Foo2]:
-      __tb__ = baml_options.get("tb", None)
-      if __tb__ is not None:
-        tb = __tb__._tb # type: ignore (we know how to use this private attribute)
-      else:
-        tb = None
-      __cr__ = baml_options.get("client_registry", None)
-
-      raw = self.__runtime.stream_function_sync(
-        "RunFoo2",
-        {
-          "input": input,
-        },
-        None,
-        self.__ctx_manager.get(),
-        tb,
-        __cr__,
-      )
-
-      return baml_py.BamlSyncStream[partial_types.Foo2, types.Foo2](
-        raw,
-        lambda x: cast(partial_types.Foo2, x.cast_to(types, partial_types)),
-        lambda x: cast(types.Foo2, x.cast_to(types, types)),
-        self.__ctx_manager.get(),
-      )
-
     def SchemaDescriptions(
         self,
         input: str,

diff --git a/integ-tests/python/baml_client/type_builder.py b/integ-tests/python/baml_client/type_builder.py
@@ -20,7 +20,7 @@
 class TypeBuilder(_TypeBuilder):
     def __init__(self):
         super().__init__(classes=set(
-          ["BigNumbers","BinaryNode","Blah","BlockConstraint","BlockConstraintForParam","BookOrder","ClassOptionalOutput","ClassOptionalOutput2","ClassToRecAlias","ClassWithImage","CompoundBigNumbers","ContactInfo","CustomTaskResult","DummyOutput","DynInputOutput","DynamicClassOne","DynamicClassTwo","DynamicOutput","Earthling","Education","Email","EmailAddress","Event","FakeImage","FlightConfirmation","Foo2","Foo3","FooAny","Forest","GroceryReceipt","InnerClass","InnerClass2","InputClass","InputClassNested","LinkedList","LinkedListAliasNode","LiteralClassHello","LiteralClassOne","LiteralClassTwo","MalformedConstraints","MalformedConstraints2","Martian","MergeAttrs","NamedArgsSingleClass","Nested","Nested2","NestedBlockConstraint","NestedBlockConstraintForParam","Node","NodeWithAliasIndirection","OptionalTest_Prop1","OptionalTest_ReturnType","OrderInfo","OriginalA","OriginalB","Person","PhoneNumber","Quantity","RaysData","ReceiptInfo","ReceiptItem","Recipe","Resume","Schema","SearchParams","SomeClassNestedDynamic","StringToClassEntry","TestClassAlias","TestClassNested","TestClassWithEnum","TestOutputClass","Tree","TwoStoriesOneTitle","UnionTest_ReturnType","WithReasoning",]
+          ["BigNumbers","BinaryNode","Blah","BlockConstraint","BlockConstraintForParam","BookOrder","ClassOptionalOutput","ClassOptionalOutput2","ClassToRecAlias","ClassWithImage","CompoundBigNumbers","ContactInfo","CustomTaskResult","DummyOutput","DynInputOutput","DynamicClassOne","DynamicClassTwo","DynamicOutput","Earthling","Education","Email","EmailAddress","Event","FakeImage","FlightConfirmation","FooAny","Forest","GroceryReceipt","InnerClass","InnerClass2","InputClass","InputClassNested","LinkedList","LinkedListAliasNode","LiteralClassHello","LiteralClassOne","LiteralClassTwo","MalformedConstraints","MalformedConstraints2","Martian","MergeAttrs","NamedArgsSingleClass","Nested","Nested2","NestedBlockConstraint","NestedBlockConstraintForParam","Node","NodeWithAliasIndirection","OptionalTest_Prop1","OptionalTest_ReturnType","OrderInfo","OriginalA","OriginalB","Person","PhoneNumber","Quantity","RaysData","ReceiptInfo","ReceiptItem","Recipe","Resume","Schema","SearchParams","SomeClassNestedDynamic","StringToClassEntry","TestClassAlias","TestClassNested","TestClassWithEnum","TestOutputClass","Tree","TwoStoriesOneTitle","UnionTest_ReturnType","WithReasoning",]
         ), enums=set(
           ["AliasedEnum","Category","Category2","Category3","Color","DataType","DynEnumOne","DynEnumTwo","EnumInClass","EnumOutput","Hobby","MapKey","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
@@ -266,16 +266,6 @@ class FlightConfirmation(BaseModel):
     arrivalTime: str
     seatNumber: str
 
-class Foo2(BaseModel):
-    bar: int
-    baz: str
-    sub: Union["Foo2", Optional[None]]
-
-class Foo3(BaseModel):
-    bar: int
-    baz: str
-    sub: Union["Foo3", Optional[None]]
-
 class FooAny(BaseModel):
     planetary_age: Union["Martian", "Earthling"]
     certainty: Checked[int,Literal["unreasonably_certain"]]

diff --git a/integ-tests/python/tests/test_functions.py b/integ-tests/python/tests/test_functions.py
@@ -44,7 +44,6 @@
     ClassToRecAlias,
     NodeWithAliasIndirection,
     MergeAttrs,
-    Foo3
 )
 import baml_client.types as types
 from ..baml_client.tracing import trace, set_tags, flush, on_log_event
@@ -1588,8 +1587,3 @@ async def test_block_constraint_arguments():
         nested_block_constraint = NestedBlockConstraintForParam(nbcfp=block_constraint)
         await b.UseNestedBlockConstraint(nested_block_constraint)
     assert "Failed assert: hi" in str(e)
-
-@pytest.mark.asyncio
-async def test_alias_bug():
-    res = await b.RunFoo2(input=Foo3(bar=10, baz="hi", sub=None))
-    assert True
diff --git a/integ-tests/ruby/baml_client/client.rb b/integ-tests/ruby/baml_client/client.rb
@@ -2706,38 +2706,6 @@ def ReturnMalformedConstraints(
       (raw.parsed_using_types(Baml::Types))
     end
 
-    sig {
-      params(
-        varargs: T.untyped,
-        input: Baml::Types::Foo3,
-        baml_options: T::Hash[Symbol, T.any(Baml::TypeBuilder, Baml::ClientRegistry)]
-      ).returns(Baml::Types::Foo2)
-    }
-    def RunFoo2(
-        *varargs,
-        input:,
-        baml_options: {}
-    )
-      if varargs.any?
-
-        raise ArgumentError.new("RunFoo2 may only be called with keyword arguments")
-      end
-      if (baml_options.keys - [:client_registry, :tb]).any?
-        raise ArgumentError.new("Received unknown keys in baml_options (valid keys: :client_registry, :tb): #{baml_options.keys - [:client_registry, :tb]}")
-      end
-
-      raw = @runtime.call_function(
-        "RunFoo2",
-        {
-          input: input,
-        },
-        @ctx_manager,
-        baml_options[:tb]&.instance_variable_get(:@registry),
-        baml_options[:client_registry],
-      )
-      (raw.parsed_using_types(Baml::Types))
-    end
-
     sig {
       params(
         varargs: T.untyped,
@@ -7064,41 +7032,6 @@ def ReturnMalformedConstraints(
       )
     end
 
-    sig {
-      params(
-        varargs: T.untyped,
-        input: Baml::Types::Foo3,
-        baml_options: T::Hash[Symbol, T.any(Baml::TypeBuilder, Baml::ClientRegistry)]
-      ).returns(Baml::BamlStream[Baml::Types::Foo2])
-    }
-    def RunFoo2(
-        *varargs,
-        input:,
-        baml_options: {}
-    )
-      if varargs.any?
-
-        raise ArgumentError.new("RunFoo2 may only be called with keyword arguments")
-      end
-      if (baml_options.keys - [:client_registry, :tb]).any?
-        raise ArgumentError.new("Received unknown keys in baml_options (valid keys: :client_registry, :tb): #{baml_options.keys - [:client_registry, :tb]}")
-      end
-
-      raw = @runtime.stream_function(
-        "RunFoo2",
-        {
-          input: input,
-        },
-        @ctx_manager,
-        baml_options[:tb]&.instance_variable_get(:@registry),
-        baml_options[:client_registry],
-      )
-      Baml::BamlStream[Baml::PartialTypes::Foo2, Baml::Types::Foo2].new(
-        ffi_stream: raw,
-        ctx_manager: @ctx_manager
-      )
-    end
-
     sig {
       params(
         varargs: T.untyped,