diff --git a/swh/storage/cassandra/storage.py b/swh/storage/cassandra/storage.py --- a/swh/storage/cassandra/storage.py +++ b/swh/storage/cassandra/storage.py @@ -1067,23 +1067,23 @@ def raw_extrinsic_metadata_get( self, - object_type: MetadataTargetType, + type: MetadataTargetType, id: Union[str, SWHID], authority: MetadataAuthority, after: Optional[datetime.datetime] = None, page_token: Optional[bytes] = None, limit: int = 1000, ) -> PagedResult[RawExtrinsicMetadata]: - if object_type == MetadataTargetType.ORIGIN: + if type == MetadataTargetType.ORIGIN: if isinstance(id, SWHID): raise StorageArgumentException( - f"raw_extrinsic_metadata_get called with object_type='origin', " + f"raw_extrinsic_metadata_get called with type='origin', " f"but provided id is an SWHID: {id!r}" ) else: if not isinstance(id, SWHID): raise StorageArgumentException( - f"raw_extrinsic_metadata_get called with object_type!='origin', " + f"raw_extrinsic_metadata_get called with type!='origin', " f"but provided id is not an SWHID: {id!r}" ) diff --git a/swh/storage/db.py b/swh/storage/db.py --- a/swh/storage/db.py +++ b/swh/storage/db.py @@ -1188,7 +1188,7 @@ def raw_extrinsic_metadata_add( self, - object_type: str, + type: str, id: str, discovery_date: datetime.datetime, authority_id: int, @@ -1206,7 +1206,7 @@ ): query = self._raw_extrinsic_metadata_insert_query args: Dict[str, Any] = dict( - type=object_type, + type=type, id=id, authority_id=authority_id, fetcher_id=fetcher_id, @@ -1228,7 +1228,7 @@ def raw_extrinsic_metadata_get( self, - object_type: str, + type: str, id: str, authority_id: int, after_time: Optional[datetime.datetime], diff --git a/swh/storage/in_memory.py b/swh/storage/in_memory.py --- a/swh/storage/in_memory.py +++ b/swh/storage/in_memory.py @@ -1109,7 +1109,7 @@ def raw_extrinsic_metadata_get( self, - object_type: MetadataTargetType, + type: MetadataTargetType, id: Union[str, SWHID], authority: MetadataAuthority, after: Optional[datetime.datetime] = None, @@ -1118,16 +1118,16 @@ ) -> PagedResult[RawExtrinsicMetadata]: authority_key = self._metadata_authority_key(authority) - if object_type == MetadataTargetType.ORIGIN: + if type == MetadataTargetType.ORIGIN: if isinstance(id, SWHID): raise StorageArgumentException( - f"raw_extrinsic_metadata_get called with object_type='origin', " + f"raw_extrinsic_metadata_get called with type='origin', " f"but provided id is an SWHID: {id!r}" ) else: if not isinstance(id, SWHID): raise StorageArgumentException( - f"raw_extrinsic_metadata_get called with object_type!='origin', " + f"raw_extrinsic_metadata_get called with type!='origin', " f"but provided id is not an SWHID: {id!r}" ) @@ -1138,16 +1138,16 @@ raise StorageArgumentException( "page_token is inconsistent with the value of 'after'." ) - entries = self._raw_extrinsic_metadata[object_type][id][ - authority_key - ].iter_after((after_time, after_fetcher)) + entries = self._raw_extrinsic_metadata[type][id][authority_key].iter_after( + (after_time, after_fetcher) + ) elif after is not None: - entries = self._raw_extrinsic_metadata[object_type][id][ - authority_key - ].iter_from((after,)) + entries = self._raw_extrinsic_metadata[type][id][authority_key].iter_from( + (after,) + ) entries = (entry for entry in entries if entry.discovery_date > after) else: - entries = iter(self._raw_extrinsic_metadata[object_type][id][authority_key]) + entries = iter(self._raw_extrinsic_metadata[type][id][authority_key]) if limit: entries = itertools.islice(entries, 0, limit + 1) diff --git a/swh/storage/interface.py b/swh/storage/interface.py --- a/swh/storage/interface.py +++ b/swh/storage/interface.py @@ -1137,7 +1137,7 @@ @remote_api_endpoint("raw_extrinsic_metadata/get") def raw_extrinsic_metadata_get( self, - object_type: MetadataTargetType, + type: MetadataTargetType, id: Union[str, SWHID], authority: MetadataAuthority, after: Optional[datetime.datetime] = None, @@ -1147,8 +1147,8 @@ """Retrieve list of all raw_extrinsic_metadata entries for the id Args: - object_type: one of the values of swh.model.model.MetadataTargetType - id: an URL if object_type is 'origin', else a core SWHID + type: one of the values of swh.model.model.MetadataTargetType + id: an URL if type is 'origin', else a core SWHID authority: a dict containing keys `type` and `url`. after: minimum discovery_date for a result to be returned page_token: opaque token, used to get the next page of results diff --git a/swh/storage/storage.py b/swh/storage/storage.py --- a/swh/storage/storage.py +++ b/swh/storage/storage.py @@ -1199,7 +1199,7 @@ fetcher_id = self._get_fetcher_id(metadata_entry.fetcher, db, cur) db.raw_extrinsic_metadata_add( - object_type=metadata_entry.type.value, + type=metadata_entry.type.value, id=str(metadata_entry.id), discovery_date=metadata_entry.discovery_date, authority_id=authority_id, @@ -1217,17 +1217,17 @@ ) counter[metadata_entry.type] += 1 - for (object_type, count) in counter.items(): + for (type, count) in counter.items(): send_metric( - f"{object_type.value}_metadata:add", + f"{type.value}_metadata:add", count=count, - method_name=f"{object_type.value}_metadata_add", + method_name=f"{type.value}_metadata_add", ) @db_transaction() def raw_extrinsic_metadata_get( self, - object_type: MetadataTargetType, + type: MetadataTargetType, id: Union[str, SWHID], authority: MetadataAuthority, after: Optional[datetime.datetime] = None, @@ -1236,16 +1236,16 @@ db=None, cur=None, ) -> PagedResult[RawExtrinsicMetadata]: - if object_type == MetadataTargetType.ORIGIN: + if type == MetadataTargetType.ORIGIN: if isinstance(id, SWHID): raise StorageArgumentException( - f"raw_extrinsic_metadata_get called with object_type='origin', " + f"raw_extrinsic_metadata_get called with type='origin', " f"but provided id is an SWHID: {id!r}" ) else: if not isinstance(id, SWHID): raise StorageArgumentException( - f"raw_extrinsic_metadata_get called with object_type!='origin', " + f"raw_extrinsic_metadata_get called with type!='origin', " f"but provided id is not an SWHID: {id!r}" ) @@ -1264,13 +1264,7 @@ return PagedResult(next_page_token=None, results=[],) rows = db.raw_extrinsic_metadata_get( - object_type, - str(id), - authority_id, - after_time, - after_fetcher, - limit + 1, - cur, + type, str(id), authority_id, after_time, after_fetcher, limit + 1, cur, ) rows = [dict(zip(db.raw_extrinsic_metadata_get_cols, row)) for row in rows] results = []