Skip to content

Commit 71587c3

Browse files
author
ci bot
committed
Merge branch 'copy-fix' into 'enterprise'
QA fixes See merge request dkinternal/testgen/dataops-testgen!314
2 parents ac2567c + 4dff068 commit 71587c3

5 files changed

Lines changed: 16 additions & 13 deletions

File tree

testgen/commands/run_profiling_bridge.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ def run_profiling_in_background(table_group_id):
214214
empty_cache()
215215
background_thread = threading.Thread(
216216
target=run_profiling_queries,
217-
args=(table_group_id, session.auth.user_display),
217+
args=(table_group_id, session.auth.user_display if session.auth else None),
218218
)
219219
background_thread.start()
220220
else:

testgen/common/models/test_definition.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from dataclasses import dataclass
33
from datetime import datetime
44
from typing import Literal
5-
from uuid import UUID, uuid4
5+
from uuid import UUID
66

77
import streamlit as st
88
from sqlalchemy import (
@@ -147,7 +147,7 @@ class TestType(Entity):
147147
class TestDefinition(Entity):
148148
__tablename__ = "test_definitions"
149149

150-
id: UUID = Column(postgresql.UUID(as_uuid=True), default=uuid4)
150+
id: UUID = Column(postgresql.UUID(as_uuid=True), server_default=text("gen_random_uuid()"))
151151
cat_test_id: int = Column(BigInteger, Identity(), primary_key=True)
152152
table_groups_id: UUID = Column(postgresql.UUID(as_uuid=True))
153153
profile_run_id: UUID = Column(postgresql.UUID(as_uuid=True))

testgen/ui/views/hygiene_issues.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def render(
156156
("Likelihood", "likelihood_order"),
157157
("Action", "r.disposition"),
158158
)
159-
default = [(sortable_columns[i][1], "ASC") for i in (0, 1)]
159+
default = [(sortable_columns[i][1], "ASC") for i in (3, 0, 1)]
160160
sorting_columns = testgen.sorting_selector(sortable_columns, default)
161161

162162
with actions_column:
@@ -434,10 +434,10 @@ def get_profiling_anomalies(
434434
THEN 'Potential PII: may require privacy policies, standards and procedures for access, storage and transmission.'
435435
END AS likelihood_explanation,
436436
CASE
437-
WHEN t.issue_likelihood = 'Potential PII' THEN 1
438-
WHEN t.issue_likelihood = 'Possible' THEN 2
439-
WHEN t.issue_likelihood = 'Likely' THEN 3
440-
WHEN t.issue_likelihood = 'Definite' THEN 4
437+
WHEN t.issue_likelihood = 'Potential PII' THEN 4
438+
WHEN t.issue_likelihood = 'Possible' THEN 3
439+
WHEN t.issue_likelihood = 'Likely' THEN 2
440+
WHEN t.issue_likelihood = 'Definite' THEN 1
441441
END AS likelihood_order,
442442
t.anomaly_description, r.detail, t.suggested_action,
443443
r.anomaly_id, r.table_groups_id::VARCHAR, r.id::VARCHAR, p.profiling_starttime, r.profile_run_id::VARCHAR,

testgen/ui/views/test_definitions.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import pandas as pd
88
import streamlit as st
9-
from sqlalchemy import asc, func, tuple_
9+
from sqlalchemy import and_, asc, func, or_, tuple_
1010
from streamlit.delta_generator import DeltaGenerator
1111
from streamlit_extras.no_default_selectbox import selectbox
1212

@@ -1184,13 +1184,16 @@ def get_test_definitions_collision(
11841184
target_table_group_id: str,
11851185
target_test_suite_id: str,
11861186
) -> pd.DataFrame:
1187+
table_tests = [(item["table_name"], item["test_type"]) for item in test_definitions if item["column_name"] is None]
1188+
column_tests = [(item["table_name"], item["column_name"], item["test_type"]) for item in test_definitions if item["column_name"] is not None]
11871189
results = TestDefinition.select_minimal_where(
11881190
TestDefinition.table_groups_id == target_table_group_id,
11891191
TestDefinition.test_suite_id == target_test_suite_id,
11901192
TestDefinition.last_auto_gen_date.isnot(None),
1191-
tuple_(TestDefinition.table_name, TestDefinition.column_name, TestDefinition.test_type).in_(
1192-
[(item["table_name"], item["column_name"], item["test_type"]) for item in test_definitions]
1193-
),
1193+
or_(
1194+
tuple_(TestDefinition.table_name, TestDefinition.column_name, TestDefinition.test_type).in_(column_tests),
1195+
and_(tuple_(TestDefinition.table_name, TestDefinition.test_type).in_(table_tests), TestDefinition.column_name.is_(None)),
1196+
)
11941197
)
11951198
return to_dataframe(results, TestDefinitionMinimal.columns())
11961199

testgen/ui/views/test_results.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ def source_data_dialog(selected_row):
805805
st.caption(selected_row["test_description"])
806806

807807
st.markdown("#### Test Parameters")
808-
st.caption(selected_row["input_parameters"])
808+
testgen.caption(selected_row["input_parameters"], styles="max-height: 100px; overflow: auto;")
809809

810810
st.markdown("#### Result Detail")
811811
st.caption(selected_row["result_message"])

0 commit comments

Comments
 (0)