Skip to content

Make 3+ verbose level turn on engine echo #37

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
msg555 merged 1 commit into from
Apr 10, 2025
Merged

Make 3+ verbose level turn on engine echo #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions subsetter/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import yaml

from subsetter.config_model import SubsetterConfig
from subsetter.config_model import DatabaseOutputConfig, SubsetterConfig
from subsetter.plan_model import SubsetPlan
from subsetter.planner import Planner
from subsetter.sampler import Sampler
Expand Down Expand Up @@ -128,7 +128,7 @@ def _dict_merge(lhs, rhs):
exc_info=args.verbose > 1,
)
sys.exit(1)
return SubsetterConfig.model_validate(config_data)
config = SubsetterConfig.model_validate(config_data)
except ValueError as exc:
LOGGER.error(
"Unexpected subsetter config file format: %s",
Expand All @@ -137,6 +137,13 @@ def _dict_merge(lhs, rhs):
)
sys.exit(1)

if args.verbose > 2:
config.source.echo = True
if config.sampler and isinstance(config.sampler.output, DatabaseOutputConfig):
config.sampler.output.echo = True

return config


def _main_plan(args):
config = _get_config(args)
Expand Down
2 changes: 2 additions & 0 deletions subsetter/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ def get_connect_args(
sqlite_databases: Optional[Dict[str, str]] = {}
isolation_level: Optional[IsolationLevel] = None
ssl: SSLConfig = SSLConfig()
echo: bool = False

def database_url(
self,
Expand Down Expand Up @@ -198,6 +199,7 @@ def database_engine(
self.dialect or DEFAULT_DIALECT,
env_prefix=env_prefix,
),
echo=self.echo,
)

@sa.event.listens_for(engine, "connect")
Expand Down