re-execute pipeline, break docker files

lfunderburk · May 19, 2023 · b61fb48 · b61fb48
1 parent e535623
commit b61fb48
Show file tree

Hide file tree

Showing 22 changed files with 71,244 additions and 63,740 deletions.
diff --git a/Dockerfile.api b/Dockerfile.api
@@ -21,16 +21,8 @@ USER appuser
 # Copy the rest of the application code
 COPY --from=builder /app .
 
-# Expose the port that the app runs on
+# Expose the port that the Dash app runs on
 EXPOSE 8000
 
-# Install ploomber
-RUN pip install ploomber
-
-# Remove files ending in .metadata from the notebooks folder
-RUN find notebooks -type f -name "*.metadata" -exec rm -f {} \;
-
-RUN ploomber build
-
 # Execute the script when the container starts
 CMD ["uvicorn", "src.app.app:app", "--host", "0.0.0.0"]
diff --git a/Dockerfile.dash b/Dockerfile.dash
@@ -19,10 +19,10 @@ RUN useradd appuser && chown -R appuser /app
 USER appuser
 
 # Copy the rest of the application code
-COPY --from=builder /app/src/visualization /app
+COPY --from=builder /app .
 
 # Expose the port that the Dash app runs on
 EXPOSE 8050
 
 # Run the Dash app
-CMD ["python", "dashboard.py"]
+CMD ["python", "./scr/visualization/dashboard.py"]
diff --git a/Dockerfile.pipe b/Dockerfile.pipe
@@ -0,0 +1,23 @@
+# Use the official Python image as the base image
+FROM python:3.10
+
+# Set the working directory
+WORKDIR /app
+
+# Copy requirements file and install dependencies
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy the rest of the application code
+COPY . .
+
+# Expose the port that the app runs on
+EXPOSE 8000
+
+# Install ploomber
+RUN pip install ploomber
+
+# Remove files ending in .metadata from the notebooks folder
+RUN find notebooks -type f -name "*.metadata" -exec rm -f {} \;
+
+CMD ["ploomber", "build"]
diff --git a/data/predicted-data/predicted_co2_rating.csv b/data/predicted-data/predicted_co2_rating.csv
diff --git a/data/predicted-data/predicted_co2_rating_electric.csv b/data/predicted-data/predicted_co2_rating_electric.csv
diff --git a/data/predicted-data/predicted_co2_rating_hybrid.csv b/data/predicted-data/predicted_co2_rating_hybrid.csv
@@ -237,13 +237,14 @@ model_year,make_,model.1_,vehicleclass_,motor_(kw),enginesize_(l),cylinders_,tra
 2023,lexus,nx 450h+ awd,suv - small,134,2.5,4.0,AV6,B/Z*,2.8 ([24.7 kWh + 0.0 L]/100 km),61,4.5,Z,6.2,7.0,6.6,835,54,10.0,7.0,continuously variable,6.0,premium gasoline,electricity & premium gasoline,236,hybrid
 2023,lincoln,aviator grand touring,suv - standard,62,3.0,6.0,AS10,B/X*,4.2 ([37.3 kWh + 0.0 L]/100 km),34,3.5,X,10.9,9.6,10.3,713,130,8.0,7.0,automatic with select Shift,10.0,regular gasoline,electricity & regular gasoline,237,hybrid
 2023,lincoln,corsair grand touring,suv - small,62,2.5,4.0,AV,B/X*,3.1 ([27.5 kWh + 0.0 L]/100 km),43,3.2,X,6.9,7.4,7.1,639,76,10.0,8.0,continuously variable,,regular gasoline,electricity & regular gasoline,238,hybrid
