Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workflow parsing #17

Merged
merged 7 commits into from
Mar 17, 2025
Merged

Workflow parsing #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8b9cda
Add workflow parsing
MasloMaslane Mar 8, 2025
6a46dbc
Add a test
MasloMaslane Mar 8, 2025
e31d16a
Run formatters
MasloMaslane Mar 8, 2025
c0a4434
Rename to/from_json
geoff128 Mar 17, 2025
2549199
Unused imports
geoff128 Mar 17, 2025
19a45f5
Fix example run workflow
geoff128 Mar 17, 2025
06f218b
Improve typing
geoff128 Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions example_graphs/example.json → example_workflows/example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "Example workflow",
"external_objects" : [
"example-object"
],
Expand All @@ -7,6 +8,7 @@
"registers" : 3,
"tasks" : [
{
"name": "Example script",
"input_registers" : [
1
],
Expand All @@ -19,6 +21,7 @@
"type" : "script"
},
{
"name": "Example execution",
"exclusive" : true,
"filesystems" : [
{
Expand Down
36 changes: 24 additions & 12 deletions example_graphs/run.json → example_workflows/run.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "Run the tests and grade the results",
"external_objects": [
"abc0a.in",
"abc0b.in",
Expand All @@ -14,7 +15,7 @@
"sol.e"
],
"observable_objects": [],
"observable_registers": 0,
"observable_registers": 1,
"registers": 19,
"tasks": [
{
Expand All @@ -35,7 +36,7 @@
}
],
"hard_time_limit": 2137,
"mount_namespace": [
"mount_namespaces": [
{
"mountpoints": [
{
Expand Down Expand Up @@ -67,6 +68,7 @@
"/exe",
"</in"
],
"environment": [],
"image" : "/exe",
"mount_namespace" : 0,
"pid_namespace" : 0,
Expand Down Expand Up @@ -105,7 +107,7 @@
}
],
"hard_time_limit": 2137,
"mount_namespace": [
"mount_namespaces": [
{
"mountpoints": [
{
Expand Down Expand Up @@ -137,6 +139,7 @@
"/exe",
"</in"
],
"environment": [],
"image" : "/exe",
"mount_namespace" : 0,
"pid_namespace" : 0,
Expand Down Expand Up @@ -175,7 +178,7 @@
}
],
"hard_time_limit": 2137,
"mount_namespace": [
"mount_namespaces": [
{
"mountpoints": [
{
Expand Down Expand Up @@ -207,6 +210,7 @@
"/exe",
"</in"
],
"environment": [],
"image" : "/exe",
"mount_namespace" : 0,
"pid_namespace" : 0,
Expand Down Expand Up @@ -245,7 +249,7 @@
}
],
"hard_time_limit": 2137,
"mount_namespace": [
"mount_namespaces": [
{
"mountpoints": [
{
Expand Down Expand Up @@ -277,6 +281,7 @@
"/exe",
"</in"
],
"environment": [],
"image" : "/exe",
"mount_namespace" : 0,
"pid_namespace" : 0,
Expand Down Expand Up @@ -315,7 +320,7 @@
}
],
"hard_time_limit": 2137,
"mount_namespace": [
"mount_namespaces": [
{
"mountpoints": [
{
Expand Down Expand Up @@ -347,6 +352,7 @@
"/exe",
"</in"
],
"environment": [],
"image" : "/exe",
"mount_namespace" : 0,
"pid_namespace" : 0,
Expand Down Expand Up @@ -389,7 +395,7 @@
}
],
"hard_time_limit": 2137,
"mount_namespace": [
"mount_namespaces": [
{
"mountpoints": [
{
Expand Down Expand Up @@ -434,6 +440,7 @@
"/out",
"wzo_out"
],
"environment": [],
"image" : "/chk",
"mount_namespace" : 0,
"pid_namespace" : 0,
Expand Down Expand Up @@ -476,7 +483,7 @@
}
],
"hard_time_limit": 2137,
"mount_namespace": [
"mount_namespaces": [
{
"mountpoints": [
{
Expand Down Expand Up @@ -521,6 +528,7 @@
"/out",
"wzo_out"
],
"environment": [],
"image" : "/chk",
"mount_namespace" : 0,
"pid_namespace" : 0,
Expand Down Expand Up @@ -563,7 +571,7 @@
}
],
"hard_time_limit": 2137,
"mount_namespace": [
"mount_namespaces": [
{
"mountpoints": [
{
Expand Down Expand Up @@ -608,6 +616,7 @@
"/out",
"wzo_out"
],
"environment": [],
"image" : "/chk",
"mount_namespace" : 0,
"pid_namespace" : 0,
Expand Down Expand Up @@ -650,7 +659,7 @@
}
],
"hard_time_limit": 2137,
"mount_namespace": [
"mount_namespaces": [
{
"mountpoints": [
{
Expand Down Expand Up @@ -695,6 +704,7 @@
"/out",
"wzo_out"
],
"environment": [],
"image" : "/chk",
"mount_namespace" : 0,
"pid_namespace" : 0,
Expand Down Expand Up @@ -737,7 +747,7 @@
}
],
"hard_time_limit": 2137,
"mount_namespace": [
"mount_namespaces": [
{
"mountpoints": [
{
Expand Down Expand Up @@ -782,6 +792,7 @@
"/out",
"wzo_out"
],
"environment": [],
"image" : "/chk",
"mount_namespace" : 0,
"pid_namespace" : 0,
Expand Down Expand Up @@ -855,7 +866,8 @@
"name": "Grade group 1",
"reactive": true,
"input_registers": [13, 14],
"output_registers": [17]
"output_registers": [17],
"script": "<PLACEHOLDER>"
},
{
"type": "script",
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ tests =
pytest
pytest-cov
pytest-xdist
deepdiff
django_tests =
pytest-django
django =
Expand Down
3 changes: 0 additions & 3 deletions src/sio3pack/graph/__init__.py
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions src/sio3pack/graph/graph.py
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/sio3pack/graph/node.py
View file
Open in desktop

This file was deleted.

13 changes: 6 additions & 7 deletions src/sio3pack/packages/package/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
from typing import Any

from sio3pack import LocalFile
from sio3pack.exceptions import SIO3PackException
from sio3pack.files import File
from sio3pack.graph import Graph, GraphOperation
from sio3pack.packages.exceptions import UnknownPackageType
from sio3pack.packages.package.handler import NoDjangoHandler
from sio3pack.test import Test
from sio3pack.utils.archive import Archive
from sio3pack.utils.classinit import RegisteredSubclassesBase

from sio3pack.exceptions import SIO3PackException
from sio3pack.workflow import Workflow, WorkflowOperation


def wrap_exceptions(func):
Expand All @@ -20,7 +19,7 @@ def decorator(*args, **kwargs):
try:
return func(*args, **kwargs)
except SIO3PackException:
raise # Do not wrap SIO3PackExceptions again
raise # Do not wrap SIO3PackExceptions again
except Exception as e:
raise SIO3PackException(f"SIO3Pack raised an exception in {func.__name__} function.", e)

Expand Down Expand Up @@ -135,15 +134,15 @@ def get_test(self, test_id: str) -> Test:
pass

@wrap_exceptions
def get_unpack_graph(self) -> GraphOperation | None:
def get_unpack_graph(self) -> WorkflowOperation | None:
pass

@wrap_exceptions
def get_run_graph(self, file: File, tests: list[Test] | None = None) -> GraphOperation | None:
def get_run_graph(self, file: File, tests: list[Test] | None = None) -> WorkflowOperation | None:
pass

@wrap_exceptions
def get_save_outs_graph(self, tests: list[Test] | None = None) -> GraphOperation | None:
def get_save_outs_graph(self, tests: list[Test] | None = None) -> WorkflowOperation | None:
pass

@wrap_exceptions
Expand Down
22 changes: 11 additions & 11 deletions src/sio3pack/packages/sinolpack/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
import yaml

from sio3pack.files import File, LocalFile
from sio3pack.graph import Graph, GraphManager, GraphOperation
from sio3pack.packages.exceptions import ImproperlyConfigured
from sio3pack.packages.package import Package
from sio3pack.packages.sinolpack.enums import ModelSolutionKind
from sio3pack.util import naturalsort_key
from sio3pack.utils.archive import Archive, UnrecognizedArchiveFormat
from sio3pack.workflow import Workflow, WorkflowManager, WorkflowOperation


class Sinolpack(Package):
Expand Down Expand Up @@ -101,8 +101,8 @@ def _from_file(self, file: LocalFile, django_settings=None):
self.rootdir = file.path

try:
graph_file = self.get_in_root("graph.json")
self.graph_manager = GraphManager.from_file(graph_file)
graph_file = self.get_in_root("workflow.json")
self.graph_manager = WorkflowManager.from_file(graph_file)
except FileNotFoundError:
self.has_custom_graph = False

Expand All @@ -116,10 +116,10 @@ def _from_db(self, problem_id: int):
if not self.django_enabled:
raise ImproperlyConfigured("sio3pack is not installed with Django support.")

def _default_graph_manager(self) -> GraphManager:
return GraphManager(
def _default_graph_manager(self) -> WorkflowManager:
return WorkflowManager(
{
"unpack": Graph.from_dict(
"unpack": Workflow.from_json(
{
"name": "unpack",
# ...
Expand Down Expand Up @@ -178,7 +178,7 @@ def _process_package(self):
self._process_attachments()

if not self.has_custom_graph:
# Create the graph with processed files.
# Create the workflow with processed files.
# TODO: Uncomment this line when Graph will work.
# self.graph_manager = self._default_graph_manager()
pass
Expand Down Expand Up @@ -283,8 +283,8 @@ def sort_key(model_solution):
def _process_prog_files(self):
"""
Process all files in the problem's program directory that are used.
Saves all models solution files. If the problem has a custom graph file,
takes the files that are used in the graph. Otherwise, ingen, inwer and
Saves all models solution files. If the problem has a custom workflow file,
takes the files that are used in the workflow. Otherwise, ingen, inwer and
files in `extra_compilation_files` and `extra_execution_files` from config
are saved.
"""
Expand Down Expand Up @@ -374,9 +374,9 @@ def _process_attachments(self):
if os.path.isfile(os.path.join(attachments_dir, attachment))
]

def get_unpack_graph(self) -> GraphOperation | None:
def get_unpack_graph(self) -> WorkflowOperation | None:
try:
return GraphOperation(
return WorkflowOperation(
self.graph_manager.get("unpack"),
True,
self._unpack_return_data,
Expand Down
Loading