Skip to content

fix: generate pk, also if the rest are only language columns #511

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
michdr merged 6 commits into from
Jul 7, 2025
Merged

fix: generate pk, also if the rest are only language columns #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5954fdf
fix: generate pk, also if the rest are only language columns
michdr Jul 3, 2025
fd0040b
try avoiding pk exclusion
michdr Jul 3, 2025
ce41f4c
Merge branch 'main' into fix-pk-only-lang
michdr Jul 3, 2025
61ff421
wip different approach
michdr Jul 4, 2025
c218a86
wip
michdr Jul 4, 2025
a21c806
Merge branch 'main' into fix-pk-only-lang
michdr Jul 4, 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
8 changes: 3 additions & 5 deletions mostlyai/sdk/domain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2680,11 +2680,9 @@ def add_model_configuration(cls, values):
else:
has_tabular_model = True
has_language_model = False
if values.foreign_keys:
# Always train tabular model for linked tables to model sequences
for fk in values.foreign_keys:
if fk.is_context:
has_tabular_model = True
# Always train tabular model for tables with a primary key or linked tables to model sequences
if values.primary_key or (values.foreign_keys and any(fk.is_context for fk in values.foreign_keys)):
has_tabular_model = True
# Remove model configurations that are not applicable for the model type
if values.tabular_model_configuration and not has_tabular_model:
values.tabular_model_configuration = None
Expand Down
13 changes: 13 additions & 0 deletions tests/test_domain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,19 @@ def assert_model_configuration(s: SourceTableConfig, has_tabular_model: bool, ha
s = SourceTableConfig(**{"name": "tbl1", "primary_key": "id", "columns": [{"name": "id"}]})
assert_model_configuration(s, has_tabular_model=True, has_language_model=False)

# PK + language column (id: pk, name: lang_text)
s = SourceTableConfig(
**{
"name": "tbl1",
"primary_key": "id",
"columns": [
{"name": "id", "model_encoding_type": ModelEncodingType.tabular_categorical},
{"name": "name", "model_encoding_type": ModelEncodingType.language_text},
],
}
)
assert_model_configuration(s, has_tabular_model=True, has_language_model=True)

# PK + FK columns
s = SourceTableConfig(
**{
Expand Down
8 changes: 3 additions & 5 deletions tools/custom_template/pydantic_v2/BaseModel.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,11 +731,9 @@ class {{ class_name }}({{ base_class }}):{% if comment is defined %} # {{ comme
else:
has_tabular_model = True
has_language_model = False
if values.foreign_keys:
# Always train tabular model for linked tables to model sequences
for fk in values.foreign_keys:
if fk.is_context:
has_tabular_model = True
# Always train tabular model for tables with a primary key or linked tables to model sequences
if values.primary_key or (values.foreign_keys and any(fk.is_context for fk in values.foreign_keys)):
has_tabular_model = True
# Remove model configurations that are not applicable for the model type
if values.tabular_model_configuration and not has_tabular_model:
values.tabular_model_configuration = None
Expand Down
8 changes: 3 additions & 5 deletions tools/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,11 +545,9 @@ def add_model_configuration(cls, values):
else:
has_tabular_model = True
has_language_model = False
if values.foreign_keys:
# Always train tabular model for linked tables to model sequences
for fk in values.foreign_keys:
if fk.is_context:
has_tabular_model = True
# Always train tabular model for tables with a primary key or linked tables to model sequences
if values.primary_key or (values.foreign_keys and any(fk.is_context for fk in values.foreign_keys)):
has_tabular_model = True
# Remove model configurations that are not applicable for the model type
if values.tabular_model_configuration and not has_tabular_model:
values.tabular_model_configuration = None
Expand Down