Spaces:
Sleeping
Sleeping
Upload realtime_pipeline.py
Browse files- realtime_pipeline.py +23 -10
realtime_pipeline.py
CHANGED
|
@@ -317,13 +317,16 @@ class RealTimeFeatureExtractor:
|
|
| 317 |
point = ee.Geometry.Point([longitude, latitude])
|
| 318 |
buffer_sizes = [0, 500, 1000, 2000]
|
| 319 |
|
| 320 |
-
#
|
| 321 |
-
|
| 322 |
-
|
| 323 |
-
|
| 324 |
-
|
| 325 |
-
|
| 326 |
-
|
|
|
|
|
|
|
|
|
|
| 327 |
|
| 328 |
soil_image = ee.Image.cat([sand, silt, clay, soc, ph, cec]) \
|
| 329 |
.rename(['sand', 'silt', 'clay', 'soc', 'ph', 'cec'])
|
|
@@ -351,11 +354,21 @@ class RealTimeFeatureExtractor:
|
|
| 351 |
|
| 352 |
if soil_values['sand'] is not None:
|
| 353 |
self.logger.info(f"✅ Soil data success with {method}")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 354 |
npk_data = self._estimate_npk_nutrients(soil_values)
|
| 355 |
soil_values.update(npk_data)
|
| 356 |
soil_values['soil_retrieval_method'] = method
|
| 357 |
soil_values['soil_buffer_used_m'] = buffer_size
|
| 358 |
return soil_values
|
|
|
|
| 359 |
except Exception as e:
|
| 360 |
self.logger.warning(f"⚠️ Soil buffer {buffer_size}m failed: {str(e)[:50]}")
|
| 361 |
continue
|
|
@@ -363,13 +376,13 @@ class RealTimeFeatureExtractor:
|
|
| 363 |
self.logger.warning("❌ All soil retrieval methods failed")
|
| 364 |
return {
|
| 365 |
'sand': None, 'silt': None, 'clay': None, 'soc': None, 'ph': None, 'cec': None,
|
| 366 |
-
'nitrogen_percent': 0.
|
| 367 |
'npk_confidence': 'Low - Default', 'soil_retrieval_method': 'no_data_available'
|
| 368 |
}
|
|
|
|
| 369 |
except Exception as e:
|
| 370 |
self.logger.error(f"❌ Soil extraction failed: {e}")
|
| 371 |
-
return None
|
| 372 |
-
|
| 373 |
def get_bdod_data(self, latitude, longitude):
|
| 374 |
"""Get soil bulk density with buffer fallback"""
|
| 375 |
try:
|
|
|
|
| 317 |
point = ee.Geometry.Point([longitude, latitude])
|
| 318 |
buffer_sizes = [0, 500, 1000, 2000]
|
| 319 |
|
| 320 |
+
# ✅ استخدم نفس الـ dataset من Historical Data
|
| 321 |
+
collection_base = "projects/soilgrids-isric"
|
| 322 |
+
|
| 323 |
+
# ✅ استخدم نفس أسماء الـ bands
|
| 324 |
+
sand = ee.Image(f"{collection_base}/sand_mean").select("sand_0-5cm_mean")
|
| 325 |
+
silt = ee.Image(f"{collection_base}/silt_mean").select("silt_0-5cm_mean")
|
| 326 |
+
clay = ee.Image(f"{collection_base}/clay_mean").select("clay_0-5cm_mean")
|
| 327 |
+
soc = ee.Image(f"{collection_base}/soc_mean").select("soc_0-5cm_mean")
|
| 328 |
+
ph = ee.Image(f"{collection_base}/phh2o_mean").select("phh2o_0-5cm_mean")
|
| 329 |
+
cec = ee.Image(f"{collection_base}/cec_mean").select("cec_0-5cm_mean")
|
| 330 |
|
| 331 |
soil_image = ee.Image.cat([sand, silt, clay, soc, ph, cec]) \
|
| 332 |
.rename(['sand', 'silt', 'clay', 'soc', 'ph', 'cec'])
|
|
|
|
| 354 |
|
| 355 |
if soil_values['sand'] is not None:
|
| 356 |
self.logger.info(f"✅ Soil data success with {method}")
|
| 357 |
+
|
| 358 |
+
# ✅ أعدل هنا لضبط الوحدات بشكل صحيح
|
| 359 |
+
# SoilGrids يعطي القيم بـ:
|
| 360 |
+
# sand/silt/clay: g/kg × 10
|
| 361 |
+
# soc: cg/kg × 10
|
| 362 |
+
# ph: pH × 10
|
| 363 |
+
# cec: mmol(c)/kg × 10
|
| 364 |
+
|
| 365 |
+
# لا تحتاج تعديل! لأن الـ NPK estimator يعمل مع القيم الأصلية
|
| 366 |
npk_data = self._estimate_npk_nutrients(soil_values)
|
| 367 |
soil_values.update(npk_data)
|
| 368 |
soil_values['soil_retrieval_method'] = method
|
| 369 |
soil_values['soil_buffer_used_m'] = buffer_size
|
| 370 |
return soil_values
|
| 371 |
+
|
| 372 |
except Exception as e:
|
| 373 |
self.logger.warning(f"⚠️ Soil buffer {buffer_size}m failed: {str(e)[:50]}")
|
| 374 |
continue
|
|
|
|
| 376 |
self.logger.warning("❌ All soil retrieval methods failed")
|
| 377 |
return {
|
| 378 |
'sand': None, 'silt': None, 'clay': None, 'soc': None, 'ph': None, 'cec': None,
|
| 379 |
+
'nitrogen_percent': 0.15, 'phosphorus_mg_kg': 12.0, 'potassium_mg_kg': 150.0,
|
| 380 |
'npk_confidence': 'Low - Default', 'soil_retrieval_method': 'no_data_available'
|
| 381 |
}
|
| 382 |
+
|
| 383 |
except Exception as e:
|
| 384 |
self.logger.error(f"❌ Soil extraction failed: {e}")
|
| 385 |
+
return None
|
|
|
|
| 386 |
def get_bdod_data(self, latitude, longitude):
|
| 387 |
"""Get soil bulk density with buffer fallback"""
|
| 388 |
try:
|