From 23e4ec367c156de77fe46896f6742bd7427b6631 Mon Sep 17 00:00:00 2001 From: Yhtyyar Sahatov Date: Thu, 26 May 2022 15:41:58 +0300 Subject: [PATCH] isort --- crawlers/mooncrawl/mooncrawl/api.py | 21 +++++++++---------- crawlers/mooncrawl/mooncrawl/blockchain.py | 4 ++-- crawlers/mooncrawl/mooncrawl/contract/cli.py | 2 +- crawlers/mooncrawl/mooncrawl/crawler.py | 2 +- crawlers/mooncrawl/mooncrawl/data.py | 2 +- .../mooncrawl/generic_crawler/base.py | 9 +++++--- .../mooncrawl/generic_crawler/cli.py | 4 +++- crawlers/mooncrawl/mooncrawl/settings.py | 3 +-- .../mooncrawl/stats_worker/dashboard.py | 8 ++----- 9 files changed, 27 insertions(+), 28 deletions(-) diff --git a/crawlers/mooncrawl/mooncrawl/api.py b/crawlers/mooncrawl/mooncrawl/api.py index ccf10492..ea0669bf 100644 --- a/crawlers/mooncrawl/mooncrawl/api.py +++ b/crawlers/mooncrawl/mooncrawl/api.py @@ -1,35 +1,34 @@ """ The Mooncrawl HTTP API """ +import logging +import time from cgi import test from datetime import datetime, timedelta -import logging from os import times -import time -from typing import Dict, Any, List +from typing import Any, Dict, List from uuid import UUID import boto3 # type: ignore -from fastapi import FastAPI, BackgroundTasks +from bugout.data import BugoutResource, BugoutResources +from fastapi import BackgroundTasks, FastAPI from fastapi.middleware.cors import CORSMiddleware from sqlalchemy import text -from bugout.data import BugoutResource, BugoutResources - from . import data from .middleware import MoonstreamHTTPException from .settings import ( - DOCS_TARGET_PATH, - ORIGINS, - bugout_client as bc, BUGOUT_RESOURCE_TYPE_SUBSCRIPTION, - NB_CONTROLLER_ACCESS_ID, + DOCS_TARGET_PATH, MOONSTREAM_S3_QUERIES_BUCKET, MOONSTREAM_S3_QUERIES_BUCKET_PREFIX, MOONSTREAM_S3_SMARTCONTRACTS_ABI_PREFIX, + NB_CONTROLLER_ACCESS_ID, + ORIGINS, ) -from .version import MOONCRAWL_VERSION +from .settings import bugout_client as bc from .stats_worker import dashboard, queries +from .version import MOONCRAWL_VERSION logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) diff --git a/crawlers/mooncrawl/mooncrawl/blockchain.py b/crawlers/mooncrawl/mooncrawl/blockchain.py index 833fc23f..f5f45b70 100644 --- a/crawlers/mooncrawl/mooncrawl/blockchain.py +++ b/crawlers/mooncrawl/mooncrawl/blockchain.py @@ -26,12 +26,12 @@ from web3.types import BlockData from .data import AvailableBlockchainType, DateRange from .settings import ( - NB_ACCESS_ID_HEADER, - NB_DATA_SOURCE_HEADER, MOONSTREAM_CRAWL_WORKERS, MOONSTREAM_ETHEREUM_WEB3_PROVIDER_URI, MOONSTREAM_POLYGON_WEB3_PROVIDER_URI, MOONSTREAM_XDAI_WEB3_PROVIDER_URI, + NB_ACCESS_ID_HEADER, + NB_DATA_SOURCE_HEADER, ) logger = logging.getLogger(__name__) diff --git a/crawlers/mooncrawl/mooncrawl/contract/cli.py b/crawlers/mooncrawl/mooncrawl/contract/cli.py index 62f3c1cb..cb77c31a 100644 --- a/crawlers/mooncrawl/mooncrawl/contract/cli.py +++ b/crawlers/mooncrawl/mooncrawl/contract/cli.py @@ -11,8 +11,8 @@ from web3 import Web3 from ..blockchain import connect from ..data import AvailableBlockchainType -from .deployment_crawler import ContractDeploymentCrawler, MoonstreamDataStore from ..settings import NB_CONTROLLER_ACCESS_ID +from .deployment_crawler import ContractDeploymentCrawler, MoonstreamDataStore logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) diff --git a/crawlers/mooncrawl/mooncrawl/crawler.py b/crawlers/mooncrawl/mooncrawl/crawler.py index 1a610ca0..a8ca13f0 100644 --- a/crawlers/mooncrawl/mooncrawl/crawler.py +++ b/crawlers/mooncrawl/mooncrawl/crawler.py @@ -23,7 +23,7 @@ from .blockchain import ( ) from .data import AvailableBlockchainType from .publish import publish_json -from .settings import NB_CONTROLLER_ACCESS_ID, MOONSTREAM_CRAWL_WORKERS +from .settings import MOONSTREAM_CRAWL_WORKERS, NB_CONTROLLER_ACCESS_ID from .version import MOONCRAWL_VERSION logging.basicConfig(level=logging.INFO) diff --git a/crawlers/mooncrawl/mooncrawl/data.py b/crawlers/mooncrawl/mooncrawl/data.py index 0c28efb1..85c269e9 100644 --- a/crawlers/mooncrawl/mooncrawl/data.py +++ b/crawlers/mooncrawl/mooncrawl/data.py @@ -1,7 +1,7 @@ from dataclasses import dataclass from datetime import datetime from enum import Enum -from typing import List, Any, Dict +from typing import Any, Dict, List from pydantic import BaseModel, Field diff --git a/crawlers/mooncrawl/mooncrawl/generic_crawler/base.py b/crawlers/mooncrawl/mooncrawl/generic_crawler/base.py index d6b57a96..d4a93d92 100644 --- a/crawlers/mooncrawl/mooncrawl/generic_crawler/base.py +++ b/crawlers/mooncrawl/mooncrawl/generic_crawler/base.py @@ -1,8 +1,8 @@ import json import logging -from dataclasses import dataclass import time -from typing import Any, Dict, List, Optional, Union, Set +from dataclasses import dataclass +from typing import Any, Dict, List, Optional, Set, Union import web3 from eth_typing import ChecksumAddress @@ -15,7 +15,10 @@ from moonstreamdb.models import ( PolygonLabel, PolygonTransaction, ) -from moonworm.crawler.function_call_crawler import ContractFunctionCall, utfy_dict # type: ignore +from moonworm.crawler.function_call_crawler import ( # type: ignore + ContractFunctionCall, + utfy_dict, +) from moonworm.crawler.log_scanner import _fetch_events_chunk # type: ignore from sqlalchemy.orm.session import Session from tqdm import tqdm diff --git a/crawlers/mooncrawl/mooncrawl/generic_crawler/cli.py b/crawlers/mooncrawl/mooncrawl/generic_crawler/cli.py index eb886c74..b14c81d3 100644 --- a/crawlers/mooncrawl/mooncrawl/generic_crawler/cli.py +++ b/crawlers/mooncrawl/mooncrawl/generic_crawler/cli.py @@ -1,12 +1,14 @@ import argparse +import json import logging from typing import Optional from moonstreamdb.db import yield_db_session_ctx from web3 import Web3 from web3.middleware import geth_poa_middleware -import json + from mooncrawl.data import AvailableBlockchainType # type: ignore + from ..blockchain import connect from .base import crawl, get_checkpoint, populate_with_events diff --git a/crawlers/mooncrawl/mooncrawl/settings.py b/crawlers/mooncrawl/mooncrawl/settings.py index 38f646a4..eaacae53 100644 --- a/crawlers/mooncrawl/mooncrawl/settings.py +++ b/crawlers/mooncrawl/mooncrawl/settings.py @@ -1,10 +1,9 @@ import os -from typing import cast, Optional +from typing import Optional, cast from uuid import UUID from bugout.app import Bugout - BUGOUT_RESOURCE_TYPE_SUBSCRIPTION = "subscription" BUGOUT_RESOURCE_TYPE_DASHBOARD = "dashboards" diff --git a/crawlers/mooncrawl/mooncrawl/stats_worker/dashboard.py b/crawlers/mooncrawl/mooncrawl/stats_worker/dashboard.py index 733a6272..c20a21a8 100644 --- a/crawlers/mooncrawl/mooncrawl/stats_worker/dashboard.py +++ b/crawlers/mooncrawl/mooncrawl/stats_worker/dashboard.py @@ -19,18 +19,14 @@ from sqlalchemy.orm import Query, Session from sqlalchemy.sql.operators import in_op from web3 import Web3 -from ..blockchain import ( - connect, - get_label_model, - get_transaction_model, -) +from ..blockchain import connect, get_label_model, get_transaction_model from ..data import AvailableBlockchainType from ..reporter import reporter from ..settings import ( CRAWLER_LABEL, - NB_CONTROLLER_ACCESS_ID, MOONSTREAM_ADMIN_ACCESS_TOKEN, MOONSTREAM_S3_SMARTCONTRACTS_ABI_PREFIX, + NB_CONTROLLER_ACCESS_ID, ) from ..settings import bugout_client as bc