Skip to content

Commit

Permalink
global: fix isort imports
Browse files Browse the repository at this point in the history
  • Loading branch information
ntarocco committed Jul 24, 2020
1 parent 657b485 commit da39f1a
Show file tree
Hide file tree
Showing 71 changed files with 233 additions and 186 deletions.
9 changes: 5 additions & 4 deletions invenio_app_ils/acquisition/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
from invenio_indexer.api import RecordIndexer
from invenio_records_rest.facets import terms_filter

from invenio_app_ils.permissions import backoffice_permission, \
superuser_permission
from invenio_app_ils.permissions import (backoffice_permission,
superuser_permission)

from .api import ORDER_PID_FETCHER, ORDER_PID_MINTER, ORDER_PID_TYPE, \
VENDOR_PID_FETCHER, VENDOR_PID_MINTER, VENDOR_PID_TYPE, Order, Vendor
from .api import (ORDER_PID_FETCHER, ORDER_PID_MINTER, ORDER_PID_TYPE,
VENDOR_PID_FETCHER, VENDOR_PID_MINTER, VENDOR_PID_TYPE,
Order, Vendor)
from .indexer import VendorIndexer
from .search import OrderSearch, VendorSearch

Expand Down
4 changes: 2 additions & 2 deletions invenio_app_ils/acquisition/loaders/jsonschemas/order.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from marshmallow import EXCLUDE, Schema, fields, pre_load, validate

from invenio_app_ils.acquisition.api import Order
from invenio_app_ils.records.loaders.schemas.changed_by import ChangedBySchema, \
set_changed_by
from invenio_app_ils.records.loaders.schemas.changed_by import (
ChangedBySchema, set_changed_by)
from invenio_app_ils.records.loaders.schemas.price import PriceSchema


Expand Down
7 changes: 4 additions & 3 deletions invenio_app_ils/circulation/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
from invenio_pidstore.models import PIDStatus
from invenio_pidstore.providers.recordid_v2 import RecordIdProviderV2

from invenio_app_ils.errors import MissingRequiredParameterError, \
PatronHasLoanOnDocumentError, PatronHasLoanOnItemError, \
PatronHasRequestOnDocumentError
from invenio_app_ils.errors import (MissingRequiredParameterError,
PatronHasLoanOnDocumentError,
PatronHasLoanOnItemError,
PatronHasRequestOnDocumentError)
from invenio_app_ils.fetchers import pid_fetcher
from invenio_app_ils.items.api import Item
from invenio_app_ils.minters import pid_minter
Expand Down
56 changes: 31 additions & 25 deletions invenio_app_ils/circulation/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,45 @@
"""Configuration for Invenio ILS circulation module."""

from invenio_circulation.api import Loan
from invenio_circulation.pidstore.pids import _LOANID_CONVERTER, \
CIRCULATION_LOAN_FETCHER, CIRCULATION_LOAN_MINTER, \
CIRCULATION_LOAN_PID_TYPE
from invenio_circulation.pidstore.pids import (_LOANID_CONVERTER,
CIRCULATION_LOAN_FETCHER,
CIRCULATION_LOAN_MINTER,
CIRCULATION_LOAN_PID_TYPE)
from invenio_circulation.search.api import LoansSearch
from invenio_circulation.transitions.transitions import CreatedToPending, \
ItemOnLoanToItemOnLoan, ItemOnLoanToItemReturned, ToCancelled, \
ToItemOnLoan
from invenio_circulation.transitions.transitions import (
CreatedToPending, ItemOnLoanToItemOnLoan, ItemOnLoanToItemReturned,
ToCancelled, ToItemOnLoan)
from invenio_records_rest.facets import terms_filter

