ci: format

scrapers/atcoder.py

@@ -17,16 +17,9 @@ from urllib3.util.retry import Retry
 
 from .base import BaseScraper, extract_precision
 from .language_ids import get_language_id
-from .models import (
+from .models import (CombinedTest, ContestListResult, ContestSummary,
-    CombinedTest,
+                     MetadataResult, ProblemSummary, SubmitResult, TestCase,
-    ContestListResult,
+                     TestsResult)
-    ContestSummary,
-    MetadataResult,
-    ProblemSummary,
-    SubmitResult,
-    TestCase,
-    TestsResult,
-)
 
 MIB_TO_MB = 1.048576
 BASE_URL = "https://atcoder.jp"
@@ -385,9 +378,7 @@ class AtcoderScraper(BaseScraper):
             try:
                 session = curl_requests.Session(impersonate="chrome")
 
-                login_page = session.get(
+                login_page = session.get(f"{BASE_URL}/login", timeout=TIMEOUT_SECONDS)
-                    f"{BASE_URL}/login", timeout=TIMEOUT_SECONDS
-                )
                 login_page.raise_for_status()
                 soup = BeautifulSoup(login_page.text, "html.parser")
                 csrf_input = soup.find("input", {"name": "csrf_token"})
@@ -414,9 +405,7 @@ class AtcoderScraper(BaseScraper):
                             success=False,
                             error="Login failed: incorrect username or password",
                         )
-                    session.get(
+                    session.get(BASE_URL + location, timeout=TIMEOUT_SECONDS)
-                        BASE_URL + location, timeout=TIMEOUT_SECONDS
-                    )
                 else:
                     login_resp.raise_for_status()
 

scrapers/base.py

@@ -6,13 +6,8 @@ import sys
 from abc import ABC, abstractmethod
 
 from .language_ids import get_language_id
