chore: clean up imports

* use relative imports for invenio_rdm_records
* remove unused imports

invenio_rdm_records/access_requests_ui/views.py

@@ -6,14 +6,12 @@
 # it under the terms of the MIT License; see LICENSE file for more details.
 
 """Access request UI views."""
-from flask import Blueprint, abort, current_app, g, redirect, render_template, request
-from flask_login import current_user
+from flask import abort, current_app, g, redirect, render_template, request
 from invenio_access.permissions import system_identity
 from invenio_i18n import lazy_gettext as _
 from invenio_mail.tasks import send_email
 from invenio_requests.proxies import current_requests_service
 from invenio_requests.views.decorators import pass_request
-from invenio_users_resources.proxies import current_user_resources
 
 from ..proxies import current_rdm_records_service as current_service
 from ..requests.access.requests import GuestAcceptAction

invenio_rdm_records/alembic/8ed1a438601c_migrate_secret_links.py

@@ -7,7 +7,6 @@
 
 """Migrate secret links permission levels."""
 
-import sqlalchemy as sa
 from alembic import op
 
 # revision identifiers, used by Alembic.

invenio_rdm_records/alembic/a3957490361d_remove_pidrelations_tables.py

@@ -7,9 +7,7 @@
 
 """Remove PIDRelations tables."""
 
-import sqlalchemy as sa
 from alembic import op
-from sqlalchemy.dialects import postgresql
 from sqlalchemy.engine.reflection import Inspector
 
 # revision identifiers, used by Alembic.

invenio_rdm_records/alembic/b822ba22c688_create_rdm_records_branch.py

@@ -8,9 +8,6 @@
 
 """Create RDM-Records branch."""
 
-import sqlalchemy as sa
-from alembic import op
-
 # revision identifiers, used by Alembic.
 revision = "b822ba22c688"
 down_revision = None

invenio_rdm_records/alembic/ffd725001655_add_field_to_record_consent_to_share_.py

@@ -8,9 +8,7 @@
 """Add field to record consent to share personal data for access request."""
 
 import sqlalchemy as sa
-import sqlalchemy_utils
 from alembic import op
-from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = "ffd725001655"

invenio_rdm_records/cli.py

@@ -25,8 +25,6 @@
 from invenio_search.engine import dsl, search
 from invenio_search.utils import build_alias_name
 
-from invenio_rdm_records.proxies import current_rdm_records, current_rdm_records_service
-
 from .fixtures import FixturesEngine
 from .fixtures.demo import (
     create_fake_community,
@@ -41,6 +39,7 @@
     create_demo_record,
     get_authenticated_identity,
 )
+from .proxies import current_rdm_records, current_rdm_records_service
 from .utils import get_or_create_user
 
 COMMUNITY_OWNER_EMAIL = "[email protected]"

invenio_rdm_records/ext.py

@@ -15,16 +15,11 @@
 from invenio_records_resources.resources.files import FileResource
 from invenio_records_resources.services import FileService
 
-from invenio_rdm_records.oaiserver.resources.config import OAIPMHServerResourceConfig
-from invenio_rdm_records.oaiserver.resources.resources import OAIPMHServerResource
-from invenio_rdm_records.oaiserver.services.config import OAIPMHServerServiceConfig
-from invenio_rdm_records.oaiserver.services.services import OAIPMHServerService
-from invenio_rdm_records.services.communities.service import RecordCommunitiesService
-from invenio_rdm_records.services.community_inclusion.service import (
-    CommunityInclusionService,
-)
-
 from . import config
+from .oaiserver.resources.config import OAIPMHServerResourceConfig
+from .oaiserver.resources.resources import OAIPMHServerResource
+from .oaiserver.services.config import OAIPMHServerServiceConfig
+from .oaiserver.services.services import OAIPMHServerService
 from .resources import (
     IIIFResource,
     IIIFResourceConfig,
@@ -59,6 +54,8 @@
     RecordAccessService,
     RecordRequestsService,
 )
