JOJ/JOJ3-config-generator
27
1
Fork 0
Code Issues4 Pull Requests1 Actions Packages Projects Releases Wiki Activity

fix: remove optional for task.Limit

Browse Source
This commit is contained in:
李衍志523370910113 2025-03-02 11:24:26 +08:00
parent 704c10e917
commit 94dc847a11
7 changed files with 53 additions and 51 deletions
joj3_config_generator/models
task.py
tests/convert
basic
task.json
clang-tidy
task.json
cppcheck
task.json
cpplint
task.json
diff
task.json
keyword
task.json

10
joj3_config_generator/models/task.py
View File

@ -2,7 +2,9 @@ from datetime import datetime
from pathlib import Path from pathlib import Path
from typing import Any, Dict, List, Optional, Type from typing import Any, Dict, List, Optional, Type
import humanfriendly
from pydantic import BaseModel, Field, model_validator from pydantic import BaseModel, Field, model_validator
from pytimeparse.timeparse import timeparse
class ParserResultDetail(BaseModel): class ParserResultDetail(BaseModel):
@ -51,10 +53,10 @@ class Files(BaseModel):
class Limit(BaseModel): class Limit(BaseModel):
mem: Optional[int] = 800 mem: int = humanfriendly.parse_size("128M")
cpu: Optional[int] = 1000 cpu: int = timeparse("1s")
stderr: Optional[int] = 800 stderr: int = humanfriendly.parse_size("128M")
stdout: Optional[int] = 800 stdout: int = humanfriendly.parse_size("128M")
class Stage(BaseModel): class Stage(BaseModel):

52
tests/convert/basic/task.json
View File

