ebird-api-data 0.2.1__tar.gz → 0.2.2__tar.gz

{ebird_api_data-0.2.1 → ebird_api_data-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ebird-api-data
-Version: 0.2.1
+Version: 0.2.2
 Summary: eBird API Data is a reusable Django app for loading data from eBird into a database.
 Author-email: Stuart MacKay <smackay@flagstonesoftware.com>
 License-Expression: MIT

{ebird_api_data-0.2.1 → ebird_api_data-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ebird-api-data"
-version = "0.2.1"
+version = "0.2.2"
 description = "eBird API Data is a reusable Django app for loading data from eBird into a database."
 keywords = ["checklists", "observations", "species", "Django", "eBird", "models"]
 license = "MIT"
@@ -65,7 +65,7 @@ dev-dependencies = [
 ]
 
 [tool.bumpversion]
-current_version = "0.2.1"
+current_version = "0.2.2"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 ignore_missing_version = false
@@ -97,7 +97,7 @@ search = """
 replace = """
 ## Latest
 
-## {new_version}
+## {new_version} ({now:%Y-%m-%d})
 """
 
 [[tool.bumpversion.files]]

ebird_api_data-0.2.2/src/ebird/api/data/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.2"

{ebird_api_data-0.2.1 → ebird_api_data-0.2.2}/src/ebird/api/data/loaders.py

@@ -308,10 +308,7 @@ class APILoader:
             identifier = self.get_observer_identifier(data)
             observer, created = Observer.objects.get_or_create(
                 identifier=identifier,
-                defaults={
-                    "name":name,
-                    "original": random_word(8)
-                }
+                defaults={"name": name, "original": random_word(8)},
             )
         else:
             if observer := Observer.objects.filter(original=name).first():
@@ -320,7 +317,7 @@ class APILoader:
                 identifier = self.get_observer_identifier(data)
                 observer, created = Observer.objects.get_or_create(
                     identifier=identifier,
-                    defaults={"name": name, "original":name,}
+                    defaults={"name": name, "original": name},
                 )
 
         if created:
@@ -392,15 +389,18 @@ class APILoader:
             if duration := data.get("durationHrs"):
                 values["duration"] = int(duration * 60.0)
 
-            if data["protocolId"] == "P22":
+            if data["protocolId"] == Checklist.Protocol.TRAVELLING.value:
                 # The distance travelled might not be reported.
                 if "effortDistanceKm" in data:
                     dist: str = data["effortDistanceKm"]
                     values["distance"] = round(Decimal(dist), 3)
-            elif data["protocolId"] == "P23":
+            elif data["protocolId"] == Checklist.Protocol.AREA.value:
                 area: str = data["effortAreaHa"]
                 values["area"] = round(Decimal(area), 3)
 
+            if data["protocolId"] not in Checklist.Protocol.values:
+                logger.info("New protocol: %s", data["protocolId"])
+
             if "comments" in data:
                 values["comments"] = data["comments"]
 

ebird_api_data-0.2.2/src/ebird/api/data/migrations/0010_alter_species_category.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.4 on 2025-07-23 12:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data', '0009_add_created_timestamps'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='species',
+            name='category',
+            field=models.TextField(blank=True, choices=[('species', 'Species'), ('slash', 'Species pairs'), ('issf', 'Subspecies'), ('domestic', 'Domestic species'), ('hybrid', 'Hybrids'), ('form', 'Species forms'), ('spuh', 'Unidentified species'), ('intergrade', 'Intergrades')], help_text='The category from the eBird/Clements taxonomy.', verbose_name='category'),
+        ),
+    ]

{ebird_api_data-0.2.1 → ebird_api_data-0.2.2}/src/ebird/api/data/models/checklist.py

@@ -3,6 +3,19 @@ from django.utils.translation import gettext_lazy as _
 
 
 class Checklist(models.Model):
+    class Protocol(models.TextChoices):
+        INCIDENTAL = "P20", _("Incidental")
+        STATIONARY = "P21", _("Stationary")
+        TRAVELLING = "P22", _("Travelling")
+        AREA = "P23", _("Area")
+        BANDING = "P33", _("Banding")
+        NOCTURNAL = "P54", _("Nocturnal Flight Call Count")
+        PELAGIC = "P60", _("Pelagic")
+        HISTORICAL = "P62", _("Historical")
+        BREEDING_BIRD_ATLAS = "P65", _("Breeding Bird Atlas")
+        COMMON_BIRD_SURVEY = "P67", _("Common Bird Survey")
+        RAM = "P68", _("RAM--Iberian Seawatch Network")
+
     class Meta:
         verbose_name = _("checklist")
         verbose_name_plural = _("checklists")
@@ -116,6 +129,9 @@ class Checklist(models.Model):
         help_text=_("The code used to identify the protocol."),
     )
 
+    # Protocol is not used to set the choices, as we still want to load
+    # the checklist when a protocol not defined in the class is used.
+
     project_code = models.TextField(
         blank=True,
         verbose_name=_("project code"),

{ebird_api_data-0.2.1 → ebird_api_data-0.2.2}/src/ebird/api/data/models/species.py

@@ -12,11 +12,14 @@ log = logging.getLogger(__name__)
 
 class Species(models.Model):
     class Category(models.TextChoices):
-        ALL = "", _("All categories")
         SPECIES = "species", _("Species")
+        SLASH = "slash", _("Species pairs")
         SUBSPECIES = "issf", _("Subspecies")
-        DOMESTIC = "domestic", _("Domestic")
-        HYBRID = "hybrid", _("Hybrid")
+        DOMESTIC = "domestic", _("Domestic species")
+        HYBRID = "hybrid", _("Hybrids")
+        FORM = "form", _("Species forms")
+        SPUH = "spuh", _("Unidentified species")
+        INTERGRADE = "intergrade", _("Intergrades")
 
     class Meta:
         verbose_name = _("species")

ebird_api_data-0.2.1/src/ebird/api/data/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.1"