diff --git a/src/azul/plugins/metadata/anvil/bundle.py b/src/azul/plugins/metadata/anvil/bundle.py index 304d579a4d..4e1b73433b 100644 --- a/src/azul/plugins/metadata/anvil/bundle.py +++ b/src/azul/plugins/metadata/anvil/bundle.py @@ -150,9 +150,7 @@ def from_json(entities): for entity_ref, entity in entities.items() } - return cls( - fqid=fqid, - entities=from_json(json_['entities']), - links=set(map(EntityLink.from_json, json_['links'])), - orphans=from_json(json_['orphans']) - ) + return cls(fqid=fqid, + entities=from_json(json_['entities']), + links=set(map(EntityLink.from_json, json_['links'])), + orphans=from_json(json_['orphans'])) diff --git a/src/azul/plugins/repository/tdr_anvil/__init__.py b/src/azul/plugins/repository/tdr_anvil/__init__.py index 76dd4b0db7..72fc3552f6 100644 --- a/src/azul/plugins/repository/tdr_anvil/__init__.py +++ b/src/azul/plugins/repository/tdr_anvil/__init__.py @@ -260,13 +260,12 @@ def list_bundles(self, bundle_uuid = change_version(dataset_row_id, self.datarepo_row_uuid_version, self.bundle_uuid_version) - bundles.append(TDRAnvilBundleFQID( - uuid=bundle_uuid, - version=self._version, - source=source, - table_name=BundleType.duos.value, - batch_prefix=None, - )) + bundle_fqid = TDRAnvilBundleFQID(uuid=bundle_uuid, + version=self._version, + source=source, + table_name=BundleType.duos.value, + batch_prefix=None) + bundles.append(bundle_fqid) for row in self._run_sql(f''' SELECT datarepo_row_id FROM {backtick(self._full_table_name(spec, BundleType.primary.value))} @@ -275,13 +274,12 @@ def list_bundles(self, bundle_uuid = change_version(row['datarepo_row_id'], self.datarepo_row_uuid_version, self.bundle_uuid_version) - bundles.append(TDRAnvilBundleFQID( - uuid=bundle_uuid, - version=self._version, - source=source, - table_name=BundleType.primary.value, - batch_prefix=None, - )) + bundle_fqid = TDRAnvilBundleFQID(uuid=bundle_uuid, + version=self._version, + source=source, + table_name=BundleType.primary.value, + batch_prefix=None) + bundles.append(bundle_fqid) prefix_lengths_by_table = self._batch_tables(source.spec, prefix) for table_name, (batch_prefix_length, _) in prefix_lengths_by_table.items(): batch_prefixes = Prefix(common=prefix,