diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d7021f4c..50e1c8ee 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -10,32 +10,32 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ build-essential pkg-config automake autoconf libtool \ && rm -rf /var/lib/apt/lists/* -# # 2) Build and install libpostal from source -# RUN git clone --depth 1 https://github.com/openvenues/libpostal /tmp/libpostal \ -# && cd /tmp/libpostal \ -# && ./bootstrap.sh \ -# && ./configure --datadir=/usr/local/share/libpostal \ -# && make -j"$(nproc)" \ -# && make install \ -# && ldconfig \ -# && rm -rf /tmp/libpostal +# 2) Build and install libpostal from source +RUN git clone --depth 1 https://github.com/openvenues/libpostal /tmp/libpostal \ + && cd /tmp/libpostal \ + && ./bootstrap.sh \ + && ./configure --datadir=/usr/local/share/libpostal \ + && make -j"$(nproc)" \ + && make install \ + && ldconfig \ + && rm -rf /tmp/libpostal # 3) Create the user and grant sudo privileges RUN useradd -m -s /usr/bin/bash ${USER} \ && echo "${USER} ALL=(ALL) NOPASSWD: ALL" >/etc/sudoers.d/${USER} \ && chmod 0440 /etc/sudoers.d/${USER} -# # 4) Python deps - if you want to run assest list -# ENV PIP_NO_CACHE_DIR=1 PIP_DISABLE_PIP_VERSION_CHECK=1 -# ADD asset_list/requirements.txt requirements.txt -# RUN pip install -r requirements.txt +# 4) Python deps - if you want to run assest list +ENV PIP_NO_CACHE_DIR=1 PIP_DISABLE_PIP_VERSION_CHECK=1 +ADD asset_list/requirements.txt requirements.txt +RUN pip install -r requirements.txt # -ENV PIP_NO_CACHE_DIR=1 PIP_DISABLE_PIP_VERSION_CHECK=1 -ADD backend/engine/requirements.txt requirements1.txt -ADD backend/app/requirements/requirements.txt requirements2.txt -RUN cat requirements1.txt requirements2.txt > requirements.txt -RUN pip install -r requirements.txt +# ENV PIP_NO_CACHE_DIR=1 PIP_DISABLE_PIP_VERSION_CHECK=1 +# ADD backend/engine/requirements.txt requirements1.txt +# ADD backend/app/requirements/requirements.txt requirements2.txt +# RUN cat requirements1.txt requirements2.txt > requirements.txt +# RUN pip install -r requirements.txt # 5) Workdir WORKDIR /workspaces/model diff --git a/asset_list/AssetList.py b/asset_list/AssetList.py index 248eb8ea..b66475ac 100644 --- a/asset_list/AssetList.py +++ b/asset_list/AssetList.py @@ -1136,13 +1136,17 @@ class AssetList: ), axis=1 ) + + col = self.EPC_API_DATA_NAMES["roof-description"] self.standardised_asset_list[self.ATTRIBUTE_EPC_ROOF_INSULATION_THICKNESS] = self.standardised_asset_list.apply( - lambda x: RoofAttributes(description=x[self.EPC_API_DATA_NAMES["roof-description"]]).process()[ + lambda x: RoofAttributes(description=x[col]).process()[ "insulation_thickness"] if not pd.isnull( - x[self.EPC_API_DATA_NAMES["roof-description"]]) else None, + x[col]) else None, axis=1 ) + + self.standardised_asset_list[self.ATTRIBUTE_EPC_ROOF_INSULATION_THICKNESS] = ( self.standardised_asset_list[self.ATTRIBUTE_EPC_ROOF_INSULATION_THICKNESS].str.replace("+", "") ) diff --git a/asset_list/app.py b/asset_list/app.py index b78e968f..7ca30808 100644 --- a/asset_list/app.py +++ b/asset_list/app.py @@ -13,7 +13,7 @@ from asset_list.utils import get_data from dotenv import load_dotenv from backend.SearchEpc import SearchEpc load_dotenv(dotenv_path="backend/.env") -EPC_AUTH_TOKEN = os.getenv("EPC_AUTH_TOKEN") +EPC_AUTH_TOKEN = os.getenv("EPC_AUTH_TOKEN", "a2Nvbm5rb3dsZXNzYXJAZ21haWwuY29tOjY5MGJiMWM0NmIyOGI5ZDUxYzAxMzQzYzNiZGNlZGJjZDNmODQwMzA=") def extract_address1(asset_list, full_address_col, postcode_col, method="first_two_words"): @@ -59,11 +59,11 @@ def app(): """ data_folder = ("/workspaces/model/asset_list") data_filename = "assets.xlsx" - sheet_name = "Fabric Programme" + sheet_name = "Sheet1" postcode_column = 'Postcode' address1_column = None address1_method = 'house_number_extraction' - fulladdress_column = 'Address' + fulladdress_column = 'Area' address_cols_to_concat = None missing_postcodes_method = None landlord_year_built = None @@ -74,7 +74,7 @@ def app(): landlord_roof_construction = None landlord_heating_system = None landlord_existing_pv = None - landlord_property_id = "UPRN" + landlord_property_id = "LLUPRN" landlord_sap = None outcomes_filename = None outcomes_sheetname = None