moanos/Notfellchen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: allow using cached results

Browse Source
This commit is contained in:
moanos [he/him]
2025-06-20 08:05:11 +02:00
parent b73f6db7b6
commit abd34ec7cb
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/upload_animal_shelters.py
View File

@@ -21,6 +21,7 @@ def parse_args():
parser.add_argument("--area", type=str, help="Area to search for animal shelters (default: Deutschland).") parser.add_argument("--area", type=str, help="Area to search for animal shelters (default: Deutschland).")
parser.add_argument("--instance", type=str, help="API instance URL.") parser.add_argument("--instance", type=str, help="API instance URL.")
parser.add_argument("--data-file", type=str, help="Path to the GeoJSON file containing (only) animal shelters.") parser.add_argument("--data-file", type=str, help="Path to the GeoJSON file containing (only) animal shelters.")
parser.add_argument("--use-cached", action='store_true', help="Use the stored GeoJSON file")
return parser.parse_args() return parser.parse_args()
@@ -33,11 +34,12 @@ def get_config():
area = args.area or os.getenv("NOTFELLCHEN_AREA", DEFAULT_OVERPASS_SEARCH_AREA) area = args.area or os.getenv("NOTFELLCHEN_AREA", DEFAULT_OVERPASS_SEARCH_AREA)
instance = args.instance or os.getenv("NOTFELLCHEN_INSTANCE") instance = args.instance or os.getenv("NOTFELLCHEN_INSTANCE")
data_file = args.data_file or os.getenv("NOTFELLCHEN_DATA_FILE", DEFAULT_OSM_DATA_FILE) data_file = args.data_file or os.getenv("NOTFELLCHEN_DATA_FILE", DEFAULT_OSM_DATA_FILE)
use_cached = args.use_cached or os.getenv("NOTFELLCHEN_USE_CACHED", False)
if not api_token or not instance: if not api_token or not instance:
raise ValueError("API token and instance URL must be provided via environment variables or CLI arguments.") raise ValueError("API token and instance URL must be provided via environment variables or CLI arguments.")
return api_token, area, instance, data_file return api_token, area, instance, data_file, use_cached
def get_or_none(data, key): def get_or_none(data, key):
@@ -181,14 +183,18 @@ def create_location(tierheim, instance, headers):
def main(): def main():
api_token, area, instance, data_file = get_config() api_token, area, instance, data_file, use_cached = get_config()
# Query shelters if not use_cached:
overpass_result = get_overpass_result(area, data_file) # Query shelters
if overpass_result is None: overpass_result = get_overpass_result(area, data_file)
print("Error: get_overpass_result returned None") if overpass_result is None:
return print("Error: get_overpass_result returned None")
print(f"Response type: {type(overpass_result)}") return
print(f"Response content: {overpass_result}") print(f"Response type: {type(overpass_result)}")
print(f"Response content: {overpass_result}")
else:
with open(data_file, 'r', encoding='utf-8') as f:
overpass_result = json.load(f)
# Set headers and endpoint # Set headers and endpoint
endpoint = f"{instance}/api/organizations/" endpoint = f"{instance}/api/organizations/"