From bc06db80adaf863c137e48f3f109c9c0a59dde13 Mon Sep 17 00:00:00 2001 From: Max Halford Date: Sun, 19 Nov 2023 01:11:32 +0100 Subject: [PATCH] ruff --- lea/app/run.py | 4 +--- lea/clients/base.py | 14 ++++++++++---- lea/clients/bigquery.py | 26 +++++++++++++------------- lea/clients/duckdb.py | 26 +++++++++++++------------- 4 files changed, 37 insertions(+), 33 deletions(-) diff --git a/lea/app/run.py b/lea/app/run.py index 1aa6e29..1d1fb82 100644 --- a/lea/app/run.py +++ b/lea/app/run.py @@ -251,9 +251,7 @@ def display_progress() -> rich.table.Table: console_log(f"{len(cache):,d} view(s) already done") - with rich.live.Live( - display_progress(), vertical_overflow="visible" - ) as live: + with rich.live.Live(display_progress(), vertical_overflow="visible") as live: while dag.is_active(): # We check if new views have been unlocked # If so, we submit a job to create them diff --git a/lea/clients/base.py b/lea/clients/base.py index 6cd09cd..877917a 100644 --- a/lea/clients/base.py +++ b/lea/clients/base.py @@ -109,7 +109,9 @@ def make_column_test_set(self, view: views.View, column: str, elements: set[str] def load_assertion_test_template(self, tag: str) -> jinja2.Template: return jinja2.Template( - (pathlib.Path(__file__).parent / "assertions" / f"{tag.lstrip('@')}.sql.jinja").read_text() + ( + pathlib.Path(__file__).parent / "assertions" / f"{tag.lstrip('@')}.sql.jinja" + ).read_text() ) def discover_assertion_tests(self, view, view_columns): @@ -138,7 +140,9 @@ def discover_assertion_tests(self, view, view_columns): query=self.make_column_test_unique(view, column), sqlglot_dialect=self.sqlglot_dialect, ) - elif unique_by := re.fullmatch(rf"{AssertionTag.UNIQUE_BY}\((?P.+)\)", comment.text): + elif unique_by := re.fullmatch( + rf"{AssertionTag.UNIQUE_BY}\((?P.+)\)", comment.text + ): by = unique_by.group("by") yield views.GenericSQLView( schema="tests", @@ -146,8 +150,10 @@ def discover_assertion_tests(self, view, view_columns): query=self.make_column_test_unique_by(view, column, by), sqlglot_dialect=self.sqlglot_dialect, ) - elif set_ := re.fullmatch(AssertionTag.SET + r"\{(?P\w+(?:,\s*\w+)*)\}", comment.text): - elements = {element.strip() for element in set_.group("elements").split(',')} + elif set_ := re.fullmatch( + AssertionTag.SET + r"\{(?P\w+(?:,\s*\w+)*)\}", comment.text + ): + elements = {element.strip() for element in set_.group("elements").split(",")} yield views.GenericSQLView( schema="tests", name=f"{view}.{column}{AssertionTag.SET}", diff --git a/lea/clients/bigquery.py b/lea/clients/bigquery.py index 46a8318..67736c4 100644 --- a/lea/clients/bigquery.py +++ b/lea/clients/bigquery.py @@ -7,7 +7,7 @@ import lea -from .base import Client +from .base import AssertionTag, Client class BigQuery(Client): @@ -148,24 +148,24 @@ def _make_view_path(self, view: lea.views.View) -> str: return f"{self.dataset_name}.{lea._SEP.join(view.key)}" def make_column_test_unique(self, view: lea.views.View, column: str) -> str: - return self.load_assertion_test_template( - AssertionTag.UNIQUE - ).render(table=self._make_view_path(view), column=column) + return self.load_assertion_test_template(AssertionTag.UNIQUE).render( + table=self._make_view_path(view), column=column + ) def make_column_test_unique_by(self, view: lea.views.View, column: str, by: str) -> str: schema, *leftover = view.key - return self.load_assertion_test_template( - AssertionTag.UNIQUE_BY - ).render(table=self._make_view_path(view), column=column, by=by) + return self.load_assertion_test_template(AssertionTag.UNIQUE_BY).render( + table=self._make_view_path(view), column=column, by=by + ) def make_column_test_no_nulls(self, view: lea.views.View, column: str) -> str: schema, *leftover = view.key - return self.load_assertion_test_template( - AssertionTag.NO_NULLS - ).render(table=self._make_view_path(view), column=column) + return self.load_assertion_test_template(AssertionTag.NO_NULLS).render( + table=self._make_view_path(view), column=column + ) def make_column_test_set(self, view: lea.views.View, column: str, elements: set[str]) -> str: schema, *leftover = view.key - return self.load_assertion_test_template( - AssertionTag.SET - ).render(table=self._make_view_path(view), column=column, elements=elements) + return self.load_assertion_test_template(AssertionTag.SET).render( + table=self._make_view_path(view), column=column, elements=elements + ) diff --git a/lea/clients/duckdb.py b/lea/clients/duckdb.py index ce8059f..f02958b 100644 --- a/lea/clients/duckdb.py +++ b/lea/clients/duckdb.py @@ -9,7 +9,7 @@ import lea -from .base import Client, AssertionTag +from .base import AssertionTag, Client class DuckDB(Client): @@ -102,24 +102,24 @@ def _make_view_path(self, view: lea.views.View) -> str: def make_column_test_unique(self, view: lea.views.View, column: str) -> str: schema, *leftover = view.key - return self.load_assertion_test_template( - AssertionTag.UNIQUE - ).render(table=f"{schema}.{lea._SEP.join(leftover)}", column=column) + return self.load_assertion_test_template(AssertionTag.UNIQUE).render( + table=f"{schema}.{lea._SEP.join(leftover)}", column=column + ) def make_column_test_unique_by(self, view: lea.views.View, column: str, by: str) -> str: schema, *leftover = view.key - return self.load_assertion_test_template( - AssertionTag.UNIQUE_BY - ).render(table=f"{schema}.{lea._SEP.join(leftover)}", column=column, by=by) + return self.load_assertion_test_template(AssertionTag.UNIQUE_BY).render( + table=f"{schema}.{lea._SEP.join(leftover)}", column=column, by=by + ) def make_column_test_no_nulls(self, view: lea.views.View, column: str) -> str: schema, *leftover = view.key - return self.load_assertion_test_template( - AssertionTag.NO_NULLS - ).render(table=f"{schema}.{lea._SEP.join(leftover)}", column=column) + return self.load_assertion_test_template(AssertionTag.NO_NULLS).render( + table=f"{schema}.{lea._SEP.join(leftover)}", column=column + ) def make_column_test_set(self, view: lea.views.View, column: str, elements: set[str]) -> str: schema, *leftover = view.key - return self.load_assertion_test_template( - AssertionTag.SET - ).render(table=f"{schema}.{lea._SEP.join(leftover)}", column=column, elements=elements) + return self.load_assertion_test_template(AssertionTag.SET).render( + table=f"{schema}.{lea._SEP.join(leftover)}", column=column, elements=elements + )