oarepo-runtime 1.5.36__py3-none-any.whl → 1.5.38__py3-none-any.whl

oarepo_runtime/services/files/components.py

@@ -0,0 +1,55 @@
+import mimetypes
+import os
+from invenio_records_resources.services.files.components import FileServiceComponent
+from marshmallow.exceptions import ValidationError
+
+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"
+        return None
+
+    @property
+    def allowed_mimetypes(self):
+        """Returns files attribute (field) key."""
+        return getattr(self.service.config, "allowed_mimetypes", [])
+
+    def guess_extension(self, file, mimetype):
+        """File extension."""
+        # The ``ext`` property is used to in search to aggregate file types, and we want e.g. both ``.jpeg`` and
+        # ``.jpg`` to be aggregated under ``.jpg``
+        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"
+        ):
+            return ext_guessed[1:]
+
+        # Support non-standard file extensions that cannot be guessed
+        _, ext = os.path.splitext(file)
+        if ext and len(ext) <= 5:
+            return ext[1:].lower()
+
+        if ext_guessed:
+            return ext_guessed[1:]
+
+    @property
+    def allowed_extensions(self):
+        """Returns files attribute (field) key."""
+        return getattr(self.service.config, "allowed_extensions", [])
+
+    def init_files(self, identity, id_, data, uow=None):
+        """Initialize the file upload for the record."""
+        list_files = list(data.files.entries)
+
+        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}")
+

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.36.dist-info → oarepo_runtime-1.5.38.dist-info}/METADATA

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

{oarepo_runtime-1.5.36.dist-info → oarepo_runtime-1.5.38.dist-info}/RECORD

@@ -71,7 +71,7 @@ oarepo_runtime/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 oarepo_runtime/services/components.py,sha256=9wt9CmoCFA8Utbb8eNA-Mvzo5LCApHT9zHpWIWZNyXY,1506
 oarepo_runtime/services/generators.py,sha256=V582uA813AIXnFhzqUwakmDgBOI1SQe3XZeJtUXNbwM,872
 oarepo_runtime/services/results.py,sha256=ocEXdTl1Gdu-OmAkmB98Yf5t4IwsbESDf1r3GV73FTg,2706
-oarepo_runtime/services/search.py,sha256=ywfwGH7oAM44WeOSjlIsY_qoCMZJ1TlTLd_NgE2ow3Y,5296
+oarepo_runtime/services/search.py,sha256=eVOJ5xI9dKAVlWDM0E8mg1bYS3pGxsdpW8kTYNl5wRk,6228
 oarepo_runtime/services/config/__init__.py,sha256=SCqww5sV8qh3gmev6TE8EyJbD58juIEDCm_7MEHxtSg,440
 oarepo_runtime/services/config/permissions_presets.py,sha256=zApeA-2DYAlD--SzVz3vq_OFjq48Ko0pe08e4o2vxr4,6114
 oarepo_runtime/services/config/service.py,sha256=2aq5jobPH22T1QqlJDommvAxJwo9aQGiqK5q-k-l9CA,4668
@@ -89,6 +89,7 @@ oarepo_runtime/services/facets/max_facet.py,sha256=TZ4KMKKVJHzyU1KgNne4V7IMQPu1A
 oarepo_runtime/services/facets/nested_facet.py,sha256=y0xgjx37HsSj2xW7URxNemYTksD8hpPs7kOEfIBw22k,971
 oarepo_runtime/services/facets/params.py,sha256=5z8I4wKdp-7RJK4x6cSKE92fDJI8OkUz5JR5UKWAeYg,3564
 oarepo_runtime/services/files/__init__.py,sha256=K8MStrEQf_BUhvzhwPTF93Hkhwrd1dtv35LDo7iZeTM,268
+oarepo_runtime/services/files/components.py,sha256=yQpZ0rCaIUkECPZMZ4aH2m1NIRlEWPgiPPV_6yUoPbY,2272
 oarepo_runtime/services/files/service.py,sha256=8DH0Pefr9kilM2JnOb-UYsnqerE8Z1Mu4p6DOJ4j_ZU,608
 oarepo_runtime/services/relations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 oarepo_runtime/services/relations/components.py,sha256=3g0VdnGUM-2yYt50fPi-OADReBGJb4h05vmYHfh-QFs,592
@@ -115,9 +116,9 @@ oarepo_runtime/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 oarepo_runtime/utils/functools.py,sha256=gKS9YZtlIYcDvdNA9cmYO00yjiXBYV1jg8VpcRUyQyg,1324
 oarepo_runtime/utils/path.py,sha256=V1NVyk3m12_YLbj7QHYvUpE1wScO78bYsX1LOLeXDkI,3108
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.5.36.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.36.dist-info/METADATA,sha256=yFDeGezqfZiK4mOLv_wBTHC75fBdmI2K4R7anq3fr34,4680
-oarepo_runtime-1.5.36.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-oarepo_runtime-1.5.36.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
-oarepo_runtime-1.5.36.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.36.dist-info/RECORD,,
+oarepo_runtime-1.5.38.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.38.dist-info/METADATA,sha256=9jbrRNAbeANj8jeFjvvqXPethvs0SoHPechzSEdX7Rs,4680
+oarepo_runtime-1.5.38.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+oarepo_runtime-1.5.38.dist-info/entry_points.txt,sha256=QrlXAKuPDVBinaSh_v3yO9_Nb9ZNmJCJ0VFcCW-z0Jg,327
+oarepo_runtime-1.5.38.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.38.dist-info/RECORD,,

{oarepo_runtime-1.5.36.dist-info → oarepo_runtime-1.5.38.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any