Cleanup import, quoting style
This commit is contained in:
@@ -3,28 +3,27 @@ from __future__ import absolute_import
|
|||||||
import logging
|
import logging
|
||||||
|
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.db.utils import DatabaseError
|
||||||
from django.utils.translation import ugettext
|
|
||||||
from django.db.models.signals import post_save, post_syncdb
|
from django.db.models.signals import post_save, post_syncdb
|
||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
from django.db.utils import DatabaseError
|
from django.utils.translation import ugettext
|
||||||
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from navigation.api import register_links, register_multi_item_links
|
from acls.api import class_permissions
|
||||||
from documents.models import Document, DocumentVersion
|
from documents.models import Document, DocumentVersion
|
||||||
from main.api import register_maintenance_links
|
from main.api import register_maintenance_links
|
||||||
|
from navigation.api import register_links, register_multi_item_links
|
||||||
from project_tools.api import register_tool
|
from project_tools.api import register_tool
|
||||||
from acls.api import class_permissions
|
|
||||||
|
|
||||||
from scheduler.api import register_interval_job
|
from scheduler.api import register_interval_job
|
||||||
|
|
||||||
|
from . import models as ocr_models
|
||||||
from .conf.settings import (AUTOMATIC_OCR, QUEUE_PROCESSING_INTERVAL)
|
from .conf.settings import (AUTOMATIC_OCR, QUEUE_PROCESSING_INTERVAL)
|
||||||
|
from .exceptions import AlreadyQueued
|
||||||
from .models import DocumentQueue, QueueTransformation
|
from .models import DocumentQueue, QueueTransformation
|
||||||
from .tasks import task_process_document_queues
|
from .tasks import task_process_document_queues
|
||||||
from .permissions import (PERMISSION_OCR_DOCUMENT,
|
from .permissions import (PERMISSION_OCR_DOCUMENT,
|
||||||
PERMISSION_OCR_DOCUMENT_DELETE, PERMISSION_OCR_QUEUE_ENABLE_DISABLE,
|
PERMISSION_OCR_DOCUMENT_DELETE, PERMISSION_OCR_QUEUE_ENABLE_DISABLE,
|
||||||
PERMISSION_OCR_CLEAN_ALL_PAGES)
|
PERMISSION_OCR_CLEAN_ALL_PAGES)
|
||||||
from .exceptions import AlreadyQueued
|
|
||||||
from . import models as ocr_models
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
from ocr.models import DocumentQueue, QueueDocument
|
from .models import DocumentQueue, QueueDocument
|
||||||
|
|
||||||
|
|
||||||
class QueueDocumentInline(admin.StackedInline):
|
class QueueDocumentInline(admin.StackedInline):
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import subprocess
|
|||||||
import tempfile
|
import tempfile
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from django.utils.translation import ugettext as _
|
|
||||||
from django.utils.importlib import import_module
|
from django.utils.importlib import import_module
|
||||||
|
from django.utils.translation import ugettext as _
|
||||||
|
|
||||||
from common.conf.settings import TEMPORARY_DIRECTORY
|
from common.conf.settings import TEMPORARY_DIRECTORY
|
||||||
from converter.api import convert
|
from converter.api import convert
|
||||||
@@ -16,10 +16,10 @@ from documents.models import DocumentPage
|
|||||||
|
|
||||||
from .conf.settings import (TESSERACT_PATH, TESSERACT_LANGUAGE, UNPAPER_PATH)
|
from .conf.settings import (TESSERACT_PATH, TESSERACT_LANGUAGE, UNPAPER_PATH)
|
||||||
from .exceptions import TesseractError, UnpaperError
|
from .exceptions import TesseractError, UnpaperError
|
||||||
from .parsers import parse_document_page
|
|
||||||
from .parsers.exceptions import ParserError, ParserUnknownFile
|
|
||||||
from .literals import (DEFAULT_OCR_FILE_FORMAT, UNPAPER_FILE_FORMAT,
|
from .literals import (DEFAULT_OCR_FILE_FORMAT, UNPAPER_FILE_FORMAT,
|
||||||
DEFAULT_OCR_FILE_EXTENSION)
|
DEFAULT_OCR_FILE_EXTENSION)
|
||||||
|
from .parsers import parse_document_page
|
||||||
|
from .parsers.exceptions import ParserError, ParserUnknownFile
|
||||||
|
|
||||||
|
|
||||||
def get_language_backend():
|
def get_language_backend():
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django import forms
|
from django import forms
|
||||||
|
|
||||||
from ocr.models import QueueTransformation
|
from .models import QueueTransformation
|
||||||
|
|
||||||
|
|
||||||
class QueueTransformationForm(forms.ModelForm):
|
class QueueTransformationForm(forms.ModelForm):
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
|
|
||||||
DOCUMENTQUEUE_STATE_STOPPED = 's'
|
DOCUMENTQUEUE_STATE_STOPPED = 's'
|
||||||
DOCUMENTQUEUE_STATE_ACTIVE = 'a'
|
DOCUMENTQUEUE_STATE_ACTIVE = 'a'
|
||||||
|
|
||||||
@@ -9,7 +8,6 @@ DOCUMENTQUEUE_STATE_CHOICES = (
|
|||||||
(DOCUMENTQUEUE_STATE_ACTIVE, _(u'active')),
|
(DOCUMENTQUEUE_STATE_ACTIVE, _(u'active')),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
QUEUEDOCUMENT_STATE_PENDING = 'p'
|
QUEUEDOCUMENT_STATE_PENDING = 'p'
|
||||||
QUEUEDOCUMENT_STATE_PROCESSING = 'i'
|
QUEUEDOCUMENT_STATE_PROCESSING = 'i'
|
||||||
QUEUEDOCUMENT_STATE_ERROR = 'e'
|
QUEUEDOCUMENT_STATE_ERROR = 'e'
|
||||||
|
|||||||
@@ -6,10 +6,11 @@ from .exceptions import AlreadyQueued
|
|||||||
|
|
||||||
|
|
||||||
class DocumentQueueManager(models.Manager):
|
class DocumentQueueManager(models.Manager):
|
||||||
'''
|
"""
|
||||||
Module manager class to handle adding documents to an OCR document
|
Module manager class to handle adding documents to an OCR document
|
||||||
queue
|
queue
|
||||||
'''
|
"""
|
||||||
|
|
||||||
def queue_document(self, document, queue_name='default'):
|
def queue_document(self, document, queue_name='default'):
|
||||||
document_queue = self.model.objects.get(name=queue_name)
|
document_queue = self.model.objects.get(name=queue_name)
|
||||||
if document_queue.queuedocument_set.filter(document=document):
|
if document_queue.queuedocument_set.filter(document=document):
|
||||||
|
|||||||
@@ -4,23 +4,22 @@ from ast import literal_eval
|
|||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.core.exceptions import ObjectDoesNotExist, ValidationError
|
||||||
from django.utils.translation import ugettext
|
|
||||||
from django.core.exceptions import ObjectDoesNotExist
|
|
||||||
from django.contrib.contenttypes.models import ContentType
|
|
||||||
from django.contrib.contenttypes import generic
|
from django.contrib.contenttypes import generic
|
||||||
from django.core.exceptions import ValidationError
|
from django.contrib.contenttypes.models import ContentType
|
||||||
|
from django.utils.translation import ugettext
|
||||||
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from documents.models import Document
|
from documents.models import Document
|
||||||
from converter.api import get_available_transformations_choices
|
from converter.api import get_available_transformations_choices
|
||||||
from sources.managers import SourceTransformationManager
|
from sources.managers import SourceTransformationManager
|
||||||
|
|
||||||
|
from .exceptions import ReQueueError
|
||||||
from .literals import (DOCUMENTQUEUE_STATE_STOPPED,
|
from .literals import (DOCUMENTQUEUE_STATE_STOPPED,
|
||||||
DOCUMENTQUEUE_STATE_CHOICES, QUEUEDOCUMENT_STATE_PENDING,
|
DOCUMENTQUEUE_STATE_CHOICES, QUEUEDOCUMENT_STATE_PENDING,
|
||||||
QUEUEDOCUMENT_STATE_CHOICES, QUEUEDOCUMENT_STATE_PROCESSING,
|
QUEUEDOCUMENT_STATE_CHOICES, QUEUEDOCUMENT_STATE_PROCESSING,
|
||||||
DOCUMENTQUEUE_STATE_ACTIVE)
|
DOCUMENTQUEUE_STATE_ACTIVE)
|
||||||
from .managers import DocumentQueueManager
|
from .managers import DocumentQueueManager
|
||||||
from .exceptions import ReQueueError
|
|
||||||
|
|
||||||
|
|
||||||
class DocumentQueue(models.Model):
|
class DocumentQueue(models.Model):
|
||||||
@@ -101,10 +100,10 @@ class ArgumentsValidator(object):
|
|||||||
|
|
||||||
|
|
||||||
class QueueTransformation(models.Model):
|
class QueueTransformation(models.Model):
|
||||||
'''
|
"""
|
||||||
Model that stores the transformation and transformation arguments
|
Model that stores the transformation and transformation arguments
|
||||||
for a given document queue
|
for a given document queue
|
||||||
'''
|
"""
|
||||||
content_type = models.ForeignKey(ContentType)
|
content_type = models.ForeignKey(ContentType)
|
||||||
object_id = models.PositiveIntegerField()
|
object_id = models.PositiveIntegerField()
|
||||||
content_object = generic.GenericForeignKey('content_type', 'object_id')
|
content_object = generic.GenericForeignKey('content_type', 'object_id')
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django.utils.translation import ugettext as _
|
from django.utils.translation import ugettext as _
|
||||||
|
|
||||||
from ocr.models import DocumentQueue, QueueDocument
|
from .models import DocumentQueue, QueueDocument
|
||||||
|
|
||||||
|
|
||||||
def get_statistics():
|
def get_statistics():
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from datetime import timedelta, datetime
|
from datetime import timedelta, datetime
|
||||||
import platform
|
|
||||||
import logging
|
import logging
|
||||||
|
import platform
|
||||||
|
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
|
|
||||||
@@ -10,12 +10,12 @@ from job_processor.api import process_job
|
|||||||
from lock_manager import Lock, LockError
|
from lock_manager import Lock, LockError
|
||||||
|
|
||||||
from .api import do_document_ocr
|
from .api import do_document_ocr
|
||||||
|
from .conf.settings import (NODE_CONCURRENT_EXECUTION, REPLICATION_DELAY,
|
||||||
|
QUEUE_PROCESSING_INTERVAL)
|
||||||
from .literals import (QUEUEDOCUMENT_STATE_PENDING,
|
from .literals import (QUEUEDOCUMENT_STATE_PENDING,
|
||||||
QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_ACTIVE,
|
QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_ACTIVE,
|
||||||
QUEUEDOCUMENT_STATE_ERROR)
|
QUEUEDOCUMENT_STATE_ERROR)
|
||||||
from .models import QueueDocument, DocumentQueue
|
from .models import QueueDocument, DocumentQueue
|
||||||
from .conf.settings import (NODE_CONCURRENT_EXECUTION, REPLICATION_DELAY,
|
|
||||||
QUEUE_PROCESSING_INTERVAL)
|
|
||||||
|
|
||||||
LOCK_EXPIRE = 60 * 10 # Lock expires in 10 minutes
|
LOCK_EXPIRE = 60 * 10 # Lock expires in 10 minutes
|
||||||
# TODO: Tie LOCK_EXPIRATION with hard task timeout
|
# TODO: Tie LOCK_EXPIRATION with hard task timeout
|
||||||
|
|||||||
@@ -1,30 +1,30 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
|
from django.contrib import messages
|
||||||
|
from django.core.exceptions import PermissionDenied
|
||||||
|
from django.core.urlresolvers import reverse
|
||||||
from django.http import HttpResponseRedirect
|
from django.http import HttpResponseRedirect
|
||||||
from django.shortcuts import render_to_response, get_object_or_404
|
from django.shortcuts import render_to_response, get_object_or_404
|
||||||
from django.template import RequestContext
|
from django.template import RequestContext
|
||||||
from django.contrib import messages
|
|
||||||
from common.backport.generic.list_detail import object_list
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.core.urlresolvers import reverse
|
|
||||||
from django.core.exceptions import PermissionDenied
|
|
||||||
|
|
||||||
from permissions.models import Permission
|
from acls.models import AccessEntry
|
||||||
|
from common.backport.generic.list_detail import object_list
|
||||||
|
from common.utils import encapsulate
|
||||||
from documents.models import Document
|
from documents.models import Document
|
||||||
from documents.widgets import document_link, document_thumbnail
|
from documents.widgets import document_link, document_thumbnail
|
||||||
from common.utils import encapsulate
|
from permissions.models import Permission
|
||||||
from acls.models import AccessEntry
|
|
||||||
|
|
||||||
from .permissions import (PERMISSION_OCR_DOCUMENT,
|
from .api import clean_pages
|
||||||
PERMISSION_OCR_DOCUMENT_DELETE, PERMISSION_OCR_QUEUE_ENABLE_DISABLE,
|
from .exceptions import AlreadyQueued, ReQueueError
|
||||||
PERMISSION_OCR_CLEAN_ALL_PAGES, PERMISSION_OCR_QUEUE_EDIT)
|
from .forms import QueueTransformationForm, QueueTransformationForm_create
|
||||||
from .models import DocumentQueue, QueueDocument, QueueTransformation
|
|
||||||
from .literals import (QUEUEDOCUMENT_STATE_PENDING,
|
from .literals import (QUEUEDOCUMENT_STATE_PENDING,
|
||||||
QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_STOPPED,
|
QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_STOPPED,
|
||||||
DOCUMENTQUEUE_STATE_ACTIVE)
|
DOCUMENTQUEUE_STATE_ACTIVE)
|
||||||
from .exceptions import AlreadyQueued, ReQueueError
|
from .models import DocumentQueue, QueueDocument, QueueTransformation
|
||||||
from .api import clean_pages
|
from .permissions import (PERMISSION_OCR_DOCUMENT,
|
||||||
from .forms import QueueTransformationForm, QueueTransformationForm_create
|
PERMISSION_OCR_DOCUMENT_DELETE, PERMISSION_OCR_QUEUE_ENABLE_DISABLE,
|
||||||
|
PERMISSION_OCR_CLEAN_ALL_PAGES, PERMISSION_OCR_QUEUE_EDIT)
|
||||||
|
|
||||||
|
|
||||||
def queue_document_list(request, queue_name='default'):
|
def queue_document_list(request, queue_name='default'):
|
||||||
|
|||||||
Reference in New Issue
Block a user