+from .services.communities.service import RecordCommunitiesService
+from .services.community_inclusion.service import CommunityInclusionService
 from .services.config import (
     RDMMediaFileDraftServiceConfig,
     RDMMediaFileRecordServiceConfig,

invenio_rdm_records/fixtures/demo.py

@@ -9,7 +9,6 @@
 """Fake demo records."""
 
 import datetime
-import json
 import random
 from pathlib import Path
 

invenio_rdm_records/oaiserver/services/config.py

@@ -14,11 +14,6 @@
 from invenio_records_resources.services.records.links import pagination_links
 from sqlalchemy import asc, desc
 
-from invenio_rdm_records.oaiserver.services.schema import (
-    OAIPMHMetadataFormat,
-    OAIPMHSetSchema,
-)
-
 from ..services.links import OAIPMHSetLink
 from ..services.permissions import OAIPMHServerPermissionPolicy
 from ..services.results import (
@@ -27,6 +22,7 @@
     OAISetItem,
     OAISetList,
 )
+from .schema import OAIPMHMetadataFormat, OAIPMHSetSchema
 
 
 class SearchOptions:

invenio_rdm_records/oaiserver/services/services.py

@@ -23,12 +23,12 @@
 from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.sql import text
 
-from invenio_rdm_records.oaiserver.services.errors import (
+from .errors import (
     OAIPMHSetDoesNotExistError,
     OAIPMHSetNotEditable,
     OAIPMHSetSpecAlreadyExistsError,
 )
-from invenio_rdm_records.oaiserver.services.uow import OAISetCommitOp, OAISetDeleteOp
+from .uow import OAISetCommitOp, OAISetDeleteOp
 
 
 class OAIPMHServerService(Service):

invenio_rdm_records/records/dumpers/files.py

@@ -10,7 +10,7 @@
 
 from invenio_records.dumpers import SearchDumperExt
 
-from invenio_rdm_records.records.systemfields.access.protection import Visibility
+from ..systemfields.access.protection import Visibility
 
 
 class FilesDumperExt(SearchDumperExt):

invenio_rdm_records/records/systemfields/draft_status.py

@@ -25,7 +25,7 @@ class Record():
 from invenio_i18n import gettext as _
 from invenio_records.systemfields import SystemField
 
-from invenio_rdm_records.services.errors import RDMRecordsException, ReviewStateError
+from ...services.errors import RDMRecordsException, ReviewStateError
 
 
 class DraftStatus(SystemField):

invenio_rdm_records/requests/community_inclusion.py

@@ -13,9 +13,8 @@
 from invenio_requests.customizations import RequestType, actions
 from invenio_requests.errors import CannotExecuteActionError
 
-from invenio_rdm_records.services.errors import InvalidAccessRestrictions
-
 from ..proxies import current_rdm_records_service as service
+from ..services.errors import InvalidAccessRestrictions
 
 
 def is_access_restriction_valid(record, community):

invenio_rdm_records/requests/decorators.py

@@ -12,7 +12,7 @@
 from invenio_requests import current_requests_service
 from invenio_requests.services.requests.links import RequestLink, RequestLinksTemplate
 
-from invenio_rdm_records.services.review.links import RequestRecordLink
+from ..services.review.links import RequestRecordLink
 
 
 def request_next_link(**kwargs):

invenio_rdm_records/requests/entity_resolvers.py

@@ -24,9 +24,8 @@
 from invenio_users_resources.services.schemas import SystemUserSchema
 from sqlalchemy.orm.exc import NoResultFound
 
-from invenio_rdm_records.services.config import RDMRecordServiceConfig
-
 from ..records.api import RDMDraft, RDMRecord
+from ..services.config import RDMRecordServiceConfig
 from ..services.dummy import DummyExpandingService
 
 # NOTE: this is the python regex from https://emailregex.com/

invenio_rdm_records/resources/deserializers/rocrate/schema.py

@@ -8,8 +8,6 @@
 
 """RO-Crate schema."""
 
-from distutils.log import error
-
 from invenio_i18n import lazy_gettext as _
 from marshmallow import EXCLUDE, Schema, ValidationError, fields, pre_load, validate
 from marshmallow_utils.fields import SanitizedHTML, SanitizedUnicode

invenio_rdm_records/resources/serializers/dcat/__init__.py

@@ -12,7 +12,7 @@
 from pkg_resources import resource_stream
 from werkzeug.utils import cached_property
 
-from invenio_rdm_records.resources.serializers import DataCite43XMLSerializer
+from .. import DataCite43XMLSerializer
 
 
 class DCATSerializer(DataCite43XMLSerializer):

invenio_rdm_records/resources/serializers/dublincore/__init__.py

@@ -11,9 +11,8 @@
 from flask_resources import BaseListSchema, MarshmallowSerializer
 from flask_resources.serializers import JSONSerializer, SimpleSerializer
 
-from invenio_rdm_records.contrib.journal.processors import JournalDublinCoreDumper
-from invenio_rdm_records.contrib.meeting.processors import MeetingDublinCoreDumper
-
+from ....contrib.journal.processors import JournalDublinCoreDumper
+from ....contrib.meeting.processors import MeetingDublinCoreDumper
 from .schema import DublinCoreSchema
 
 

invenio_rdm_records/resources/serializers/ui/fields.py

@@ -13,9 +13,7 @@
 from invenio_i18n import gettext as _
 from marshmallow import fields
 
-from invenio_rdm_records.records.systemfields.access.field.record import (
-    AccessStatusEnum,
-)
+from ....records.systemfields.access.field.record import AccessStatusEnum
 
 
 class UIAccessStatus(object):

invenio_rdm_records/secret_links/models.py

@@ -11,7 +11,6 @@
 from datetime import date, datetime
 
 from invenio_db import db
-from itsdangerous import BadData
 from sqlalchemy_utils import UUIDType
 
 from .errors import InvalidPermissionLevelError

invenio_rdm_records/services/access/service.py

@@ -12,7 +12,7 @@
 from datetime import datetime, timedelta
 
 import arrow
-from flask import current_app, url_for
+from flask import current_app
 from flask_login import current_user
 from invenio_access.permissions import authenticated_user, system_identity
 from invenio_drafts_resources.services.records import RecordService

invenio_rdm_records/services/communities/service.py

@@ -28,12 +28,10 @@
 from invenio_search.engine import dsl
 from sqlalchemy.orm.exc import NoResultFound
 
-from invenio_rdm_records.notifications.builders import (
-    CommunityInclusionSubmittedNotificationBuilder,
-)
-from invenio_rdm_records.proxies import current_rdm_records, current_rdm_records_service
-from invenio_rdm_records.requests import CommunityInclusion
-from invenio_rdm_records.services.errors import (
+from ...notifications.builders import CommunityInclusionSubmittedNotificationBuilder
+from ...proxies import current_rdm_records, current_rdm_records_service
+from ...requests import CommunityInclusion
+from ..errors import (
     CommunityAlreadyExists,
     InvalidAccessRestrictions,
     OpenRequestAlreadyExists,

invenio_rdm_records/services/community_inclusion/service.py

@@ -9,15 +9,14 @@
 
 from flask import current_app
 from invenio_communities import current_communities
-from invenio_i18n import lazy_gettext as _
 from invenio_requests import current_requests_service
 
-from invenio_rdm_records.requests.community_inclusion import (
+from ...requests.community_inclusion import (
     CommunityInclusion,
     is_access_restriction_valid,
 )
-from invenio_rdm_records.requests.community_submission import CommunitySubmission
-from invenio_rdm_records.services.errors import InvalidAccessRestrictions
+from ...requests.community_submission import CommunitySubmission
+from ..errors import InvalidAccessRestrictions
 
 
 class CommunityInclusionService:

invenio_rdm_records/services/community_records/service.py

@@ -18,7 +18,7 @@
 from invenio_records_resources.services.uow import unit_of_work
 from invenio_search.engine import dsl
 
-from invenio_rdm_records.proxies import current_record_communities_service
+from ...proxies import current_record_communities_service
 
 
 class CommunityRecordsService(RecordService):

invenio_rdm_records/services/components/verified.py

@@ -9,7 +9,6 @@
 from flask import current_app
 from invenio_access.permissions import system_identity
 from invenio_drafts_resources.services.records.components import ServiceComponent
-from invenio_i18n import lazy_gettext as _
 from invenio_requests.tasks import request_moderation
 
 

invenio_rdm_records/services/generators.py

@@ -16,8 +16,7 @@
 from invenio_records_resources.services.files.transfer import TransferType
 from invenio_search.engine import dsl
 
-from invenio_rdm_records.records import RDMDraft
-
+from ..records import RDMDraft
 from ..records.systemfields.access.grants import Grant
 from ..requests.access import AccessRequestTokenNeed
 from ..tokens.permissions import RATNeed

invenio_rdm_records/services/github/release.py

@@ -13,10 +13,10 @@
 from invenio_github.models import ReleaseStatus
 from invenio_records_resources.services.uow import UnitOfWork
 
-from invenio_rdm_records.proxies import current_rdm_records_service
-from invenio_rdm_records.resources.serializers.ui import UIJSONSerializer
-from invenio_rdm_records.services.github.metadata import RDMReleaseMetadata
-from invenio_rdm_records.services.github.utils import retrieve_recid_by_uuid
+from ...proxies import current_rdm_records_service
+from ...resources.serializers.ui import UIJSONSerializer
+from .metadata import RDMReleaseMetadata
+from .utils import retrieve_recid_by_uuid
 
 
 class RDMGithubRelease(GitHubRelease):

invenio_rdm_records/services/github/utils.py

@@ -6,9 +6,7 @@
 # it under the terms of the MIT License; see LICENSE file for more details.
 """Utility functions."""
 
-from flask import current_app
 from invenio_pidstore.models import PersistentIdentifier
-from marshmallow import Schema
 
 
 def retrieve_recid_by_uuid(rec_uuid):

invenio_rdm_records/services/permissions.py

@@ -18,7 +18,7 @@
     SystemProcess,
 )
 from invenio_records_permissions.policies.records import RecordPermissionPolicy
-from invenio_requests.services.generators import Creator, Receiver, Status
+from invenio_requests.services.generators import Receiver, Status
 from invenio_requests.services.permissions import (
     PermissionPolicy as RequestPermissionPolicy,
 )

invenio_rdm_records/services/pids/providers/datacite.py

@@ -20,8 +20,7 @@
 from invenio_i18n import lazy_gettext as _
 from invenio_pidstore.models import PIDStatus
 
-from invenio_rdm_records.resources.serializers import DataCite43JSONSerializer
-
+from ....resources.serializers import DataCite43JSONSerializer
 from .base import PIDProvider
 
 

invenio_rdm_records/services/pids/service.py

@@ -14,8 +14,8 @@
 from invenio_requests.services.results import EntityResolverExpandableField
 from sqlalchemy.orm.exc import NoResultFound
 
-from invenio_rdm_records.services.results import ParentCommunitiesExpandableField
-from invenio_rdm_records.utils import ChainObject
+from ...utils import ChainObject
+from ..results import ParentCommunitiesExpandableField
 
 
 class PIDsService(RecordService):

invenio_rdm_records/services/pids/tasks.py

@@ -10,7 +10,7 @@
 from celery import shared_task
 from invenio_access.permissions import system_identity
 
-from invenio_rdm_records.proxies import current_rdm_records
+from ...proxies import current_rdm_records
 
 
 @shared_task(ignore_result=True)

invenio_rdm_records/services/tasks.py

@@ -10,10 +10,9 @@
 from celery import shared_task
 from flask import current_app
 from invenio_access.permissions import system_identity
-from invenio_i18n import lazy_gettext as _
 
-from invenio_rdm_records.proxies import current_rdm_records
-from invenio_rdm_records.services.errors import EmbargoNotLiftedError
+from ..proxies import current_rdm_records
+from .errors import EmbargoNotLiftedError
 
 
 @shared_task(ignore_result=True)