and fix client

Author: WojtekKarwacki

cli/py/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "trustspeccli"
-version = "{VERSION}"
+version = "0.1.59"
 authors = ["Wojciech Karwacki <karwacki.wojciech@gmail.com>"]
 homepage = "https://github.com/wkarwacki/python-openapi-generator-rust"
 repository = "https://github.com/wkarwacki/python-openapi-generator-rust"
@@ -29,7 +29,7 @@ classifiers = [
 ]
 
 [tool.poetry.dependencies]
-trustspecpy = "{VERSION}"
+trustspecpy = "0.1.59"
 
 [tool.poetry.scripts]
 trust = "trustspeccli.main:run"

plugin/py-binding/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "trustspecpy"
-version = "{VERSION}"
+version = "0.1.59"
 edition = "2021"
 
 [lib]

src/lib/gen/python/client/templates/dto.hbs

@@ -21,15 +21,15 @@
 {{indent}}    @classmethod
 {{indent}}    def get(cls) -> '{{adtParent}}{{key}}':
 {{indent}}        return {{>stubImpl key=(add adtParent key) val=val adtVar=adtVar indent=(add indent "    ")}}
-{{indent}}{{#each val.vars}}{{#if (or (or (eq this.type "obj") (eq this.type "enum")) this.item this.val)}}    {{>dto key=(fmtClass @key) val=this dtoFormLike=(or ../formLike ../dtoFormLike) indent=(add ../indent "    ") prefix=../key}}{{/if}}{{/each}}{{#each val.vars}}{{#if (or (not ../this.formLike) (not (eq @key "file")))}}
+{{indent}}{{#each val.vars}}{{#if (or (or (eq this.type "obj") (eq this.type "enum")) this.item this.val)}}    {{#if ../adtParent}}{{>dto key=(fmtClass @key) val=this prefix=(add ../adtParent ../key) indent=(add ../indent "    ")}}{{else}}{{>dto key=(fmtClass @key) val=this dtoFormLike=(or ../formLike ../dtoFormLike) indent=(add ../indent "    ") prefix=../key}}{{/if}}{{/if}}{{/each}}{{#each val.vars}}{{#if (or (not ../this.formLike) (not (eq @key "file")))}}
     {{../indent}}{{>var}}{{/if}}{{/each}}{{else if (eq val.type "enum")}}class {{key}}({{#with (valueDef val.vars.[0])}}{{#if (eq type "int")}}IntEnum{{else}}str, Enum{{/if}}{{/with}}):
 {{#each val.vals}}
     {{../indent}}{{fmtEnum this}} = {{json this}}
-{{/each}}{{/if}}{{#if (and (and (hasKey this "tl") (not tl)) (and dtoFormLike (eq val.type "obj")))}}
-
+{{/each}}{{/if}}
+{{#if (and (and (hasKey this "tl") (not tl)) (and dtoFormLike (eq val.type "obj")))}}
     {{../indent}}@model_validator(mode = "after")
     {{../indent}}def serialize(cls, {{fmtName key}}: '{{fmtClass key}}') -> str:
         {{../indent}}return {{fmtName key}}.model_dump_json(exclude_none=True){{/if}}{{#if formLike}}
 
     def form(self) -> dict[str, Any]:
-        return self.model_dump(exclude_none=True){{/if}}{{#if (and (eq val.type "obj") (and (not val.adt) (not (typeParams val))))}}{{/if}}
+        return self.model_dump(exclude_none=True){{/if}}{{#if (and (eq val.type "obj") (and (not val.adt) (not (typeParams val))))}}{{/if}}

src/lib/gen/python/client/templates/union.hbs

@@ -1,4 +1,4 @@
- Annotated[
+Annotated[
     {{#each val.adt.map}}{{../key}}{{fmtClass @key}}{{#unless @last}} | {{/unless}}{{/each}},
     Field(discriminator="{{fmtName val.adt.var}}")
-]
+]