oarepo-runtime 1.5.100__tar.gz → 1.5.102__tar.gz

{oarepo_runtime-1.5.100/oarepo_runtime.egg-info → oarepo_runtime-1.5.102}/PKG-INFO

@@ -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.102/oarepo_runtime/cli/configuration.py

@@ -0,0 +1,51 @@
+import json
+from collections.abc import Mapping, Sequence, Set
+
+import click
+from flask import current_app
+from flask.cli import with_appcontext
+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 = remove_lazy_objects(current_app.config)
+
+    try:
+        invenio_db = current_app.extensions["invenio-db"]
+        alembic_config = invenio_db.alembic.config
+        configuration["ALEMBIC_LOCATIONS"] = alembic_config.get_main_option(
+            "version_locations"
+        ).split(",")
+    except Exception as e:
+        configuration["ALEMBIC_LOCATIONS_ERROR"] = str(e)
+
+    if output_file == "-":
+        print(
+            json.dumps(
+                configuration, skipkeys=True, indent=4, ensure_ascii=False, default=lambda x: str(x)
+            )
+        )
+    else:
+        with open(output_file, "w") as f:
+            json.dump(configuration, f,skipkeys=True, ensure_ascii=False, default=lambda x: str(x))

{oarepo_runtime-1.5.100 → oarepo_runtime-1.5.102}/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 → oarepo_runtime-1.5.102/oarepo_runtime.egg-info}/PKG-INFO

@@ -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 → oarepo_runtime-1.5.102}/setup.cfg

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

oarepo_runtime-1.5.100/oarepo_runtime/cli/configuration.py

@@ -1,36 +0,0 @@
-import json
-
-import click
-from flask import current_app
-from flask.cli import with_appcontext
-from werkzeug.local import LocalProxy
-
-from .base import oarepo
-
-
-@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)
-    }
-
-    try:
-        invenio_db = current_app.extensions["invenio-db"]
-        alembic_config = invenio_db.alembic.config
-        configuration["ALEMBIC_LOCATIONS"] = alembic_config.get_main_option(
-            "version_locations"
-        ).split(",")
-    except Exception as e:
-        configuration["ALEMBIC_LOCATIONS_ERROR"] = str(e)
-
-    if output_file == "-":
-        print(
-            json.dumps(
-                configuration, skipkeys=True, indent=4, ensure_ascii=False, default=lambda x: str(x)
-            )
-        )
-    else:
-        with open(output_file, "w") as f:
-            json.dump(configuration, f, skipkeys=True, ensure_ascii=False, default=lambda x: str(x))