-2023,mini,cooper se countryman all4,mid-size,65,1.5,3.0,AS6,B/Z*,3.2 ([28.4 kWh + 0.0 L]/100 km),29,3.0,Z,8.1,7.9,8.0,451,109,8.0,3.0,automatic with select Shift,6.0,premium gasoline,electricity & premium gasoline,239,hybrid
-2023,mitsubishi,outlander phev awd,suv - standard,100,2.4,4.0,A1,B/X*,3.6 ([32.1 kWh + 0.0 L]/100 km),61,6.5,X,9.2,8.7,9.0,626,70,10.0,7.0,automatic,1.0,regular gasoline,electricity & regular gasoline,240,hybrid
-2023,subaru,crosstrek hybrid awd,suv - small,100,2.0,4.0,AV,B/X*,2.6 ([23.5 kWh + 0.0 L]/100 km),27,2.0,X,6.6,6.8,6.7,747,94,9.0,6.0,continuously variable,,regular gasoline,electricity & regular gasoline,241,hybrid
-2023,toyota,prius prime se,mid-size,120,2.0,4.0,AV,B/X*,1.8 ([16.4 kWh + 0.0 L]/100 km),72,4.0,X,4.4,4.6,4.5,890,31,10.0,7.0,continuously variable,,regular gasoline,electricity & regular gasoline,242,hybrid
-2023,toyota,rav4 prime,suv - small,134,2.5,4.0,AV,B/X*,2.5 ([22.3 kWh + 0.0 L]/100 km),68,4.5,X,5.7,6.4,6.0,911,44,10.0,7.0,continuously variable,,regular gasoline,electricity & regular gasoline,243,hybrid
-2023,volvo,s60 t8 awd recharge,compact,107,2.0,4.0,AS8,B/Z*,3.0 ([27.2 kWh + 0.0 L]/100 km),64,5.0,Z,8.0,7.2,7.6,792,58,10.0,7.0,automatic with select Shift,8.0,premium gasoline,electricity & premium gasoline,244,hybrid
-2023,volvo,s90 t8 awd recharge,mid-size,107,2.0,4.0,AS8,B/Z*,3.4 ([30.0 kWh + 0.0 L]/100 km),61,5.0,Z,8.5,7.6,8.1,748,65,10.0,7.0,automatic with select Shift,8.0,premium gasoline,electricity & premium gasoline,245,hybrid
-2023,volvo,v60 t8 awd recharge,station wagon - small,107,2.0,4.0,AS8,B/Z*,3.0 ([27.2 kWh + 0.0 L]/100 km),64,5.0,Z,8.0,7.2,7.6,792,58,10.0,7.0,automatic with select Shift,8.0,premium gasoline,electricity & premium gasoline,246,hybrid
-2023,volvo,xc60 t8 awd recharge,suv - small,107,2.0,4.0,AS8,B/Z*,3.5 ([31.2 kWh + 0.0 L]/100 km),58,5.0,Z,8.5,8.5,8.5,838,72,10.0,7.0,automatic with select Shift,8.0,premium gasoline,electricity & premium gasoline,247,hybrid
-2023,volvo,xc90 t8 awd recharge,suv - standard,107,2.0,4.0,AS8,B/Z*,3.8 ([34.4 kWh + 0.0 L]/100 km),53,5.0,Z,9.1,8.6,8.9,803,82,9.0,7.0,automatic with select Shift,8.0,premium gasoline,electricity & premium gasoline,248,hybrid
+2023,mercedes-benz,s 580e 4matic sedan,full-size,110,3.0,6.0,A9,B/Z,4.6 ([30.4 kWh + 1.2 L]/100 km),90,2.25,Z,11.5,8.2,10.0,671,67,10.0,7.0,automatic,9.0,premium gasoline,electricity & premium gasoline,239,hybrid
+2023,mini,cooper se countryman all4,mid-size,65,1.5,3.0,AS6,B/Z*,3.2 ([28.4 kWh + 0.0 L]/100 km),29,3.0,Z,8.1,7.9,8.0,451,109,8.0,3.0,automatic with select Shift,6.0,premium gasoline,electricity & premium gasoline,240,hybrid
+2023,mitsubishi,outlander phev awd,suv - standard,100,2.4,4.0,A1,B/X*,3.6 ([32.1 kWh + 0.0 L]/100 km),61,6.5,X,9.2,8.7,9.0,626,70,10.0,7.0,automatic,1.0,regular gasoline,electricity & regular gasoline,241,hybrid
+2023,subaru,crosstrek hybrid awd,suv - small,100,2.0,4.0,AV,B/X*,2.6 ([23.5 kWh + 0.0 L]/100 km),27,2.0,X,6.6,6.8,6.7,747,94,9.0,6.0,continuously variable,,regular gasoline,electricity & regular gasoline,242,hybrid
+2023,toyota,prius prime se,mid-size,120,2.0,4.0,AV,B/X*,1.8 ([16.4 kWh + 0.0 L]/100 km),72,4.0,X,4.4,4.6,4.5,890,31,10.0,7.0,continuously variable,,regular gasoline,electricity & regular gasoline,243,hybrid
+2023,toyota,rav4 prime,suv - small,134,2.5,4.0,AV,B/X*,2.5 ([22.3 kWh + 0.0 L]/100 km),68,4.5,X,5.7,6.4,6.0,911,44,10.0,7.0,continuously variable,,regular gasoline,electricity & regular gasoline,244,hybrid
+2023,volvo,s60 t8 awd recharge,compact,107,2.0,4.0,AS8,B/Z*,3.0 ([27.2 kWh + 0.0 L]/100 km),64,5.0,Z,8.0,7.2,7.6,792,58,10.0,7.0,automatic with select Shift,8.0,premium gasoline,electricity & premium gasoline,245,hybrid
+2023,volvo,s90 t8 awd recharge,mid-size,107,2.0,4.0,AS8,B/Z*,3.4 ([30.0 kWh + 0.0 L]/100 km),61,5.0,Z,8.5,7.6,8.1,748,65,10.0,7.0,automatic with select Shift,8.0,premium gasoline,electricity & premium gasoline,246,hybrid
+2023,volvo,v60 t8 awd recharge,station wagon - small,107,2.0,4.0,AS8,B/Z*,3.0 ([27.2 kWh + 0.0 L]/100 km),64,5.0,Z,8.0,7.2,7.6,792,58,10.0,7.0,automatic with select Shift,8.0,premium gasoline,electricity & premium gasoline,247,hybrid
+2023,volvo,xc60 t8 awd recharge,suv - small,107,2.0,4.0,AS8,B/Z*,3.5 ([31.2 kWh + 0.0 L]/100 km),58,5.0,Z,8.5,8.5,8.5,838,72,10.0,7.0,automatic with select Shift,8.0,premium gasoline,electricity & premium gasoline,248,hybrid
+2023,volvo,xc90 t8 awd recharge,suv - standard,107,2.0,4.0,AS8,B/Z*,3.8 ([34.4 kWh + 0.0 L]/100 km),53,5.0,Z,9.1,8.6,8.9,803,82,9.0,7.0,automatic with select Shift,8.0,premium gasoline,electricity & premium gasoline,249,hybrid