Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Call sqla templates directly #2773

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
merged 2 commits into from
Jun 20, 2025
Merged

Call sqla templates directly #2773

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
a550eb1
Calling sqla templates directly as the __init__ file was causing loca…
ialarmedalien Jun 17, 2025
a125826
Merge branch 'main' into call_sqla_tmpls_directly
ialarmedalien Jun 17, 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
4 changes: 0 additions & 4 deletions linkml/generators/sqlalchemy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
from .sqlalchemy_declarative_template import sqlalchemy_declarative_template_str
from .sqlalchemy_imperative_template import sqlalchemy_imperative_template_str

__all__ = ["sqlalchemy_declarative_template_str", "sqlalchemy_imperative_template_str"]
24 changes: 9 additions & 15 deletions linkml/generators/sqlalchemygen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from __future__ import annotations

Check warning on line 1 in linkml/generators/sqlalchemygen.py

View check run for this annotation

Codecov / codecov/patch

linkml/generators/sqlalchemygen.py#L1 

Added line #L1 was not covered by tests

import logging
import os
from collections import defaultdict
from dataclasses import dataclass
from types import ModuleType
from typing import Optional, Union

import click
from jinja2 import Template
Expand All @@ -16,7 +17,8 @@
from linkml._version import __version__
from linkml.generators.pydanticgen import PydanticGenerator
from linkml.generators.pythongen import PythonGenerator
from linkml.generators.sqlalchemy import sqlalchemy_declarative_template_str, sqlalchemy_imperative_template_str
from linkml.generators.sqlalchemy.sqlalchemy_declarative_template import sqlalchemy_declarative_template_str
from linkml.generators.sqlalchemy.sqlalchemy_imperative_template import sqlalchemy_imperative_template_str

Check warning on line 21 in linkml/generators/sqlalchemygen.py

View check run for this annotation

Codecov / codecov/patch

linkml/generators/sqlalchemygen.py#L20-L21 

Added lines #L20 - L21 were not covered by tests
from linkml.generators.sqltablegen import SQLTableGenerator
from linkml.transformers.relmodel_transformer import ForeignKeyPolicy, RelationalModelTransformer
from linkml.utils.generator import Generator, shared_arguments
Expand All @@ -43,10 +45,10 @@
valid_formats = ["sqla"]
file_extension = "py"
uses_schemaloader = False
template: Optional[TemplateEnum] = None
template: TemplateEnum | None = None

Check warning on line 48 in linkml/generators/sqlalchemygen.py

View check run for this annotation

Codecov / codecov/patch

linkml/generators/sqlalchemygen.py#L48 

Added line #L48 was not covered by tests

# ObjectVars
original_schema: Union[SchemaDefinition, str] = None
original_schema: SchemaDefinition | str = None

Check warning on line 51 in linkml/generators/sqlalchemygen.py

View check run for this annotation

Codecov / codecov/patch

linkml/generators/sqlalchemygen.py#L51 

Added line #L51 was not covered by tests

def __post_init__(self) -> None:
self.original_schema = self.schema
Expand All @@ -55,14 +57,12 @@

def generate_sqla(
self,
model_path: Optional[str] = None,
model_path: str | None = None,
no_model_import: bool = False,
template: Optional[TemplateEnum] = None,
foreign_key_policy: Optional[ForeignKeyPolicy] = None,
template: TemplateEnum | None = None,
foreign_key_policy: ForeignKeyPolicy | None = None,
**kwargs,
) -> str:
# src_sv = SchemaView(self.schema)
# self.schema = src_sv.schema
template = template or self.template or TemplateEnum.IMPERATIVE
sqltr = RelationalModelTransformer(self.schemaview)
if foreign_key_policy:
Expand All @@ -76,7 +76,6 @@
sql_type = sql_range.__repr__()
ann = Annotation("sql_type", sql_type)
a.annotations[ann.tag] = ann
# a.sql_type = sql_type
if template == TemplateEnum.IMPERATIVE:
template_str = sqlalchemy_imperative_template_str
elif template == TemplateEnum.DECLARATIVE:
Expand All @@ -90,10 +89,6 @@
backrefs = defaultdict(list)
for m in tr_result.mappings:
backrefs[m.source_class].append(m)
# for c in tr_schema.classes.values():
# if len(c.attributes) == 0:
# skip[c.name] = True
# #raise ValueError(f'Class must have attrs: {c.name}')
self.add_safe_aliases(tr_schema)
tr_sv = SchemaView(tr_schema)
rel_schema_classes_ordered = [tr_sv.get_class(cn, strict=True) for cn in self.order_classes_by_hierarchy(tr_sv)]
Expand Down Expand Up @@ -167,7 +162,6 @@
@staticmethod
def add_safe_aliases(schema: SchemaDefinition) -> None:
for c in schema.classes.values():
# c.alias = underscore(c.name)
for a in c.attributes.values():
a.alias = underscore(a.name)

Expand Down