update：后端-任务管理功能模块实现

server/crud/internal/job.py

@@ -1,6 +1,6 @@
 from typing import Union
 from loguru import logger
-from sqlmodel import select, Session
+from sqlmodel import select, Session, delete
 from ...models.internal.job import JobLogs
 from ..base import CRUDBase
 
@@ -9,5 +9,9 @@ class CRUDJobLogs(CRUDBase[JobLogs]):
     def get_by_job_id(self, db: Session, job_id: str):
         return db.exec(select(self.model).where(self.model.job_id == job_id)).one()
 
+    def delete_by_jobid(self, db: Session, job_id: str):
+        db.exec(delete(self.model).where(self.model.job_id == job_id))
+        db.commit()
+
 
 job_logs = CRUDJobLogs(JobLogs)

server/models/internal/job.py

@@ -27,7 +27,7 @@ class TriggerArgs(BaseModel):
 class AnsibleArgs(BaseModel):
     module: Union[str, None] = Field(default=None, description="ansible模块")
     module_args: Union[str, None] = Field(default=None, description="ansible模块参数")
-    playbook: Union[str, None] = Field(default=None, description="ansible playbook")
+    playbook: Union[int, None] = Field(default=None, description="ansible playbook")
 
 
 class JobAdd(BaseModel):

server/routers/internal/job.py

@@ -46,6 +46,7 @@ async def delete_job(job_id: str, uid: int = Depends(get_uid), session: Session
         conn = rpyc.connect(**settings.rpyc_config)
         conn.root.pause_job(job_id)
         conn.root.remove_job(job_id)
+        crud.internal.job_logs.delete_by_jobid(session, job_id)
     except Exception as e:
         logger.warning(e)
         return ApiResponse(
@@ -80,8 +81,8 @@ async def add_job(job: JobAdd, uid: int = Depends(get_uid), session: Session = D
     logger.debug(f'user defined job ID:{job_id}')
     # 只支持cron和date任务，interval间隔任务完全可以用cron替代，没必要单独实现功能
     try:
-        conn = rpyc.connect(**settings.rpyc_config)
-        job = conn.root.add_job('scheduler-server:ansible_task', trigger=job.trigger, id=job_id,
+        conn = rpyc.connect(**settings['rpyc_config'])
+        job = conn.root.add_job('server:ansible_task', trigger=job.trigger, id=job_id,
                                 kwargs={'job_id': job_id, 'targets': job.targets,
                                         'ansible_args': job.ansible_args.model_dump(),
                                         'task_type': 0 if job.trigger == 'cron' else 1}, name=job.name,
@@ -180,8 +181,8 @@ async def show_jobs(search: Pagination[JobSearch], uid: int = Depends(get_uid),
 @router.post('/logs', summary='任务日志查询', response_model=ApiResponse[SearchResponse[JobLogs]])
 async def job_logs(page_search: Pagination[JobLogSearch], session: Session = Depends(get_session)):
     logger.debug(page_search)
-    total = crud.internal.job_logs.search_total(session, page_search.search, filter_type={'job_id': 'eq','type':'eq'})
-    jobs = crud.internal.job_logs.search(session, page_search, filter_type={'job_id': 'eq','type':'eq'})
+    total = crud.internal.job_logs.search_total(session, page_search.search, filter_type={'job_id': 'eq', 'type': 'eq'})
+    jobs = crud.internal.job_logs.search(session, page_search, filter_type={'job_id': 'eq', 'type': 'eq'})
     logger.debug(jobs)
     return ApiResponse(
         data={