JOJ/JOJ3-config-generator
27
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge conflict

Browse Source
This commit is contained in:
李衍志523370910113 2024-10-27 22:56:52 +08:00
parent e5eb582f5f
commit e54d0af8c5
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
joj3_config_generator/convert.py
View File

@ -1,7 +1,16 @@
from joj3_config_generator.models import joj1, repo, result, task from joj3_config_generator.models import joj1, repo, result, task
from joj3_config_generator.lib.task import (
fix_comment,
fix_diff,
fix_keyword,
fix_result_detail,
get_executorWithConfig,
get_conf_stage,
)
from joj3_config_generator.lib.repo import getHealthcheckConfig
# FIXME: LLM generated convert function, only for demostration
def convert(repo_conf: Repo, task_conf: Task) -> ResultConfig: def convert(repo_conf: repo.Config, task_conf: task.Config) -> result.Config:
# Create the base ResultConf object # Create the base ResultConf object
result_conf = ResultConfig( result_conf = ResultConfig(
name=task_conf.task, name=task_conf.task,
@ -12,8 +21,8 @@ def convert(repo_conf: Repo, task_conf: Task) -> ResultConfig:
if task_conf.release.deadline if task_conf.release.deadline
else -1 else -1
), ),
stage=StageConfig(stages=[], sandbox_token=repo_conf.sandbox_token), stage=result.Stage(stages=[], sandbox_token=repo_conf.sandbox_token),
teapot=getTeapotConfig(repo_conf, task_conf), teapot=result.Teapot(),
) )
# Construct healthcheck stage # Construct healthcheck stage

11
joj3_config_generator/lib/__init__.py
View File

@ -1,11 +0,0 @@
from joj3_config_generator.models.repo import Repo as Repo
from joj3_config_generator.models.result import Cmd as Cmd
from joj3_config_generator.models.result import CmdFile as CmdFile
from joj3_config_generator.models.result import ExecutorConfig as ExecutorConfig
from joj3_config_generator.models.result import ExecutorWithConfig as ExecutorWithConfig
from joj3_config_generator.models.result import ParserConfig as ParserConfig
from joj3_config_generator.models.result import ResultConfig as ResultConfig
from joj3_config_generator.models.result import Stage as Stage
from joj3_config_generator.models.result import StageConfig as StageConfig
from joj3_config_generator.models.result import TeapotConfig as TeapotConfig
from joj3_config_generator.models.task import Task as Task