from invenio_app_ils.documents.api import document_exists
from invenio_app_ils.facets import date_range_filter, overdue_agg, \
overdue_loans_filter
from invenio_app_ils.ill.api import can_item_circulate, \
circulation_default_extension_duration, \
circulation_default_loan_duration, circulation_item_location_retriever
from invenio_app_ils.items.api import get_document_pid_by_item_pid, \
get_item_pids_by_document_pid, item_exists
from invenio_app_ils.facets import (date_range_filter, overdue_agg,
overdue_loans_filter)
from invenio_app_ils.ill.api import (can_item_circulate,
circulation_default_extension_duration,
circulation_default_loan_duration,
circulation_item_location_retriever)
from invenio_app_ils.items.api import (get_document_pid_by_item_pid,
get_item_pids_by_document_pid,
item_exists)
from invenio_app_ils.patrons.api import patron_exists
from invenio_app_ils.permissions import PatronOwnerPermission, \
authenticated_user_permission, backoffice_permission, \
loan_extend_circulation_permission, superuser_permission
from invenio_app_ils.permissions import (PatronOwnerPermission,
authenticated_user_permission,
backoffice_permission,
loan_extend_circulation_permission,
superuser_permission)

from .api import ILS_CIRCULATION_LOAN_FETCHER, ILS_CIRCULATION_LOAN_MINTER
from .indexer import LoanIndexer
from .jsonresolvers.loan import document_resolver, item_resolver, \
loan_patron_resolver
from .utils import circulation_build_document_ref, \
circulation_build_item_ref, circulation_build_patron_ref, \
circulation_can_be_requested, circulation_default_extension_max_count, \
circulation_is_loan_duration_valid, circulation_loan_will_expire_days, \
circulation_location_validator, \
circulation_transaction_location_validator, \
circulation_transaction_user_validator
from .jsonresolvers.loan import (document_resolver, item_resolver,
loan_patron_resolver)
from .utils import (circulation_build_document_ref, circulation_build_item_ref,
circulation_build_patron_ref, circulation_can_be_requested,
circulation_default_extension_max_count,
circulation_is_loan_duration_valid,
circulation_loan_will_expire_days,
circulation_location_validator,
circulation_transaction_location_validator,
circulation_transaction_user_validator)

###############################################################################
# ILS Circulation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import arrow
from flask import current_app
from flask_babelex import lazy_gettext as _
from invenio_circulation.records.loaders.schemas.json import DateString, \
LoanItemPIDSchemaV1
from invenio_circulation.records.loaders.schemas.json import (
DateString, LoanItemPIDSchemaV1)
from marshmallow import ValidationError, fields, post_load, validates

from invenio_app_ils.permissions import check_permission
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
from flask import current_app
from flask_babelex import lazy_gettext as _
from invenio_circulation.records.loaders.schemas.json import DateString
from marshmallow import Schema, ValidationError, fields, post_load, \
validates, validates_schema
from marshmallow import (Schema, ValidationError, fields, post_load, validates,
validates_schema)

from .base import LoanBaseSchemaV1

Expand Down
4 changes: 2 additions & 2 deletions invenio_app_ils/circulation/mail/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

from invenio_app_ils.circulation.mail.factory import \
loan_message_creator_factory
from invenio_app_ils.circulation.search import get_all_expiring_loans, \
get_all_overdue_loans
from invenio_app_ils.circulation.search import (get_all_expiring_loans,
get_all_overdue_loans)
from invenio_app_ils.circulation.utils import circulation_overdue_loan_days
from invenio_app_ils.mail.messages import get_common_message_ctx
from invenio_app_ils.mail.tasks import send_ils_email
Expand Down
4 changes: 2 additions & 2 deletions invenio_app_ils/circulation/serializers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

"""Loan serializers."""

from invenio_records_rest.serializers.response import record_responsify, \
search_responsify
from invenio_records_rest.serializers.response import (record_responsify,
search_responsify)

from invenio_app_ils.records.schemas.json import ILSRecordSchemaJSONV1

Expand Down
4 changes: 2 additions & 2 deletions invenio_app_ils/circulation/serializers/csv.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

from invenio_records_rest.serializers.csv import CSVSerializer

from .custom_fields import field_is_overdue, field_pickup_location, \
field_transaction_location, field_transaction_user
from .custom_fields import (field_is_overdue, field_pickup_location,
field_transaction_location, field_transaction_user)


class LoanCSVSerializer(CSVSerializer):
Expand Down
4 changes: 2 additions & 2 deletions invenio_app_ils/circulation/serializers/json.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from invenio_app_ils.literature.serializers.custom_fields import \
field_cover_metadata

