Merge pull request #86 from Hestia-Homes/main

getting deployment working

backend/requirements/base.txt

@@ -24,5 +24,4 @@ typing_extensions==4.7.1
 uvicorn==0.22.0
 uvloop==0.17.0
 watchfiles==0.19.0
-websockets==11.0.3
+websockets==11.0.3
-boto3

make_serverless_requirements.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+# This script combines the requirements from base.txt and requirements.txt into serverless_requirements.txt
+
+# Navigate to the directory containing this script
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+cd "$DIR"
+
+# Concatenate the requirements files with a newline character in between
+cat backend/requirements/base.txt > serverless_requirements.txt
+echo "" >> serverless_requirements.txt
+cat model_data/requirements/requirements.txt >> serverless_requirements.txt
+
+# Identify duplicates
+duplicates=$(sort serverless_requirements.txt | uniq -d)
+
+if [ -n "$duplicates" ]; then
+    echo "Warning: Duplicate entries found:"
+    echo "$duplicates"
+    echo "Please resolve these conflicts manually in the combined requirements file."
+fi
+
+# Print a success message
+echo "Combined requirements files into serverless_requirements.txt"

model_data/Property.py

@@ -1,4 +1,4 @@
-import pandas as pd
+from datetime import datetime
 import re
 from epc_api.client import EpcClient
 from model_data.config import EPC_AUTH_TOKEN
@@ -130,7 +130,8 @@ class Property(BaseUtility):
         """
 
         if self.full_sap_epc:
-            self.year_built = pd.to_datetime(self.full_sap_epc["lodgement-date"]).year
+            self.year_built = datetime.strptime(self.full_sap_epc["lodgement-date"], '%Y-%m-%d').year
+
             return
 
         if self.data["construction-age-band"] not in self.DATA_ANOMALY_MATCHES:

model_data/requirements/dev.txt

@@ -4,3 +4,4 @@ mock
 pytest-cov
 pytest-mock
 pip-check-reqs
+seaborn

model_data/requirements/requirements.txt

@@ -1,5 +1,3 @@
-pandas==2.0.3
-numpy==1.25.1
 pytz==2023.3
 tzdata==2023.3
 epc-api-python==1.0.2
@@ -11,9 +9,5 @@ dbfread
 pyproj
 pint
 mip
-seaborn
-statsmodels
-scikit-learn
 pyspellchecker
-textblob
+textblob
-xgboost

model_data/requirements/static.txt

@@ -1 +1,6 @@
-geopandas
+geopandas
+xgboost
+statsmodels
+scikit-learn
+pandas==2.0.3
+numpy==1.25.1

serverless.yml

@@ -14,13 +14,14 @@ provider:
 
 
 package:
-  #  individually: true
+  individually: true
   #  include:
   #    - backend/**
   #    # Might need to refine the paths that are included
   #    - model_data/**
   exclude:
     - model_data/local_data/**
+    - model_data/tests/**
     - infrastructure/**
     - data_collection/**
     - node_modules/**

serverless_requirements.txt

@@ -1,2 +1,40 @@
--r backend/requirements/base.txt
+anyio==3.7.1
--r model_data/requirements/requirements.txt
+cffi==1.15.1
+click==8.1.3
+cryptography==37.0.4
+ecdsa==0.18.0
+exceptiongroup==1.1.2
+fastapi==0.99.1
+h11==0.14.0
+httptools==0.5.0
+idna==3.4
+mangum==0.17.0
+pyasn1==0.5.0
+pycparser==2.21
+pydantic==1.10.11
+PyJWT==2.7.0
+python-dotenv==1.0.0
+python-jose==3.3.0
+PyYAML==6.0
+rsa==4.9
+six==1.16.0
+sniffio==1.3.0
+starlette==0.27.0
+typing_extensions==4.7.1
+uvicorn==0.22.0
+uvloop==0.17.0
+watchfiles==0.19.0
+websockets==11.0.3
+pytz==2023.3
+tzdata==2023.3
+epc-api-python==1.0.2
+tqdm
+mypy
+fuzzywuzzy
+python-Levenshtein
+dbfread
+pyproj
+pint
+mip
+pyspellchecker
+textblob