From ab1ab99afa5cf882c1ba53fa2890f85d98468103 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 28 Oct 2024 10:52:29 +0100 Subject: [PATCH] build: pre-commit autoupdate --- .flake8_strict | 3 ++- .pre-commit-config.yaml | 8 ++++---- toolbox/commands.py | 12 ++++-------- toolbox/overrides.py | 1 + toolbox/sql_recorder.py | 1 + .../tables_activity_ranked/tables_activity_ranked.py | 7 ++++--- .../toolbox/doctype/mariadb_index/mariadb_index.py | 6 ++---- toolbox/utils.py | 4 +++- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.flake8_strict b/.flake8_strict index 9e52a68..aa91ed9 100644 --- a/.flake8_strict +++ b/.flake8_strict @@ -66,7 +66,8 @@ ignore = F841, E713, E712, - B023 + B023, + E704, max-line-length = 200 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 51d786c..bbd40f7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ fail_fast: false repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v5.0.0 hooks: - id: trailing-whitespace files: "remote_actions.*" @@ -15,7 +15,7 @@ repos: - id: check-ast - repo: https://github.com/PyCQA/flake8 - rev: 6.1.0 + rev: 7.1.0 hooks: - id: flake8 additional_dependencies: [ @@ -24,13 +24,13 @@ repos: args: ['--config', '.flake8_strict'] - repo: https://github.com/timothycrosley/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort exclude: ".*setup.py$" - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 24.10.0 hooks: - id: black additional_dependencies: ['click'] diff --git a/toolbox/commands.py b/toolbox/commands.py index ce457f5..87b3017 100644 --- a/toolbox/commands.py +++ b/toolbox/commands.py @@ -12,23 +12,19 @@ @click.group("doctype-manager") -def doctype_manager_cli(): - ... +def doctype_manager_cli(): ... @click.group("sql-recorder") -def sql_recorder_cli(): - ... +def sql_recorder_cli(): ... @click.group("index-manager") -def index_manager_cli(): - ... +def index_manager_cli(): ... @click.group("sql-manager") -def sql_manager_cli(): - ... +def sql_manager_cli(): ... @click.command("start") diff --git a/toolbox/overrides.py b/toolbox/overrides.py index 1e9d47e..26fa95a 100644 --- a/toolbox/overrides.py +++ b/toolbox/overrides.py @@ -11,6 +11,7 @@ def boot_session(bootinfo): } } + def after_migrate(): import frappe diff --git a/toolbox/sql_recorder.py b/toolbox/sql_recorder.py index c0bd194..ee84868 100644 --- a/toolbox/sql_recorder.py +++ b/toolbox/sql_recorder.py @@ -4,6 +4,7 @@ from re import compile import frappe + import toolbox TRACEBACK_PATH_PATTERN = compile(".*/apps/") diff --git a/toolbox/toolbox/dashboard_chart_source/tables_activity_ranked/tables_activity_ranked.py b/toolbox/toolbox/dashboard_chart_source/tables_activity_ranked/tables_activity_ranked.py index 45161a2..2b94681 100644 --- a/toolbox/toolbox/dashboard_chart_source/tables_activity_ranked/tables_activity_ranked.py +++ b/toolbox/toolbox/dashboard_chart_source/tables_activity_ranked/tables_activity_ranked.py @@ -1,14 +1,15 @@ import frappe -from frappe import _ + from toolbox.api.index_manager import tables + @frappe.whitelist() def get(): data = tables(limit=10) labels = [x["name"] for x in data] datasets = [ - {'name': 'Read', 'values': [x["num_read_queries"] for x in data]}, - {'name': 'Write', 'values': [x["num_write_queries"] for x in data]}, + {"name": "Read", "values": [x["num_read_queries"] for x in data]}, + {"name": "Write", "values": [x["num_write_queries"] for x in data]}, ] return { diff --git a/toolbox/toolbox/doctype/mariadb_index/mariadb_index.py b/toolbox/toolbox/doctype/mariadb_index/mariadb_index.py index 14e91ee..48b3641 100644 --- a/toolbox/toolbox/doctype/mariadb_index/mariadb_index.py +++ b/toolbox/toolbox/doctype/mariadb_index/mariadb_index.py @@ -65,12 +65,10 @@ def db_insert(self, *args, **kwargs): def db_update(self): raise NotImplementedError - def delete(self): - ... + def delete(self): ... @staticmethod - def get_stats(args): - ... + def get_stats(args): ... def load_from_db(self): index, column_name, table = self.name.split("--") diff --git a/toolbox/utils.py b/toolbox/utils.py index 249c408..f22212f 100644 --- a/toolbox/utils.py +++ b/toolbox/utils.py @@ -190,7 +190,9 @@ def process_sql_metadata_chunk( try: explain_data = frappe.db.sql(f"EXPLAIN EXTENDED {query}", as_dict=True) except Exception as e: - frappe.logger("toolbox").exception(f"process_sql_metadata_chunk: EXPLAIN EXTENDED {query}") + frappe.logger("toolbox").exception( + f"process_sql_metadata_chunk: EXPLAIN EXTENDED {query}" + ) continue if not explain_data: