mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-12 22:25:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use new ids for ArchiveResult API

Browse source
This commit is contained in:
Nick Sweeting 2024-08-17 23:03:43 -07:00
parent f72debfdb2
commit a271bcb4ce
No known key found for this signature in database
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
archivebox/api/v1_core.py
View file

@ -22,8 +22,9 @@ router = Router(tags=['Core Models'])
class ArchiveResultSchema(Schema): class ArchiveResultSchema(Schema):
abid: str abid: str
uuid: UUID id: UUID
pk: str # old_id: int
modified: datetime modified: datetime
created: datetime created: datetime
created_by_id: str created_by_id: str
@ -73,8 +74,7 @@ class ArchiveResultSchema(Schema):
class ArchiveResultFilterSchema(FilterSchema): class ArchiveResultFilterSchema(FilterSchema):
uuid: Optional[UUID] = Field(None, q='uuid') id: Optional[UUID] = Field(None, q='id')
# abid: Optional[str] = Field(None, q='abid')
search: Optional[str] = Field(None, q=['snapshot__url__icontains', 'snapshot__title__icontains', 'snapshot__tags__name__icontains', 'extractor', 'output__icontains']) search: Optional[str] = Field(None, q=['snapshot__url__icontains', 'snapshot__title__icontains', 'snapshot__tags__name__icontains', 'extractor', 'output__icontains'])
snapshot_uuid: Optional[UUID] = Field(None, q='snapshot_uuid__icontains') snapshot_uuid: Optional[UUID] = Field(None, q='snapshot_uuid__icontains')
@ -104,8 +104,8 @@ def get_archiveresults(request, filters: ArchiveResultFilterSchema = Query(...))
@router.get("/archiveresult/{archiveresult_id}", response=ArchiveResultSchema, url_name="get_archiveresult") @router.get("/archiveresult/{archiveresult_id}", response=ArchiveResultSchema, url_name="get_archiveresult")
def get_archiveresult(request, archiveresult_id: str): def get_archiveresult(request, archiveresult_id: str):
"""Get a specific ArchiveResult by abid, uuid, or pk.""" """Get a specific ArchiveResult by pk, abid, or old_id."""
return ArchiveResult.objects.get(Q(pk__icontains=archiveresult_id) | Q(abid__icontains=archiveresult_id) | Q(uuid__icontains=archiveresult_id)) return ArchiveResult.objects.get(Q(pk__icontains=archiveresult_id) | Q(abid__icontains=archiveresult_id) | Q(old_id__icontains=archiveresult_id))
# @router.post("/archiveresult", response=ArchiveResultSchema) # @router.post("/archiveresult", response=ArchiveResultSchema)

3
archivebox/core/admin.py
View file

@ -511,7 +511,10 @@ class ArchiveResultAdmin(admin.ModelAdmin):
) )
def identifiers(self, obj): def identifiers(self, obj):
try:
return get_abid_info(self, obj) return get_abid_info(self, obj)
except Exception as e:
return str(e)
@admin.display( @admin.display(
description='Snapshot Tags' description='Snapshot Tags'

4
archivebox/core/models.py
View file

@ -347,8 +347,8 @@ class ArchiveResult(ABIDModel):
abid_rand_src = 'self.id' abid_rand_src = 'self.id'
EXTRACTOR_CHOICES = EXTRACTOR_CHOICES EXTRACTOR_CHOICES = EXTRACTOR_CHOICES
old_id = models.BigIntegerField(default=rand_int_id, serialize=False, verbose_name='ID') old_id = models.BigIntegerField(default=rand_int_id, serialize=False, verbose_name='Old ID')
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=True, unique=True) id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=True, unique=True, verbose_name='ID')
abid = ABIDField(prefix=abid_prefix) abid = ABIDField(prefix=abid_prefix)
snapshot = models.ForeignKey(Snapshot, on_delete=models.CASCADE) snapshot = models.ForeignKey(Snapshot, on_delete=models.CASCADE)