from .custom_fields import field_is_overdue, field_pickup_location, \
field_transaction_location, field_transaction_user
from .custom_fields import (field_is_overdue, field_pickup_location,
field_transaction_location, field_transaction_user)


class LoanJSONSerializer(JSONSerializer):
Expand Down
4 changes: 2 additions & 2 deletions invenio_app_ils/circulation/stats/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
from invenio_rest import ContentNegotiatedMethodView

from invenio_app_ils.circulation.stats.api import fetch_most_loaned_documents
from invenio_app_ils.documents.api import DOCUMENT_PID_FETCHER, \
DOCUMENT_PID_TYPE
from invenio_app_ils.documents.api import (DOCUMENT_PID_FETCHER,
DOCUMENT_PID_TYPE)
from invenio_app_ils.errors import InvalidParameterError
from invenio_app_ils.permissions import need_permissions

Expand Down
4 changes: 2 additions & 2 deletions invenio_app_ils/circulation/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
from invenio_records_rest.views import pass_record
from invenio_rest import ContentNegotiatedMethodView

from invenio_app_ils.circulation.loaders import loan_checkout_loader, \
loan_request_loader
from invenio_app_ils.circulation.loaders import (loan_checkout_loader,
loan_request_loader)
from invenio_app_ils.circulation.utils import circulation_overdue_loan_days
from invenio_app_ils.errors import OverdueLoansMailError
from invenio_app_ils.permissions import need_permissions
Expand Down
14 changes: 7 additions & 7 deletions invenio_app_ils/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
from .document_requests.api import DOCUMENT_REQUEST_PID_TYPE, DocumentRequest
from .documents.api import DOCUMENT_PID_TYPE, Document
from .eitems.api import EITEM_PID_TYPE, EItem
from .ill.api import BORROWING_REQUEST_PID_TYPE, LIBRARY_PID_TYPE, \
BorrowingRequest, Library
from .internal_locations.api import INTERNAL_LOCATION_PID_TYPE, \
InternalLocation
from .ill.api import (BORROWING_REQUEST_PID_TYPE, LIBRARY_PID_TYPE,
BorrowingRequest, Library)
from .internal_locations.api import (INTERNAL_LOCATION_PID_TYPE,
InternalLocation)
from .items.api import ITEM_PID_TYPE, Item
from .locations.api import LOCATION_PID_TYPE, Location
from .patrons.indexer import PatronIndexer
from .proxies import current_app_ils
from .records_relations.api import RecordRelationsParentChild, \
RecordRelationsSiblings
from .records_relations.api import (RecordRelationsParentChild,
RecordRelationsSiblings)
from .relations.api import Relation
from .series.api import SERIES_PID_TYPE, Series

Expand Down Expand Up @@ -1365,9 +1365,9 @@ def pages():
def setup(recreate_db, skip_demo_data, skip_file_location, skip_patrons,
skip_vocabularies, skip_pages, verbose):
"""ILS setup command."""
import redis
from flask import current_app
from invenio_base.app import create_cli
import redis

click.secho("ils setup started...", fg="blue")

Expand Down
50 changes: 26 additions & 24 deletions invenio_app_ils/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,48 +30,50 @@
from invenio_app_ils.eitems.indexer import EItemIndexer
from invenio_app_ils.internal_locations.indexer import InternalLocationIndexer
from invenio_app_ils.items.indexer import ItemIndexer
from invenio_app_ils.literature.api import LITERATURE_PID_FETCHER, \
LITERATURE_PID_MINTER, LITERATURE_PID_TYPE
from invenio_app_ils.literature.api import (LITERATURE_PID_FETCHER,
LITERATURE_PID_MINTER,
LITERATURE_PID_TYPE)
from invenio_app_ils.literature.covers_builder import build_ils_demo_cover_urls
from invenio_app_ils.literature.search import LiteratureSearch
from invenio_app_ils.locations.indexer import LocationIndexer
from invenio_app_ils.patrons.indexer import PatronIndexer
from invenio_app_ils.series.indexer import SeriesIndexer
from invenio_app_ils.vocabularies.indexer import VocabularyIndexer

