Various run command fixes (#85)

* When a group hasn't finished show ??/20 points instead of 0/20

* Fix partial points in `run` with checker

* Change group for ocen tests

* Fix partial points

* Refactor

* Add enum for status

* Allow pacakges with `time_limits` and no `time_limit` in config

* Respect --time-limit and --memory-limit flag

* Remove old parts of code

* Rename `NO_STATUS` to `PENDING`

* Apply suggestions from code review

Co-authored-by: Tomasz Nowak <[email protected]>

* Fix tests

* Fix tests after changes from code review

* Add tests for --ml and --tl flags

* Change tests

* Fix getting memory limit

* Update workflow

* Revert "Update workflow"

This reverts commit 5d63969.

* Version bump

---------

Co-authored-by: Tomasz Nowak <[email protected]>

Author: MasloMaslane

src/sinol_make/__init__.py

@@ -6,7 +6,7 @@
 
 from sinol_make import util
 
-__version__ = "1.4.2"
+__version__ = "1.4.3"
 
 def configure_parsers():
     parser = argparse.ArgumentParser(

src/sinol_make/commands/run/__init__.py

@@ -1,12 +1,15 @@
 from typing import List
 from dataclasses import dataclass
 
+from sinol_make.structs.status_structs import Status
+
+
 @dataclass
 class ResultChange:
     solution: str
     group: int
-    old_result: str
-    result: str
+    old_result: Status
+    result: Status
 
 @dataclass
 class PointsChange:
@@ -27,9 +30,9 @@ class ValidationResult:
 
 @dataclass
 class ExecutionResult:
-    # Result status of execution. Can be one of:
-    # "OK", "WA", "TL", "ML", "RE", "CE"
-    Status: str
+    # Result status of execution. Possible values
+    #  can be found in `Status` enum definition.
+    Status: Status
     # Time in milliseconds
     Time: float
     # Memory in KB

src/sinol_make/commands/run/structs.py

@@ -19,6 +19,8 @@ def extract_test_id(test_path):
 
 
 def get_group(test_path):
+    if extract_test_id(test_path).endswith("ocen"):
+        return 0
     return int("".join(filter(str.isdigit, extract_test_id(test_path))))
 
 
@@ -59,10 +61,13 @@ def get_executable_path(solution: str) -> str:
     return os.path.join(os.getcwd(), 'cache', 'executables', get_executable(solution))
 
 
-def get_time_limit(test_path, config):
+def get_time_limit(test_path, config, args=None):
     """
     Returns time limit for given test.
     """
+    if args is not None and hasattr(args, "tl") and args.tl is not None:
+        return args.tl * 1000
+
     str_config = util.stringify_keys(config)
     test_id = extract_test_id(test_path)
     test_group = str(get_group(test_path))
@@ -75,10 +80,13 @@ def get_time_limit(test_path, config):
     return str_config["time_limit"]
 
 
-def get_memory_limit(test_path, config):
+def get_memory_limit(test_path, config, args=None):
     """
     Returns memory limit for given test.
     """
+    if args is not None and hasattr(args, "ml") and args.ml is not None:
+        return int(args.ml * 1024)
+
     str_config = util.stringify_keys(config)
     test_id = extract_test_id(test_path)
     test_group = str(get_group(test_path))

src/sinol_make/helpers/package_util.py

@@ -0,0 +1,17 @@
+from enum import Enum
+
+
+class Status(str, Enum):
+    PENDING = "  "
+    CE = "CE"
+    TL = "TL"
+    ML = "ML"
+    RE = "RE"
+    WA = "WA"
+    OK = "OK"
+
+    def __str__(self):
+        return self.name
+
+    def __repr__(self):
+        return self.name

src/sinol_make/structs/status_structs.py

@@ -1,3 +1,5 @@
+import pytest
+
 from ...fixtures import *
 from .util import *
 from sinol_make import configure_parsers
@@ -255,3 +257,45 @@ def test_no_limits_in_config(capsys, create_package, time_tool):
 
     out = capsys.readouterr().out
     assert "Use flag --apply-suggestions to apply suggestions." in out
+
+
+@pytest.mark.parametrize("create_package", [get_limits_package_path()], indirect=True)
+def test_time_limit_flag(capsys, create_package, time_tool):
+    """
+    Test flag --tl.
+    """
+    package_path = create_package
+    command = get_command()
+    create_ins_outs(package_path)
+
+    parser = configure_parsers()
+    args = parser.parse_args(["run", "--tl", "20", "--time-tool", time_tool])
+    command = Command()
+    with pytest.raises(SystemExit):
+        command.run(args)
+
+    out = capsys.readouterr().out
+    assert "Solution lim1.cpp passed group 1 with status OK while it should pass with status TL." in out
+    assert "Solution lim2.cpp passed group 1 with status OK while it should pass with status TL." in out
+    assert "Solution lim2.cpp passed group 2 with status OK while it should pass with status TL." in out
+
+
+@pytest.mark.parametrize("create_package", [get_limits_package_path()], indirect=True)
+def test_memory_limit_flag(capsys, create_package, time_tool):
+    """
+    Test flag --ml.
+    """
+    package_path = create_package
+    command = get_command()
+    create_ins_outs(package_path)
+
+    parser = configure_parsers()
+    args = parser.parse_args(["run", "--ml", "256", "--time-tool", time_tool])
+    command = Command()
+    with pytest.raises(SystemExit):
+        command.run(args)
+
+    out = capsys.readouterr().out
+    assert "Solution lim3.cpp passed group 1 with status OK while it should pass with status ML." in out
+    assert "Solution lim4.cpp passed group 1 with status OK while it should pass with status ML." in out
+    assert "Solution lim4.cpp passed group 2 with status OK while it should pass with status ML." in out

tests/commands/run/test_integration.py

@@ -1,6 +1,7 @@
 import argparse, re, yaml
 from sinol_make import util
 from sinol_make.commands.run.structs import ResultChange, ValidationResult
+from sinol_make.structs.status_structs import Status
 from sinol_make.helpers import package_util
 from .util import *
 from ...util import *
@@ -55,19 +56,19 @@ def test_execution(create_package, time_tool):
 
     os.makedirs(os.path.join(command.EXECUTIONS_DIR, solution), exist_ok=True)
     result = command.run_solution((solution, os.path.join(command.EXECUTABLES_DIR, executable), test, config['time_limit'], config['memory_limit'], util.get_oiejq_path()))
-    assert result.Status == "OK"
+    assert result.Status == Status.OK
 
 
 def test_calculate_points():
     os.chdir(get_simple_package_path())
     command = get_command()
     command.scores = command.config["scores"]
 
-    assert command.calculate_points({1: "OK", 2: "OK", 3: "OK", 4: "OK"}) == 100
-    assert command.calculate_points({1: "OK", 2: "OK", 3: "OK", 4: "WA"}) == 75
-    assert command.calculate_points({1: "OK", 2: "OK", 3: "TL"}) == 50
-    assert command.calculate_points({1: "OK"}) == 25
-    assert command.calculate_points({1: "WA"}) == 0
+    assert command.calculate_points({1: Status.OK, 2: Status.OK, 3: Status.OK, 4: Status.OK}) == 100
+    assert command.calculate_points({1: Status.OK, 2: Status.OK, 3: Status.OK, 4: Status.WA}) == 75
+    assert command.calculate_points({1: Status.OK, 2: Status.OK, 3: Status.TL}) == 50
+    assert command.calculate_points({1: Status.OK}) == 25
+    assert command.calculate_points({1: Status.WA}) == 0
 
 
 def test_run_solutions(create_package, time_tool):
@@ -91,10 +92,10 @@ def flatten_results(results):
                                          for group, group_result in results[solution].items())
         return new_results
 
-    assert flatten_results(command.compile_and_run(["abc.cpp"])[0]) == {"abc.cpp": {1: "OK", 2: "OK", 3: "OK", 4: "OK"}}
+    assert flatten_results(command.compile_and_run(["abc.cpp"])[0]) == {"abc.cpp": {1: Status.OK, 2: Status.OK, 3: Status.OK, 4: Status.OK}}
     assert flatten_results(command.compile_and_run(["abc.cpp", "abc4.cpp"])[0]) == {
-        "abc.cpp": {1: "OK", 2: "OK", 3: "OK", 4: "OK"},
-        "abc4.cpp": {1: "OK", 2: "OK", 3: "WA", 4: "RE"}
+        "abc.cpp": {1: Status.OK, 2: Status.OK, 3: Status.OK, 4: Status.OK},
+        "abc4.cpp": {1: Status.OK, 2: Status.OK, 3: "WA", 4: "RE"}
     }