💄 Lint with isort

.pre-commit-config.yaml

@@ -1,9 +1,4 @@
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
-    hooks:
-    -   id: check-yaml
-
 -   repo: https://github.com/pre-commit/mirrors-isort
     rev: v5.10.1
     hooks:
@@ -21,11 +16,5 @@ repos:
     -   id: mypy
         additional_dependencies: [types-setuptools]
 
--   repo: https://github.com/executablebooks/mdformat
-    rev: 0.7.14
-    hooks:
-    -   id: mdformat
-        additional_dependencies: [mdformat-gfm, mdformat-frontmatter]
-
 default_language_version:
     python: python3

src/web3cli/controllers/base_controller.py

@@ -1,7 +1,8 @@
 from cement import ex
+
 from web3cli.controllers.controller import Controller
-from web3cli.helpers.version import get_version_message
 from web3cli.helpers import args
+from web3cli.helpers.version import get_version_message
 
 
 class BaseController(Controller):

src/web3cli/controllers/config_controller.py

@@ -1,7 +1,9 @@
+import argparse
+
 from cement import ex
+
 from web3cli.controllers.controller import Controller
 from web3cli.helpers.config import update_setting_in_config_file
-import argparse
 
 
 class ConfigController(Controller):

src/web3cli/controllers/controller.py

@@ -1,7 +1,8 @@
 from typing import Any
+
+from cement import App
 from cement import Controller as CementController
 from cement.core.config import ConfigInterface
-from cement import App
 
 
 class Controller(CementController):

src/web3cli/controllers/db/address_controller.py

@@ -1,7 +1,8 @@
 from cement import ex
+
 from web3cli.controllers.controller import Controller
-from web3cli.core.models.address import Address
 from web3cli.core.exceptions import Web3CliError
+from web3cli.core.models.address import Address
 from web3cli.helpers.render import render_table
 
 

src/web3cli/controllers/db/chain_controller.py

@@ -1,4 +1,5 @@
 from cement import ex
+
 from web3cli.controllers.controller import Controller
 from web3cli.core.exceptions import ChainNotFound, Web3CliError
 from web3cli.core.models.chain import Chain

src/web3cli/controllers/db/contract_controller.py

@@ -1,10 +1,11 @@
 from cement import ex
+from playhouse.shortcuts import model_to_dict
+
 from web3cli.controllers.controller import Controller
+from web3cli.core.exceptions import Web3CliError
 from web3cli.core.helpers.os import read_json
 from web3cli.core.models.contract import Contract
-from web3cli.core.exceptions import Web3CliError
 from web3cli.helpers.render import render_table
-from playhouse.shortcuts import model_to_dict
 
 
 class ContractController(Controller):

src/web3cli/controllers/db/db_base_controller.py

@@ -1,4 +1,5 @@
 from cement import ex
+
 from web3cli.controllers.controller import Controller
 from web3cli.core.helpers.input import yes_or_exit
 from web3cli.helpers.database import delete_db_file, get_db_file

src/web3cli/controllers/db/rpc_controller.py

@@ -1,8 +1,8 @@
 from cement import ex
+
 from web3cli.controllers.controller import Controller
 from web3cli.core.exceptions import ChainNotFound, Web3CliError
-from web3cli.core.models.chain import Chain, Rpc, ChainRpc
-
+from web3cli.core.models.chain import Chain, ChainRpc, Rpc
 from web3cli.helpers.render import render_table
 
 

src/web3cli/controllers/db/signer_controller.py

@@ -1,11 +1,12 @@
+import getpass
+
 from cement import ex
+from eth_account import Account
+
 from web3cli.controllers.controller import Controller
-from web3cli.core.models.signer import Signer
 from web3cli.core.exceptions import KeyIsInvalid, SignerNotFound, Web3CliError
+from web3cli.core.models.signer import Signer
 from web3cli.helpers.crypto import encrypt_string_with_app_key
-from eth_account import Account
-import getpass
-
 from web3cli.helpers.render import render_table
 
 

src/web3cli/controllers/db/tx_controller.py

@@ -1,10 +1,11 @@
 from cement import ex
+from playhouse.shortcuts import model_to_dict
+
 from web3cli.controllers.controller import Controller
-from web3cli.core.models.tx import Tx
 from web3cli.core.exceptions import Web3CliError
-from web3cli.helpers.render import render_table
 from web3cli.core.helpers.format import cut
