From 4e6a564b6cafe45263dd492336834fd56aa47caa Mon Sep 17 00:00:00 2001
From: dadams <david@dadams.io>
Date: Fri, 15 May 2026 20:49:51 -0700
Subject: [PATCH] gitignore, energy)layer fix

---
 .gitignore                                    |  76 ++++++++++++++++++
 .../ingest_eia_energy_layers.cpython-314.pyc  | Bin 35829 -> 35923 bytes
 ingest_eia_energy_layers.py                   |  13 ++-
 3 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2b964dd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,76 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache/
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.pytest_cache/
+
+# Type checkers / linters
+.mypy_cache/
+.pyre/
+.ruff_cache/
+
+# Environments
+.env
+.env.*
+.venv/
+venv/
+env/
+ENV/
+
+# Jupyter Notebook
+.ipynb_checkpoints/
+
+# IDEs and editors
+.vscode/
+.idea/
+*.swp
+*.swo
+
+# Logs
+*.log
+
+# OS files
+.DS_Store
+Thumbs.db
diff --git a/__pycache__/ingest_eia_energy_layers.cpython-314.pyc b/__pycache__/ingest_eia_energy_layers.cpython-314.pyc
index 07a3c0b68bbc1b26c9d66b2a3f0bd7466621db11..abd9810d75faf02be9e6ad5a247a1139cedcf001 100644
GIT binary patch
delta 2294
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
Wq7+Wp^lzU$XrjN%oBLqkp!PqW%~AsZ

delta 2250
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
ZT^qSBgRueHgU@Wx(XZlF4&QH3{{vhlO`re(

diff --git a/ingest_eia_energy_layers.py b/ingest_eia_energy_layers.py
index a416875..81ef532 100644
--- a/ingest_eia_energy_layers.py
+++ b/ingest_eia_energy_layers.py
@@ -80,6 +80,11 @@ EIA_GEOCODABLE_ENDPOINTS = {
     "electricity/facility-fuel": ["latitude", "longitude"],
 }
 
+# Endpoints that do not reliably support retry with ad-hoc data[] field requests.
+EIA_NO_RETRY_EXTRA_FIELDS = {
+    "electricity/facility-fuel",
+}
+
 # US state abbreviation to FIPS code mapping for state-level GEOID linking
 STATE_FIPS = {
     "AL": "01", "AK": "02", "AZ": "04", "AR": "05", "CA": "06",
@@ -138,7 +143,7 @@ def query_eia_api(endpoint: str, params: Optional[Dict[str, Any]] = None, extra_
             req_params[f"data[{i}]"] = field
     
     try:
-        resp = requests.get(url, params=req_params, timeout=60)
+        resp = requests.get(url, params=req_params, timeout=(10, 20))
         resp.raise_for_status()
         return resp.json()
     except requests.RequestException as e:
@@ -163,7 +168,11 @@ def fetch_eia_records(
         data = query_eia_api(endpoint, params=params, extra_data_fields=used_extra_fields)
 
         # Some endpoints return 400 when requesting unsupported fields (e.g. lat/lon).
-        if data is None and used_extra_fields:
+        if (
+            data is None
+            and used_extra_fields
+            and endpoint not in EIA_NO_RETRY_EXTRA_FIELDS
+        ):
             print(f"  retrying {endpoint} without extra data fields")
             used_extra_fields = None
             data = query_eia_api(endpoint, params=params, extra_data_fields=None)