From 39f954a0887422be4b53f2aa7c2423349ce12411 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Fri, 21 Jul 2023 17:32:06 +0100 Subject: [PATCH] restructured app to move property to backend --- {model_data => backend}/Property.py | 0 backend/app/plan/router.py | 2 +- .../tests/test_property.py | 0 model_data/requirements/requirements.txt | 1 - model_data/requirements/static.txt | 1 - recommendations/FloorRecommendations.py | 2 +- recommendations/WallRecommendations.py | 2 +- recommendations/recommendation_utils.py | 2 +- .../tests/test_data/input_properties.pkl | Bin 34268 -> 32198 bytes .../tests/test_floor_recommendations.py | 13 ++++++++++++- .../tests/test_wall_recommendations.py | 2 +- 11 files changed, 17 insertions(+), 8 deletions(-) rename {model_data => backend}/Property.py (100%) rename {model_data => backend}/tests/test_property.py (100%) diff --git a/model_data/Property.py b/backend/Property.py similarity index 100% rename from model_data/Property.py rename to backend/Property.py diff --git a/backend/app/plan/router.py b/backend/app/plan/router.py index aa8655bf..4934042e 100644 --- a/backend/app/plan/router.py +++ b/backend/app/plan/router.py @@ -3,7 +3,7 @@ from backend.app.dependencies import validate_token from backend.app.plan.schemas import PlanTriggerRequest from backend.app.utils import read_csv_from_s3 from backend.app.config import get_settings -from model_data.Property import Property +from backend.Property import Property from epc_api.client import EpcClient from utils.logger import setup_logger from recommendations.FloorRecommendations import FloorRecommendations diff --git a/model_data/tests/test_property.py b/backend/tests/test_property.py similarity index 100% rename from model_data/tests/test_property.py rename to backend/tests/test_property.py diff --git a/model_data/requirements/requirements.txt b/model_data/requirements/requirements.txt index 1bc54bc7..28fce331 100644 --- a/model_data/requirements/requirements.txt +++ b/model_data/requirements/requirements.txt @@ -18,4 +18,3 @@ statsmodels scikit-learn pyspellchecker textblob -xgboost diff --git a/model_data/requirements/static.txt b/model_data/requirements/static.txt index 95a6a6dd..55b449c1 100644 --- a/model_data/requirements/static.txt +++ b/model_data/requirements/static.txt @@ -1,3 +1,2 @@ -xgboost statsmodels scikit-learn diff --git a/recommendations/FloorRecommendations.py b/recommendations/FloorRecommendations.py index afdea35f..2cf90c0f 100644 --- a/recommendations/FloorRecommendations.py +++ b/recommendations/FloorRecommendations.py @@ -1,7 +1,7 @@ import math from typing import List from model_data.BaseUtility import BaseUtility -from model_data.Property import Property +from backend.Property import Property from model_data.rdsap_tables import default_wall_thickness, age_band_data from recommendations.recommendation_utils import ( r_value_per_mm_to_u_value, calculate_u_value_uplift, is_diminishing_returns, update_lowest_selected_u_value, diff --git a/recommendations/WallRecommendations.py b/recommendations/WallRecommendations.py index f729fc82..35a5b022 100644 --- a/recommendations/WallRecommendations.py +++ b/recommendations/WallRecommendations.py @@ -1,7 +1,7 @@ import itertools import math -from model_data.Property import Property +from backend.Property import Property from model_data.BaseUtility import BaseUtility from recommendations.recommendation_utils import ( r_value_per_mm_to_u_value, calculate_u_value_uplift, is_diminishing_returns, update_lowest_selected_u_value, diff --git a/recommendations/recommendation_utils.py b/recommendations/recommendation_utils.py index 9d09a13a..ae906194 100644 --- a/recommendations/recommendation_utils.py +++ b/recommendations/recommendation_utils.py @@ -1,5 +1,5 @@ from copy import deepcopy -from model_data.Property import Property +from backend.Property import Property from statistics import mean diff --git a/recommendations/tests/test_data/input_properties.pkl b/recommendations/tests/test_data/input_properties.pkl index 09aa1dc953b753f4bedc4e736f58bfd9f66b61b4..d21b89c28dd56cfb872170a9c27b20b7fc67b4e9 100644 GIT binary patch delta 3367 zcmds)U2GFq7RNJV$Akn(NC?JB2;(F`NaAG1-wq4;;yd630?U??I1_u~@x}HSdmI|N zDbSByk8qLbnW{x<)mD92ZM$NrMwPl+byvF&TD5(lAE?s4Y|}ssRi(Dtz4tn4 z0;OHr?Njscn|sIOGxz>|{`Z_*J?`MpUtZ!SGXN^DAds*hZah>~vsWga+ znW7>si!AVblfJkFPYRK)9B4R!O7S#@%E%LF3FT7CWt8QZIaEQ%%PA`76{uBNQV%%Q9bvw-IP6) zy@c{i4)xLL7R;P{D{oFJNlDM5t$1Egx39!ikaB?D zA0%TEeJ>r{!kgRDa-b9q<7px6)gjv=G>WJFMaI)Djm75kcno53gK@3nIfh9Yr-T8P z$r@K&FR{!D__gHj@8bE^S>=%f{_gLo7RdS!<2T^!m{;yGXZtd$-1e@I-YwmfdhuOjX~160 zbQ&F-o6PJE7XGHx8Ap51vFz6@EZO>c8`^0mnGnVrp^do^Go8L%RqSYl{h*$j_& zl|t*Tr9D)1YC`RQnedKOz|n~PXtZm)teXmv?lhnF9p=-}tobx*KKM(2?IM~zXawHr zPp)d?wxy+rgpc|oTyHiOkKp6Ejq`co@NNzc9pWrzXS>U(!z+P0mUqG4<8>wZVu5dW z2|8R`RcAIiJ-#PwHDI)M!r-1m5Gt_%{~!mK_xRSD1wP={^Ce;=l9nVR)7KSt3J^ zxf*5$`WQEyHLr%j!3tB^)+Br|HCgX+@E(VNU$`tG#*!IFRLnTW<6=}tbBD=F=Yr)3 zdfu`vE~=ah>>(?R>^;r$Zs0B4k}`qkdAEmm2i!c&ggDk4faRmBab@cm9cv=1_-0Q| zJzx240d+VlY=^%lEJO~&Br*)7dMvNRaKc(R4yaNB~D3mX(_3SaTq<|W_<9x z-EI=R0&smcc+cKxrjr|C>%2PU(gRrk46d@ch-Z_ko@emy`}@Auo^F93cX|1M*DJZb z5pg^aaE85Zw@320!dMH@>Gw+>zgzNq0%1Y)M_ggv?;G=ZJzkGL;^##VjCdO1e54m{ z{SvR_(OTHkD6;aaaKdYa*AG6vbHR~~51rh-9@$uM^hXm0aaG}1Iy$uiuK#N3<{#py z9GWd_vyQ^Y>coA$wplme(AhEBwBZzOPAup(lX3CBafaCemySPdT)5w0%+q)c@QKL= zCx-(Ild&5rN8XyRSY@H#Ft~AfVl=?A-~4tiqb6)N4J6F?5dFULMD{w3PgS~Cq~OP? z`;mj(+fP0{O74;KAB`|Zcs$CmSq3g2x54S5CB}_t;iYY8s2J_TPg1}9^F$SVon8d_ zDGuI5mkJvp#r5KmGYq@WY#dDV<0cEPbG0m*hAS?&aZ{Nfh4x7Lxn;MP3J^07E^Nd; z%&c!A^&ww2*E7b{N&Pzug`hUxOQF#2p;ODDAJ(bm5b4zLf%ubmY8}VAs_xRM!Kq{G zxVv|1^MwK~9&_~mxbAF`IDtFxC~eT-=mQ(Y|EDGUxEN>DJ}S@+lSbp*Lyr-gtU0-H&L$>A oyA>C7+bwV&7m|k-R~i3!_zm{JRlK+#Wt(ZTt8dwcSY2xWFI(i3^#A|> delta 2438 zcmbVNYfMvT81_3Y6c}28l?nnq1%V zB~nVXD$%Ay2aXBWiKCFZxXy*|SUJR4H=uF~F6ma{vOnlL%9eB;XIqukZ8*jQcLa5q z3o~Mj-3XKAO>iXFg%^FB+m#m=QZZH|+_0Efx*j&@4Fv0fTjjk{$W)wyF`6}hgV0f_ zx4Mf^PvX2V-_;G@4eBMWwV6Pxq1*n^sz;I>(>653g*03u!i@)gVj^%m5xB#82;4y6 zPgalr70B6q`AUP6vPSvpK6LO^U-`=lT7s76xDXi)FnoxMMCqvb5PU+$1kd?-Iuv4f zk$n=B9tFKc2ysE>wAu5xYT%Y9Fz-=1mZ&I-HEWvGI^G8%TXMvo!P;TR%hb_YY3D%%Q5=T#r z)xg?~70{V=VtLl4E3A!U))=;DhA$^zR^KFs#Ip>gvLm?2Yv%qQX8W|vy!qHHi0IR?&3 z6BvCtX`0^fSeTm*!`5gs{95CH8_yfTzoh}EHOAJUIXJgv06E}HzW~*RhP5uU#cj4( zL}68k4u&IUKOHfTj?;dTJq5GoGEqBX>W!RTQ$9Ktc9!v=6!m zW`V=)UN`7qm!}6>NE0-q<-zftI+#c+B3yQ$n;fueFb~=(V_C8rl5*8LY_*g_6tuXR zs5#0_m?KyKnY|+0tA-(CehRBdL1Q`vX9w$n=_U!M4SwHeP^+v~JM6Y@SF0$y9niMi zG%A@E5@YM(vlp{UiYbT7;fw+%;!jdD0`PK(=Nx4|bZdT1QVgw&Uc zG^v|-E*ADdXNeIsJuY~^WDhj$&VwsG2On3S=WOx+pf+rQJVb6dvAqIos<(6*w#M0{ znkLzbCpyjBs*Mc?R28p^@+hXV#cFB9JBknwr}@{U&OQkd7$?;4RS44$pY~rtG9gN( z4_|l_VgIQbs3GJ}FqBZAZj;Uqs#Wb*)Od{lMIMtI#%Ir7!=EQL2G2U{m7o2rmeOfI zLX*!k4L3?ieJ@gH^QaJU3p_C|z-=uozP z!9KN_vcE1a$J)x|%x67jq%b++e0DkSgde#wa(VB3piN+yFhB6iiX|ufs9$R6DTb&0 z3zj)EQTMc#S-`%PiqY@E*d^HQa*QpU#{fPV$v?RXQ$sq<+wY&q-DsU!9$?s3po1o+ x7KGTvBt!O0DGa$cUAM@P6gKG-3%+|{-)UlN7q0iexN<<=Xp$?~j)$45zX2G2