-from .models import (
+from .models import (CombinedTest, ContestListResult, MetadataResult,
-    CombinedTest,
+                     SubmitResult, TestsResult)
-    ContestListResult,
-    MetadataResult,
-    SubmitResult,
-    TestsResult,
-)
 
 _PRECISION_ABS_REL_RE = re.compile(
     r"(?:absolute|relative)\s+error[^.]*?10\s*[\^{]\s*\{?\s*[-\u2212]\s*(\d+)\s*\}?",

scrapers/codechef.py

@@ -9,14 +9,8 @@ import httpx
 from curl_cffi import requests as curl_requests
 
 from .base import BaseScraper, extract_precision
-from .models import (
+from .models import (ContestListResult, ContestSummary, MetadataResult,
-    ContestListResult,
+                     ProblemSummary, SubmitResult, TestCase)
-    ContestSummary,
-    MetadataResult,
-    ProblemSummary,
-    SubmitResult,
-    TestCase,
-)
 
 BASE_URL = "https://www.codechef.com"
 API_CONTESTS_ALL = "/api/list/contests/all"

scrapers/codeforces.py

@@ -10,14 +10,8 @@ from bs4 import BeautifulSoup, Tag
 from curl_cffi import requests as curl_requests
 
 from .base import BaseScraper, extract_precision
-from .models import (
+from .models import (ContestListResult, ContestSummary, MetadataResult,
-    ContestListResult,
+                     ProblemSummary, SubmitResult, TestCase)
-    ContestSummary,
-    MetadataResult,
-    ProblemSummary,
-    SubmitResult,
-    TestCase,
-)
 
 BASE_URL = "https://codeforces.com"
 API_CONTEST_LIST_URL = f"{BASE_URL}/api/contest.list"

scrapers/cses.py

@@ -8,14 +8,8 @@ from typing import Any
 import httpx
 
 from .base import BaseScraper, extract_precision
-from .models import (
+from .models import (ContestListResult, ContestSummary, MetadataResult,
-    ContestListResult,
+                     ProblemSummary, SubmitResult, TestCase)
-    ContestSummary,
-    MetadataResult,
-    ProblemSummary,
-    SubmitResult,
-    TestCase,
-)
 
 BASE_URL = "https://cses.fi"
 INDEX_PATH = "/problemset"

scrapers/kattis.py

@@ -10,14 +10,8 @@ from datetime import datetime
 import httpx
 
 from .base import BaseScraper
-from .models import (
+from .models import (ContestListResult, ContestSummary, MetadataResult,
-    ContestListResult,
+                     ProblemSummary, SubmitResult, TestCase)
-    ContestSummary,
-    MetadataResult,
-    ProblemSummary,
-    SubmitResult,
-    TestCase,
-)
 
 BASE_URL = "https://open.kattis.com"
 HEADERS = {

scrapers/usaco.py

@@ -8,14 +8,8 @@ from typing import Any, cast
 import httpx
 
 from .base import BaseScraper
-from .models import (
+from .models import (ContestListResult, ContestSummary, MetadataResult,
-    ContestListResult,
+                     ProblemSummary, SubmitResult, TestCase)
-    ContestSummary,
-    MetadataResult,
-    ProblemSummary,
-    SubmitResult,
-    TestCase,
-)
 
 BASE_URL = "http://www.usaco.org"
 HEADERS = {
@@ -37,8 +31,7 @@ DIVISION_HEADING_RE = re.compile(
     re.IGNORECASE,
 )
 PROBLEM_BLOCK_RE = re.compile(
-    r"<b>([^<]+)</b>\s*<br\s*/?>.*?"
+    r"<b>([^<]+)</b>\s*<br\s*/?>.*?" r"viewproblem2&cpid=(\d+)",
-    r"viewproblem2&cpid=(\d+)",
     re.DOTALL,
 )
 SAMPLE_IN_RE = re.compile(r"<pre\s+class=['\"]in['\"]>(.*?)</pre>", re.DOTALL)

tests/test_scrapers.py

@@ -1,10 +1,6 @@
 import pytest
 
-from scrapers.models import (
+from scrapers.models import ContestListResult, MetadataResult, TestsResult
-    ContestListResult,
-    MetadataResult,
-    TestsResult,
-)
 
 MATRIX = {
     "cses": {
@@ -61,9 +57,9 @@ def test_scraper_offline_fixture_matrix(run_scraper_offline, scraper, mode):
                 assert hasattr(tr.combined, "input"), "combined missing input"
                 assert hasattr(tr.combined, "expected"), "combined missing expected"
                 assert isinstance(tr.combined.input, str), "combined.input not string"
-                assert isinstance(tr.combined.expected, str), (
+                assert isinstance(
-                    "combined.expected not string"
+                    tr.combined.expected, str
-                )
+                ), "combined.expected not string"
                 assert hasattr(tr, "multi_test"), "Missing multi_test field"
                 assert isinstance(tr.multi_test, bool), "multi_test not boolean"
                 validated_any = True
@@ -77,12 +73,12 @@ def test_scraper_offline_fixture_matrix(run_scraper_offline, scraper, mode):
                 assert isinstance(obj["combined"], dict), "combined not a dict"
                 assert "input" in obj["combined"], "combined missing input key"
                 assert "expected" in obj["combined"], "combined missing expected key"
-                assert isinstance(obj["combined"]["input"], str), (
+                assert isinstance(
-                    "combined.input not string"
+                    obj["combined"]["input"], str
-                )
+                ), "combined.input not string"
-                assert isinstance(obj["combined"]["expected"], str), (
+                assert isinstance(
-                    "combined.expected not string"
+                    obj["combined"]["expected"], str
-                )
+                ), "combined.expected not string"
                 assert "multi_test" in obj, "Missing multi_test field in raw JSON"
                 assert isinstance(obj["multi_test"], bool), "multi_test not boolean"
                 validated_any = True