setterを追加 (#249)

* setterを追加

* setterを追加

* テストを追加

* LoginErrorの判断基準を修正

* codegenでwithout-loginが使われていなかったので変更

Author: chaemon

atcodertools/atcoder_tools.py

@@ -10,6 +10,7 @@
 from atcodertools.tools.submit import main as submit_main
 from atcodertools.tools.codegen import main as codegen_main
 from atcodertools.tools.compiler import main as compiler_main
+from atcodertools.tools.setter import main as setter_main
 from atcodertools.release_management.version import __version__
 from colorama import Fore, Style
 
@@ -39,14 +40,16 @@ def notify_if_latest_version_found():
 def main():
     notify_if_latest_version_found()
 
-    if len(sys.argv) < 2 or sys.argv[1] not in ("gen", "test", "submit", "codegen", "compile", "version"):
+    if len(sys.argv) < 2 or sys.argv[1] not in ("gen", "test", "submit", "codegen", "compile", "set", "version"):
         print("Usage:")
         print("{} gen -- to generate workspace".format(sys.argv[0]))
         print(
             "{} compile -- to compile codes in your workspace".format(sys.argv[0]))
         print("{} test -- to test codes in your workspace".format(sys.argv[0]))
         print(
             "{} submit -- to submit a code to the contest system".format(sys.argv[0]))
+        print(
+            "{} set -- to set some additional option(error value, language)".format(sys.argv[0]))
         print(
             "{} version -- show atcoder-tools version".format(sys.argv[0]))
         sys.exit(-1)
@@ -69,5 +72,8 @@ def main():
     if sys.argv[1] == "compile":
         compiler_main(prog, args)
 
+    if sys.argv[1] == "set":
+        setter_main(prog, args)
+
     if sys.argv[1] == "version":
         print(__version__)

atcodertools/client/atcoder.py

@@ -103,7 +103,7 @@ def login(self,
             "csrf_token": token
         }, method='POST')
 
-        if resp.text.find("パスワードを忘れた方はこちら") != -1:
+        if resp.text.find("パスワードを忘れた方はこちら") != -1 or resp.text.find("Forgot your password") != -1:
             raise LoginError
 
         if use_local_session_cache and save_session_cache:

atcodertools/common/judgetype.py

@@ -16,6 +16,13 @@ class ErrorType(Enum):
     AbsoluteOrRelative = "absolute_or_relative"
 
 
+DEFAULT_EPS = 1e-9
+
+
+class NoJudgeTypeException(Exception):
+    pass
+
+
 class Judge(metaclass=ABCMeta):
     @abstractmethod
     def verify(self, output, expected):

atcodertools/tools/codegen.py

@@ -163,7 +163,7 @@ def main(prog, args, output_file=sys.stdout):
     config = get_config(args)
 
     client = AtCoderClient()
-    if not config.etc_config.download_without_login:
+    if not args.without_login or not config.etc_config.download_without_login:
         try:
             client.login(
                 save_session_cache=not config.etc_config.save_no_session_cache)

atcodertools/tools/setter.py

