diff --git a/swh/indexer/storage/__init__.py b/swh/indexer/storage/__init__.py --- a/swh/indexer/storage/__init__.py +++ b/swh/indexer/storage/__init__.py @@ -357,11 +357,11 @@ db.content_fossology_license_add_from_temp(conflict_update, cur) @db_transaction_generator() - def content_metadata_missing(self, metadatas, db=None, cur=None): - """List metadatas missing from storage. + def content_metadata_missing(self, metadata, db=None, cur=None): + """List metadata missing from storage. Args: - metadatas (iterable): dictionaries with keys: + metadata (iterable): dictionaries with keys: id (bytes): sha1 identifier indexer_configuration_id (int): tool used to compute @@ -372,7 +372,7 @@ indexer_configuration_id) """ - for obj in db.content_metadata_missing_from_list(metadatas, cur): + for obj in db.content_metadata_missing_from_list(metadata, cur): yield obj[0] @db_transaction_generator() @@ -395,12 +395,12 @@ dict(zip(db.content_metadata_cols, c))) @db_transaction() - def content_metadata_add(self, metadatas, conflict_update=False, db=None, + def content_metadata_add(self, metadata, conflict_update=False, db=None, cur=None): - """Add metadatas not present in storage. + """Add metadata not present in storage. Args: - metadatas (iterable): dictionaries with keys: + metadata (iterable): dictionaries with keys: id: sha1 translated_metadata: bytes / jsonb ? @@ -412,17 +412,17 @@ db.mktemp_content_metadata(cur) # empty metadata is mapped to 'unknown' - db.copy_to(metadatas, 'tmp_content_metadata', + db.copy_to(metadata, 'tmp_content_metadata', ['id', 'translated_metadata', 'indexer_configuration_id'], cur) db.content_metadata_add_from_temp(conflict_update, cur) @db_transaction_generator() - def revision_metadata_missing(self, metadatas, db=None, cur=None): - """List metadatas missing from storage. + def revision_metadata_missing(self, metadata, db=None, cur=None): + """List metadata missing from storage. Args: - metadatas (iterable): dictionaries with keys: + metadata (iterable): dictionaries with keys: id (bytes): sha1_git revision identifier indexer_configuration_id (int): tool used to compute @@ -432,7 +432,7 @@ iterable: missing ids """ - for obj in db.revision_metadata_missing_from_list(metadatas, cur): + for obj in db.revision_metadata_missing_from_list(metadata, cur): yield obj[0] @db_transaction_generator() @@ -455,12 +455,12 @@ dict(zip(db.revision_metadata_cols, c))) @db_transaction() - def revision_metadata_add(self, metadatas, conflict_update=False, db=None, + def revision_metadata_add(self, metadata, conflict_update=False, db=None, cur=None): - """Add metadatas not present in storage. + """Add metadata not present in storage. Args: - metadatas (iterable): dictionaries with keys: + metadata (iterable): dictionaries with keys: - id: sha1_git of revision - translated_metadata: bytes / jsonb ? @@ -472,7 +472,7 @@ db.mktemp_revision_metadata(cur) # empty metadata is mapped to 'unknown' - db.copy_to(metadatas, 'tmp_revision_metadata', + db.copy_to(metadata, 'tmp_revision_metadata', ['id', 'translated_metadata', 'indexer_configuration_id'], cur) db.revision_metadata_add_from_temp(conflict_update, cur) diff --git a/swh/indexer/storage/api/client.py b/swh/indexer/storage/api/client.py --- a/swh/indexer/storage/api/client.py +++ b/swh/indexer/storage/api/client.py @@ -70,26 +70,26 @@ def content_fossology_license_get(self, ids): return self.post('content/fossology_license', {'ids': ids}) - def content_metadata_add(self, metadatas, conflict_update=False): + def content_metadata_add(self, metadata, conflict_update=False): return self.post('content_metadata/add', { - 'metadatas': metadatas, + 'metadata': metadata, 'conflict_update': conflict_update, }) - def content_metadata_missing(self, metadatas): - return self.post('content_metadata/missing', {'metadatas': metadatas}) + def content_metadata_missing(self, metadata): + return self.post('content_metadata/missing', {'metadata': metadata}) def content_metadata_get(self, ids): return self.post('content_metadata', {'ids': ids}) - def revision_metadata_add(self, metadatas, conflict_update=False): + def revision_metadata_add(self, metadata, conflict_update=False): return self.post('revision_metadata/add', { - 'metadatas': metadatas, + 'metadata': metadata, 'conflict_update': conflict_update, }) - def revision_metadata_missing(self, metadatas): - return self.post('revision_metadata/missing', {'metadatas': metadatas}) + def revision_metadata_missing(self, metadata): + return self.post('revision_metadata/missing', {'metadata': metadata}) def revision_metadata_get(self, ids): return self.post('revision_metadata', {'ids': ids}) diff --git a/swh/indexer/tests/storage/test_storage.py b/swh/indexer/tests/storage/test_storage.py --- a/swh/indexer/tests/storage/test_storage.py +++ b/swh/indexer/tests/storage/test_storage.py @@ -930,7 +930,7 @@ # given tool_id = self.tools['swh-metadata-translator']['id'] - metadatas = [ + metadata = [ { 'id': self.sha1_2, 'indexer_configuration_id': tool_id, @@ -942,7 +942,7 @@ ] # when - actual_missing = list(self.storage.content_metadata_missing(metadatas)) + actual_missing = list(self.storage.content_metadata_missing(metadata)) # then self.assertEqual(list(actual_missing), [ @@ -967,7 +967,7 @@ }]) # when - actual_missing = list(self.storage.content_metadata_missing(metadatas)) + actual_missing = list(self.storage.content_metadata_missing(metadata)) # then self.assertEqual(actual_missing, [self.sha1_1]) @@ -996,10 +996,10 @@ self.storage.content_metadata_add([metadata1]) # then - actual_metadatas = list(self.storage.content_metadata_get( + actual_metadata = list(self.storage.content_metadata_get( [self.sha1_2, self.sha1_1])) - expected_metadatas = [{ + expected_metadata = [{ 'id': self.sha1_2, 'translated_metadata': { 'other': {}, @@ -1014,7 +1014,7 @@ 'tool': self.tools['swh-metadata-translator'] }] - self.assertEqual(actual_metadatas, expected_metadatas) + self.assertEqual(actual_metadata, expected_metadata) @istest def content_metadata_add_drop_duplicate(self): @@ -1035,10 +1035,10 @@ self.storage.content_metadata_add([metadata_v1]) # when - actual_metadatas = list(self.storage.content_metadata_get( + actual_metadata = list(self.storage.content_metadata_get( [self.sha1_2])) - expected_metadatas_v1 = [{ + expected_metadata_v1 = [{ 'id': self.sha1_2, 'translated_metadata': { 'other': {}, @@ -1048,7 +1048,7 @@ 'tool': self.tools['swh-metadata-translator'] }] - self.assertEqual(actual_metadatas, expected_metadatas_v1) + self.assertEqual(actual_metadata, expected_metadata_v1) # given metadata_v2 = metadata_v1.copy() @@ -1063,11 +1063,11 @@ self.storage.content_metadata_add([metadata_v2]) # then - actual_metadatas = list(self.storage.content_metadata_get( + actual_metadata = list(self.storage.content_metadata_get( [self.sha1_2])) # metadata did not change as the v2 was dropped. - self.assertEqual(actual_metadatas, expected_metadatas_v1) + self.assertEqual(actual_metadata, expected_metadata_v1) @istest def content_metadata_add_update_in_place_duplicate(self): @@ -1088,11 +1088,11 @@ self.storage.content_metadata_add([metadata_v1]) # when - actual_metadatas = list(self.storage.content_metadata_get( + actual_metadata = list(self.storage.content_metadata_get( [self.sha1_2])) # then - expected_metadatas_v1 = [{ + expected_metadata_v1 = [{ 'id': self.sha1_2, 'translated_metadata': { 'other': {}, @@ -1101,7 +1101,7 @@ }, 'tool': self.tools['swh-metadata-translator'] }] - self.assertEqual(actual_metadatas, expected_metadatas_v1) + self.assertEqual(actual_metadata, expected_metadata_v1) # given metadata_v2 = metadata_v1.copy() @@ -1114,11 +1114,11 @@ }) self.storage.content_metadata_add([metadata_v2], conflict_update=True) - actual_metadatas = list(self.storage.content_metadata_get( + actual_metadata = list(self.storage.content_metadata_get( [self.sha1_2])) # language did not change as the v2 was dropped. - expected_metadatas_v2 = [{ + expected_metadata_v2 = [{ 'id': self.sha1_2, 'translated_metadata': { 'other': {}, @@ -1129,14 +1129,14 @@ }] # metadata did change as the v2 was used to overwrite v1 - self.assertEqual(actual_metadatas, expected_metadatas_v2) + self.assertEqual(actual_metadata, expected_metadata_v2) @istest def revision_metadata_missing(self): # given tool_id = self.tools['swh-metadata-detector']['id'] - metadatas = [ + metadata = [ { 'id': self.revision_id_1, 'indexer_configuration_id': tool_id, @@ -1149,7 +1149,7 @@ # when actual_missing = list(self.storage.revision_metadata_missing( - metadatas)) + metadata)) # then self.assertEqual(list(actual_missing), [ @@ -1183,7 +1183,7 @@ # when actual_missing = list(self.storage.revision_metadata_missing( - metadatas)) + metadata)) # then self.assertEqual(actual_missing, [self.revision_id_2]) @@ -1220,16 +1220,16 @@ self.storage.revision_metadata_add([metadata_rev]) # then - actual_metadatas = list(self.storage.revision_metadata_get( + actual_metadata = list(self.storage.revision_metadata_get( [self.revision_id_2, self.revision_id_1])) - expected_metadatas = [{ + expected_metadata = [{ 'id': self.revision_id_2, 'translated_metadata': metadata_rev['translated_metadata'], 'tool': self.tools['swh-metadata-detector'] }] - self.assertEqual(actual_metadatas, expected_metadatas) + self.assertEqual(actual_metadata, expected_metadata) @istest def revision_metadata_add_drop_duplicate(self): @@ -1263,16 +1263,16 @@ self.storage.revision_metadata_add([metadata_v1]) # when - actual_metadatas = list(self.storage.revision_metadata_get( + actual_metadata = list(self.storage.revision_metadata_get( [self.revision_id_1])) - expected_metadatas_v1 = [{ + expected_metadata_v1 = [{ 'id': self.revision_id_1, 'translated_metadata': metadata_v1['translated_metadata'], 'tool': self.tools['swh-metadata-detector'] }] - self.assertEqual(actual_metadatas, expected_metadatas_v1) + self.assertEqual(actual_metadata, expected_metadata_v1) # given metadata_v2 = metadata_v1.copy() @@ -1286,11 +1286,11 @@ self.storage.revision_metadata_add([metadata_v2]) # then - actual_metadatas = list(self.storage.revision_metadata_get( + actual_metadata = list(self.storage.revision_metadata_get( [self.revision_id_1])) # metadata did not change as the v2 was dropped. - self.assertEqual(actual_metadatas, expected_metadatas_v1) + self.assertEqual(actual_metadata, expected_metadata_v1) @istest def revision_metadata_add_update_in_place_duplicate(self): @@ -1324,16 +1324,16 @@ self.storage.revision_metadata_add([metadata_v1]) # when - actual_metadatas = list(self.storage.revision_metadata_get( + actual_metadata = list(self.storage.revision_metadata_get( [self.revision_id_2])) # then - expected_metadatas_v1 = [{ + expected_metadata_v1 = [{ 'id': self.revision_id_2, 'translated_metadata': metadata_v1['translated_metadata'], 'tool': self.tools['swh-metadata-detector'] }] - self.assertEqual(actual_metadatas, expected_metadatas_v1) + self.assertEqual(actual_metadata, expected_metadata_v1) # given metadata_v2 = metadata_v1.copy() @@ -1345,18 +1345,18 @@ }) self.storage.revision_metadata_add([metadata_v2], conflict_update=True) - actual_metadatas = list(self.storage.revision_metadata_get( + actual_metadata = list(self.storage.revision_metadata_get( [self.revision_id_2])) # language did not change as the v2 was dropped. - expected_metadatas_v2 = [{ + expected_metadata_v2 = [{ 'id': self.revision_id_2, 'translated_metadata': metadata_v2['translated_metadata'], 'tool': self.tools['swh-metadata-detector'] }] # metadata did change as the v2 was used to overwrite v1 - self.assertEqual(actual_metadatas, expected_metadatas_v2) + self.assertEqual(actual_metadata, expected_metadata_v2) @istest def indexer_configuration_add(self):