Merge pull request #89 from Koed00/dev

Adds version and broker info to qinfo

django_q/monitor.py

@@ -13,7 +13,7 @@ from django.utils.translation import ugettext as _
 from django_q.conf import Conf
 from django_q.status import Stat
 from django_q.brokers import get_broker
-from django_q import models
+from django_q import models, VERSION
 
 
 def monitor(run_once=False, broker=None):
@@ -146,7 +146,10 @@ def info(broker=None):
     # print to terminal
     print(term.clear_eos())
     col_width = int(term.width / 6)
-    print(term.black_on_green(term.center(_('-- {} summary --').format(Conf.PREFIX))))
+    print(term.black_on_green(
+        term.center(
+            _('-- {} {} on {}  --').format(Conf.PREFIX.capitalize(), '.'.join(str(v) for v in VERSION),
+                                           broker.info()))))
     print(term.cyan(_('Clusters')) +
           term.move_x(1 * col_width) +
           term.white(str(clusters)) +

docs/examples.rst

@@ -296,7 +296,7 @@ Alternatively the ``parzen_async()`` function can also be written with :func:`as
 
     # create 100 calculations and return the collated result
     def parzen_async():
-        mu_vec = numpy.array([0, 0])
+        mu_vec = numpy.array([0, 0])n this case, but without hook support.
         cov_mat = numpy.array([[1, 0], [0, 1]])
         sample = numpy.random. \
             multivariate_normal(mu_vec, cov_mat, 10000)
@@ -304,9 +304,9 @@ Alternatively the ``parzen_async()`` function can also be written with :func:`as
         x = numpy.array([[0], [0]])
         # async them with async iterable
         args = [(sample, x, w) for w in widths]
-        result_id = async_iter(parzen_estimation, args)
+        result_id = async_iter(parzen_estimation, args, cached=True)
-        # return the result or timeout after 10 seconds
+        # return the cached result or timeout after 10 seconds
-        return result(result_id, wait=10000)
+        return result(result_id, wait=10000, cached=True)
 
 
 .. note::

docs/tasks.rst

@@ -205,6 +205,8 @@ This works both globally or on individual async executions.::
     # and then save it to the database
     task.save()
 
+As you can see you can easily turn a cached result into a permanent database result by calling ``save()`` on it.
+
 This also works for group actions::
 
     # cached group example
@@ -225,7 +227,7 @@ This also works for group actions::
     # wait max 50ms for one hundred results to return
     result_group('frexp', wait=50, count=100, cached=True)
 
-Note that exact same result can be achieved by using the more convenient :func:`async_iter` in this case, but without hook support.
+If you don't need hooks, that exact same result can be achieved by using the more convenient :func:`async_iter`.
 
 Synchronous testing
 -------------------