From 6324390369485e175a1e2648a722220c0dc1988f Mon Sep 17 00:00:00 2001
From: Martijn Vermaat <martijn@vermaat.name>
Date: Sun, 1 Nov 2015 01:27:19 +0100
Subject: [PATCH] List batch jobs in admin interface
---
mutalyzer/entrypoints/admin.py | 53 +++++++++++++++++++++++++++++++++-
1 file changed, 52 insertions(+), 1 deletion(-)
diff --git a/mutalyzer/entrypoints/admin.py b/mutalyzer/entrypoints/admin.py
index c235a93f..f9eeff88 100644
--- a/mutalyzer/entrypoints/admin.py
+++ b/mutalyzer/entrypoints/admin.py
@@ -14,13 +14,14 @@ import os
import alembic.command
import alembic.config
from alembic.migration import MigrationContext
+import sqlalchemy
from sqlalchemy.orm.exc import NoResultFound
from . import _cli_string
from .. import announce
from .. import db
from ..db import session
-from ..db.models import Assembly, Chromosome
+from ..db.models import Assembly, BatchJob, BatchQueueItem, Chromosome
from .. import mapping
from .. import output
from .. import sync
@@ -151,6 +152,50 @@ def sync_cache(wsdl_url, url_template, history=7):
% (inserted, downloaded))
+def list_batch_jobs():
+ """
+ List batch jobs.
+ """
+ # For getting all batch jobs and their item counts, the following query
+ # might be more obvious at first thought. However, our current query below
+ # turns out to be more than twice as fast (and shorter).
+ #
+ # sq = session.query(
+ # BatchQueueItem.batch_job_id,
+ # sqlalchemy.func.count(BatchQueueItem.id).label('count')
+ # ).group_by(BatchQueueItem.batch_job_id).subquery()
+ # session.query(
+ # BatchJob,
+ # sq.c.count
+ # ).join(sq, BatchJob.id == sq.c.batch_job_id)
+ #
+ batch_jobs_with_counts = session.query(
+ BatchJob,
+ session.query(sqlalchemy.func.count('*')).filter(
+ BatchQueueItem.batch_job_id == BatchJob.id
+ ).label('count')
+ ).order_by(BatchJob.added.asc()).all()
+
+ lengths = {
+ 'id_len': max(len(str(j.id)) for j, _ in batch_jobs_with_counts),
+ 'type_len': max(len(j.job_type) for j, _ in batch_jobs_with_counts),
+ 'count_len': max(len(str(c)) for _, c in batch_jobs_with_counts),
+ 'email_len': max(len(j.email) for j, _ in batch_jobs_with_counts)
+ }
+
+ template = ('{id:{id_len}} {type:<{type_len}} {added:%Y-%m-%d %H:%M:%S}'
+ ' {count:<{count_len}} {email:{email_len}}')
+
+ for batch_job, count in batch_jobs_with_counts:
+ print template.format(
+ id=batch_job.id,
+ type=batch_job.job_type,
+ added=batch_job.added,
+ count=count,
+ email=batch_job.email,
+ **lengths)
+
+
def set_announcement(body, url=None):
"""
Set announcement to show to the user.
@@ -309,6 +354,12 @@ def main():
description=unset_announcement.__doc__.split('\n\n')[0])
p.set_defaults(func=unset_announcement)
+ # Subparser 'batch-jobs'.
+ p = subparsers.add_parser(
+ 'batch-jobs', help='list batch jobs',
+ description=list_batch_jobs.__doc__.split('\n\n')[0])
+ p.set_defaults(func=list_batch_jobs)
+
# Subparser 'sync-cache'.
p = subparsers.add_parser(
'sync-cache', help='synchronize cache with remote Mutalyzer',
--
GitLab