from .document_requests.api import DOCUMENT_REQUEST_PID_FETCHER, \
DOCUMENT_REQUEST_PID_MINTER, DOCUMENT_REQUEST_PID_TYPE, DocumentRequest
from .document_requests.api import (DOCUMENT_REQUEST_PID_FETCHER,
DOCUMENT_REQUEST_PID_MINTER,
DOCUMENT_REQUEST_PID_TYPE, DocumentRequest)
from .document_requests.search import DocumentRequestSearch
from .documents.api import DOCUMENT_PID_FETCHER, DOCUMENT_PID_MINTER, \
DOCUMENT_PID_TYPE, Document
from .documents.api import (DOCUMENT_PID_FETCHER, DOCUMENT_PID_MINTER,
DOCUMENT_PID_TYPE, Document)
from .documents.search import DocumentSearch
from .eitems.api import EITEM_PID_FETCHER, EITEM_PID_MINTER, EITEM_PID_TYPE, \
EItem
from .eitems.api import (EITEM_PID_FETCHER, EITEM_PID_MINTER, EITEM_PID_TYPE,
EItem)
from .eitems.search import EItemSearch
from .facets import default_value_when_missing_filter, keyed_range_filter, \
not_empty_object_or_list_filter
from .internal_locations.api import INTERNAL_LOCATION_PID_FETCHER, \
INTERNAL_LOCATION_PID_MINTER, INTERNAL_LOCATION_PID_TYPE, \
InternalLocation
from .facets import (default_value_when_missing_filter, keyed_range_filter,
not_empty_object_or_list_filter)
from .internal_locations.api import (INTERNAL_LOCATION_PID_FETCHER,
INTERNAL_LOCATION_PID_MINTER,
INTERNAL_LOCATION_PID_TYPE,
InternalLocation)
from .internal_locations.search import InternalLocationSearch
from .items.api import ITEM_PID_FETCHER, ITEM_PID_MINTER, ITEM_PID_TYPE, Item
from .items.search import ItemSearch
from .locations.api import LOCATION_PID_FETCHER, LOCATION_PID_MINTER, \
LOCATION_PID_TYPE, Location
from .locations.api import (LOCATION_PID_FETCHER, LOCATION_PID_MINTER,
LOCATION_PID_TYPE, Location)
from .locations.search import LocationSearch
from .patrons.api import PATRON_PID_FETCHER, PATRON_PID_MINTER, \
PATRON_PID_TYPE, Patron
from .patrons.api import (PATRON_PID_FETCHER, PATRON_PID_MINTER,
PATRON_PID_TYPE, Patron)
from .patrons.search import PatronsSearch
from .permissions import PatronOwnerPermission, \
authenticated_user_permission, backoffice_permission, \
views_permissions_factory
from .permissions import (PatronOwnerPermission, authenticated_user_permission,
backoffice_permission, views_permissions_factory)
from .records.permissions import record_read_permission_factory
from .series.api import SERIES_PID_FETCHER, SERIES_PID_MINTER, \
SERIES_PID_TYPE, Series
from .series.api import (SERIES_PID_FETCHER, SERIES_PID_MINTER,
SERIES_PID_TYPE, Series)
from .series.search import SeriesSearch
from .views import UserInfoResource
from .vocabularies.api import VOCABULARY_PID_FETCHER, VOCABULARY_PID_MINTER, \
VOCABULARY_PID_TYPE, Vocabulary
from .vocabularies.api import (VOCABULARY_PID_FETCHER, VOCABULARY_PID_MINTER,
VOCABULARY_PID_TYPE, Vocabulary)
from .vocabularies.search import VocabularySearch


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
from elasticsearch import VERSION as ES_VERSION
from werkzeug.routing import Rule

from invenio_app_ils.circulation.search import get_active_loans_by_doc_pid, \
get_loan_next_available_date, get_overdue_loans_by_doc_pid, \
get_past_loans_by_doc_pid, get_pending_loans_by_doc_pid
from invenio_app_ils.circulation.search import (get_active_loans_by_doc_pid,
get_loan_next_available_date,
get_overdue_loans_by_doc_pid,
get_past_loans_by_doc_pid,
get_pending_loans_by_doc_pid)
from invenio_app_ils.proxies import current_app_ils

