Use new APIs

Author: huzecong

.gitignore

@@ -1,5 +1,7 @@
 # Created by .ignore support plugin (hsz.mobi)
 /contest_problems.pkl
+/contest_cpp/
+/contest_python/
 
 ### Python template
 # Byte-compiled / optimized / DLL files

lchelper/common.py

@@ -1,3 +1,4 @@
+from dataclasses import dataclass
 from typing import Any, Dict, List, NamedTuple, Optional, Tuple
 
 __all__ = [
@@ -11,7 +12,8 @@
 ]
 
 
-class User(NamedTuple):
+@dataclass
+class User:
     username: str
     site: str  # "leetcode" or "leetcode-cn"
 
@@ -21,7 +23,8 @@ def __repr__(self):
         return f"{self.username} ({self.site})"
 
 
-class Problem(NamedTuple):
+@dataclass
+class Problem:
     """Raw description of the problem crawled from the web page."""
 
     url: str
@@ -32,29 +35,33 @@ class Problem(NamedTuple):
     code: List[str]  # template code, in lines
 
 
-class FunctionSignature(NamedTuple):
+@dataclass
+class FunctionSignature:
     """Signature of a function."""
 
     name: str
     arguments: List[Tuple[str, str]]  # list of (type, name)
     return_type: str
 
 
-class Example(NamedTuple):
+@dataclass
+class Example:
     """An example test case, consisting of an input--output pair."""
 
     input: Dict[str, Any]
     output: Any
 
 
-class ProblemSignature(NamedTuple):
+@dataclass
+class ProblemSignature:
     """Signature of a problem, including the function signature and test cases."""
 
     function: FunctionSignature
     examples: List[Example]
 
 
-class Interaction(NamedTuple):
+@dataclass
+class Interaction:
     """
     An "interaction" in interactive problems. An example test case for interactive
     problems consist of multiple "interactions", where each interaction calls a specific
@@ -66,7 +73,8 @@ class Interaction(NamedTuple):
     output: Optional[Any]
 
 
-class InteractiveProblemSignature(NamedTuple):
+@dataclass
+class InteractiveProblemSignature:
     """Signature of an interactive problem."""
 
     class_name: str

lchelper/crawler.py

@@ -93,7 +93,7 @@ def update_cookie(username: str, site: str) -> None:
         )
     print("Login page loaded. Please enter your password in the browser window.")
 
-    elem = browser.find_element_by_css_selector('input[name="login"]')
+    elem = browser.find_element(By.CSS_SELECTOR, 'input[name="login"]')
     elem.clear()
     elem.send_keys(username)
 
@@ -167,8 +167,8 @@ def get_problems(contest_url: str, site: str, cookie_path: str) -> List[Problem]
         print(f"Cookie '{cookie_path}' might have expired. Please try logging in again")
         exit(1)
 
-    elem = browser.find_element_by_css_selector("ul.contest-question-list")
-    links = elem.find_elements_by_tag_name("a")
+    elem = browser.find_element(By.CSS_SELECTOR, "ul.contest-question-list")
+    links = elem.find_elements(By.TAG_NAME, "a")
     problem_paths = [(link.get_attribute("href"), link.text) for link in links]
     log(f"Found problems: {[name for _, name in problem_paths]!r}")
 
@@ -179,27 +179,27 @@ def get_problems(contest_url: str, site: str, cookie_path: str) -> List[Problem]
             # Page during contest; editor located below statement.
             statement_css_selector = "div.question-content"
             code_css_selector = "pre.CodeMirror-line"
-            statement = browser.find_element_by_css_selector(
-                statement_css_selector
+            statement = browser.find_element(
+                By.CSS_SELECTOR, statement_css_selector
             ).text
         except (TimeoutException, NoSuchElementException):
             # Page after contest; statement and editor in vertically split panes.
             statement_css_selector = (
                 "div[data-key='description-content'] div.content__1Y2H"
             )
             code_css_selector = "div.monaco-scrollable-element div.view-line"
-            statement = browser.find_element_by_css_selector(
-                statement_css_selector
+            statement = browser.find_element(
+                By.CSS_SELECTOR, statement_css_selector
             ).text
         examples = [
             elem.text
-            for elem in browser.find_elements_by_css_selector("pre:not([class])")
+            for elem in browser.find_elements(By.CSS_SELECTOR, "pre:not([class])")
             if elem.text
         ]
         # TODO: Should make sure C++ is selected!
         code = [
             elem.text
-            for elem in browser.find_elements_by_css_selector(code_css_selector)
+            for elem in browser.find_elements(By.CSS_SELECTOR, code_css_selector)
         ]
         problem = Problem(problem_url, problem_name, statement, examples, code)
         parsed_problems.append(problem)

lchelper/logging.py

@@ -1,5 +1,3 @@
-import time
-
 from termcolor import colored
 
 __all__ = [

lchelper/utils.py

@@ -1,26 +1,12 @@
 import sys
-from typing import Any, Dict, NamedTuple, Optional, Type, TypeVar
+from typing import Optional
 
 __all__ = [
-    "to_dict",
-    "from_dict",
     "remove_affix",
     "register_excepthook",
 ]
 
 
-def to_dict(nm_tpl: NamedTuple) -> Dict[str, Any]:
-    return nm_tpl._asdict()
-
-
-TupleType = TypeVar("TupleType", bound=NamedTuple)
-
-
-def from_dict(tpl_class: Type[TupleType], d: Dict[str, Any]) -> TupleType:
-    assert all(field in d for field in tpl_class._fields)
-    return tpl_class(**d)
-
-
 def remove_affix(
     s: str, prefix: Optional[str] = None, suffix: Optional[str] = None
 ) -> str:
@@ -42,5 +28,7 @@ def excepthook(type, value, traceback):
     # enter IPython debugger on exception
     from IPython.core import ultratb
 
-    ipython_hook = ultratb.FormattedTB(mode="Context", color_scheme="Linux", call_pdb=1)
+    ipython_hook = ultratb.FormattedTB(
+        mode="Context", color_scheme="Linux", call_pdb=True
+    )
     sys.excepthook = excepthook

main.py

@@ -1,4 +1,5 @@
 import argparse
+import dataclasses
 import os
 import pickle
 import sys
@@ -183,13 +184,11 @@ def main():
 
             problems = lchelper.get_problems(url, user.site, cookie_path)
 
-            info[site, contest_name] = [lchelper.utils.to_dict(p) for p in problems]
+            info[site, contest_name] = [dataclasses.asdict(p) for p in problems]
             with open(CACHE_FILE, "wb") as f:
                 pickle.dump(info, f)
         else:
-            problems = [
-                lchelper.utils.from_dict(lchelper.Problem, p) for p in cached_problems
-            ]
+            problems = [lchelper.Problem(**p) for p in cached_problems]
 
         for lang in args.lang:
             codegen = lchelper.create_codegen(lang)