Skip to content

Commit

Permalink
Merge pull request #1748 from laws-africa/gazette-improvements
Browse files Browse the repository at this point in the history
More gazette improvements
  • Loading branch information
longhotsummer authored Mar 1, 2024
2 parents ff6710b + 67d1717 commit a111694
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 3 deletions.
8 changes: 7 additions & 1 deletion peachjam/adapters/indigo.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,13 @@ def get_doc_list(self):
logger.info(f"Getting document list for {place_code}")
url = f"{self.api_url}/akn/{place_code}/.json"
while url:
res = self.client_get(url).json()
try:
res = self.client_get(url).json()
except requests.exceptions.HTTPError as e:
if e.response.status_code == 404:
logger.warning(f"Ignoring 404 for {url}")
continue
raise e

# ignore bills
# TODO: later, make this configurable
Expand Down
15 changes: 13 additions & 2 deletions peachjam/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
citations_processor,
pj_settings,
)
from peachjam.plugins import plugins
from peachjam.resources import (
ArticleResource,
AttorneyResource,
Expand Down Expand Up @@ -821,12 +822,22 @@ class IngestorSettingInline(admin.TabularInline):
extra = 3


class IngestorForm(forms.ModelForm):
adapter = forms.ChoiceField(
choices=lambda: [(y, y) for y in plugins.registry["ingestor-adapter"].keys()]
)

class Meta:
model = Ingestor
fields = ("adapter", "name", "last_refreshed_at", "enabled")


@admin.register(Ingestor)
class IngestorAdmin(admin.ModelAdmin):
inlines = [IngestorSettingInline]
actions = ["refresh_all_content"]
fields = ("adapter", "name", "last_refreshed_at", "enabled")
list_display = ("name", "last_refreshed_at", "enabled")
list_display = ("name", "adapter", "last_refreshed_at", "enabled")
form = IngestorForm

def refresh_all_content(self, request, queryset):
from peachjam.tasks import run_ingestor
Expand Down
20 changes: 20 additions & 0 deletions peachjam/migrations/0121_alter_ingestorsetting_value.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 3.2.20 on 2024-03-01 08:43

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("peachjam", "0120_gazette_details"),
]

operations = [
migrations.AlterField(
model_name="ingestorsetting",
name="value",
field=models.CharField(
blank=True, default="", max_length=2048, verbose_name="value"
),
),
]

0 comments on commit a111694

Please sign in to comment.