remove bfs, dfs unused schedulers

pybossa/sched.py

@@ -64,12 +64,9 @@ def new_task(project_id, sched, user_id=None, user_ip=None,
     """Get a new task by calling the appropriate scheduler function."""
     sched_map = {
         'default': get_locked_task,
-        'breadth_first': get_breadth_first_task,
-        'depth_first': get_depth_first_task,
         Schedulers.locked: get_locked_task,
         'incremental': get_incremental_task,
         Schedulers.user_pref: get_user_pref_task,
-        'depth_first_all': get_depth_first_all_task,
         Schedulers.task_queue: get_user_pref_task
     }
     scheduler = sched_map.get(sched, sched_map['default'])
@@ -138,59 +135,6 @@ def after_save(task_run, conn):
         release_reserve_task_lock_by_id(task_run.project_id, task_run.task_id, uid, TIMEOUT)
 
 
-def get_breadth_first_task(project_id, user_id=None, user_ip=None,
-                           external_uid=None, offset=0, limit=1, orderby='id',
-                           desc=False, **kwargs):
-    """Get a new task which have the least number of task runs."""
-    project_query = session.query(Task.id).filter(Task.project_id==project_id,
-                                                  Task.state!='completed',
-                                                  Task.state!='enrich')
-    if user_id and not user_ip and not external_uid:
-        subquery = session.query(TaskRun.task_id).filter_by(project_id=project_id,
-                                                            user_id=user_id)
-    else:
-        if not user_ip:  # pragma: no cover
-            user_ip = '127.0.0.1'
-        if user_ip and not external_uid:
-            subquery = session.query(TaskRun.task_id).filter_by(project_id=project_id,
-                                                                user_ip=user_ip)
-        else:
-            subquery = session.query(TaskRun.task_id).filter_by(project_id=project_id,
-                                                                external_uid=external_uid)
-
-    tmp = project_query.except_(subquery)
-    query = session.query(Task, func.sum(Counter.n_task_runs).label('n_task_runs'))\
-                   .filter(Task.id==Counter.task_id)\
-                   .filter(Counter.task_id.in_(tmp))\
-                   .filter(or_(Task.expiration == None, Task.expiration > datetime.utcnow()))\
-                   .group_by(Task.id)\
-                   .order_by(text('n_task_runs ASC'))\
-
-    query = _set_orderby_desc(query, orderby, desc)
-    data = query.limit(limit).offset(offset).all()
-    return _handle_tuples(data)
-
-
-def get_depth_first_task(project_id, user_id=None, user_ip=None,
-                         external_uid=None, offset=0, limit=1,
-                         orderby='priority_0', desc=True, **kwargs):
-    """Get a new task for a given project."""
-    tasks = get_candidate_task_ids(project_id, user_id,
-                                   user_ip, external_uid, limit, offset,
-                                   orderby=orderby, desc=desc)
-    return tasks
-
-
-def get_depth_first_all_task(project_id, user_id=None, user_ip=None,
-                             external_uid=None, offset=0, limit=1,
-                             orderby='priority_0', desc=True, **kwargs):
-    """Get a new task for a given project."""
-    tasks = get_candidate_task_ids(project_id, user_id,
-                                   user_ip, external_uid, limit, offset,
-                                   orderby=orderby, desc=desc, completed=False)
-    return tasks
-
-
 def get_incremental_task(project_id, user_id=None, user_ip=None,
                          external_uid=None, offset=0, limit=1, orderby='id',
                          desc=False, **kwargs):
@@ -850,11 +794,9 @@ def get_project_scheduler(project_id, conn):
 
 
 def sched_variants():
-    return [('default', 'Default'), ('breadth_first', 'Breadth First'),
-            ('depth_first', 'Depth First'),
+    return [('default', 'Default'),
             (Schedulers.locked, 'Locked'),
             (Schedulers.user_pref, 'User Preference Scheduler'),
-            ('depth_first_all', 'Depth First All'),
             (Schedulers.task_queue, 'Task Queues')
             ]
 

test/test_api/test_task_api.py

@@ -21,7 +21,6 @@
 from nose.tools import assert_equal
 
 from pybossa.api.task import TaskAPI
-from pybossa.model.counter import Counter
 from pybossa.repositories import ProjectRepository
 from pybossa.repositories import ResultRepository
 from pybossa.repositories import TaskRepository

test/test_auditlog.py

@@ -198,11 +198,10 @@ def test_project_update_scheduler(self):
 
         owner_id = project.owner.id
         owner_name = project.owner.name
-        data = {'info': {'sched': 'depth_first', 'data_classification': dict(input_data="L4 - public", output_data="L4 - public")}}
+        data = {'info': {'sched': 'task_queue_scheduler', 'data_classification': dict(input_data="L4 - public", output_data="L4 - public")}}
         url = '/api/project/%s?api_key=%s' % (project.id, project.owner.api_key)
         self.app.put(url, data=json.dumps(data))
         logs = auditlog_repo.filter_by(project_id=project.id)
-
         assert len(logs) == 1, logs
         for log in logs:
             assert log.user_id == owner_id, log.user_id
@@ -221,7 +220,7 @@ def test_project_update_two_info_objects(self):
 
         owner_id = project.owner.id
         owner_name = project.owner.name
-        data = {'info': {'sched': 'depth_first', 'task_presenter': 'new', 'data_classification': dict(input_data="L4 - public", output_data="L4 - public")}}
+        data = {'info': {'sched': 'task_queue_scheduler', 'task_presenter': 'new', 'data_classification': dict(input_data="L4 - public", output_data="L4 - public")}}
         attributes = list(data['info'].keys())
         url = '/api/project/%s?api_key=%s' % (project.id, project.owner.api_key)
         self.app.put(url, data=json.dumps(data))
@@ -564,7 +563,7 @@ def test_project_task_scheduler(self):
 
         attribute = 'sched'
 
-        new_string = 'depth_first'
+        new_string = 'locked_scheduler'
 
         old_value = 'default'
 

test/test_sched.py

@@ -119,46 +119,6 @@ def test_anonymous_03_respects_limit_tasks(self):
                 assert data.get('id'), data
 
 
-    @with_context
-    def test_newtask_default_orderby(self):
-        """Test SCHED depth first works with orderby."""
-        project = ProjectFactory.create(info=dict(sched="depth_first"))
-        task1 = TaskFactory.create(project=project, fav_user_ids=None)
-        task2 = TaskFactory.create(project=project, fav_user_ids=[1,2,3])
-        api_key = project.owner.api_key
-
-        url = "/api/project/%s/newtask?orderby=%s&desc=%s&api_key=%s" % (project.id, 'id', False, api_key)
-        res = self.app.get(url)
-        data = json.loads(res.data)
-        assert data['id'] == task1.id, data
-
-        url = "/api/project/%s/newtask?orderby=%s&desc=%s&api_key=%s" % (project.id, 'id', True, api_key)
-        res = self.app.get(url)
-        data = json.loads(res.data)
-        assert data['id'] == task2.id, data
-
-        url = "/api/project/%s/newtask?orderby=%s&desc=%s&api_key=%s" % (project.id, 'created', False, api_key)
-        res = self.app.get(url)
-        data = json.loads(res.data)
-        assert data['id'] == task1.id, data
-
-        url = "/api/project/%s/newtask?orderby=%s&desc=%s&api_key=%s" % (project.id, 'created', True, api_key)
-        res = self.app.get(url)
-        data = json.loads(res.data)
-        assert data['id'] == task2.id, data
-
-        url = "/api/project/%s/newtask?orderby=%s&desc=%s&api_key=%s" % (project.id, 'fav_user_ids', False, api_key)
-        res = self.app.get(url)
-        data = json.loads(res.data)
-        assert data['id'] == task1.id, data
-
-        url = "/api/project/%s/newtask?orderby=%s&desc=%s&api_key=%s" % (project.id, 'fav_user_ids', True, api_key)
-        res = self.app.get(url)
-        data = json.loads(res.data)
-        assert data['id'] == task2.id, data
-        assert data['fav_user_ids'] == task2.fav_user_ids, data
-
-
     @with_context
     def test_user_01_newtask(self):
         """ Test SCHED newtask returns a Task for John Doe User"""