SIO3Pack integration

setup.cfg

@@ -30,6 +30,7 @@ install_requires =
     importlib-resources
     psutil
     packaging
+    sio3pack==1.0.0.dev1
 
 [options.packages.find]
 where = src

src/sinol_make/__init__.py

@@ -12,7 +12,7 @@
 from sinol_make.task_type.interactive import InteractiveTaskType # noqa
 
 
-__version__ = "1.9.7"
+__version__ = "2.0.0.dev1"
 
 
 def configure_parsers():

src/sinol_make/commands/doc/__init__.py

@@ -6,6 +6,7 @@
 from sinol_make import util
 from sinol_make.helpers import package_util, paths
 from sinol_make.interfaces.BaseCommand import BaseCommand
+from sinol_make.sio3pack.package import Sio3Package
 
 
 class Command(BaseCommand):
@@ -92,7 +93,7 @@ def run(self, args: argparse.Namespace):
         # when it is not provided by the user, instead of using the default
         # behavior of defaulting to None.
         if not hasattr(args, 'latex_compiler'):
-            config = package_util.get_config()
+            config = Sio3Package().get_config()
             args.latex_compiler = config.get('sinol_latex_compiler', 'auto')
 
         if args.latex_compiler == 'pdflatex':
@@ -104,13 +105,13 @@ def run(self, args: argparse.Namespace):
         elif args.latex_compiler == 'auto':
             self.compilation_method = 'pdflatex'
             for extension in ['ps', 'eps']:
-                if glob.glob(os.path.join(os.getcwd(), 'doc', f'*.{extension}')) != []:
+                if glob.glob(os.path.join(os.getcwd(), 'doc', f'*.{extension}')): #TODO: SIO3Pack?
                     self.compilation_method = 'latex_dvi'
         else:
             util.exit_with_error("Unrecognized latex compiler")
 
         if args.files == []:
-            self.files = glob.glob(os.path.join(os.getcwd(), 'doc', '*.tex'))
+            self.files = glob.glob(os.path.join(os.getcwd(), 'doc', '*.tex')) #TODO: SIO3Pack?
         else:
             self.files = []
             for file in args.files:

src/sinol_make/contest_types/__init__.py

@@ -5,11 +5,12 @@
 from sinol_make.helpers.func_cache import cache_result
 from sinol_make.helpers.package_util import get_config
 from sinol_make.interfaces.Errors import UnknownContestType
+from sinol_make.sio3pack.package import Sio3Package
 
 
 @cache_result(cwd=True)
 def get_contest_type():
-    config = get_config()
+    config = Sio3Package().get_config()
     contest_type = config.get("sinol_contest_type", "default").lower()
 
     if contest_type == "default":

src/sinol_make/helpers/package_util.py

@@ -10,21 +10,13 @@
 from sinol_make.helpers.func_cache import cache_result
 from sinol_make import util, contest_types
 from sinol_make.helpers import paths
+from sinol_make.sio3pack.package import Sio3Package
 from sinol_make.task_type import BaseTaskType
 
 
 @cache_result(cwd=True)
 def get_task_id() -> str:
-    config = get_config()
-    if "sinol_task_id" in config:
-        return config["sinol_task_id"]
-    else:
-        print(util.warning("sinol_task_id not specified in config.yml. Using task id from directory name."))
-        task_id = os.path.split(os.getcwd())[-1]
-        if len(task_id) == 3:
-            return task_id
-        else:
-            util.exit_with_error("Invalid task id. Task id should be 3 characters long.")
+    return Sio3Package().get_task_id()
 
 
 def extract_test_id(test_path, task_id):
@@ -53,14 +45,7 @@ def get_test_key(test, task_id):
 
 
 def get_config():
-    try:
-        with open(os.path.join(os.getcwd(), "config.yml"), "r") as config_file:
-            return yaml.load(config_file, Loader=yaml.FullLoader) or {}
-    except FileNotFoundError:
-        # Potentially redundant with util:exit_if_not_package
-        util.exit_with_error("You are not in a package directory (couldn't find config.yml in current directory).")
-    except yaml.YAMLError as e:
-        util.exit_with_error("config.yml is not a valid YAML. Fix it before continuing:\n" + str(e))
+    return Sio3Package().get_config()
 
 
 def get_solutions_re(task_id: str) -> re.Pattern:

src/sinol_make/sio3pack/package.py

@@ -0,0 +1,22 @@
+import os
+
+from sio3pack import Package
+from sio3pack import LocalFile
+
+
+def _get_local_file():
+    return LocalFile(os.getcwd())
+
+
+class Sio3Package:
+    """
+    Singleton class for package base class.
+    """
+
+    _instance = None
+
+    def __new__(cls) -> Package:
+        if cls._instance is None:
+            cls._instance = Package.from_file(_get_local_file())
+        return cls._instance
+

src/sinol_make/util.py

@@ -12,7 +12,7 @@
 from sinol_make.helpers import paths, cache
 from sinol_make.helpers.func_cache import cache_result
 from sinol_make.structs.status_structs import Status
-
+from sinol_make.sio3pack.package import Sio3Package
 
 @cache_result()
 def get_commands():
@@ -55,12 +55,20 @@ def find_and_chdir_package():
         return False
 
 
+def instantiate_package():
+    """
+    Function to instantiate package from current directory.
+    """
+    Sio3Package()
+
+
 def init_package_command(args):
     """
     Updates arguments with contest specific overrides for commands
     that require being in package directory
     """
     exit_if_not_package()
+    instantiate_package()
     contest = get_contest_type()
     contest.verify_config()
     return contest.argument_overrides(args)