ebird-api-data 0.1.0__tar.gz → 0.2.0__tar.gz

ebird_api_data-0.2.0/.gitignore

@@ -0,0 +1,31 @@
+# Python
+__pycache__/
+*.py[co]
+*.egg*
+
+# Editor temp files
+*~
+
+# Ignore dot files except those required for the project
+.*
+!.editorconfig
+!.env.example
+!.envrc
+!.gitignore
+!.gitkeep
+!.pre-commit-config.yaml
+!.readthedocs.yaml
+
+# data
+*.sqlite3
+*.csv
+
+!ebird_basic_dataset_sample.csv
+!MyEBirdData.csv
+
+#docs
+_build/
+
+# directories
+build/
+logs/

{ebird_api_data-0.1.0 → ebird_api_data-0.2.0}/PKG-INFO

@@ -1,39 +1,18 @@
 Metadata-Version: 2.4
 Name: ebird-api-data
-Version: 0.1.0
+Version: 0.2.0
 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: The MIT License (MIT)
-        
-        Copyright (c) 2025 Stuart MacKay
-        
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-        
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-        
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-        
-Keywords: checklists,observations,species,Django,eBird,models
+License-Expression: MIT
+License-File: LICENSE
+Keywords: Django,checklists,eBird,models,observations,species
 Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Science/Research
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 4.2
 Classifier: Framework :: Django :: 5.0
 Classifier: Framework :: Django :: 5.1
 Classifier: Framework :: Django :: 5.2
-Classifier: License :: OSI Approved :: MIT License
+Classifier: Intended Audience :: Science/Research
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
@@ -42,12 +21,12 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
 Classifier: Topic :: Scientific/Engineering :: Information Analysis
 Requires-Python: >=3.10
-Description-Content-Type: text/x-rst
 Requires-Dist: beautifulsoup4>=4.13.3
 Requires-Dist: django>=4.2
 Requires-Dist: ebird-api-requests>=4.0.1
 Requires-Dist: ebird-codes>=0.0.2
 Requires-Dist: lxml>=6.0.0
+Description-Content-Type: text/x-rst
 
 eBird API Data
 ==============

{ebird_api_data-0.1.0 → ebird_api_data-0.2.0}/pyproject.toml

@@ -1,13 +1,10 @@
-[build-system]
-build-backend = "setuptools.build_meta"
-requires = ["setuptools >= 61.0"]
-
 [project]
 name = "ebird-api-data"
-version = "0.1.0"
+version = "0.2.0"
 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 = { file = "LICENSE" }
+license = "MIT"
+license-files = ["LICENSE"]
 authors = [
   {name = "Stuart MacKay", email = "smackay@flagstonesoftware.com"},
 ]
@@ -28,7 +25,6 @@ classifiers = [
     "Framework :: Django :: 5.0",
     "Framework :: Django :: 5.1",
     "Framework :: Django :: 5.2",
-    "License :: OSI Approved :: MIT License",
     "Natural Language :: English",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -38,8 +34,15 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Information Analysis",
 ]
 
-[tool.setuptools]
-license-files = []
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.sdist]
+only-include=["src"]
+
+[tool.hatch.build.targets.wheel]
+packages=["src/ebird"]
 
 [tool.uv]
 dev-dependencies = [
@@ -61,7 +64,7 @@ dev-dependencies = [
 ]
 
 [tool.bumpversion]
-current_version = "0.1.0"
+current_version = "0.2.0"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 ignore_missing_version = false

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

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

{ebird_api_data-0.1.0 → ebird_api_data-0.2.0}/src/ebird/api/data/admin.py

@@ -142,7 +142,7 @@ class CountyAdmin(admin.ModelAdmin):
 
 @admin.register(models.Location)
 class LocationAdmin(admin.ModelAdmin):
-    list_display = ("identifier", "names", "county", "state", "country")
+    list_display = ("identifier", "name", "county", "state", "country")
     list_select_related = ("country", "county", "state")
     ordering = ("-identifier",)
     search_fields = (
@@ -154,13 +154,9 @@ class LocationAdmin(admin.ModelAdmin):
     )
     readonly_fields = ("identifier",)
 
-    @admin.display(description=_("Name / Byname"))
-    def names(self, obj):
-        return format_html("%s<br/>%s" % (obj.name, obj.byname))
-
     def formfield_for_dbfield(self, db_field, request, **kwargs):
         field = super().formfield_for_dbfield(db_field, request, **kwargs)
-        if db_field.name == "byname":
+        if db_field.name == "original":
             field.widget = TextInput(attrs={"class": "vLargeTextField"})
         elif db_field.name == "name":
             field.widget = TextInput(attrs={"class": "vLargeTextField"})
@@ -271,19 +267,15 @@ class ObservationAdmin(admin.ModelAdmin):
 
 @admin.register(models.Observer)
 class ObserverAdmin(admin.ModelAdmin):
-    list_display = ("names", "identifier", "multiple", "enabled")
+    list_display = ("name", "identifier", "multiple", "enabled")
     ordering = ("name",)
     search_fields = ("name", "identifier")
     list_filter = ("multiple", "enabled")
     form = ObservationForm
 
-    @admin.display(description=_("Name / Byname"))
-    def names(self, obj):
-        return format_html("%s<br/>%s" % (obj.name, obj.byname))
-
     def formfield_for_dbfield(self, db_field, request, **kwargs):
         field = super().formfield_for_dbfield(db_field, request, **kwargs)
-        if db_field.name == "byname":
+        if db_field.name == "original":
             field.widget = TextInput(attrs={"class": "vTextField"})
         elif db_field.name == "name":
             field.widget = TextInput(attrs={"class": "vTextField"})

{ebird_api_data-0.1.0 → ebird_api_data-0.2.0}/src/ebird/api/data/loaders.py

@@ -303,19 +303,33 @@ class APILoader:
 
     def get_observer(self, data: dict) -> Observer:
         name: str = data.get("userDisplayName", "Anonymous eBirder")
-        observer, created = Observer.objects.get_or_create(
-            original=name, defaults={"name": name}
-        )
-        if observer.multiple:
+        is_multiple = Observer.objects.filter(original=name, multiple=True).exists()
+        if is_multiple:
+            identifier = self.get_observer_identifier(data)
             observer, created = Observer.objects.get_or_create(
-                identifier=self.get_observer_identifier(data),
-                defaults={"original": random_word(8), "name": name},
+                identifier=identifier,
+                defaults={
+                    "name":name,
+                    "original": random_word(8)
+                }
             )
-        elif observer.identifier == "":
-            observer.identifier = self.get_observer_identifier(data)
-            observer.save()
+        else:
+            if observer := Observer.objects.filter(original=name).first():
+                created = False
+            else:
+                identifier = self.get_observer_identifier(data)
+                observer = Observer.objects.create(
+                    identifier=identifier,
+                    name=name,
+                    original=name,
+                )
+                created = True
+
         if created:
-            logger.info("Added observer: %s", observer.name)
+            logger.info("Added observer: %s", name)
+            if Observer.objects.filter(original=name).count() > 1:
+                logger.error("Multiple observers exist with same name: %s", name)
+
         return observer
 
     def add_checklist(self, identifier: str) -> Checklist | None: