fix: url_for

rearq/server/routes/index.py

@@ -18,7 +18,7 @@ class ToDate(Function):
     database_func = Date
 
 
-@router.get("/", include_in_schema=False)
+@router.get("/", include_in_schema=False, name="rearq.index")
 async def index(
     request: Request,
     rearq: ReArq = Depends(get_rearq),

rearq/server/routes/job.py

@@ -16,7 +16,7 @@
 router = APIRouter()
 
 
-@router.get("", include_in_schema=False)
+@router.get("", include_in_schema=False, name="rearq.job_page")
 async def job_page(
     request: Request, redis: Redis = Depends(get_redis), rearq: ReArq = Depends(get_rearq)
 ):
@@ -33,7 +33,7 @@ async def job_page(
     )
 
 
-@router.get("/data", response_model=JobListOut)
+@router.get("/data", response_model=JobListOut, name="rearq.get_jobs")
 async def get_jobs(
     task: Optional[str] = None,
     job_id: Optional[str] = None,
@@ -57,12 +57,12 @@ async def get_jobs(
     return {"rows": results, "total": await qs.count()}
 
 
-@router.get("/result")
+@router.get("/result", name="rearq.get_job_result")
 async def get_job_result(job_id: str):
     return await JobResult.get_or_none(job_id=job_id)
 
 
-@router.put("")
+@router.put("", name="rearq.update_job")
 async def update_job(update_job_in: UpdateJobIn):
     job = await Job.get_or_none(job_id=update_job_in.job_id)
     if not job:
@@ -73,7 +73,7 @@ async def update_job(update_job_in: UpdateJobIn):
         raise HTTPException(status_code=HTTP_409_CONFLICT, detail="Can't update job")
 
 
-@router.put("/cancel")
+@router.put("/cancel", name="rearq.cancel_job")
 async def cancel_job(cancel_job_in: CancelJobIn, rearq: ReArq = Depends(get_rearq)):
     job = await Job.get_or_none(job_id=cancel_job_in.job_id)
     if not job:
@@ -89,12 +89,12 @@ async def cancel_job(cancel_job_in: CancelJobIn, rearq: ReArq = Depends(get_rear
         raise HTTPException(status_code=HTTP_409_CONFLICT, detail="Can't cancel job")
 
 
-@router.delete("")
+@router.delete("", name="rearq.delete_job")
 async def delete_job(ids: str):
     return await Job.filter(id__in=ids.split(",")).delete()
 
 
-@router.post("", response_model=JobOut)
+@router.post("", response_model=JobOut, name="rearq.add_job")
 async def add_job(add_job_in: AddJobIn, rearq: ReArq = Depends(get_rearq)):
     task = rearq.task_map.get(add_job_in.task)
     if await rearq.redis.hget(constants.TASK_KEY, add_job_in.task) == TaskStatus.disabled:

rearq/server/routes/result.py

@@ -13,7 +13,7 @@
 router = APIRouter()
 
 
-@router.get("/data", response_model=JobResultListOut)
+@router.get("/data", response_model=JobResultListOut, name="rearq.get_results")
 async def get_results(
     task: Optional[str] = None,
     job_id: Optional[str] = None,
@@ -40,12 +40,12 @@ async def get_results(
     return {"rows": results, "total": await qs.count()}
 
 
-@router.delete("")
+@router.delete("", name="rearq.delete_result")
 async def delete_result(ids: str):
     return await JobResult.filter(id__in=ids.split(",")).delete()
 
 
-@router.get("", include_in_schema=False)
+@router.get("", include_in_schema=False, name="rearq.job_result_page")
 async def job_result_page(
     request: Request,
     redis: Redis = Depends(get_redis),

rearq/server/routes/task.py

@@ -12,7 +12,7 @@
 router = APIRouter()
 
 
-@router.get("", include_in_schema=False)
+@router.get("", include_in_schema=False, name="rearq.get_tasks")
 async def get_tasks(request: Request, rearq: ReArq = Depends(get_rearq)):
     task_map = rearq.task_map
     tasks = []
@@ -46,7 +46,7 @@ async def get_tasks(request: Request, rearq: ReArq = Depends(get_rearq)):
     )
 
 
-@router.put("")
+@router.put("", name="rearq.update_task")
 async def update_task(ut: UpdateTask, rearq: ReArq = Depends(get_rearq)):
     task_map = rearq.task_map
     task = task_map.get(ut.task_name)

rearq/server/routes/worker.py

@@ -15,7 +15,7 @@
 router = APIRouter()
 
 
-@router.get("", include_in_schema=False)
+@router.get("", include_in_schema=False, name="rearq.get_workers")
 async def get_workers(request: Request, redis: Redis = Depends(get_redis)):
     workers_info = await redis.hgetall(constants.WORKER_KEY)
     workers = []
@@ -46,6 +46,6 @@ async def get_workers(request: Request, redis: Redis = Depends(get_redis)):
     )
 
 
-@router.delete("")
+@router.delete("", name="rearq.delete_worker")
 async def delete_worker(name: str, redis: Redis = Depends(get_redis)):
     return await redis.hdel(constants.WORKER_KEY, name)

rearq/server/templates/base.html

@@ -36,34 +36,34 @@
             <ul class="nav flex-column">
                 <li class="nav-item">
                     <a class="nav-link {% if page_title == 'dashboard' %}active{% endif %}"
-                       href="{{ url_for("index") }}">
+                       href="{{ url_for("rearq.index") }}">
                         <span data-feather="home"></span>
                         Dashboard
                     </a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link {% if page_title == 'worker' %}active{% endif %}"
-                       href="{{ url_for("get_workers") }}">
+                       href="{{ url_for("rearq.get_workers") }}">
                         <span data-feather="briefcase"></span>
                         Worker
                     </a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link {% if page_title == 'task' %}active{% endif %}"
-                       href="{{ url_for("get_tasks") }}">
+                       href="{{ url_for("rearq.get_tasks") }}">
                         <span data-feather="inbox"></span>
                         Task
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link {% if page_title == 'job' %}active{% endif %}" href="{{ url_for("job_page") }}">
+                    <a class="nav-link {% if page_title == 'job' %}active{% endif %}" href="{{ url_for("rearq.job_page") }}">
                         <span data-feather="clock"></span>
                         Job
                     </a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link {% if page_title == 'result' %}active{% endif %}"
-                       href="{{ url_for("job_result_page") }}">
+                       href="{{ url_for("rearq.job_result_page") }}">
                         <span data-feather="file-text"></span>
                         Result
                     </a>

rearq/server/templates/dashboard.html

@@ -13,23 +13,23 @@
             <div class="card-body">
                 <h5 class="card-title">{{ task_num }}</h5>
                 <p class="card-text">All task num</p>
-                <a href="{{ url_for("get_tasks") }}" class="stretched-link"></a>
+                <a href="{{ url_for("rearq.get_tasks") }}" class="stretched-link"></a>
             </div>
         </div>
         <div class="flex-grow-1 card text-white bg-success me-3">
             <div class="card-header">Run Times</div>
             <div class="card-body">
                 <h5 class="card-title">{{ run_times }}</h5>
                 <p class="card-text">All task run times</p>
-                <a href="{{ url_for("job_result_page") }}" class="stretched-link"></a>
+                <a href="{{ url_for("rearq.job_result_page") }}" class="stretched-link"></a>
             </div>
         </div>
         <div class="flex-grow-1 card text-white bg-secondary">
             <div class="card-header">Worker Num</div>
             <div class="card-body">
                 <h5 class="card-title">{{ worker_num }}</h5>
                 <p class="card-text">All worker num, include timer worker</p>
-                <a href="{{ url_for("get_workers") }}" class="stretched-link"></a>
+                <a href="{{ url_for("rearq.get_workers") }}" class="stretched-link"></a>
             </div>
         </div>
     </div>

rearq/server/templates/job.html

@@ -50,7 +50,7 @@
            data-pagination="true"
            data-side-pagination="server"
            data-pagination-loop="false"
-           data-url="{{ url_for("get_jobs") }}" data-query-params="queryParams">
+           data-url="{{ url_for("rearq.get_jobs") }}" data-query-params="queryParams">
         <thead>
         <tr>
             <th data-field="state" data-checkbox="true"></th>
@@ -109,7 +109,7 @@
                 job_id: job_id,
             }
             $.ajax({
-                url: '{{ url_for("cancel_job") }}',
+                url: '{{ url_for("rearq.cancel_job") }}',
                 method: 'PUT',
                 data: JSON.stringify(data),
                 contentType: 'application/json',
@@ -236,7 +236,7 @@ <h5 class="modal-title">Edit Job</h5>
                 data.job_retry_after = job_retry_after;
             }
             $.ajax({
-                url: '{{ url_for("update_job") }}',
+                url: '{{ url_for("rearq.update_job") }}',
                 method: 'PUT',
                 data: JSON.stringify(data),
                 contentType: 'application/json',
@@ -261,7 +261,7 @@ <h5 class="modal-title">Edit Job</h5>
         }
 
         function jobIdFormatter(value, row) {
-            return `<a class="text-decoration-none" href="{{ url_for("job_result_page") }}?job_id=${value}">${value}</a>`;
+            return `<a class="text-decoration-none" href="{{ url_for("rearq.job_result_page") }}?job_id=${value}">${value}</a>`;
         }
 
         $(function () {
@@ -274,7 +274,7 @@ <h5 class="modal-title">Edit Job</h5>
                     return row.id
                 });
                 $.ajax({
-                    url: "{{ url_for("delete_job") }}?ids=" + ids,
+                    url: "{{ url_for("rearq.delete_job") }}?ids=" + ids,
                     method: 'DELETE',
                     success: res => {
                         table.bootstrapTable('remove', {field: 'id', values: ids});

rearq/server/templates/result.html

@@ -49,7 +49,7 @@
            data-pagination="true"
            data-side-pagination="server"
            data-pagination-loop="false"
-           data-url="{{ url_for("get_results") }}" data-query-params="queryParams">
+           data-url="{{ url_for("rearq.get_results") }}" data-query-params="queryParams">
         <thead>
         <tr>
             <th data-field="state" data-checkbox="true"></th>
@@ -84,7 +84,7 @@
         }
 
         function jobIdFormatter(value, row) {
-            return `<a class="text-decoration-none" href="{{ url_for("job_page") }}?job_id=${value}">${value}</a>`;
+            return `<a class="text-decoration-none" href="{{ url_for("rearq.job_page") }}?job_id=${value}">${value}</a>`;
         }
 
         function booleanFormatter(value, row) {
@@ -105,7 +105,7 @@
                     return row.id
                 });
                 $.ajax({
-                    url: "{{ url_for("delete_result") }}?ids=" + ids,
+                    url: "{{ url_for("rearq.delete_result") }}?ids=" + ids,
                     method: 'DELETE',
                     success: res => {
                         table.bootstrapTable('remove', {field: 'id', values: ids});

rearq/server/templates/widgets/task_actions.html

@@ -3,8 +3,8 @@
 {% endif %}  data-bs-toggle="modal" data-bs-target="#run-{{ task.name }}">
     Run
 </button>
-<a class="btn btn-secondary btn-sm" href="{{ url_for("job_page") }}?task={{ task.name }}">Job</a>
-<a class="btn btn-dark btn-sm" href="{{ url_for("job_result_page") }}?task={{ task.name }}">Result</a>
+<a class="btn btn-secondary btn-sm" href="{{ url_for("rearq.job_page") }}?task={{ task.name }}">Job</a>
+<a class="btn btn-dark btn-sm" href="{{ url_for("rearq.job_result_page") }}?task={{ task.name }}">Result</a>
 <button onclick="set_task('{{ task.name }}','{{ task.status }}')"
         class="btn btn-sm {% if task.status == "enabled" %}btn-warning{% else %}btn-success{% endif %}">
     {% if task.status == "enabled" %}
@@ -125,7 +125,7 @@ <h5 class="modal-title">Run task {{ task.name }}</h5>
                 data.job_retry = job_retry;
             }
             $.ajax({
-                url: '{{ url_for("add_job") }}',
+                url: '{{ url_for("rearq.add_job") }}',
                 method: 'POST',
                 data: JSON.stringify(data),
                 contentType: 'application/json',
@@ -137,7 +137,7 @@ <h5 class="modal-title">Run task {{ task.name }}</h5>
                         content: {
                             element: "a",
                             attributes: {
-                                href: "{{ url_for("job_page") }}?job_id=" + res.job_id,
+                                href: "{{ url_for("rearq.job_page") }}?job_id=" + res.job_id,
                                 text: "JobID: " + res.job_id,
                             },
                         }
@@ -158,7 +158,7 @@ <h5 class="modal-title">Run task {{ task.name }}</h5>
         function set_task(task_name, status) {
             let set_status = status === 'disabled' ? 'enabled' : 'disabled';
             $.ajax({
-                url: "{{ url_for("update_task") }}",
+                url: "{{ url_for("rearq.update_task") }}",
                 method: 'PUT',
                 data: JSON.stringify({
                     status: set_status,

rearq/server/templates/worker.html

@@ -52,7 +52,7 @@
     <script>
         function delete_worker(name) {
             $.ajax({
-                url: "{{ url_for("delete_worker") }}?name=" + name,
+                url: "{{ url_for("rearq.delete_worker") }}?name=" + name,
                 method: "DELETE",
                 success: res => {
                     location.reload();