-from playhouse.shortcuts import model_to_dict
+from web3cli.core.models.tx import Tx
+from web3cli.helpers.render import render_table
 
 
 class TxController(Controller):

src/web3cli/controllers/key_controller.py

@@ -1,8 +1,10 @@
+import secrets
+import sys
+
 from cement import ex
+
 from web3cli.controllers.controller import Controller
 from web3cli.helpers.config import update_setting_in_config_file
-import secrets
-import sys
 
 
 class KeyController(Controller):

src/web3cli/controllers/misc_controller.py

@@ -1,5 +1,7 @@
 from pprint import pformat
+
 from cement import ex
+
 from web3cli.controllers.controller import Controller
 from web3cli.core.models.address import Address
 from web3cli.helpers.chain import chain_ready_or_raise

src/web3cli/controllers/send_controller.py

@@ -1,4 +1,5 @@
 from cement import ex
+
 from web3cli.controllers.controller import Controller
 from web3cli.core.helpers.input import yes_or_exit
 from web3cli.core.models.address import Address

src/web3cli/core/helpers/client_factory.py

@@ -1,9 +1,11 @@
 from typing import Any, Type
-from web3cli.core.models.signer import Signer
-from web3cli.core.types import Logger
+
 from web3client.base_client import BaseClient
-from web3cli.core.models.chain import Chain
+
 from web3cli.core.helpers.crypto import decrypt_string
