Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better handling of disjunctions in builders for python #724

Merged
merged 1 commit into from
Jan 27, 2025
Merged

Better handling of disjunctions in builders for python #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions internal/jennies/python/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,9 @@ func (jenny *Builder) generateBuilder(context languages.Context, builder ast.Bui
return jenny.tmpl.
Funcs(common.TypeResolvingTemplateHelpers(context)).
Funcs(map[string]any{
"formatType": jenny.typeFormatter.formatType,
"formatRawType": jenny.rawTypeFormatter.formatType,
"isDisjunctionOfBuilders": context.IsDisjunctionOfBuilders,
"formatType": jenny.typeFormatter.formatType,
"formatRawType": jenny.rawTypeFormatter.formatType,
"formatRawTypeNotNullable": func(def ast.Type) string {
typeDef := def.DeepCopy()
typeDef.Nullable = false
Expand Down
9 changes: 8 additions & 1 deletion internal/jennies/python/templates/builders/assignment.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@
{{- with .Value.Argument }}
{{- if or (resolvesToBuilder .Type) (resolvesToComposableSlot .Type) }}
{{- $builtResultSuffix := ternary "_resources" "_resource" (or .Type.IsArray .Type.IsMap) }}
{{ .Name|formatIdentifier }}{{ $builtResultSuffix }} = {{ template "unfold_builders" (dict "InputType" .Type "InputVar" (formatIdentifier .Name) "Depth" 1) }}
{{- $name := print (.Name|formatIdentifier) $builtResultSuffix }}
{{ $name }} = {{ template "unfold_builders" (dict "InputType" .Type "InputVar" (formatIdentifier .Name) "Depth" 1) }}
{{- if and .Type.IsDisjunction (not (isDisjunctionOfBuilders .Type)) }}
{{ $branchesCount := sub1 (len .Type.Disjunction.Branches) -}}
assert {{ range $i, $branch := .Type.Disjunction.Branches }}isinstance({{ $name }}, {{ $branch|formatRawType}}){{ if ne $i $branchesCount }} or {{ end }}{{ end -}}
{{- end -}}
{{- end }}
{{- end }}
{{- with .Value.Envelope }}
Expand All @@ -36,6 +41,8 @@
[{{ template "unfold_builders" (dict "InputType" .InputType.Array.ValueType "InputVar" (print "r" .Depth ) "Depth" (add1 .Depth)) }} for r{{ .Depth }} in {{ .InputVar }}]
{{- else if .InputType.IsMap -}}
{ key{{.Depth}}: {{ template "unfold_builders" (dict "InputType" .InputType.Map.ValueType "InputVar" (print "val" .Depth ) "Depth" (add1 .Depth)) }} for (key{{.Depth}}, val{{ .Depth }}) in {{ .InputVar }}.items() }
{{- else if and .InputType.IsDisjunction (not (isDisjunctionOfBuilders .InputType)) -}}
{{ .InputVar }}.build() if hasattr({{ .InputVar }}, 'build') and callable({{ .InputVar }}.build) else {{ .InputVar }}
{{- else -}}
{{ .InputVar }}.build()
{{- end -}}
Expand Down
3 changes: 3 additions & 0 deletions internal/jennies/python/tmpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ func initTemplates(apiRefCollector *common.APIReferenceCollector, extraTemplates
template.Funcs(formattingTemplateFuncs()),
// placeholder functions, will be overridden by jennies
template.Funcs(template.FuncMap{
"isDisjunctionOfBuilders": func(_ ast.Type) string {
panic("isDisjunctionOfBuilders() needs to be overridden by a jenny")
},
"formatType": func(_ ast.Type) string {
panic("formatType() needs to be overridden by a jenny")
},
Expand Down
5 changes: 3 additions & 2 deletions ...der_delegation_in_disjunction/PythonBuilder/builders/builder_delegation_in_disjunction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ def single_link_or_string(self, single_link_or_string: typing.Union[cogbuilder.B
will be expanded to cog.Builder<DashboardLink> | string
"""

single_link_or_string_resource = single_link_or_string.build()
single_link_or_string_resource = single_link_or_string.build() if hasattr(single_link_or_string, 'build') and callable(single_link_or_string.build) else single_link_or_string
assert isinstance(single_link_or_string_resource, builder_delegation_in_disjunction.DashboardLink) or isinstance(single_link_or_string_resource, str)
self._internal.single_link_or_string = single_link_or_string_resource

return self
Expand All @@ -71,7 +72,7 @@ def links_or_strings(self, links_or_strings: list[typing.Union[cogbuilder.Builde
will be expanded to [](cog.Builder<DashboardLink> | string)
"""

links_or_strings_resources = [r1.build() for r1 in links_or_strings]
links_or_strings_resources = [r1.build() if hasattr(r1, 'build') and callable(r1.build) else r1 for r1 in links_or_strings]
self._internal.links_or_strings = links_or_strings_resources

return self
Expand Down
Loading