Fix data fetch 2

This commit is contained in:
Urtzi Alfaro
2025-07-27 20:20:09 +02:00
parent 4684235111
commit a627b566d2
6 changed files with 179 additions and 115 deletions

View File

@@ -140,17 +140,29 @@ class TrainingService:
# Fetch sales data from data service
sales_data = await self.data_client.fetch_sales_data(tenant_id)
# Fetch external data if requested
if not sales_data:
raise ValueError("No sales data found for training")
# Determine date range from sales data
start_date, end_date = await self._determine_sales_date_range(sales_data)
# Fetch external data if requested using the sales date range
weather_data = []
traffic_data = []
if request.include_weather:
await self._update_job_status(db, job_id, "running", 15, "Fetching weather data")
weather_data = await self.data_client.fetch_weather_data(tenant_id)
await self._update_job_status(db, job_id, "running", 15, "Fetching weather data")
weather_data = await self.data_client.fetch_weather_data(
tenant_id,
start_date=start_date.isoformat(),
end_date=end_date.isoformat()
)
if request.include_traffic:
await self._update_job_status(db, job_id, "running", 25, "Fetching traffic data")
traffic_data = await self.data_client.fetch_traffic_data(tenant_id)
await self._update_job_status(db, job_id, "running", 25, "Fetching traffic data")
traffic_data = await self.data_client.fetch_traffic_data(
tenant_id,
start_date=start_date.isoformat(),
end_date=end_date.isoformat()
)
# Execute ML training
await self._update_job_status(db, job_id, "running", 35, "Processing training data")
@@ -668,4 +680,26 @@ class TrainingService:
except Exception as e:
logger.error(f"Failed to get training logs: {str(e)}")
return None
return None
async def _determine_sales_date_range(self, sales_data: List[Dict]) -> tuple[datetime, datetime]:
"""Determine start and end dates from sales data"""
if not sales_data:
raise ValueError("No sales data available to determine date range")
dates = []
for record in sales_data:
if 'date' in record:
if isinstance(record['date'], str):
dates.append(datetime.fromisoformat(record['date'].replace('Z', '+00:00')))
elif isinstance(record['date'], datetime):
dates.append(record['date'])
if not dates:
raise ValueError("No valid dates found in sales data")
start_date = min(dates)
end_date = max(dates)
logger.info(f"Determined sales date range: {start_date} to {end_date}")
return start_date, end_date