+from web3cli.core.models.chain import Chain
+from web3cli.core.models.signer import Signer
+from web3cli.core.types import Logger
 
 
 def make_base_client(

src/web3cli/core/helpers/crypto.py

@@ -1,4 +1,5 @@
 import secrets
+
 from cryptography.hazmat.primitives.ciphers.aead import AESGCM
 
 

src/web3cli/core/helpers/database.py

@@ -1,13 +1,15 @@
+import os
 from typing import List, Type
+
 from playhouse.sqlite_ext import SqliteExtDatabase
-from web3cli.core.models.base_model import BaseModel, db
+
+from web3cli.core.helpers.os import create_folder
 from web3cli.core.models.address import Address
+from web3cli.core.models.base_model import BaseModel, db
 from web3cli.core.models.chain import Chain, ChainRpc, Rpc
 from web3cli.core.models.contract import Contract
 from web3cli.core.models.signer import Signer
 from web3cli.core.models.tx import Tx
-from web3cli.core.helpers.os import create_folder
-import os
 
 tables: List[Type[BaseModel]] = [Signer, Address, Chain, Rpc, ChainRpc, Tx, Contract]
 

src/web3cli/core/helpers/input.py

@@ -1,5 +1,6 @@
-from typing import Any
 import sys
+from typing import Any
+
 from web3cli.core.types import Logger
 
 

src/web3cli/core/helpers/rpc.py

@@ -1,6 +1,5 @@
 from urllib.parse import urlparse
 
-
 HTTP_SCHEMES = {"http", "https"}
 WS_SCHEMES = {"ws", "wss"}
 

src/web3cli/core/helpers/yaml.py

@@ -1,6 +1,8 @@
+import os
 from typing import Any
+
 import ruamel.yaml
-import os
+
 from web3cli.core.types import Logger
 
 

src/web3cli/core/models/address.py

@@ -1,15 +1,14 @@
 from __future__ import annotations
+
 from typing import Type
+
+import web3
 from peewee import TextField
+from playhouse.signals import pre_save
+
+from web3cli.core.exceptions import AddressIsInvalid, AddressNotResolved, RecordNotFound
 from web3cli.core.models.base_model import BaseModel
-from web3cli.core.exceptions import (
-    AddressIsInvalid,
-    RecordNotFound,
-    AddressNotResolved,
-)
-import web3
 from web3cli.core.models.types import AddressFields
-from playhouse.signals import pre_save
 from web3cli.core.types import Logger
 
 

src/web3cli/core/models/base_model.py

@@ -1,9 +1,12 @@
 from __future__ import annotations
-from peewee import SqliteDatabase, Field
+
+from typing import Any, Dict, List, Type, TypeVar
+
+from peewee import Field, SqliteDatabase
+from playhouse.shortcuts import update_model_from_dict
 from playhouse.signals import Model
-from typing import List, Dict, Any, Type, TypeVar
+
 from web3cli.core.exceptions import RecordNotFound
-from playhouse.shortcuts import update_model_from_dict
 from web3cli.core.types import Logger
 
 db = SqliteDatabase(None, pragmas={"foreign_keys": 1})

src/web3cli/core/models/chain.py

@@ -1,6 +1,12 @@
 from __future__ import annotations
+
 from typing import List
-from peewee import TextField, IntegerField, ForeignKeyField
+
+from peewee import ForeignKeyField, IntegerField, TextField
+from playhouse.shortcuts import dict_to_model
+from web3.middleware import geth_poa_middleware
+from web3.types import Middleware
+
 from web3cli.core.exceptions import (
     ChainNotResolved,
     RpcIsInvalid,
@@ -9,12 +15,9 @@
 )
 from web3cli.core.helpers.rpc import is_rpc_uri_valid
 from web3cli.core.models.base_model import BaseModel
-from web3.types import Middleware
-from web3.middleware import geth_poa_middleware
 from web3cli.core.models.types import ChainFields
-from web3cli.core.types import Logger
-from playhouse.shortcuts import dict_to_model
 from web3cli.core.seeds import chain_seeds
+from web3cli.core.types import Logger
 
 
 class Chain(BaseModel):

src/web3cli/core/models/contract.py

@@ -1,12 +1,15 @@
 from __future__ import annotations
+
 from typing import Type
+
 from peewee import TextField
 from playhouse.signals import pre_save
+from playhouse.sqlite_ext import JSONField
+from web3._utils.validation import validate_abi
+
 from web3cli.core.exceptions import ContractIsInvalid, ContractNotFound
 from web3cli.core.models.address import Address
 from web3cli.core.models.base_model import BaseModel
-from playhouse.sqlite_ext import JSONField
-from web3._utils.validation import validate_abi
 from web3cli.core.models.types import ContractFields
 from web3cli.core.types import Logger
 

src/web3cli/core/models/signer.py

@@ -1,9 +1,11 @@
 from __future__ import annotations
-from peewee import TextField, BlobField
+
+from peewee import BlobField, TextField
 from web3 import Account
+
+from web3cli.core.exceptions import SignerNotFound
 from web3cli.core.helpers.crypto import encrypt_string
 from web3cli.core.models.base_model import BaseModel
-from web3cli.core.exceptions import SignerNotFound
 
 
 class Signer(BaseModel):

src/web3cli/core/models/timestamps_model.py

@@ -1,6 +1,8 @@
 import datetime as dt
 from typing import Type
+
 from playhouse.signals import pre_save
+
 from web3cli.core.models.base_model import BaseModel
 
 

src/web3cli/core/models/tx.py

@@ -1,13 +1,16 @@
 from __future__ import annotations
+
+import re
 from typing import Type
-from peewee import TextField, DateTimeField, BigIntegerField
+
+from peewee import BigIntegerField, DateTimeField, TextField
+from playhouse.signals import pre_save
+
 from web3cli.core.exceptions import AddressIsInvalid, TxIsInvalid, TxNotFound
 from web3cli.core.models.address import Address
 from web3cli.core.models.timestamps_model import TimestampsModel
-from playhouse.signals import pre_save
 from web3cli.core.models.types import TxFields
 from web3cli.core.types import Logger
-import re
 
 
 class Tx(TimestampsModel):

src/web3cli/core/models/types.py

@@ -1,4 +1,5 @@
 from typing import Any, Dict, List, TypedDict
+
 from typing_extensions import NotRequired
 from web3.types import ABI
 

src/web3cli/core/seeds/chain_seeds.py

@@ -1,6 +1,6 @@
 from typing import List
-from web3cli.core.models.types import ChainFields
 
+from web3cli.core.models.types import ChainFields
 
 # Ethereum
 eth: ChainFields = {

src/web3cli/helpers/args.py

@@ -1,4 +1,5 @@
 from cement import App
+
 from web3cli.core.exceptions import RpcIsInvalid, Web3CliError
 from web3cli.core.helpers.rpc import is_rpc_uri_valid
 from web3cli.core.models.chain import Chain

src/web3cli/helpers/chain.py

@@ -1,4 +1,5 @@
 from cement import App
+
 from web3cli.core.exceptions import ChainNotFound
 from web3cli.core.models.chain import Chain
 

src/web3cli/helpers/client_factory.py

@@ -1,7 +1,8 @@
 from cement import App
-from web3cli.core.helpers.client_factory import make_base_client, make_base_wallet
 from web3client.base_client import BaseClient
+
 from web3cli.core.exceptions import SignerNotFound
+from web3cli.core.helpers.client_factory import make_base_client, make_base_wallet
 
 
 def make_client(app: App, log: bool = False) -> BaseClient: