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

Fix sorting by columns with potentially empty values #3325

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Fix sorting by columns with potentially empty values #3325

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
51388ec
Fix sorting by columns with empty values
schustmi Jan 27, 2025
113316a
Fix tests
schustmi Jan 28, 2025
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 src/zenml/models/v2/base/scoped.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,9 @@ def apply_sorting(
if sort_by == "user":
column = UserSchema.name

query = query.join(
UserSchema, getattr(table, "user_id") == UserSchema.id
query = query.outerjoin(
UserSchema,
getattr(table, "user_id") == UserSchema.id,
)

query = query.add_columns(UserSchema.name)
Expand Down
12 changes: 6 additions & 6 deletions src/zenml/models/v2/core/pipeline_run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,31 +950,31 @@ def apply_sorting(
sort_by, operand = self.sorting_params

if sort_by == "pipeline":
query = query.join(
query = query.outerjoin(
PipelineSchema,
PipelineRunSchema.pipeline_id == PipelineSchema.id,
)
column = PipelineSchema.name
elif sort_by == "stack":
query = query.join(
query = query.outerjoin(
PipelineDeploymentSchema,
PipelineRunSchema.deployment_id == PipelineDeploymentSchema.id,
).join(
).outerjoin(
StackSchema,
PipelineDeploymentSchema.stack_id == StackSchema.id,
)
column = StackSchema.name
elif sort_by == "model":
query = query.join(
query = query.outerjoin(
ModelVersionSchema,
PipelineRunSchema.model_version_id == ModelVersionSchema.id,
).join(
).outerjoin(
ModelSchema,
ModelVersionSchema.model_id == ModelSchema.id,
)
column = ModelSchema.name
elif sort_by == "model_version":
query = query.join(
query = query.outerjoin(
ModelVersionSchema,
PipelineRunSchema.model_version_id == ModelVersionSchema.id,
)
Expand Down
6 changes: 4 additions & 2 deletions tests/integration/functional/models/test_sorting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,16 @@ def test_sorting_entities(clean_client):

# Sorting runs by model name
results = clean_client.list_pipeline_runs(sort_by="asc:model")
assert results[0].model_version.model.name == "Model1"
assert results[0].model_version is None
assert results[1].model_version.model.name == "Model1"
assert results[-1].model_version.model.name == "Model2"
clean_client.list_pipeline_runs(sort_by="desc:model")

# Sorting runs by model version
results = clean_client.list_pipeline_runs(sort_by="asc:model_version")

assert results[0].model_version.name == "1"
assert results[0].model_version is None
assert results[1].model_version.name == "1"
assert results[-1].model_version.name == "second"

clean_client.list_pipeline_runs(sort_by="desc:model")
Expand Down
Loading