Fix dynamic generation in python (#638)

engine/language-client-codegen/src/python/templates/type_builder.py.j2

@@ -9,21 +9,22 @@ class TypeBuilder(_TypeBuilder):
           [{% for enum in enums %}"{{enum.name}}",{% endfor %}]
         ))
 
-{%- for cls in classes %}{% if cls.dynamic %}
+{% for cls in classes %}{% if cls.dynamic %}
 
     @property
     def {{cls.name}}(self) -> "{{cls.name}}Builder":
         return {{cls.name}}Builder(self)
-{%- endif %}{% endfor %}
+{% endif %}{% endfor %}
 
-{%- for enum in enums %}{% if enum.dynamic %}
+{% for enum in enums %}{% if enum.dynamic %}
 
     @property
     def {{enum.name}}(self) -> "{{enum.name}}Builder":
         return {{enum.name}}Builder(self)
 {% endif %}{% endfor %}
 
 {% for cls in classes %}{% if cls.dynamic -%}
+
 class {{cls.name}}Builder:
     def __init__(self, tb: _TypeBuilder):
         self.__bldr = tb._tb.class_("{{cls.name}}")
@@ -50,7 +51,7 @@ class {{cls.name}}Properties:
         self.__bldr = cls_bldr
         self.__properties = properties
 
-    {%- for (name, type) in cls.fields %}
+    {% for (name, type) in cls.fields %}
 
     @property
     def {{name}}(self) -> ClassPropertyBuilder:
@@ -61,7 +62,7 @@ class {{cls.name}}Properties:
         if name not in self.__properties:
             raise AttributeError(f"Property {name} not found.")
         return ClassPropertyBuilder(self.__bldr.property(name))
-{%- endif %}{% endfor %}
+{% endif %}{% endfor %}
 
 {% for enum in enums %}{% if enum.dynamic %}
 class {{enum.name}}Builder:
@@ -91,17 +92,17 @@ class {{enum.name}}Values:
         self.__bldr = enum_bldr
         self.__values = values
 
-    {%- for value in enum.values %}
+    {% for value in enum.values %}
 
     @property
     def {{value}}(self) -> EnumValueBuilder:
         return self.__bldr.value("{{value}}")
-    {%- endfor %}
+    {% endfor %}
 
     def __getattr__(self, name: str) -> EnumValueBuilder:
         if name not in self.__values:
             raise AttributeError(f"Value {name} not found.")
         return self.__bldr.value(name)
-{%- endif %}{% endfor %}
+{% endif %}{% endfor %}
 
 __all__ = ["TypeBuilder"]

engine/language_client_python/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "baml-py"
-version = "0.33.0"
+version = "0.33.1"
 description = "BAML python bindings (pyproject.toml)"
 readme = "README.md"
 authors = [["Boundary", "[email protected]"]]

integ-tests/baml_src/test-files/dynamic/dynamic.baml

@@ -0,0 +1,25 @@
+class DynamicClassOne {
+  hi string
+  @@dynamic
+}
+
+enum DynEnumOne {
+  @@dynamic
+}
+
+enum DynEnumTwo {
+  @@dynamic
+}
+
+class SomeClassNestedDynamic {
+  hi string
+  @@dynamic
+
+}
+
+class DynamicClassTwo {
+  hi string
+  some_class SomeClassNestedDynamic
+  status DynEnumOne
+  @@dynamic
+}

integ-tests/baml_src/test-files/functions/v2/basic.baml

@@ -1,7 +1,7 @@
 
 
 function ExtractResume2(resume: string) -> Resume {
-    client Resilient_ComplexSyntax
+    client GPT4
     prompt #"
         {{ _.role('system') }}
 

integ-tests/python/baml_client/partial_types.py

@@ -45,6 +45,14 @@ class ClassWithImage(BaseModel):
     param2: Optional[str] = None
     fake_image: "FakeImage"
 
+class DynamicClassOne(BaseModel):
+    hi: Optional[str] = None
+
+class DynamicClassTwo(BaseModel):
+    hi: Optional[str] = None
+    some_class: "SomeClassNestedDynamic"
+    status: Optional[Union[types.DynEnumOne, str]] = None
+
 class Education(BaseModel):
     institution: Optional[str] = None
     location: Optional[str] = None
@@ -109,6 +117,9 @@ class SearchParams(BaseModel):
     description: List["WithReasoning"]
     tags: List[Optional[Union[Optional[types.Tag], Optional[str]]]]
 
+class SomeClassNestedDynamic(BaseModel):
+    hi: Optional[str] = None
+
 class TestClassAlias(BaseModel):
     key: Optional[str] = None
     key2: Optional[str] = None