@ -115,18 +115,18 @@
}, },
"stdout": { "stdout": {
"name": "stdout", "name": "stdout",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"stderr": { "stderr": {
"name": "stderr", "name": "stderr",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"cpuLimit": 1000000000000000, "cpuLimit": 1000000000000,
"realCpuLimit": 0, "realCpuLimit": 0,
"clockLimit": 2000000000000000, "clockLimit": 2000000000000,
"memoryLimit": 838860800, "memoryLimit": 134217728000000,
"stackLimit": 0, "stackLimit": 0,
"procLimit": 50, "procLimit": 50,
"cpuRateLimit": 0, "cpuRateLimit": 0,
@ -203,18 +203,18 @@
}, },
"stdout": { "stdout": {
"name": "stdout", "name": "stdout",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"stderr": { "stderr": {
"name": "stderr", "name": "stderr",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"cpuLimit": 1000000000000000, "cpuLimit": 1000000000000,
"realCpuLimit": 0, "realCpuLimit": 0,
"clockLimit": 2000000000000000, "clockLimit": 2000000000000,
"memoryLimit": 838860800, "memoryLimit": 134217728000000,
"stackLimit": 0, "stackLimit": 0,
"procLimit": 50, "procLimit": 50,
"cpuRateLimit": 0, "cpuRateLimit": 0,
@ -309,13 +309,13 @@
}, },
"stderr": { "stderr": {
"name": "stderr", "name": "stderr",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"cpuLimit": 1000000000000000, "cpuLimit": 1000000000000,
"realCpuLimit": 0, "realCpuLimit": 0,
"clockLimit": 2000000000000000, "clockLimit": 2000000000000,
"memoryLimit": 838860800, "memoryLimit": 134217728000000,
"stackLimit": 0, "stackLimit": 0,
"procLimit": 50, "procLimit": 50,
"cpuRateLimit": 0, "cpuRateLimit": 0,
@ -431,7 +431,7 @@
}, },
"stdout": { "stdout": {
"name": "stdout", "name": "stdout",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"stderr": { "stderr": {
@ -439,10 +439,10 @@
"max": 65000000000000, "max": 65000000000000,
"pipe": true "pipe": true
}, },
"cpuLimit": 1000000000000000, "cpuLimit": 1000000000000,
"realCpuLimit": 0, "realCpuLimit": 0,
"clockLimit": 2000000000000000, "clockLimit": 2000000000000,
"memoryLimit": 838860800, "memoryLimit": 134217728000000,
"stackLimit": 0, "stackLimit": 0,
"procLimit": 50, "procLimit": 50,
"cpuRateLimit": 0, "cpuRateLimit": 0,
@ -535,13 +535,13 @@
}, },
"stderr": { "stderr": {
"name": "stderr", "name": "stderr",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"cpuLimit": 1000000000000000, "cpuLimit": 1000000000000,
"realCpuLimit": 0, "realCpuLimit": 0,
"clockLimit": 2000000000000000, "clockLimit": 2000000000000,
"memoryLimit": 838860800, "memoryLimit": 134217728000000,
"stackLimit": 0, "stackLimit": 0,
"procLimit": 50, "procLimit": 50,
"cpuRateLimit": 0, "cpuRateLimit": 0,
@ -625,17 +625,17 @@
"env": [], "env": [],
"stdout": { "stdout": {
"name": "stdout", "name": "stdout",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"stderr": { "stderr": {
"name": "stderr", "name": "stderr",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"cpuLimit": 1000000000000000, "cpuLimit": 1000000000000,
"realCpuLimit": 0, "realCpuLimit": 0,
"clockLimit": 2000000000000000, "clockLimit": 2000000000000,
"memoryLimit": 95656304705536, "memoryLimit": 95656304705536,
"stackLimit": 0, "stackLimit": 0,
"procLimit": 50, "procLimit": 50,

8
tests/convert/clang-tidy/task.json
View File

@ -37,13 +37,13 @@
}, },
"stderr": { "stderr": {
"name": "stderr", "name": "stderr",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"cpuLimit": 1000000000000000, "cpuLimit": 1000000000000,
"realCpuLimit": 0, "realCpuLimit": 0,
"clockLimit": 2000000000000000, "clockLimit": 2000000000000,
"memoryLimit": 838860800, "memoryLimit": 134217728000000,
"stackLimit": 0, "stackLimit": 0,
"procLimit": 50, "procLimit": 50,
"cpuRateLimit": 0, "cpuRateLimit": 0,

8
tests/convert/cppcheck/task.json
View File

@ -32,7 +32,7 @@
}, },
"stdout": { "stdout": {
"name": "stdout", "name": "stdout",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"stderr": { "stderr": {
@ -40,10 +40,10 @@
"max": 65000000000000, "max": 65000000000000,
"pipe": true "pipe": true
}, },
"cpuLimit": 1000000000000000, "cpuLimit": 1000000000000,
"realCpuLimit": 0, "realCpuLimit": 0,
"clockLimit": 2000000000000000, "clockLimit": 2000000000000,
"memoryLimit": 838860800, "memoryLimit": 134217728000000,
"stackLimit": 0, "stackLimit": 0,
"procLimit": 50, "procLimit": 50,
"cpuRateLimit": 0, "cpuRateLimit": 0,

8
tests/convert/cpplint/task.json
View File

@ -36,13 +36,13 @@
}, },
"stderr": { "stderr": {
"name": "stderr", "name": "stderr",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"cpuLimit": 1000000000000000, "cpuLimit": 1000000000000,
"realCpuLimit": 0, "realCpuLimit": 0,
"clockLimit": 2000000000000000, "clockLimit": 2000000000000,
"memoryLimit": 838860800, "memoryLimit": 134217728000000,
"stackLimit": 0, "stackLimit": 0,
"procLimit": 50, "procLimit": 50,
"cpuRateLimit": 0, "cpuRateLimit": 0,

8
tests/convert/diff/task.json
View File

@ -24,17 +24,17 @@
"env": [], "env": [],
"stdout": { "stdout": {
"name": "stdout", "name": "stdout",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"stderr": { "stderr": {
"name": "stderr", "name": "stderr",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"cpuLimit": 1000000000000000, "cpuLimit": 1000000000000,
"realCpuLimit": 0, "realCpuLimit": 0,
"clockLimit": 2000000000000000, "clockLimit": 2000000000000,
"memoryLimit": 95656304705536, "memoryLimit": 95656304705536,
"stackLimit": 0, "stackLimit": 0,
"procLimit": 50, "procLimit": 50,

10
tests/convert/keyword/task.json
View File

@ -30,18 +30,18 @@
}, },
"stdout": { "stdout": {
"name": "stdout", "name": "stdout",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"stderr": { "stderr": {
"name": "stderr", "name": "stderr",
"max": 800000000000000, "max": 128000000000000000000,
"pipe": true "pipe": true
}, },
"cpuLimit": 1000000000000000, "cpuLimit": 1000000000000,
"realCpuLimit": 0, "realCpuLimit": 0,
"clockLimit": 2000000000000000, "clockLimit": 2000000000000,
"memoryLimit": 838860800, "memoryLimit": 134217728000000,
"stackLimit": 0, "stackLimit": 0,
"procLimit": 50, "procLimit": 50,
"cpuRateLimit": 0, "cpuRateLimit": 0,