Skip to content

fix: reuse duplicate capability extension models #56

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

Merged
damaz91 merged 2 commits into from
Jul 16, 2026
Merged

fix: reuse duplicate capability extension models #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7788dc9
fix: reuse duplicate capability extension models
ShuoRen-TT Jul 16, 2026
2f24e22
test: remove fragile generated models reuse test
damaz91 Jul 16, 2026
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
2 changes: 2 additions & 0 deletions generate_models.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ mkdir -p "$OUTPUT_DIR"
# Run generation using uv
# We use --use-schema-description to use descriptions from JSON schema as docstrings
# We use --field-constraints to include validation constraints (regex, min/max, etc.)
# We use --reuse-model to collapse structurally identical generated types.
# Note: Formatting is done as a post-processing step.
uv run \
--link-mode=copy \
Expand All @@ -83,6 +84,7 @@ uv run \
--use-double-quotes \
--allow-extra-fields \
--use-type-alias \
--reuse-model \
--custom-template-dir templates \
--additional-imports pydantic.ConfigDict

Expand Down
51 changes: 6 additions & 45 deletions src/ucp_sdk/models/schemas/capability.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,10 @@
"""


Extends2 = TypeAliasType(
"Extends2",
Annotated[
str, Field(..., pattern="^[a-z][a-z0-9]*(?:\\.[a-z][a-z0-9_]*)+$")
],
)
"""
Parent capability(s) this extends. Present for extensions, absent for root capabilities. Use array for multi-parent extensions.
"""
Extends2 = TypeAliasType("Extends2", Extends)


Extends3Item = TypeAliasType(
"Extends3Item",
Annotated[
str, Field(..., pattern="^[a-z][a-z0-9]*(?:\\.[a-z][a-z0-9_]*)+$")
],
)
Extends3Item = TypeAliasType("Extends3Item", Extends1Item)


Extends3 = TypeAliasType(
Expand All @@ -85,23 +72,10 @@
"""


Extends4 = TypeAliasType(
"Extends4",
Annotated[
str, Field(..., pattern="^[a-z][a-z0-9]*(?:\\.[a-z][a-z0-9_]*)+$")
],
)
"""
Parent capability(s) this extends. Present for extensions, absent for root capabilities. Use array for multi-parent extensions.
"""
Extends4 = TypeAliasType("Extends4", Extends)


Extends5Item = TypeAliasType(
"Extends5Item",
Annotated[
str, Field(..., pattern="^[a-z][a-z0-9]*(?:\\.[a-z][a-z0-9_]*)+$")
],
)
Extends5Item = TypeAliasType("Extends5Item", Extends1Item)


Extends5 = TypeAliasType(
Expand All @@ -112,23 +86,10 @@
"""


Extends6 = TypeAliasType(
"Extends6",
Annotated[
str, Field(..., pattern="^[a-z][a-z0-9]*(?:\\.[a-z][a-z0-9_]*)+$")
],
)
"""
Parent capability(s) this extends. Present for extensions, absent for root capabilities. Use array for multi-parent extensions.
"""
Extends6 = TypeAliasType("Extends6", Extends)


Extends7Item = TypeAliasType(
"Extends7Item",
Annotated[
str, Field(..., pattern="^[a-z][a-z0-9]*(?:\\.[a-z][a-z0-9_]*)+$")
],
)
Extends7Item = TypeAliasType("Extends7Item", Extends1Item)


Extends7 = TypeAliasType(
Expand Down
Loading