From 9319a416d9b45f06e71abf559b873afcecc19f55 Mon Sep 17 00:00:00 2001
From: Nuvole <jon-lee@sjtu.edu.cn>
Date: Sun, 27 Oct 2024 22:56:52 +0800
Subject: [PATCH] fix: merge conflict

---
 joj3_config_generator/convert.py      | 16 ++++++++++++----
 joj3_config_generator/lib/__init__.py | 11 -----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/joj3_config_generator/convert.py b/joj3_config_generator/convert.py
index 8b3b506..a79181f 100644
--- a/joj3_config_generator/convert.py
+++ b/joj3_config_generator/convert.py
@@ -1,8 +1,16 @@
 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
     result_conf = result.Config(
         name=task_conf.task,
@@ -13,8 +21,8 @@ def convert(repo_conf: Repo, task_conf: Task) -> ResultConfig:
             if task_conf.release.deadline
             else -1
         ),
-        stage=StageConfig(stages=[], sandbox_token=repo_conf.sandbox_token),
-        teapot=TeapotConfig(),
+        stage=result.Stage(stages=[], sandbox_token=repo_conf.sandbox_token),
+        teapot=result.Teapot(),
     )
 
     # Construct healthcheck stage
diff --git a/joj3_config_generator/lib/__init__.py b/joj3_config_generator/lib/__init__.py
index 68802d4..e69de29 100644
--- a/joj3_config_generator/lib/__init__.py
+++ b/joj3_config_generator/lib/__init__.py
@@ -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