Modify import order (#1353)

* Modify import order

* Modify import order

* Modify import order

* Modify import order

* Modify import order

* Modify import order

.github/workflows/lint.yml

@@ -30,9 +30,13 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.9
+
     - name: Run Pylint
       run: make pylint
-
+    - name: Check import order
+      uses: jamescurtin/isort-action@master
+      with:
+        sortPaths: deepchecks/
   docstring:
     runs-on: ubuntu-latest
     steps:

deepchecks/__init__.py

@@ -9,42 +9,27 @@
 # ----------------------------------------------------------------------------
 #
 """Deepchecks."""
-import sys
-import types
 import os
 import pathlib
-import matplotlib
-import plotly.io as pio
+import sys
+import types
 import warnings
 from importlib._bootstrap import _init_module_attrs
 
-from deepchecks.utils.ipython import is_notebook
-from deepchecks.core import (
-    BaseCheck,
-    BaseSuite,
-    CheckResult,
-    CheckFailure,
-    SuiteResult,
-    Condition,
-    ConditionResult,
-    ConditionCategory,
-    SingleDatasetBaseCheck,
-    TrainTestBaseCheck,
-    ModelOnlyBaseCheck
-)
-# TODO: remove in further versions
-from deepchecks.tabular import (
-    Dataset,
-    Suite,
-    Context,
-    SingleDatasetCheck,
-    TrainTestCheck,
-    ModelOnlyCheck,
-    ModelComparisonCheck,
-    ModelComparisonSuite,
-)
+import matplotlib
+import plotly.io as pio
 
-from deepchecks.analytics.anonymous_telemetry import send_anonymous_import_event
+from deepchecks.analytics.anonymous_telemetry import \
+    send_anonymous_import_event
+from deepchecks.core import (BaseCheck, BaseSuite, CheckFailure, CheckResult,
+                             Condition, ConditionCategory, ConditionResult,
+                             ModelOnlyBaseCheck, SingleDatasetBaseCheck,
+                             SuiteResult, TrainTestBaseCheck)
+# TODO: remove in further versions
+from deepchecks.tabular import (Context, Dataset, ModelComparisonCheck,
+                                ModelComparisonSuite, ModelOnlyCheck,
+                                SingleDatasetCheck, Suite, TrainTestCheck)
+from deepchecks.utils.ipython import is_notebook
 
 __all__ = [
     # core

deepchecks/analytics/anonymous_telemetry.py

@@ -17,6 +17,7 @@
 import os
 import pathlib
 import uuid
+
 import deepchecks
 
 MODULE_DIR = pathlib.Path(__file__).absolute().parent.parent

deepchecks/checks.py

@@ -15,8 +15,8 @@
 """
 # flake8: noqa
 import warnings
-from deepchecks.tabular.checks import *  # pylint: disable=wildcard-import
 
+from deepchecks.tabular.checks import *  # pylint: disable=wildcard-import
 
 warnings.warn(
     'Ability to import tabular checks from the `deepchecks.checks` '

deepchecks/core/__init__.py

@@ -12,19 +12,11 @@
 
 Import objects to be available in parent deepchecks module.
 """
+from .check_result import CheckFailure, CheckResult
+from .checks import (BaseCheck, DatasetKind, ModelOnlyBaseCheck,
+                     SingleDatasetBaseCheck, TrainTestBaseCheck)
+from .condition import Condition, ConditionCategory, ConditionResult
 from .suite import BaseSuite, SuiteResult
-from .condition import Condition, ConditionResult, ConditionCategory
-from .check_result import (
-    CheckResult,
-    CheckFailure,
-)
-from .checks import (
-    DatasetKind,
-    BaseCheck,
-    SingleDatasetBaseCheck,
-    TrainTestBaseCheck,
-    ModelOnlyBaseCheck,
-)
 
 __all__ = [
     'BaseCheck',

deepchecks/core/check_result.py

@@ -14,28 +14,31 @@
 import io
 import traceback
 import warnings
-from typing import Any, Callable, List, Tuple, Union, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Callable, List, Tuple, Union
 
+import ipywidgets as widgets
 import jsonpickle
 import jsonpickle.ext.pandas as jsonpickle_pd
 import matplotlib
-import pandas as pd
 import numpy as np
-import ipywidgets as widgets
+import pandas as pd
+import plotly
 import plotly.graph_objects as go
-from plotly.basedatatypes import BaseFigure
 import plotly.io as pio
-import plotly
-from matplotlib import pyplot as plt
 from IPython.display import display_html
+from matplotlib import pyplot as plt
 from pandas.io.formats.style import Styler
+from plotly.basedatatypes import BaseFigure
 
-from deepchecks.core.condition import Condition, ConditionCategory, ConditionResult
-from deepchecks.core.display_pandas import dataframe_to_html, get_conditions_table
+from deepchecks.core.condition import (Condition, ConditionCategory,
+                                       ConditionResult)
+from deepchecks.core.display_pandas import (dataframe_to_html,
+                                            get_conditions_table)
 from deepchecks.core.errors import DeepchecksValueError
 from deepchecks.utils.dataframes import un_numpy
-from deepchecks.utils.strings import create_new_file_name, get_docs_summary, widget_to_html
 from deepchecks.utils.ipython import is_notebook
+from deepchecks.utils.strings import (create_new_file_name, get_docs_summary,
+                                      widget_to_html)
 from deepchecks.utils.wandb_utils import set_wandb_run_state
 
 # registers jsonpickle pandas extension for pandas support in the to_json function

deepchecks/core/check_utils/single_feature_contribution_utils.py

@@ -13,10 +13,11 @@
 
 import numpy as np
 import pandas as pd
+import plotly.graph_objects as go
+
 import deepchecks.ppscore as pps
 from deepchecks.utils.plot import colors
 from deepchecks.utils.typing import Hashable
-import plotly.graph_objects as go
 
 
 def get_pps_figure(per_class: bool):

deepchecks/core/check_utils/whole_dataset_drift_utils.py

@@ -10,30 +10,32 @@
 #
 """Module containing common WholeDatasetDriftCheck (domain classifier drift) utils."""
 
-from typing import List
 import warnings
+from typing import List
 
 import numpy as np
 import pandas as pd
+import plotly.graph_objects as go
 from plotly.subplots import make_subplots
-
-from sklearn.pipeline import Pipeline
 from sklearn.compose import ColumnTransformer
+from sklearn.pipeline import Pipeline
 
 with warnings.catch_warnings():
     warnings.simplefilter('ignore')
     from sklearn.experimental import enable_hist_gradient_boosting  # noqa # pylint: disable=unused-import
 
 from sklearn.ensemble import HistGradientBoostingClassifier
 from sklearn.metrics import roc_auc_score
-from sklearn.preprocessing import OrdinalEncoder
 from sklearn.model_selection import train_test_split
-import plotly.graph_objects as go
+from sklearn.preprocessing import OrdinalEncoder
 
 from deepchecks.tabular import Dataset
-from deepchecks.utils.distribution.plot import feature_distribution_traces, drift_score_bar_traces
-from deepchecks.utils.distribution.rare_category_encoder import RareCategoryEncoder
-from deepchecks.utils.features import N_TOP_MESSAGE, calculate_feature_importance_or_none
+from deepchecks.utils.distribution.plot import (drift_score_bar_traces,
+                                                feature_distribution_traces)
+from deepchecks.utils.distribution.rare_category_encoder import \
+    RareCategoryEncoder
+from deepchecks.utils.features import (N_TOP_MESSAGE,
+                                       calculate_feature_importance_or_none)
 from deepchecks.utils.function import run_available_kwargs
 from deepchecks.utils.strings import format_percent
 from deepchecks.utils.typing import Hashable

deepchecks/core/checks.py

@@ -14,10 +14,11 @@
 import enum
 import inspect
 from collections import OrderedDict
-from typing import Any, Callable, List, Union, Dict, Type, ClassVar, Optional
+from typing import Any, Callable, ClassVar, Dict, List, Optional, Type, Union
 
-from deepchecks.core.check_result import CheckResult, CheckFailure
-from deepchecks.core.condition import Condition, ConditionCategory, ConditionResult
+from deepchecks.core.check_result import CheckFailure, CheckResult
+from deepchecks.core.condition import (Condition, ConditionCategory,
+                                       ConditionResult)
 from deepchecks.core.errors import DeepchecksValueError
 from deepchecks.utils.strings import split_camel_case
 

deepchecks/core/condition.py

@@ -14,7 +14,6 @@
 
 from deepchecks.core.errors import DeepchecksValueError
 
-
 __all__ = [
     'Condition',
     'ConditionResult',

deepchecks/core/display_pandas.py

@@ -9,14 +9,13 @@
 # ----------------------------------------------------------------------------
 #
 """Handle displays of pandas objects."""
-from deepchecks.utils.strings import get_docs_summary, get_ellipsis
-
-from typing import List, Union, TYPE_CHECKING
 import warnings
+from typing import TYPE_CHECKING, List, Union
 
 import pandas as pd
 from pandas.io.formats.style import Styler
 
+from deepchecks.utils.strings import get_docs_summary, get_ellipsis
 
 if TYPE_CHECKING:
     from deepchecks.core.check_result import CheckResult

deepchecks/core/display_suite.py

@@ -11,26 +11,25 @@
 """Handle display of suite result."""
 import os
 import sys
-from typing import List, Union
 import warnings
+from typing import List, Union
 
+import ipywidgets as widgets
+import pandas as pd
 # pylint: disable=protected-access
 import tqdm
-from tqdm.notebook import tqdm as tqdm_notebook
-import pandas as pd
-from IPython.display import display, display_html
 from IPython import get_ipython
-import ipywidgets as widgets
+from IPython.display import display, display_html
+from tqdm.notebook import tqdm as tqdm_notebook
 
 from deepchecks.core import errors
+from deepchecks.core.check_result import CheckFailure, CheckResult
+from deepchecks.core.display_pandas import (dataframe_to_html,
+                                            get_conditions_table,
+                                            get_result_navigation_display)
 from deepchecks.utils.ipython import is_widgets_enabled
-from deepchecks.utils.strings import create_new_file_name, get_random_string, widget_to_html
-from deepchecks.core.check_result import CheckResult, CheckFailure
-from deepchecks.core.display_pandas import (
-    dataframe_to_html, get_conditions_table,
-    get_result_navigation_display
-)
-
+from deepchecks.utils.strings import (create_new_file_name, get_random_string,
+                                      widget_to_html)
 
 __all__ = ['display_suite_result', 'ProgressBar']
 

deepchecks/core/suite.py

@@ -9,20 +9,20 @@
 # ----------------------------------------------------------------------------
 #
 """Module containing the Suite object, used for running a set of checks together."""
-import io
 import abc
+import io
 import warnings
 from collections import OrderedDict
-from typing import Any, Union, List, Tuple, Dict
+from typing import Any, Dict, List, Tuple, Union
 
+import jsonpickle
 from IPython.core.display import display_html
 from IPython.core.getipython import get_ipython
-import jsonpickle
 
+from deepchecks.core.check_result import CheckFailure, CheckResult
+from deepchecks.core.checks import BaseCheck
 from deepchecks.core.display_suite import ProgressBar, display_suite_result
 from deepchecks.core.errors import DeepchecksValueError
-from deepchecks.core.check_result import CheckResult, CheckFailure
-from deepchecks.core.checks import BaseCheck
 from deepchecks.utils.ipython import is_notebook
 from deepchecks.utils.wandb_utils import set_wandb_run_state
 

deepchecks/datasets/__init__.py

@@ -15,7 +15,6 @@
 """
 import warnings
 
-
 warnings.warn(
     'Ability to import tabular suites from the `deepchecks.suites` '
     'is deprecated, please import from `deepchecks.tabular.suites` instead',

deepchecks/datasets/classification/breast_cancer.py

@@ -13,6 +13,7 @@
 This module exists only for backward compatibility and will be
 removed in the nexts versions.
 """
-from deepchecks.tabular.datasets.classification.breast_cancer import load_data, load_fitted_model
+from deepchecks.tabular.datasets.classification.breast_cancer import (
+    load_data, load_fitted_model)
 
 __all__ = ['load_data', 'load_fitted_model']

deepchecks/datasets/classification/iris.py

@@ -13,6 +13,7 @@
 This module exists only for backward compatibility and will be
 removed in the nexts versions.
 """
-from deepchecks.tabular.datasets.classification.iris import load_data, load_fitted_model
+from deepchecks.tabular.datasets.classification.iris import (load_data,
+                                                             load_fitted_model)
 
 __all__ = ['load_data', 'load_fitted_model']

deepchecks/datasets/classification/phishing.py

@@ -13,6 +13,7 @@
 This module exists only for backward compatibility and will be
 removed in the nexts versions.
 """
-from deepchecks.tabular.datasets.classification.phishing import load_data, load_fitted_model
+from deepchecks.tabular.datasets.classification.phishing import (
+    load_data, load_fitted_model)
 
 __all__ = ['load_data', 'load_fitted_model']

deepchecks/datasets/regression/avocado.py

@@ -13,6 +13,7 @@
 This module exists only for backward compatibility and will be
 removed in the nexts versions.
 """
-from deepchecks.tabular.datasets.classification.phishing import load_data, load_fitted_model
+from deepchecks.tabular.datasets.classification.phishing import (
+    load_data, load_fitted_model)
 
 __all__ = ['load_data', 'load_fitted_model']

deepchecks/ppscore.py

@@ -33,22 +33,14 @@
 
 
 import numpy as np
-
-from sklearn import tree
-from sklearn import preprocessing
-from sklearn.model_selection import cross_val_score
-from sklearn.metrics import mean_absolute_error, f1_score
-
 import pandas as pd
-from pandas.api.types import (
-    is_numeric_dtype,
-    is_bool_dtype,
-    is_object_dtype,
-    is_categorical_dtype,
-    is_string_dtype,
-    is_datetime64_any_dtype,
-    is_timedelta64_dtype,
-)
+from pandas.api.types import (is_bool_dtype, is_categorical_dtype,
+                              is_datetime64_any_dtype, is_numeric_dtype,
+                              is_object_dtype, is_string_dtype,
+                              is_timedelta64_dtype)
+from sklearn import preprocessing, tree
+from sklearn.metrics import f1_score, mean_absolute_error
+from sklearn.model_selection import cross_val_score
 
 from deepchecks.utils.typing import Hashable
 

deepchecks/suites.py

@@ -15,8 +15,8 @@
 """
 # flake8: noqa
 import warnings
-from deepchecks.tabular.suites import * # pylint: disable=wildcard-import
 
+from deepchecks.tabular.suites import *  # pylint: disable=wildcard-import
 
 warnings.warn(
     'Ability to import tabular suites from the `deepchecks.suites` '