Commit 78f36d52 authored by Administrator's avatar Administrator

[CLEAN] celery file, processing steps cleaner with sqlalchemy.

parent 5981ec9c
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
#import os
#import djcelery
#
#from celery import Celery
#
#from django.conf import settings
#
## set the default Django settings module for the 'celery' program.
#os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'gargantext_web.settings')
#
#app = Celery('gargantext_web')
#
#
#app.conf.update(
# CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend',
#)
#
#
#app.conf.update(
# CELERY_RESULT_BACKEND='djcelery.backends.cache:CacheBackend',
#)
#
## Using a string here means the worker will not have to
## pickle the object when using Windows.
##app.config_from_object('django.conf:settings')
#app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
#
from celery import shared_task from celery import shared_task
from node import models from node import models
...@@ -49,27 +22,26 @@ from admin.utils import PrintException ...@@ -49,27 +22,26 @@ from admin.utils import PrintException
def update_processing(corpus, step=0): def update_processing(corpus, step=0):
try: try:
corpus.hyperdata['Processing'] = step corpus.hyperdata.update({'Processing' : step})
corpus.save() session.query(Node).filter(Node.id==corpus.id).update({'hyperdata' : corpus.hyperdata})
session.commit()
except : except :
PrintException() PrintException()
@shared_task @shared_task
def apply_workflow(corpus_id): def apply_workflow(corpus_id):
corpus = session.query(Node).filter(Node.id==corpus_id).first() corpus = session.query(Node).filter(Node.id==corpus_id).first()
corpus_django = models.Node.objects.get(id=corpus_id)
update_processing(corpus_django, 1) update_processing(corpus, 1)
parse_resources(corpus) parse_resources(corpus)
update_processing(corpus_django, 2) update_processing(corpus, 2)
extract_ngrams(corpus, ['title', 'abstract']) extract_ngrams(corpus, ['title', 'abstract'])
update_processing(corpus_django, 3) update_processing(corpus, 3)
compute_tfidf(corpus) compute_tfidf(corpus)
update_processing(corpus_django, 0) update_processing(corpus, 0)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment