From f48296c6a7ef501f30ff382296872087672b4ccf Mon Sep 17 00:00:00 2001 From: Paul Schreiber Date: Tue, 10 Dec 2024 10:43:28 -0500 Subject: [PATCH 1/2] fix: allow soilweb URL to be overridden with environment variable --- soil_id/config.py | 1 + soil_id/services.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/soil_id/config.py b/soil_id/config.py index 2ff2f04..ca70423 100644 --- a/soil_id/config.py +++ b/soil_id/config.py @@ -41,6 +41,7 @@ # US Soil ID STATSGO_PATH = f"{DATA_PATH}/gsmsoilmu_a_us.shp" MUNSELL_RGB_LAB_PATH = f"{DATA_PATH}/LandPKS_munsell_rgb_lab.csv" +SOILWEB_URL = os.environ.get("SOILWEB_URL", "https://soilmap4-1.lawr.ucdavis.edu/api/landPKS.php") # Global Soil ID HWSD_PATH = f"{DATA_PATH}/HWSD_global_noWater_no_country.shp" diff --git a/soil_id/services.py b/soil_id/services.py index ad429f8..f98e488 100644 --- a/soil_id/services.py +++ b/soil_id/services.py @@ -17,6 +17,7 @@ import logging import re +import config import pandas as pd import requests @@ -162,7 +163,7 @@ def get_soilweb_data(lon, lat): Returns: dict: A dictionary containing soil data or error information if the request fails. """ - base_url = "https://soilmap4-1.lawr.ucdavis.edu/api/landPKS.php" + base_url = config.SOILWEB_URL params = { "q": "spn", # Query type - static for this function's purpose "lon": lon, From d83b4f511168af503b3efd1b060e549b51796340 Mon Sep 17 00:00:00 2001 From: Paul Schreiber Date: Tue, 10 Dec 2024 10:54:08 -0500 Subject: [PATCH 2/2] fix: fix config import in services --- soil_id/services.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/soil_id/services.py b/soil_id/services.py index f98e488..4ddc5fd 100644 --- a/soil_id/services.py +++ b/soil_id/services.py @@ -17,10 +17,10 @@ import logging import re -import config import pandas as pd import requests +from .config import SOILWEB_URL from .db import save_soilgrids_output @@ -163,7 +163,7 @@ def get_soilweb_data(lon, lat): Returns: dict: A dictionary containing soil data or error information if the request fails. """ - base_url = config.SOILWEB_URL + base_url = SOILWEB_URL params = { "q": "spn", # Query type - static for this function's purpose "lon": lon,