@@ -0,0 +1,102 @@
+#!/usr/bin/python3
+
+import argparse
+import os
+from atcodertools.common.judgetype import NormalJudge, DecimalJudge, ErrorType,\
+    JudgeType, NoJudgeTypeException, DEFAULT_EPS
+from atcodertools.common.logging import logger
+from atcodertools.tools.models.metadata import Metadata
+from atcodertools.common.language import Language, ALL_LANGUAGES
+from atcodertools.tools.codegen import main as codegen_main
+
+USER_FACING_JUDGE_TYPE_LIST = [
+    "normal", "absolute", "relative", "absolute_or_relative"]
+
+
+def main(prog, args) -> None:
+    if len(args) == 0:
+        print("Usage: atcoder tools set [options]")
+        return
+
+    parser = argparse.ArgumentParser(
+        prog=prog,
+        formatter_class=argparse.RawTextHelpFormatter)
+
+    parser.add_argument('--judge-type', '-j',
+                        help='error type'
+                             ' must be one of [{}]'.format(
+                                 ', '.join(USER_FACING_JUDGE_TYPE_LIST)),
+                        type=str,
+                        default=None)
+
+    parser.add_argument('--error-value', '-v',
+                        help='error value for decimal number judge:'
+                             ' [Default] ' + str(DEFAULT_EPS),
+                        type=float,
+                        default=None)
+
+    parser.add_argument("--lang", '-l',
+                        help="Programming language of your template code, {}.\n".format(
+                            " or ".join([lang.name for lang in ALL_LANGUAGES])),
+                        default=None)
+
+    parser.add_argument("--dir", '-d',
+                        help="Target directory to test. [Default] Current directory",
+                        default=".")
+
+    parser.add_argument("--without-login",
+                        action="store_true",
+                        help="Download data without login")
+
+    args = parser.parse_args(args)
+
+    old_metadata = Metadata.load_from(os.path.join(args.dir, "metadata.json"))
+
+    # Use the old metadata as base metadata.
+    output_metadata = Metadata.load_from(
+        os.path.join(args.dir, "metadata.json"))
+
+    old_metadata_judge_type = old_metadata.judge_method.judge_type.value
+
+    if args.judge_type in ["absolute", "relative", "absolute_or_relative"]:
+        new_metadata_judge_type = "decimal"
+        output_metadata.judge_method.error_type = ErrorType(args.judge_type)
+    elif args.judge_type is not None:
+        new_metadata_judge_type = args.judge_type
+    else:
+        new_metadata_judge_type = old_metadata_judge_type
+
+    if new_metadata_judge_type is not None and new_metadata_judge_type != old_metadata_judge_type:
+        if new_metadata_judge_type == JudgeType.Normal.value:
+            output_metadata.judge_method = NormalJudge()
+        elif new_metadata_judge_type == JudgeType.Decimal.value:
+            output_metadata.judge_method = DecimalJudge()
+            if args.error_value is None:
+                logger.warn(
+                    "Error-value is not specified. DEFAULT_EPS is set")
+                output_metadata.judge_method.diff = DEFAULT_EPS
+        else:
+            raise NoJudgeTypeException()
+
+    if new_metadata_judge_type == JudgeType.Decimal.value and args.error_value is not None:
+        output_metadata.judge_method.diff = args.error_value
+
+    if args.lang is not None:
+        if args.lang != output_metadata.lang.name:
+            output_metadata.lang = Language.from_name(args.lang)
+            output_metadata.code_filename = output_metadata.lang.get_code_filename(
+                'main')
+            url = "https://atcoder.jp/contests/{}/tasks/{}".format(
+                output_metadata.problem.contest.contest_id, output_metadata.problem.problem_id)
+            main_code_filename = os.path.join(
+                args.dir, output_metadata.code_filename)
+            if not os.path.exists(main_code_filename):
+                a = ["--lang", output_metadata.lang.name, url]
+                if args.without_login:
+                    a.append("--without-login")
+                codegen_main("", a, open(main_code_filename, 'w'))
+            else:
+                print("File exists: ", output_metadata.code_filename)
+        else:
+            print("Already set to {}. Skipping changing language...".format(args.lang))
+    output_metadata.save_to(os.path.join(args.dir, "metadata.json"))

tests/resources/test_atcoder_client_mock/exec_on_submit/exec_after_submit_is_completed

@@ -0,0 +1 @@
+Kyuuridenamida

tests/resources/test_atcoder_client_mock/exec_on_submit/exec_before_submit_is_completed

@@ -0,0 +1,19 @@
+import java.io.*;
+import java.util.*;
+
+class Main {
+
+    // Generated by 2.9.0 https://github.com/kyuridenamida/atcoder-tools  (tips: You use the default template now. You can remove this line by using your custom template)
+    public static void main(String[] args) throws Exception {
+        final Scanner sc = new Scanner(System.in);
+        long T;
+        T = sc.nextLong();
+        long X;
+        X = sc.nextLong();
+        solve(T, X);
+    }
+
+    static void solve(long T, long X){
+
+    }
+}

tests/resources/test_setter/ans/main.java

@@ -0,0 +1,18 @@
+{
+ "code_filename": "main.java",
+ "judge": {
+  "diff": 1e-07,
+  "error_type": "relative",
+  "judge_type": "decimal"
+ },
+ "lang": "java",
+ "problem": {
+  "alphabet": "A",
+  "contest": {
+   "contest_id": "abc117"
+  },
+  "problem_id": "abc117_a"
+ },
+ "sample_in_pattern": "in_*.txt",
+ "sample_out_pattern": "out_*.txt"
+}

tests/resources/test_setter/ans/metadata_change_error_value.json

@@ -0,0 +1,18 @@
+{
+ "code_filename": "main.java",
+ "judge": {
+  "diff": 0.001,
+  "error_type": "relative",
+  "judge_type": "decimal"
+ },
+ "lang": "java",
+ "problem": {
+  "alphabet": "A",
+  "contest": {
+   "contest_id": "abc117"
+  },
+  "problem_id": "abc117_a"
+ },
+ "sample_in_pattern": "in_*.txt",
+ "sample_out_pattern": "out_*.txt"
+}