Add cherry-picked release candidates for 1.1.7 (#199)

* 整数判定において、先頭が0だったり、文字数が20以上だったらFalseにするように (#172)

* 整数判定において、先頭が0だったり、文字数が20以上だったらFalseにするように

* answer.txtを変更

* test_mod_caseをstringに

* Makes gen command retry with exponential backoff (#174)

Previously, gen command retries with fixed delay of 1.5 seconds indefinitely. It could hurt the service especially when they are experiencing overloaded traffic. This patch changes the retry strategy with exponential backoff starting from 1.5 seconds to 60 seconds at maximum. The gen commands aborts by EnvironmentInitializationError exception after 10 attempts.

* #186 Support \dots in input formats (#187)

* C++言語アップデートへの対応 (#191)

* Fix cpp language configs

* Update atcodertools/common/language.py

Co-authored-by: DNEK <[email protected]>

Co-authored-by: Kazuma Mikami <[email protected]>
Co-authored-by: DNEK <[email protected]>

* Pythonの言語アップデートに対応 (#192)

* Fix crash in new judgement using Python

* Fix bugs of Python2 submissions in old judgement

Co-authored-by: Matts966 <[email protected]>

* 新しい言語のバージョンに対応 (#196)

* 新しい言語のバージョンに対応

* gen, submitを新しいのに対応

* Fix regexps

Co-authored-by: Kazuma Mikami <[email protected]>

* Fix style

* Update mock pages

* Fix submissions

* Fix flake8

Co-authored-by: chaemon <[email protected]>
Co-authored-by: Yuki Hamada <[email protected]>
Co-authored-by: Takaaki Hirano <[email protected]>
Co-authored-by: DNEK <[email protected]>
Co-authored-by: Matts966 <[email protected]>
Co-authored-by: Matts966 <[email protected]>

Author: 6 people

atcodertools/client/atcoder.py

@@ -65,9 +65,9 @@ def __init__(self):
         self._session = requests.Session()
 
     def check_logging_in(self):
-        private_url = "https://arc001.contest.atcoder.jp/settings"
+        private_url = "https://atcoder.jp/home"
         resp = self._request(private_url)
-        return resp.url == private_url
+        return resp.text.find("Sign In") == -1
 
     def login(self,
               credential_supplier=None,
@@ -89,9 +89,14 @@ def login(self,
 
         username, password = credential_supplier()
 
-        resp = self._request("https://arc001.contest.atcoder.jp/login", data={
-            'name': username,
-            "password": password
+        soup = BeautifulSoup(self._session.get(
+            "https://atcoder.jp/login").text, "html.parser")
+        token = soup.find_all("form")[1].find(
+            "input", type="hidden").get("value")
+        resp = self._request("https://atcoder.jp/login", data={
+            'username': username,
+            "password": password,
+            "csrf_token": token
         }, method='POST')
 
         if resp.text.find("パスワードを忘れた方はこちら") != -1:
@@ -104,7 +109,8 @@ def download_problem_list(self, contest: Contest) -> List[Problem]:
         resp = self._request(contest.get_problem_list_url())
         soup = BeautifulSoup(resp.text, "html.parser")
         res = []
-        for tag in soup.select('.linkwrapper')[0::2]:
+        for tag in soup.find('table').select('tr')[1::]:
+            tag = tag.find("a")
             alphabet = tag.text
             problem_id = tag.get("href").split("/")[-1]
             res.append(Problem(contest, alphabet, problem_id))
@@ -158,25 +164,24 @@ def submit_source_code(self, contest: Contest, problem: Problem, lang: Union[str
         soup = BeautifulSoup(resp.text, "html.parser")
         session_id = soup.find("input", attrs={"type": "hidden"}).get("value")
         task_select_area = soup.find(
-            'select', attrs={"id": "submit-task-selector"})
-        task_field_name = task_select_area.get("name")
+            'select', attrs={"id": "select-task"})
         task_number = task_select_area.find(
             "option", text=re.compile('{} -'.format(problem.get_alphabet()))).get("value")
         language_select_area = soup.find(
-            'select', attrs={"id": "submit-language-selector-{}".format(task_number)})
-        language_field_name = language_select_area.get("name")
+            'select', attrs={"data-placeholder": "-"})
         language_number = language_select_area.find(
             "option", text=lang_option_pattern).get("value")
         postdata = {
-            "__session": session_id,
-            task_field_name: task_number,
-            language_field_name: language_number,
-            "source_code": source
+            "csrf_token": session_id,
+            "data.TaskScreenName": task_number,
+            "data.LanguageId": language_number,
+            "sourceCode": source
         }
         resp = self._request(
             contest.get_submit_url(),
             data=postdata,
             method='POST')
+
         return Submission.make_submissions_from(resp.text)[0]
 
     def download_submission_list(self, contest: Contest) -> List[Submission]:

atcodertools/client/models/contest.py

@@ -19,13 +19,13 @@ def get_problem_list_url(self):
         return "{}assignments".format(self.get_url())
 
     def get_submit_url(self):
-        return "{}submit".format(self.get_url())
+        return "{}submit".format(self.get_new_url())
 
     def get_my_submissions_url(self, page=1):
-        return "{}submissions/me/{}".format(self.get_url(), page)
+        return "{}submissions/me/?page={}".format(self.get_new_url(), page)
 
     def get_submissions_url(self, submission: Submission):
-        return "{}submissions/{}".format(self.get_new_url(), submission.submission_id)
+        return "{}submissions/?page={}".format(self.get_new_url(), submission.submission_id)
 
     def to_dict(self):
         return {

atcodertools/client/models/submission.py

@@ -3,9 +3,9 @@
 from bs4 import BeautifulSoup
 
 PROB_URL_RE = re.compile(
-    r'"/tasks/([A-Za-z0-9\'~+\-_]+)"')
+    r'"/contests/.*/tasks/([A-Za-z0-9\'~+\-_]+)"')
 SUBMISSION_URL_RE = re.compile(
-    r'"/submissions/([0-9]+)"')
+    r'/submissions/([0-9]+)')
 
 
 class Submission:

atcodertools/codegen/code_generators/rust.py

@@ -73,7 +73,6 @@ def _generate_declaration(self, var: Variable):
         elif var.dim_num() == 1:
             if var.type == Type.str:
                 constructor = " = vec![String::new(); ({size}) as usize]".format(
-                    type=self._convert_type(var.type),
                     size=var.first_index.get_length()
                 )
             else:
@@ -84,7 +83,6 @@ def _generate_declaration(self, var: Variable):
         elif var.dim_num() == 2:
             if var.type == Type.str:
                 constructor = " = vec![vec![String::new(); ({col_size}) as usize]; ({row_size}) as usize]".format(
-                    type=self._convert_type(var.type),
                     row_size=var.first_index.get_length(),
                     col_size=var.second_index.get_length()
                 )

atcodertools/common/language.py

@@ -41,9 +41,9 @@ def source_code_name(self, name_without_extension: str) -> str:
 
     @classmethod
     def from_name(cls, name: str):
-        for l in ALL_LANGUAGES:
-            if l.name == name:
-                return l
+        for lang in ALL_LANGUAGES:
+            if lang.name == name:
+                return lang
         raise LanguageNotFoundError(
             "No language support for '{}'".format(ALL_LANGUAGE_NAMES))
 
@@ -52,7 +52,8 @@ def from_name(cls, name: str):
     name="cpp",
     display_name="C++",
     extension="cpp",
-    submission_lang_pattern=re.compile(".*C\\+\\+14 \\(GCC.*"),
+    submission_lang_pattern=re.compile(
+        ".*C\\+\\+ \\(GCC 9.*|.*C\\+\\+14 \\(GCC 5.*"),
     default_code_generator=cpp.main,
     default_template_path=get_default_template_path('cpp'),
 )
@@ -61,7 +62,7 @@ def from_name(cls, name: str):
     name="java",
     display_name="Java",
     extension="java",
-    submission_lang_pattern=re.compile(".*Java8.*"),
+    submission_lang_pattern=re.compile(".*Java8.*|.*Java \\(OpenJDK 11.*"),
     default_code_generator=java.main,
     default_template_path=get_default_template_path('java'),
 )
@@ -77,9 +78,9 @@ def from_name(cls, name: str):
 
 PYTHON = Language(
     name="python",
-    display_name="Python3",
+    display_name="Python",
     extension="py",
-    submission_lang_pattern=re.compile(".*Python3.*"),
+    submission_lang_pattern=re.compile(".*Python3.*|^Python$"),
     default_code_generator=python.main,
     default_template_path=get_default_template_path('py'),
 )
@@ -88,7 +89,7 @@ def from_name(cls, name: str):
     name="d",
     display_name="D",
     extension="d",
-    submission_lang_pattern=re.compile(".*DMD64.*"),
+    submission_lang_pattern=re.compile(".*D \\(DMD.*"),
     default_code_generator=d.main,
     default_template_path=get_default_template_path('d'),
 )
@@ -97,7 +98,7 @@ def from_name(cls, name: str):
     name="nim",
     display_name="NIM",
     extension="nim",
-    submission_lang_pattern=re.compile(".*Nim \\(0.*"),
+    submission_lang_pattern=re.compile(".*Nim \\(1.*"),
     default_code_generator=nim.main,
     default_template_path=get_default_template_path('nim'),
     default_code_style=CodeStyle(indent_width=2)

atcodertools/fmtprediction/predict_types.py

@@ -48,7 +48,15 @@ def is_float(text):
 
 
 def is_int(text):
-    return re.match(r"-?\d+$", text) is not None
+    if text == "0":
+        return True
+    if re.match(r"-?\d+$", text) is None:
+        return False
+    if text[0] == "0":
+        return False
+    if len(text) > 19 or (text[0] == '-' and len(text) > 20):
+        return False
+    return True
 
 
 def _convert_to_proper_type(value: str) -> Any:

atcodertools/fmtprediction/tokenize_format.py

@@ -11,7 +11,7 @@ def _is_ascii(s):
     return all(ord(c) < 128 for c in s)
 
 
-DOTS_PATTERNS = ["ldots", "cdots", "vdots", "ddots"]
+DOTS_PATTERNS = ["ldots", "cdots", "vdots", "ddots", "dots"]
 
 
 def _is_noise(s):

atcodertools/tools/envgen.py

@@ -6,7 +6,7 @@
 import traceback
 from multiprocessing import Pool, cpu_count
 from os.path import expanduser
-from time import sleep
+import time
 from typing import Tuple
 
 from colorama import Fore
@@ -34,6 +34,10 @@ class BannedFileDetectedError(Exception):
     pass
 
 
+class EnvironmentInitializationError(Exception):
+    pass
+
+
 def output_splitter():
     # for readability
     print("=================================================", file=sys.stderr)
@@ -159,16 +163,23 @@ def func(argv: Tuple[AtCoderClient, Problem, Config]):
 
 def prepare_contest(atcoder_client: AtCoderClient,
                     contest_id: str,
-                    config: Config):
-    retry_duration = 1.5
+                    config: Config,
+                    retry_delay_secs: float = 1.5,
+                    retry_max_delay_secs: float = 60,
+                    retry_max_tries: int = 10):
+    attempt_count = 1
     while True:
         problem_list = atcoder_client.download_problem_list(
             Contest(contest_id=contest_id))
         if problem_list:
             break
-        sleep(retry_duration)
+        if 0 < retry_max_tries < attempt_count:
+            raise EnvironmentInitializationError
         logger.warning(
-            "Failed to fetch. Will retry in {} seconds".format(retry_duration))
+            "Failed to fetch. Will retry in {} seconds. (Attempt {})".format(retry_delay_secs, attempt_count))
+        time.sleep(retry_delay_secs)
+        retry_delay_secs = min(retry_delay_secs * 2, retry_max_delay_secs)
+        attempt_count += 1
 
     tasks = [(atcoder_client,
               problem,