junte/Model
1
0
Fork 0
mirror of https://github.com/Hestia-Homes/Model.git synced 2026-06-30 13:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding parsing of kwargs to Property class

Browse source
This commit is contained in:
Khalim Conn-Kowlessar 2024-04-11 11:49:48 +01:00
parent 2aa2e5947e
commit 606fd3a615
4 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/Model.iml generated
View file

@ -7,7 +7,7 @@
<sourceFolder url="file://$MODULE_DIR$/open_uprn" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/open_uprn" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/recommendations" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/recommendations" isTestSource="false" />
</content> </content>
<orderEntry type="jdk" jdkName="Python 3.10 (model_data)" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="Python 3.10 (backend)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
<component name="PyNamespacePackagesService"> <component name="PyNamespacePackagesService">

2
.idea/misc.xml generated
View file

@ -3,7 +3,7 @@
<component name="Black"> <component name="Black">
<option name="sdkName" value="Python 3.10 (backend)" /> <option name="sdkName" value="Python 3.10 (backend)" />
</component> </component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (model_data)" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (backend)" project-jdk-type="Python SDK" />
<component name="PythonCompatibilityInspectionAdvertiser"> <component name="PythonCompatibilityInspectionAdvertiser">
<option name="version" value="3" /> <option name="version" value="3" />
</component> </component>

6
backend/Property.py
View file

@ -139,6 +139,8 @@ class Property:
self.recommendations_scoring_data = [] self.recommendations_scoring_data = []
self.parse_kwargs(kwargs)
@classmethod @classmethod
def extract_kwargs(cls, kwargs): def extract_kwargs(cls, kwargs):
""" """
@ -150,11 +152,11 @@ class Property:
n_bathrooms = kwargs.get("n_bathrooms", None) n_bathrooms = kwargs.get("n_bathrooms", None)
if n_bathrooms is not None: if n_bathrooms is not None:
# We add on a small value to ensure that the number of bathrooms is rounded up, in case the value is 0.5 # We add on a small value to ensure that the number of bathrooms is rounded up, in case the value is 0.5
n_bathrooms = int(round(n_bathrooms + 1e-5)) n_bathrooms = int(round(float(n_bathrooms) + 1e-5))
n_bedrooms = kwargs.get("n_bedrooms", None) n_bedrooms = kwargs.get("n_bedrooms", None)
if n_bedrooms is not None: if n_bedrooms is not None:
n_bedrooms = int(round(n_bedrooms + 1e-5)) n_bedrooms = int(round(float(n_bedrooms) + 1e-5))
return { return {
"n_bathrooms": n_bathrooms, "n_bathrooms": n_bathrooms,

20
backend/app/plan/router.py
View file

@ -109,16 +109,16 @@ async def trigger_plan(body: PlanTriggerRequest):
session, body.portfolio_id, epc_searcher.address_clean, epc_searcher.postcode_clean, epc_searcher.uprn session, body.portfolio_id, epc_searcher.address_clean, epc_searcher.postcode_clean, epc_searcher.uprn
) )
# if a new record was not created, we don't produduce recommendations # if a new record was not created, we don't produduce recommendations
if not is_new: # if not is_new:
continue # continue
#
create_property_targets( # create_property_targets(
session, # session,
property_id=property_id, # property_id=property_id,
portfolio_id=body.portfolio_id, # portfolio_id=body.portfolio_id,
epc_target=body.goal_value, # epc_target=body.goal_value,
heat_demand_target=None # heat_demand_target=None
) # )
epc_records = { epc_records = {
'original_epc': epc_searcher.newest_epc.copy(), 'original_epc': epc_searcher.newest_epc.copy(),