lt_es7 = ES_VERSION[0] < 7
Expand Down
4 changes: 2 additions & 2 deletions invenio_app_ils/documents/loaders/jsonschemas/document.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
from marshmallow import EXCLUDE, Schema, fields, pre_load, validate

from invenio_app_ils.documents.api import Document
from invenio_app_ils.records.loaders.schemas.changed_by import ChangedBySchema, \
set_changed_by
from invenio_app_ils.records.loaders.schemas.changed_by import (
ChangedBySchema, set_changed_by)
from invenio_app_ils.records.loaders.schemas.preserve_cover_metadata import \
preserve_cover_metadata

Expand Down
4 changes: 2 additions & 2 deletions invenio_app_ils/ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
from invenio_rest.errors import RESTException
from werkzeug.utils import cached_property

from invenio_app_ils.records.metadata_extensions import MetadataExtensions, \
add_es_metadata_extensions
from invenio_app_ils.records.metadata_extensions import (
MetadataExtensions, add_es_metadata_extensions)

from .circulation import config as circulation_config
from .circulation.receivers import register_circulation_signals
Expand Down
8 changes: 4 additions & 4 deletions invenio_app_ils/ill/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
from invenio_pidstore.models import PIDStatus
from invenio_pidstore.providers.recordid_v2 import RecordIdProviderV2

from invenio_app_ils.circulation.api import checkout_loan, \
circulation_default_loan_duration_for_item
from invenio_app_ils.errors import RecordHasReferencesError, \
UnknownItemPidTypeError
from invenio_app_ils.circulation.api import (
checkout_loan, circulation_default_loan_duration_for_item)
from invenio_app_ils.errors import (RecordHasReferencesError,
UnknownItemPidTypeError)
from invenio_app_ils.fetchers import pid_fetcher
from invenio_app_ils.ill.errors import ILLError
from invenio_app_ils.ill.proxies import current_ils_ill
Expand Down
14 changes: 8 additions & 6 deletions invenio_app_ils/ill/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
from invenio_indexer.api import RecordIndexer
from invenio_records_rest.facets import terms_filter

from invenio_app_ils.permissions import PatronOwnerPermission, \
authenticated_user_permission, backoffice_permission, \
superuser_permission
from invenio_app_ils.permissions import (PatronOwnerPermission,
authenticated_user_permission,
backoffice_permission,
superuser_permission)

from .api import BORROWING_REQUEST_PID_FETCHER, BORROWING_REQUEST_PID_MINTER, \
BORROWING_REQUEST_PID_TYPE, LIBRARY_PID_FETCHER, LIBRARY_PID_MINTER, \
LIBRARY_PID_TYPE, BorrowingRequest, Library
from .api import (BORROWING_REQUEST_PID_FETCHER, BORROWING_REQUEST_PID_MINTER,
BORROWING_REQUEST_PID_TYPE, LIBRARY_PID_FETCHER,
LIBRARY_PID_MINTER, LIBRARY_PID_TYPE, BorrowingRequest,
Library)
from .indexer import LibraryIndexer
from .search import BorrowingRequestsSearch, LibrarySearch

Expand Down
5 changes: 3 additions & 2 deletions invenio_app_ils/ill/loaders/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
from .jsonschemas.borrowing_request import BorrowingRequestSchemaV1
from .jsonschemas.library import LibrarySchemaV1
from .jsonschemas.patron_loan_actions import CreateLoanSchemaV1
from .jsonschemas.patron_loan_extension_actions import AcceptExtensionSchemaV1, \
DeclineExtensionSchemaV1, RequestExtensionSchemaV1
from .jsonschemas.patron_loan_extension_actions import (
AcceptExtensionSchemaV1, DeclineExtensionSchemaV1,
RequestExtensionSchemaV1)

borrowing_request_loader = ils_marshmallow_loader(BorrowingRequestSchemaV1)
patron_loan_create_action_loader = ils_marshmallow_loader(CreateLoanSchemaV1)
Expand Down

0 comments on commit da39f1a

Please sign in to comment.