remove unused imports; fix import order

Author: aagbsn

ooniapi/services/ooniprobe/src/ooniprobe/dependencies.py

@@ -1,18 +1,14 @@
 import io
 from functools import lru_cache
-from typing import Annotated, TypeAlias, Dict, Any
 from pathlib import Path
+from typing import Annotated, TypeAlias, Dict, Any
 
-from fastapi import Depends
-
+import boto3
 import geoip2.database
-
+from clickhouse_driver import Client as Clickhouse
+from fastapi import Depends
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
-
-from clickhouse_driver import Client as Clickhouse
-
-import boto3
 from mypy_boto3_s3 import S3Client
 
 from .common.config import Settings

ooniapi/services/ooniprobe/src/ooniprobe/models.py

@@ -1,10 +1,10 @@
 from datetime import datetime
-from typing import Dict
+
+from sqlalchemy import ForeignKey, Sequence, String
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
 from .common.models import UtcDateTime
 from .common.postgresql import Base
-from sqlalchemy import ForeignKey, Sequence, String, Integer
-from sqlalchemy.orm import Mapped
-from sqlalchemy.orm import mapped_column, relationship
 
 
 class OONIProbeVPNProvider(Base):

ooniapi/services/ooniprobe/src/ooniprobe/prio.py

@@ -21,15 +21,15 @@
 ```
 """
 
-from typing import List, Tuple
 import logging
+from typing import List, Tuple
+
+import sqlalchemy as sa
+from clickhouse_driver import Client as Clickhouse
 
 from .common.clickhouse_utils import query_click
 from .common.metrics import timer
 
-from clickhouse_driver import Client as Clickhouse
-import sqlalchemy as sa
-
 log = logging.getLogger(__name__)
 
 ## Reactive algorithm

ooniapi/services/ooniprobe/src/ooniprobe/routers/reports.py

@@ -1,29 +1,27 @@
-from typing import List, Annotated, Dict, Any
 import asyncio
-from pathlib import Path
-import logging
-from hashlib import sha512
-from urllib.request import urlopen
-from datetime import datetime, timezone
 import io
+import logging
 import random
+from datetime import datetime, timezone
+from hashlib import sha512
+from typing import List, Dict, Any
 
-from fastapi import Request, Response, APIRouter, HTTPException, Header, Body
 import httpx
+from fastapi import Request, Response, APIRouter, HTTPException, Header
 from pydantic import Field
 from prometheus_client import Counter
 import zstd
 
+from ..common.metrics import timer
+from ..common.routers import BaseModel
+from ..common.utils import setnocacheresponse
+from ..dependencies import SettingsDep, ASNReaderDep, CCReaderDep, S3ClientDep
 from ..utils import (
     generate_report_id,
     extract_probe_ipaddr,
     lookup_probe_cc,
     lookup_probe_network,
 )
-from ..dependencies import SettingsDep, ASNReaderDep, CCReaderDep, S3ClientDep
-from ..common.routers import BaseModel
-from ..common.utils import setnocacheresponse
-from ..common.metrics import timer
 
 router = APIRouter()
 

ooniapi/services/ooniprobe/src/ooniprobe/routers/v1/probe_services.py

@@ -1,21 +1,22 @@
 import logging
-from datetime import datetime, timezone, timedelta
-import time
-from typing import List, Optional, Any, Dict, Tuple, Optional
 import random
+import time
+from datetime import datetime, timezone, timedelta
+from typing import List, Optional, Any, Dict, Tuple
 
 import geoip2
 import geoip2.errors
-from fastapi import APIRouter, Depends, HTTPException, Response, Request
+from fastapi import APIRouter, HTTPException, Response, Request
 from prometheus_client import Counter, Info, Gauge
 from pydantic import Field, IPvAnyAddress
-import ujson
 
+from ...common.auth import create_jwt, decode_jwt, jwt
+from ...common.routers import BaseModel
+from ...common.utils import setnocacheresponse
 from ...dependencies import (
     ASNReaderDep,
     CCReaderDep,
     ClickhouseDep,
-    S3ClientDep,
     SettingsDep,
     TorTargetsDep,
 )
@@ -24,12 +25,7 @@
     extract_probe_ipaddr,
     lookup_probe_cc,
     lookup_probe_network,
-    read_file,
 )
-from ...common.routers import BaseModel
-from ...common.auth import create_jwt, decode_jwt, jwt
-from ...common.config import Settings
-from ...common.utils import setnocacheresponse
 from ...prio import generate_test_list
 
 router = APIRouter(prefix="/v1")

ooniapi/services/ooniprobe/src/ooniprobe/utils.py

@@ -4,23 +4,23 @@
 Insert VPN credentials into database.
 """
 
-from base64 import b64encode
-from os import urandom
-from datetime import datetime, timezone
 import itertools
 import logging
-from typing import List, TypedDict, Tuple
 import io
+from base64 import b64encode
+from datetime import datetime, timezone
+from os import urandom
+from typing import List, TypedDict, Tuple
 
+import httpx
+import pem
 from fastapi import Request
 from mypy_boto3_s3 import S3Client
 from sqlalchemy.orm import Session
-import pem
-import httpx
 
 from .common.config import Settings
-from ooniprobe.models import OONIProbeVPNProvider, OONIProbeVPNProviderEndpoint
 from .dependencies import CCReaderDep, ASNReaderDep
+from ooniprobe.models import OONIProbeVPNProvider, OONIProbeVPNProviderEndpoint
 
 RISEUP_CA_URL = "https://api.black.riseup.net/ca.crt"
 RISEUP_CERT_URL = "https://api.black.riseup.net/3/cert"