oarepo-runtime 1.5.100__py3-none-any.whl → 1.5.102__py3-none-any.whl

oarepo_runtime/cli/configuration.py

@@ -1,4 +1,5 @@
 import json
+from collections.abc import Mapping, Sequence, Set
 
 import click
 from flask import current_app
@@ -7,14 +8,28 @@ from werkzeug.local import LocalProxy
 
 from .base import oarepo
 
+def remove_lazy_objects(obj):
+    if isinstance(obj, Sequence):
+        if isinstance(obj, list):
+            return [remove_lazy_objects(item) for item in obj if not isinstance(item, LocalProxy)]
+        elif isinstance(obj, tuple):
+            return tuple(remove_lazy_objects(item) for item in obj if not isinstance(item, LocalProxy))
+        elif not isinstance(obj, LocalProxy):
+            return obj # strings, bytes, bytesarray etc.
+    elif isinstance(obj, Set):
+        if isinstance(obj, frozenset):
+            return frozenset(remove_lazy_objects(item) for item in obj if not isinstance(item, LocalProxy))
+        return {remove_lazy_objects(item) for item in obj if not isinstance(item, LocalProxy)}
+    elif isinstance(obj, Mapping):
+        return {k: remove_lazy_objects(v) for k, v in obj.items() if not isinstance(v, LocalProxy)}
+    elif not isinstance(obj, LocalProxy):
+        return obj # everything else that is not localproxy
 
 @oarepo.command(name="configuration")
 @click.argument("output_file", default="-")
 @with_appcontext
 def configuration_command(output_file):
-    configuration = {
-        k: v for k, v in current_app.config.items() if not isinstance(v, LocalProxy)
-    }
+    configuration = remove_lazy_objects(current_app.config)
 
     try:
         invenio_db = current_app.extensions["invenio-db"]
@@ -33,4 +48,4 @@ def configuration_command(output_file):
         )
     else:
         with open(output_file, "w") as f:
-            json.dump(configuration, f, skipkeys=True, ensure_ascii=False, default=lambda x: str(x))
+            json.dump(configuration, f,skipkeys=True, ensure_ascii=False, default=lambda x: str(x))

oarepo_runtime/records/dumpers/edtf_interval.py

@@ -20,9 +20,9 @@ class EDTFIntervalDumperExt(SearchDumperExt):
             rec = rec.split("/")
             search_range = {}
             if rec[0]:
-                search_range["gte"] = rec[0]
-            if rec[1]:
-                search_range["lte"] = rec[1]
+                search_range["gte"] = rec[0].strip()
+            if len(rec) > 1 and rec[1]:
+                search_range["lte"] = rec[1].strip()
             path[-1].parent_data[path[-1].key] = search_range
         return data
 

{oarepo_runtime-1.5.100.dist-info → oarepo_runtime-1.5.102.dist-info}/METADATA

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

{oarepo_runtime-1.5.100.dist-info → oarepo_runtime-1.5.102.dist-info}/RECORD

@@ -10,7 +10,7 @@ oarepo_runtime/cli/assets.py,sha256=ZG80xIOKch7rsU_7QlvZxBQAXNQ9ow5xLsUREsl5MEE,
 oarepo_runtime/cli/base.py,sha256=94RBTa8TOSPxEyEUmYLGXaWen-XktP2-MIbTtZSlCZo,544
 oarepo_runtime/cli/cf.py,sha256=W0JEJK2JqKubQw8qtZJxohmADDRUBode4JZAqYLDGvc,339
 oarepo_runtime/cli/check.py,sha256=sCe2PeokSHvNOXHFZ8YHF8NMhsu5nYjyuZuvXHJ6X18,5092
-oarepo_runtime/cli/configuration.py,sha256=_iMmESs2dd1Oif95gxgpnkSxc13ymwr82_sTJfxlhrM,1091
+oarepo_runtime/cli/configuration.py,sha256=M_19zrS0vo-7uHi047a3i4rQsK6pmp4QS0IEBAxMLZ0,2039
 oarepo_runtime/cli/fixtures.py,sha256=l6zHpz1adjotrbFy_wcN2TOL8x20i-1jbQmaoEEo-UU,5419
 oarepo_runtime/cli/index.py,sha256=KH5PArp0fCNbgJI1zSz0pb69U9eyCdnJuy0aMIgf2tg,8685
 oarepo_runtime/cli/validate.py,sha256=HpSvHQCGHlrdgdpKix9cIlzlBoJEiT1vACZdMnOUGEY,2827
@@ -53,7 +53,7 @@ oarepo_runtime/info/permissions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 oarepo_runtime/info/permissions/debug.py,sha256=2gak5W64g_AAZoX8cCII2di4G_jBo1ZvnU5ceP_u6z4,6722
 oarepo_runtime/records/__init__.py,sha256=JUf9_o09_6q4vuG43JzhSeTu7c-m_CVDSmgTQ7epYEo,1776
 oarepo_runtime/records/dumpers/__init__.py,sha256=OmzNhLdMNKibmCksnj9eTX9xPBG30dziiK3j3bAAp3k,233
-oarepo_runtime/records/dumpers/edtf_interval.py,sha256=YCShZAoqBQYaxVilEVotS-jXZsxxoXO67yu2urhkaMA,1198
+oarepo_runtime/records/dumpers/edtf_interval.py,sha256=8bE3JlaR7b33rxDc7LW9R8jcwNI66Zb07Jee6YUmlrE,1231
 oarepo_runtime/records/dumpers/multilingual_dumper.py,sha256=PbNFCLsiH4XV3E1v8xga_fzlcEImHy8OXn_UKh_8VBU,1090
 oarepo_runtime/records/entity_resolvers/__init__.py,sha256=UiiIT54pUu9j7qPAPfqVp4UTnXnppp0c_LtKbFnyt6Y,383
 oarepo_runtime/records/entity_resolvers/proxies.py,sha256=R92Cil_sTgX-sHJtdNv82yd-F3SUfsGSNCHdwI9Zfq8,1516
@@ -142,9 +142,9 @@ tests/marshmallow_to_json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 tests/marshmallow_to_json/test_datacite_ui_schema.py,sha256=82iLj8nW45lZOUewpWbLX3mpSkpa9lxo-vK-Qtv_1bU,48552
 tests/marshmallow_to_json/test_simple_schema.py,sha256=izZN9p0v6kovtSZ6AdxBYmK_c6ZOti2_z_wPT_zXIr0,1500
 tests/pkg_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-oarepo_runtime-1.5.100.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.100.dist-info/METADATA,sha256=Pv0Sq-lTvfpaoq3baSsGxFfNWXpeMwEQQexb16JrSeQ,4721
-oarepo_runtime-1.5.100.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.100.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.100.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.100.dist-info/RECORD,,
+oarepo_runtime-1.5.102.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.102.dist-info/METADATA,sha256=Gzch2ffpJDzH8HdjdKtaaQ5DX0xzAZTGYT0aOTwA5hI,4721
+oarepo_runtime-1.5.102.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+oarepo_runtime-1.5.102.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.102.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.102.dist-info/RECORD,,