Skip to content

Better errors #35

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

Merged
merged 10 commits into from
Jun 6, 2025
Merged

Better errors #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f088aa1
Workflow parsing validation
MasloMaslane Jun 5, 2025
d4aaf28
Fix tests
MasloMaslane Jun 5, 2025
306d0ab
Run formatters
MasloMaslane Jun 5, 2025
e843114
Better error handling
MasloMaslane Jun 5, 2025
8d38be1
Run formatters
MasloMaslane Jun 5, 2025
719af4b
Docstring for documentation
MasloMaslane Jun 5, 2025
1d43e6e
Run formatters
MasloMaslane Jun 5, 2025
a83dfff
Fix test
MasloMaslane Jun 5, 2025
9e4944a
Bump version
MasloMaslane Jun 6, 2025
6edbd39
Cleanup
MasloMaslane Jun 6, 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
8 changes: 4 additions & 4 deletions example_workflows/encdec_workflows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -152,12 +152,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down
8 changes: 4 additions & 4 deletions example_workflows/interactive_io_workflows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -143,12 +143,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down
12 changes: 6 additions & 6 deletions example_workflows/inwer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -102,12 +102,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -162,12 +162,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down
12 changes: 6 additions & 6 deletions example_workflows/outgen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -105,12 +105,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -168,12 +168,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down
20 changes: 10 additions & 10 deletions example_workflows/run.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -105,12 +105,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -195,12 +195,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -285,12 +285,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -375,12 +375,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down
28 changes: 14 additions & 14 deletions example_workflows/string_regs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -107,8 +107,8 @@
"pipes": 0,
"resource_groups": [
{
"cpu_usage_limit": 100,
"instruction_limit": 30000000000000.0,
"cpu_usage_limit": 100.0,
"instruction_limit": 30000000000000,
"memory_limit": 104857600,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
Expand Down Expand Up @@ -198,12 +198,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -287,8 +287,8 @@
"pipes": 0,
"resource_groups": [
{
"cpu_usage_limit": 100,
"instruction_limit": 30000000000000.0,
"cpu_usage_limit": 100.0,
"instruction_limit": 30000000000000,
"memory_limit": 104857600,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
Expand Down Expand Up @@ -378,12 +378,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -467,8 +467,8 @@
"pipes": 0,
"resource_groups": [
{
"cpu_usage_limit": 100,
"instruction_limit": 30000000000000.0,
"cpu_usage_limit": 100.0,
"instruction_limit": 30000000000000,
"memory_limit": 104857600,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
Expand Down Expand Up @@ -558,12 +558,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down
8 changes: 4 additions & 4 deletions example_workflows/test_run.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -103,12 +103,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down
8 changes: 4 additions & 4 deletions example_workflows/user_out.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down Expand Up @@ -103,12 +103,12 @@
"resource_groups": [
{
"cpu_usage_limit": 100.0,
"instruction_limit": 1000000000.0,
"instruction_limit": 1000000000,
"memory_limit": 2147483648,
"oom_terminate_all_tasks": false,
"pid_limit": 2,
"swap_limit": 0,
"time_limit": 1000000000.0
"time_limit": 1000000000
}
],
"processes": [
Expand Down
10 changes: 7 additions & 3 deletions src/sio3pack/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
__version__ = "1.0.0.dev3"
__version__ = "1.0.0.dev4"

from sio3pack.exceptions import ImproperlyConfigured
from sio3pack.files import LocalFile
from sio3pack.packages.exceptions import *
from sio3pack.packages.package import Package

__all__ = ["from_file", "from_db"]
Expand Down Expand Up @@ -39,4 +39,8 @@ def from_db(problem_id: int, configuration: SIO3PackConfig = None) -> Package:
configuration.django_settings = settings
return Package.from_db(problem_id, configuration)
except ImportError:
raise ImproperlyConfigured("sio3pack is not installed with Django support.")
raise ImproperlyConfigured(
"sio3pack is not installed with Django support.",
"from_db function was used, but sio3pack isn't installed with Django support. "
"Read the documentation to learn more.",
)
Loading