sosokker/HomieCare
1
0
Fork 0
mirror of https://github.com/Sosokker/HomieCare.git synced 2025-12-19 02:04:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update indoor temperature predicton api logic

Browse Source
This commit is contained in:
sosokker 2024-05-11 19:03:42 +07:00
parent 2caa415ac8
commit 5dc4cb2c3b
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
StreamServer/src/query/prediction.py
View File

@ -12,11 +12,11 @@ def get_temp_prediction_data(session: Session):
limit_day = current_time + timedelta(days=5) limit_day = current_time + timedelta(days=5)
return session.query( return session.query(
PredictionData.timestamp, PredictionData.indoor_temp PredictionData.timestamp, PredictionData.indoor_temp, PredictionData.outdoor_temp
).filter( ).filter(
PredictionData.timestamp >= current_time, PredictionData.timestamp >= current_time,
PredictionData.timestamp < limit_day PredictionData.timestamp < limit_day
).order_by(PredictionData.timestamp.desc()).all() ).order_by(PredictionData.timestamp.asc()).limit(12)
def get_feature_prediction_data(session: Session): def get_feature_prediction_data(session: Session):
@ -30,4 +30,4 @@ def get_feature_prediction_data(session: Session):
).filter( ).filter(
PredictionData.timestamp >= current_time, PredictionData.timestamp >= current_time,
PredictionData.timestamp < limit_day PredictionData.timestamp < limit_day
).order_by(PredictionData.timestamp.desc()).all() ).order_by(PredictionData.timestamp.asc()).limit(12)

8
StreamServer/src/routers/prediction.py
View File

@ -10,7 +10,7 @@ from fastapi import APIRouter, Depends, HTTPException, status
from analytic.health.indoor_model import XgboostIndoorModel from analytic.health.indoor_model import XgboostIndoorModel
from config import WEATHER_API_KEY, LAT, LON from config import WEATHER_API_KEY, LAT, LON
from database import SessionLocal from database import SessionLocal
from scheme import IndoorTemperature from scheme import PredictonTemperature
from models import PredictionData from models import PredictionData
from query.prediction import get_temp_prediction_data, get_feature_prediction_data from query.prediction import get_temp_prediction_data, get_feature_prediction_data
@ -38,7 +38,7 @@ def _fetch_data_from_api() -> dict:
return response.json() return response.json()
@router.get("/indoor/predict/", response_model=list[IndoorTemperature]) @router.get("/indoor/predict/", response_model=list[PredictonTemperature])
async def get_tomorrow_indoor_temp(db: Session = Depends(get_db)): async def get_tomorrow_indoor_temp(db: Session = Depends(get_db)):
result = get_temp_prediction_data(db) result = get_temp_prediction_data(db)
if not result: if not result:
@ -54,7 +54,7 @@ async def get_tomorrow_indoor_temp(db: Session = Depends(get_db)):
data = data['main'] data = data['main']
features = [data['temp'], data['feels_like'], data['pressure'], data['humidity']] features = [data['temp'], data['feels_like'], data['pressure'], data['humidity']]
result = xgboost.predict(features) result = xgboost.predict(features)
results.append(IndoorTemperature(indoor_temp=result, timestamp=ts)) results.append(PredictonTemperature(indoor_temp=result, timestamp=ts, outdoor_temp=data['temp']))
new_data_entry = PredictionData( new_data_entry = PredictionData(
timestamp=ts, timestamp=ts,
indoor_temp=result, indoor_temp=result,
@ -74,5 +74,5 @@ async def get_tomorrow_indoor_temp(db: Session = Depends(get_db)):
else: else:
for i in features: for i in features:
indoor = xgboost.predict([i.outdoor_temp, i.outdoor_feels_like, i.outdoor_pressure, i.outdoor_humidity]) indoor = xgboost.predict([i.outdoor_temp, i.outdoor_feels_like, i.outdoor_pressure, i.outdoor_humidity])
result.append(IndoorTemperature(timestamp=i.timestamp, indoor_temp=indoor)) result.append(PredictonTemperature(timestamp=i.timestamp, indoor_temp=indoor, outdoor_temp=i.outdoor_temp))
return result return result

4
StreamServer/src/scheme.py
View File

@ -68,9 +68,11 @@ class Camera(BaseModel):
status: bool = False status: bool = False
class IndoorTemperature(BaseModel): class PredictonTemperature(BaseModel):
timestamp: Optional[datetime] timestamp: Optional[datetime]
indoor_temp: Optional[float] indoor_temp: Optional[float]
outdoor_temp: Optional[float]
# class Action(BaseModel): # class Action(BaseModel):