oarepo-runtime 1.5.124__tar.gz → 1.5.125__tar.gz

{oarepo_runtime-1.5.124/oarepo_runtime.egg-info → oarepo_runtime-1.5.125}/PKG-INFO

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

{oarepo_runtime-1.5.124 → oarepo_runtime-1.5.125}/oarepo_runtime/cli/fixtures.py

@@ -24,7 +24,7 @@ def fixtures():
 
 
 @fixtures.command()
-@click.argument("fixture_dir", required=False)
+@click.argument("fixture_dir_or_catalogue", required=False)
 @click.option("--include", multiple=True)
 @click.option("--exclude", multiple=True)
 @click.option("--system-fixtures/--no-system-fixtures", default=True, is_flag=True)
@@ -43,7 +43,7 @@ def fixtures():
 )
 @with_appcontext
 def load(
-    fixture_dir=None,
+    fixture_dir_or_catalogue=None,
     include=None,
     exclude=None,
     system_fixtures=None,
@@ -61,7 +61,7 @@ def load(
     else:
         callback = fixtures_asynchronous_callback.s()
 
-    if fixture_dir:
+    if fixture_dir_or_catalogue:
         system_fixtures = False
 
     if not identity:
@@ -84,7 +84,7 @@ def load(
 
     with current_app.wsgi_app.mounts["/api"].app_context():
         load_fixtures(
-            fixture_dir,
+            fixture_dir_or_catalogue,
             _make_list(include),
             _make_list(exclude),
             system_fixtures=system_fixtures,
@@ -110,7 +110,12 @@ def dump(fixture_dir, include, exclude, verbose):
     callback = TQDMCallback(verbose=verbose)
 
     with current_app.wsgi_app.mounts["/api"].app_context():
-        dump_fixtures(fixture_dir, _make_list(include), _make_list(exclude))
+        dump_fixtures(
+            fixture_dir,
+            _make_list(include),
+            _make_list(exclude),
+            callback=TQDMCallback(verbose=verbose),
+        )
         _show_stats(callback, "Dump fixtures")
 
 

{oarepo_runtime-1.5.124 → oarepo_runtime-1.5.125}/oarepo_runtime/datastreams/fixtures.py

@@ -28,7 +28,7 @@ class FixturesCallback(StatsKeepingDataStreamCallback):
 
 
 def load_fixtures(
-    fixture_dir=None,
+    fixture_dir_or_catalogue=None,
     include=None,
     exclude=None,
     system_fixtures=True,
@@ -54,8 +54,13 @@ def load_fixtures(
     exclude = [re.compile(x) for x in (exclude or [])]
     fixtures = set()
 
-    if fixture_dir:
-        catalogue = DataStreamCatalogue(Path(fixture_dir) / "catalogue.yaml")
+    if fixture_dir_or_catalogue:
+        if Path(fixture_dir_or_catalogue).is_dir():
+            fixture_catalogue = Path(fixture_dir_or_catalogue) / "catalogue.yaml"
+        else:
+            fixture_catalogue = Path(fixture_dir_or_catalogue)
+
+        catalogue = DataStreamCatalogue(fixture_catalogue)
         _load_fixtures_from_catalogue(
             catalogue,
             fixtures,
@@ -201,7 +206,7 @@ def default_config_generator(service_id, use_files=False):
     ]
     if use_files:
         writers.append(
-            {"writer": "attachments_file", "target": f"files"},
+            {"writer": "attachments_file", "target": "files"},
         )
 
     yield service_id, [
@@ -229,11 +234,11 @@ def fixtures_asynchronous_callback(*args, callback, **kwargs):
             )
         else:
             batch = None
-            log.info(f"Fixtures progress: %s", callback)
+            log.info("Fixtures progress: %s", callback)
 
         if "error" in callback:
             log.error(
-                f"Error in loading fixtures: %s\n%s\n%s",
+                "Error in loading fixtures: %s\n%s\n%s",
                 callback,
                 "\n".join(args),
                 "\n".join(f"{kwarg}: {value}" for kwarg, value in kwargs.items()),
@@ -250,11 +255,11 @@ def fixtures_asynchronous_callback(*args, callback, **kwargs):
             for entry in batch.entries:
                 if entry.errors:
                     log.error(
-                        f"Errors in entry %s of batch %s:\npayload %s\n",
+                        "Errors in entry %s of batch %s:\npayload %s\n",
                         entry.seq,
                         batch.seq,
                         entry.entry,
                         "\n".join(str(x) for x in entry.errors),
                     )
-    except Exception as e:
+    except Exception:
         print(f"Error in fixtures callback: {callback=}, {args=}, {kwargs=}")

{oarepo_runtime-1.5.124 → oarepo_runtime-1.5.125/oarepo_runtime.egg-info}/PKG-INFO

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

{oarepo_runtime-1.5.124 → oarepo_runtime-1.5.125}/setup.cfg

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