oarepo-runtime 1.5.124__py3-none-any.whl → 1.5.126__py3-none-any.whl

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/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/datastreams/writers/service.py

@@ -2,6 +2,7 @@ from invenio_access.permissions import system_identity
 from invenio_pidstore.errors import PIDDoesNotExistError
 from invenio_records_resources.proxies import current_service_registry
 from invenio_records_resources.services.uow import UnitOfWork
+from sqlalchemy.exc import NoResultFound
 
 from ...uow import BulkUnitOfWork
 from ..types import StreamBatch, StreamEntry, StreamEntryError
@@ -57,6 +58,9 @@ class ServiceWriter(BaseWriter):
                 return self._service.read(self._identity, id_)
             except PIDDoesNotExistError:
                 pass
+            except NoResultFound:
+                # vocabularies do not raise a PIDDoesNotExistError, they raise sql exception
+                pass
         return None
 
     def _get_stream_entry_id(self, entry: StreamEntry):

{oarepo_runtime-1.5.124.dist-info → oarepo_runtime-1.5.126.dist-info}/METADATA

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

{oarepo_runtime-1.5.124.dist-info → oarepo_runtime-1.5.126.dist-info}/RECORD

@@ -11,7 +11,7 @@ oarepo_runtime/cli/base.py,sha256=94RBTa8TOSPxEyEUmYLGXaWen-XktP2-MIbTtZSlCZo,54
 oarepo_runtime/cli/cf.py,sha256=W0JEJK2JqKubQw8qtZJxohmADDRUBode4JZAqYLDGvc,339
 oarepo_runtime/cli/check.py,sha256=sCe2PeokSHvNOXHFZ8YHF8NMhsu5nYjyuZuvXHJ6X18,5092
 oarepo_runtime/cli/configuration.py,sha256=M_19zrS0vo-7uHi047a3i4rQsK6pmp4QS0IEBAxMLZ0,2039
-oarepo_runtime/cli/fixtures.py,sha256=l6zHpz1adjotrbFy_wcN2TOL8x20i-1jbQmaoEEo-UU,5419
+oarepo_runtime/cli/fixtures.py,sha256=_aMQqPnspG0JuL5ewYTBa3HY1RaoOAI0V2R5q7e5frw,5570
 oarepo_runtime/cli/index.py,sha256=8Q2KZlAWjoMyZ9Ft9WIBJDws0ce15VF12o1tdYUP7AI,8936
 oarepo_runtime/cli/validate.py,sha256=HpSvHQCGHlrdgdpKix9cIlzlBoJEiT1vACZdMnOUGEY,2827
 oarepo_runtime/cli/permissions/__init__.py,sha256=2qufYdUoCb9kG7Zy0gKNW5lpRyqbVQSNsf7shLwrThM,198
@@ -25,7 +25,7 @@ oarepo_runtime/datastreams/catalogue.py,sha256=D6leq-FPT3RP3SniEAXPm66v3q8ZdQnaU
 oarepo_runtime/datastreams/datastreams.py,sha256=N9XXwIaBTADkPhE-XG6uotMwd-8Kn0vEZOoeV2BnMGI,4679
 oarepo_runtime/datastreams/errors.py,sha256=WyZLU53EdFJTLv6K2ooM_M6ISjLS-U1dDw6B7guOLSc,1540
 oarepo_runtime/datastreams/ext.py,sha256=ivugdVMCqwugK-5SeX14a-dMq6VaTt7DM2wFU357tR4,1406
-oarepo_runtime/datastreams/fixtures.py,sha256=LTzRLoS3hkdP7a7wX3fCNWplaxh0DQQjxGto3p1_Luk,8691
+oarepo_runtime/datastreams/fixtures.py,sha256=oc3b1XP7gJmEXVskZTltZUasdeTux-wbgxox66OyIT8,8901
 oarepo_runtime/datastreams/json.py,sha256=OkIkGKUawtYoGelyS5V92DVk7Ei7SlkMMny2Ue2dDWc,132
 oarepo_runtime/datastreams/semi_asynchronous.py,sha256=kNc6BBnV6oFoY9kHgf5l8fd1wibRfI0dwyzLtu4fmUA,2940
 oarepo_runtime/datastreams/synchronous.py,sha256=t5lfnMkLqy3jK5zMl-nIuA0HlMPiHGjwCqZ8XQP-3GM,2595
@@ -42,7 +42,7 @@ oarepo_runtime/datastreams/writers/__init__.py,sha256=PWufWNrixFhXv5wSv3_pzmrimr
 oarepo_runtime/datastreams/writers/attachments_file.py,sha256=kV_IPAWawJ9PX-IfoncmLQXpdTbzRMsJie8uKX1vNp0,3161
 oarepo_runtime/datastreams/writers/attachments_service.py,sha256=g_tbjUA3YnTE5gP21zlG2kIxneZsn0q95EVjlxB8s1M,4152
 oarepo_runtime/datastreams/writers/publish.py,sha256=x_ipun8TQiYNvGokVnEppYw9ko1AyrSzHu3D8b3ZWzI,2126
-oarepo_runtime/datastreams/writers/service.py,sha256=GUnXVuRlJaBo19s7oeSG-vpFenah-NTursrX08UP-B4,6010
+oarepo_runtime/datastreams/writers/service.py,sha256=PAMo0t_d-T4xGcO4VIIVaMOAqj7_tahXo-v-fTqKG8A,6199
 oarepo_runtime/datastreams/writers/utils.py,sha256=Lk_ZLNeXTLuFEn04lw1-6bJ7duG6kwA8X4wf9c_GiL4,1067
 oarepo_runtime/datastreams/writers/validation_errors.py,sha256=wOCXdniR6so_4ExpdFYYgBRyENp7_6kVFZM2L-Hy3G8,661
 oarepo_runtime/datastreams/writers/yaml.py,sha256=XchUJHQ58E2Mfgs8elImXbL38jFtI8Hfoye6yaR0gKI,1482
@@ -148,9 +148,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.124.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
-oarepo_runtime-1.5.124.dist-info/METADATA,sha256=t1V9nLySEgmPYmIiMh3qOxk9VpxOOc-GNg12ei7YHTA,4721
-oarepo_runtime-1.5.124.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-oarepo_runtime-1.5.124.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
-oarepo_runtime-1.5.124.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
-oarepo_runtime-1.5.124.dist-info/RECORD,,
+oarepo_runtime-1.5.126.dist-info/LICENSE,sha256=h2uWz0OaB3EN-J1ImdGJZzc7yvfQjvHVYdUhQ-H7ypY,1064
+oarepo_runtime-1.5.126.dist-info/METADATA,sha256=GURVSenQMBQuWZxCEi_eZgtoW8jNgbOXDvMKBc8EK-0,4721
+oarepo_runtime-1.5.126.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+oarepo_runtime-1.5.126.dist-info/entry_points.txt,sha256=k7O5LZUOGsVeSpB7ulU0txBUNp1CVQG7Q7TJIVTPbzU,491
+oarepo_runtime-1.5.126.dist-info/top_level.txt,sha256=bHhlkT1_RQC4IkfTQCqA3iN4KCB6cSFQlsXpQMSP-bE,21
+oarepo_runtime-1.5.126.dist-info/RECORD,,