oarepo-runtime 1.5.37__tar.gz → 1.5.39__tar.gz

{oarepo_runtime-1.5.37/oarepo_runtime.egg-info → oarepo_runtime-1.5.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.5.37
+Version: 1.5.39
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/cli/fixtures.py

@@ -3,8 +3,14 @@ import tqdm
 from flask import current_app
 from flask.cli import with_appcontext
 from flask_login import login_user
-from flask_principal import Identity, identity_changed, identity_loaded, UserNeed, RoleNeed
-from invenio_access.permissions import system_identity, any_user, authenticated_user
+from flask_principal import (
+    Identity,
+    RoleNeed,
+    UserNeed,
+    identity_changed,
+    identity_loaded,
+)
+from invenio_access.permissions import any_user, authenticated_user, system_identity
 from invenio_accounts.models import User
 
 from oarepo_runtime.cli import oarepo
@@ -39,7 +45,9 @@ def fixtures():
     "will be committed in a single transaction and indexed together",
 )
 @click.option("--batch-size", help="Alias for --bulk-size", type=int)
-@click.option("--identity", help="Email of the identity that will be used to import the data")
+@click.option(
+    "--identity", help="Email of the identity that will be used to import the data"
+)
 @with_appcontext
 def load(
     fixture_dir=None,
@@ -50,7 +58,7 @@ def load(
     bulk_size=100,
     on_background=False,
     batch_size=None,
-        identity=None
+    identity=None,
 ):
     """Loads fixtures"""
     if batch_size:
@@ -77,12 +85,11 @@ def load(
         identity.provides.add(any_user)
         identity.provides.add(authenticated_user)
         identity.provides.add(UserNeed(user.id))
-        for role in getattr(user, 'roles', []):
+        for role in getattr(user, "roles", []):
             identity.provides.add(RoleNeed(role.name))
         # TODO: community roles ...
 
     with current_app.wsgi_app.mounts["/api"].app_context():
-
         load_fixtures(
             fixture_dir,
             _make_list(include),
@@ -93,7 +100,7 @@ def load(
             datastreams_impl=(
                 AsynchronousDataStream if on_background else SynchronousDataStream
             ),
-            identity=identity
+            identity=identity,
         )
         if not on_background:
             _show_stats(callback, "Load fixtures")

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/cli/index.py

@@ -112,14 +112,19 @@ def reindex(model, bulk_size, verbose):
             service = current_service_registry.get(service_id)
         except KeyError:
             click.secho(f"Service {service_id} not in known services:", color="red")
-            for known_service_id, known_service in sorted(current_service_registry._services.items()):
-                click.secho(f"    {known_service_id} -> {type(known_service).__module__}.{type(known_service).__name__}", color="red")
+            for known_service_id, known_service in sorted(
+                current_service_registry._services.items()
+            ):
+                click.secho(
+                    f"    {known_service_id} -> {type(known_service).__module__}.{type(known_service).__name__}",
+                    color="red",
+                )
             sys.exit(1)
         record_class = getattr(service.config, "record_cls", None)
 
         id_generators = []
 
-        record_generator = RECORD_GENERATORS.get(service_id,  model_records_generator)
+        record_generator = RECORD_GENERATORS.get(service_id, model_records_generator)
 
         if record_class and hasattr(service, "indexer"):
             try:
@@ -223,9 +228,11 @@ def model_records_generator(model_class):
     except Exception as e:
         click.secho(f"Could not index {model_class}: {e}", fg="red", file=sys.stderr)
 
+
 def users_record_generator(model_class):
     from invenio_accounts.models import User
     from invenio_users_resources.records.api import UserAggregate
+
     try:
         for x in db.session.query(User.id):
             rec_id = x[0]
@@ -233,6 +240,5 @@ def users_record_generator(model_class):
     except Exception as e:
         click.secho(f"Could not index {model_class}: {e}", fg="red", file=sys.stderr)
 
-RECORD_GENERATORS = {
-    'users': users_record_generator
-}
+
+RECORD_GENERATORS = {"users": users_record_generator}

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/datastreams/fixtures.py

@@ -35,7 +35,7 @@ def load_fixtures(
     callback: FixturesCallback = None,
     batch_size=100,
     datastreams_impl=SynchronousDataStream,
-    identity=system_identity
+    identity=system_identity,
 ):
     """
     Loads fixtures. If fixture dir is set, fixtures are loaded from that directory first.
@@ -64,7 +64,7 @@ def load_fixtures(
             callback,
             batch_size=batch_size,
             datastreams_impl=datastreams_impl,
-            identity=identity
+            identity=identity,
         )
 
     if system_fixtures:
@@ -94,13 +94,19 @@ def load_fixtures(
                 callback,
                 batch_size=batch_size,
                 datastreams_impl=datastreams_impl,
-                identity=identity
+                identity=identity,
             )
 
 
 def _load_fixtures_from_catalogue(
-    catalogue, fixtures, include, exclude, callback, batch_size, datastreams_impl,
-        identity=system_identity
+    catalogue,
+    fixtures,
+    include,
+    exclude,
+    callback,
+    batch_size,
+    datastreams_impl,
+    identity=system_identity,
 ):
     for catalogue_datastream in catalogue.get_datastreams():
         if catalogue_datastream.stream_name in fixtures:

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/info/views.py

@@ -273,7 +273,6 @@ class InfoResource(Resource):
             return None
         return service
 
-
     def _get_service_class(self, model_data):
         service_id = model_data["service"]["class"]
         return obj_or_import_string(service_id)
@@ -301,7 +300,7 @@ def get_package_version(package_name):
 def api_url_for(endpoint, _external=True, **values):
     """API url_for."""
     try:
-        api_app = current_app.wsgi_app.mounts['/api']
+        api_app = current_app.wsgi_app.mounts["/api"]
     except:
         api_app = current_app
 
@@ -309,14 +308,15 @@ def api_url_for(endpoint, _external=True, **values):
     site_url = current_app.config["SITE_UI_URL"]
     current_request_context = _cv_request.get()
     try:
-        new_context = RequestContext(app=api_app,
-                                     environ=request.environ)
+        new_context = RequestContext(app=api_app, environ=request.environ)
         _cv_request.set(new_context)
         base_url = api_app.url_for(endpoint, **values, _external=_external)
         if base_url.startswith(site_api_url):
             return base_url
         if base_url.startswith(site_url):
             return base_url.replace(site_url, site_api_url)
-        raise ValueError(f"URL {base_url} does not start with {site_url} or {site_api_url}")
+        raise ValueError(
+            f"URL {base_url} does not start with {site_url} or {site_api_url}"
+        )
     finally:
-        _cv_request.set(current_request_context)
+        _cv_request.set(current_request_context)

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/records/__init__.py

@@ -25,6 +25,6 @@ def has_draft(record, ctx):
     """Shortcut for links to determine if record is either a draft or a published one with a draft associated."""
     if getattr(record, "is_draft", False):
         return True
-    if getattr(record, 'has_draft', False):
+    if getattr(record, "has_draft", False):
         return True
     return False

oarepo_runtime-1.5.39/oarepo_runtime/records/entity_resolvers/__init__.py

@@ -0,0 +1,13 @@
+from invenio_records_resources.references import EntityResolver, RecordResolver
+from invenio_users_resources.entity_resolvers import GroupResolver, UserResolver
+
+from oarepo_runtime.records.entity_resolvers.proxies import DraftProxy, RecordProxy
+
+__all__ = [
+    "DraftProxy",
+    "UserResolver",
+    "GroupResolver",
+    "RecordResolver",
+    "EntityResolver",
+    "RecordProxy",
+]

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/records/entity_resolvers/proxies.py

@@ -1,9 +1,7 @@
 from invenio_pidstore.errors import PIDUnregistered
-
 from invenio_records_resources.references.entity_resolvers.records import (
     RecordProxy as InvenioRecordProxy,
 )
-
 from sqlalchemy.exc import NoResultFound
 
 

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/records/systemfields/owner.py

@@ -17,7 +17,6 @@ from oarepo_runtime.records.systemfields import MappingSystemFieldMixin
 
 
 class OwnerRelationManager:
-
     def __init__(self, record_id, serialized_owners):
         self._serialized_owners = serialized_owners
         self._deserialized_owners = None
@@ -33,9 +32,13 @@ class OwnerRelationManager:
         if self._serialized_owners is None:
             deserialized_owners = []
             for deserialized_owner in self._deserialized_owners or []:
-                serialized_owner = OwnerEntityResolverRegistry.reference_entity(deserialized_owner)
+                serialized_owner = OwnerEntityResolverRegistry.reference_entity(
+                    deserialized_owner
+                )
                 if serialized_owner is None:
-                    raise ValueError(f'failed serialize owner; owner - {deserialized_owner}')
+                    raise ValueError(
+                        f"failed serialize owner; owner - {deserialized_owner}"
+                    )
                 deserialized_owners.append(serialized_owner)
             self._serialized_owners = deserialized_owners
         return self._serialized_owners
@@ -44,7 +47,9 @@ class OwnerRelationManager:
         if self._deserialized_owners is None:
             self._deserialized_owners = set()
             for ref in self._serialized_owners or []:
-                self._deserialized_owners.add(OwnerEntityResolverRegistry.resolve_reference(ref))
+                self._deserialized_owners.add(
+                    OwnerEntityResolverRegistry.resolve_reference(ref)
+                )
             self._serialized_owners = None
 
     def add(self, owner):
@@ -63,6 +68,7 @@ class OwnerRelationManager:
         self._resolve()
         return iter(self._deserialized_owners)
 
+
 class OwnersField(MappingSystemFieldMixin, SystemField):
     """Communites system field for managing relations to communities."""
 

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/services/components.py

@@ -41,3 +41,13 @@ class OwnersComponent(ServiceComponent):
         if new_term:
             return search.filter(new_term)
         return search
+
+
+from datetime import datetime
+
+
+class DateIssuedComponent(ServiceComponent):
+    def publish(self, identity, data=None, record=None, errors=None, **kwargs):
+        """Create a new record."""
+        if "dateIssued" not in record["metadata"]:
+            record["metadata"]["dateIssued"] = datetime.today().strftime("%Y-%m-%d")

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/services/files/components.py

@@ -1,10 +1,11 @@
 import mimetypes
 import os
+
 from invenio_records_resources.services.files.components import FileServiceComponent
 from marshmallow.exceptions import ValidationError
 
-class AllowedFileTypesComponent(FileServiceComponent):
 
+class AllowedFileTypesComponent(FileServiceComponent):
     def guess_content_type(self, filename: str | None) -> str | None:
         if filename:
             return mimetypes.guess_type(filename)[0] or "application/octet-stream"
@@ -22,10 +23,7 @@ class AllowedFileTypesComponent(FileServiceComponent):
         ext_guessed = mimetypes.guess_extension(mimetype)
 
         # Check if a valid extension is guessed and it's not the default mimetype
-        if (
-                ext_guessed is not None
-                and mimetype != "application/octet-stream"
-        ):
+        if ext_guessed is not None and mimetype != "application/octet-stream":
             return ext_guessed[1:]
 
         # Support non-standard file extensions that cannot be guessed
@@ -48,8 +46,17 @@ class AllowedFileTypesComponent(FileServiceComponent):
         for file in list_files:
             allowed_type = self.guess_content_type(file)
             allowed_ext = self.guess_extension(file, allowed_type)
-            if len(self.allowed_mimetypes) > 0 and allowed_type not in self.allowed_mimetypes:
-                raise ValidationError(f"Mimetype not supported, supported mimetypes: {self.allowed_mimetypes}")
-            elif len(self.allowed_extensions) > 0 and allowed_ext not in self.allowed_extensions:
-                raise ValidationError(f"Extension not supported, supported extensions: {self.allowed_extensions}")
-
+            if (
+                len(self.allowed_mimetypes) > 0
+                and allowed_type not in self.allowed_mimetypes
+            ):
+                raise ValidationError(
+                    f"Mimetype not supported, supported mimetypes: {self.allowed_mimetypes}"
+                )
+            elif (
+                len(self.allowed_extensions) > 0
+                and allowed_ext not in self.allowed_extensions
+            ):
+                raise ValidationError(
+                    f"Extension not supported, supported extensions: {self.allowed_extensions}"
+                )

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/services/results.py

@@ -43,15 +43,15 @@ class RecordList(BaseRecordList):
                 return result
 
             for key in result.keys():
-                if 'buckets' in result[key]:
-                    for bucket in result[key]['buckets']:
-                        val = bucket['key']
-                        label = bucket.get('label', '')
+                if "buckets" in result[key]:
+                    for bucket in result[key]["buckets"]:
+                        val = bucket["key"]
+                        label = bucket.get("label", "")
 
                         if not isinstance(val, str):
-                            bucket['key'] = str(val)
+                            bucket["key"] = str(val)
                         if not isinstance(label, str):
-                            bucket['label'] = str(label)
+                            bucket["label"] = str(label)
             return result
         except AttributeError:
             return None

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/services/schema/__init__.py

@@ -3,11 +3,11 @@ from .polymorphic import PolymorphicSchema
 
 def consistent_resolution(*classes):
     """
-        A helper function to solve resolution order of classes.
-        If the classes are in a correct mro order, it will return
-        them in the same order. Otherwise it will try to reorder
-        them and remove those that are already contained in mro
-        of others.
+    A helper function to solve resolution order of classes.
+    If the classes are in a correct mro order, it will return
+    them in the same order. Otherwise it will try to reorder
+    them and remove those that are already contained in mro
+    of others.
     """
 
     # remove classes that are already in mro of others
@@ -35,8 +35,10 @@ def consistent_resolution(*classes):
 
     bases = ", ".join(cls.__name__ for cls in filtered_classes)
     orig_bases = ", ".join(cls.__name__ for cls in classes)
-    raise TypeError(f"Cannot create a consistent method resolution order (MRO) "
-                    f"for bases {orig_bases}, tried {bases}")
+    raise TypeError(
+        f"Cannot create a consistent method resolution order (MRO) "
+        f"for bases {orig_bases}, tried {bases}"
+    )
 
 
 __all__ = ("PolymorphicSchema", "consistent_resolution")

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/services/schema/i18n.py

@@ -1,5 +1,6 @@
-from functools import lru_cache
 import importlib
+from functools import lru_cache
+
 import langcodes
 from invenio_base.utils import obj_or_import_string
 from marshmallow import Schema, ValidationError, fields, validates
@@ -11,7 +12,9 @@ it for each project.
 
 
 @lru_cache
-def get_i18n_schema(lang_name, value_name, value_field="marshmallow_utils.fields.SanitizedHTML"):
+def get_i18n_schema(
+    lang_name, value_name, value_field="marshmallow_utils.fields.SanitizedHTML"
+):
     @validates(lang_name)
     def validate_lang(self, value):
         if value != "_" and not langcodes.Language.get(value).is_valid():
@@ -31,7 +34,11 @@ def get_i18n_schema(lang_name, value_name, value_field="marshmallow_utils.fields
 
 
 def MultilingualField(  # noqa NOSONAR
-    *args, lang_name="lang", value_name="value", value_field="marshmallow_utils.fields.SanitizedHTML", **kwargs
+    *args,
+    lang_name="lang",
+    value_name="value",
+    value_field="marshmallow_utils.fields.SanitizedHTML",
+    **kwargs,
 ):
     # TODO: args are not used but oarepo-model-builder-multilingual generates them
     # should be fixed there and subsequently removed here
@@ -42,7 +49,11 @@ def MultilingualField(  # noqa NOSONAR
 
 
 def I18nStrField(  # noqa NOSONAR
-    *args, lang_name="lang", value_name="value", value_field="marshmallow_utils.fields.SanitizedHTML", **kwargs
+    *args,
+    lang_name="lang",
+    value_name="value",
+    value_field="marshmallow_utils.fields.SanitizedHTML",
+    **kwargs,
 ):
     return fields.Nested(
         get_i18n_schema(lang_name, value_name, value_field),

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/services/schema/i18n_ui.py

@@ -1,11 +1,14 @@
 from functools import lru_cache
 
+from invenio_base.utils import obj_or_import_string
 from marshmallow import Schema, fields
 from marshmallow_utils.fields import SanitizedHTML
-from invenio_base.utils import obj_or_import_string
+
 
 @lru_cache
-def get_i18n_ui_schema(lang_name, value_name, value_field="marshmallow_utils.fields.SanitizedHTML"):
+def get_i18n_ui_schema(
+    lang_name, value_name, value_field="marshmallow_utils.fields.SanitizedHTML"
+):
     value_field_class = obj_or_import_string(value_field)
     return type(
         f"I18nUISchema_{lang_name}_{value_name}",
@@ -18,7 +21,11 @@ def get_i18n_ui_schema(lang_name, value_name, value_field="marshmallow_utils.fie
 
 
 def MultilingualUIField(  # noqa NOSONAR
-    *args, lang_name="lang", value_name="value", value_field="marshmallow_utils.fields.SanitizedHTML", **kwargs
+    *args,
+    lang_name="lang",
+    value_name="value",
+    value_field="marshmallow_utils.fields.SanitizedHTML",
+    **kwargs,
 ):
     return fields.List(
         fields.Nested(get_i18n_ui_schema(lang_name, value_name, value_field)),
@@ -27,7 +34,11 @@ def MultilingualUIField(  # noqa NOSONAR
 
 
 def I18nStrUIField(  # noqa NOSONAR
-    *args, lang_name="lang", value_name="value", value_field="marshmallow_utils.fields.SanitizedHTML", **kwargs
+    *args,
+    lang_name="lang",
+    value_name="value",
+    value_field="marshmallow_utils.fields.SanitizedHTML",
+    **kwargs,
 ):
     return fields.Nested(
         get_i18n_ui_schema(lang_name, value_name, value_field),
@@ -59,9 +70,7 @@ def get_i18n_localized_ui_schema(lang_name, value_name):
 def MultilingualLocalizedUIField(  # noqa NOSONAR
     *args, lang_name="lang", value_name="value", **kwargs
 ):
-    return fields.Nested(
-        get_i18n_localized_ui_schema(lang_name, value_name), **kwargs
-    )
+    return fields.Nested(get_i18n_localized_ui_schema(lang_name, value_name), **kwargs)
 
 
 def I18nStrLocalizedUIField(  # noqa NOSONAR

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/services/schema/oneofschema.py

@@ -189,4 +189,4 @@ class OneOfSchema(Schema):
             self.load(data, many=many, partial=partial)
         except ValidationError as ve:
             return ve.messages
-        return {}
+        return {}

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/services/schema/polymorphic.py

@@ -1,9 +1,11 @@
 from functools import cached_property
 
 import marshmallow as ma
-#from marshmallow_oneofschema import OneOfSchema
+
+# from marshmallow_oneofschema import OneOfSchema
 from oarepo_runtime.services.schema.oneofschema import OneOfSchema
 
+
 class PolymorphicSchema(OneOfSchema):
     type_field_remove = False
 

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/services/search.py

@@ -12,6 +12,8 @@ from invenio_records_resources.services.records.params import (
     SortParam,
 )
 from invenio_records_resources.services.records.queryparser import SuggestQueryParser
+from invenio_search.engine import dsl
+
 
 # TODO: integrate this to invenio_records_resources.services.records and remove SearchOptions class
 from oarepo_runtime.i18n import lazy_gettext as _
@@ -25,6 +27,27 @@ except ImportError:
     from invenio_i18n.babel import get_locale
 
 
+class FuzzySuggestQueryParser(SuggestQueryParser):
+    def __init__(self, identity=None, extra_params=None, **kwargs):
+        """Constructor."""
+        super().__init__(identity=identity, extra_params=extra_params)
+        self.fields = self.extra_params.get("fields", [])
+        self.extra_params.setdefault("type", "bool_prefix")
+
+    def parse(self, query_str):
+        """Parse the query."""
+        # default behavior
+        multi_match_with_bool_prefix = dsl.Q(
+            "multi_match", query=query_str, **self.extra_params
+        )
+        # fuzziness does not seem to work with bool_prefix multimatch query, so we turn this into
+        # should multi match query with two clauses
+        multi_match_fuzzy = dsl.Q(
+            "multi_match", query=query_str, fields=self.fields, fuzziness="AUTO"
+        )
+        return dsl.Q("bool", should=[multi_match_with_bool_prefix, multi_match_fuzzy])
+
+
 class SearchOptions(InvenioSearchOptions):
     params_interpreters_cls = [
         QueryStrParam,
@@ -114,9 +137,7 @@ class ICUSuggestParser:
                     f"{fld.field}._index_prefix^{fld.boost * fld.boost_prefix}"
                 )
 
-        return SuggestQueryParser.factory(
-            fields=fields,
-        )
+        return FuzzySuggestQueryParser.factory(fields=fields)
 
 
 @dataclasses.dataclass

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39/oarepo_runtime.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oarepo-runtime
-Version: 1.5.37
+Version: 1.5.39
 Summary: A set of runtime extensions of Invenio repository
 Description-Content-Type: text/markdown
 License-File: LICENSE

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = oarepo-runtime
-version = 1.5.37
+version = 1.5.39
 description = A set of runtime extensions of Invenio repository
 authors = Alzbeta Pokorna
 readme = README.md

oarepo_runtime-1.5.37/oarepo_runtime/records/entity_resolvers/__init__.py

@@ -1,6 +0,0 @@
-from oarepo_runtime.records.entity_resolvers.proxies import DraftProxy, RecordProxy
-
-from invenio_records_resources.references import EntityResolver, RecordResolver
-from invenio_users_resources.entity_resolvers import UserResolver, GroupResolver
-
-__all__ = ["DraftProxy", "UserResolver", "GroupResolver", "RecordResolver", "EntityResolver", "RecordProxy"]

{oarepo_runtime-1.5.37 → oarepo_runtime-1.5.39}/oarepo_runtime/records/systemfields/synthetic.py

@@ -1,9 +1,9 @@
+import logging
+
 from invenio_records.systemfields import SystemField
 
 from .mapping import MappingSystemFieldMixin
 
-import logging
-
 log = logging.getLogger(__name__)