Merge branch 'master' into Heat_Cool_Load_Predictor

.github/workflows/validate-pr.yaml

@@ -44,7 +44,7 @@ jobs:
     - name: Test Streamlit App
       run: |
         pip install streamlit
-        streamlit run app.py --server.headless true --browser.gatherUsageStats false &
+        streamlit run App.py --server.headless true --browser.gatherUsageStats false &
         sleep 10  # Wait for the app to start
         curl --retry 5 --retry-delay 5 http://localhost:8501
       env:

docs/project-structure.md

@@ -4,37 +4,59 @@ The directory layout of **Predictive Calc** is organized in a way that separates
 
 ```
 predictive-calc/
-├── app.py                          # Main entry point for the Streamlit web app
-├── docs/                           # Documentation files
-├── form_configs/                   # Configuration files for the forms
-│   ├── house_price.json             # JSON configuration for house price model form input fields
-│   ├── loan_eligibility.json        # JSON configuration for loan eligibility model form input fields
-├── models/                         # Folder containing machine learning models
-│   ├── house_price/                # Example model directory (for house price prediction)
-│   │   ├── data/                   # Datasets used by the models
-│   │   ├── notebooks/               # Jupyter notebooks for training and experimentation
+├── app.py                           # Main entry point for the Streamlit web app
+├── docs/                            # Documentation files
+│   ├── project-structure.md         	# Directory layout of the repository
+│   ├── tutorial.md                  	# Steps to integrate a new machine learning model into the repository 
+├── form_configs/                    # Configuration files for the forms
+│   ├── house_price.json             	# JSON configuration for house price model form input fields
+│   ├── loan_eligibility.json        	# JSON configuration for loan eligibility model form input fields
+│   ├── ...
+├── models/                          # Folder containing machine learning models
+│   ├── house_price/                 	# Example model directory (for house price prediction)
+│   │   ├── data/                    	  # Datasets used by the models
+│   │   ├── notebooks/               		# Jupyter notebooks for dataset exploration and model training
 │   │   │   ├── house_price.ipynb 
-│   │   ├── saved_models/            # Serialized (pickled) model files and scalers
-│   │   │   ├── model.pkl            # Trained model for predictions
-│   │   │   ├── scaler.pkl           # Scaler for data normalization
-│   │   ├── model.py                 # Code to define and train the model
-│   │   ├── predict.py               # Code to make predictions using the trained model
-│   ├── modelEvaluation.py           # Model evaluation class
+│   │   ├── saved_models/            		# Serialized (pickled) model files and scalers
+│   │   │   ├── model.pkl            			# Trained model for predictions
+│   │   │   ├── scaler.pkl           			# Scaler for data normalization
+│   │   ├── model.py                 	# Code to define and train the model
+│   │   ├── predict.py               	# Code to make predictions using the trained model. Contain get_prediction() function
+│   ├── modelEvaluation.py           # Model evaluation class generates plots and metrics
+│   ├── ...
 ├── pages/                           # Streamlit pages representing different calculators
+│   ├── pages.json                   	# Configuration file for managing page details and settings
 │   ├── House_Price_Estimator.py    
 │   ├── Loan_Eligibility_Estimator.py
-│   ├── pages.json                   # Configuration file for managing page details and settings
-├── form_handler.py                  # Handles dynamic form generation based on JSON configs
-├── page_handler.py                  # Manages the page rendering logic and handles model predictions
-├── requirements.txt                 # List of Python dependencies
+│   ├── ...
+├── assets/
+│   ├── images/                      # Image assets used in the Streamlit app                  
+│   │   ├── machine-learning.png
+│   │   ├── machine-learning.gif
+│   │   ├── ...
+├── form_handler.py                  # Class to handle dynamic form generation based on JSON configs
+├── page_handler.py                  # Class to manage the page rendering logic and handles model predictions
+├── requirements.txt                 # List of Python dependencies required for the Streamlit App
+├── dev-requirements.txt             # Development dependencies, including Jupyter and tools for local use, excluding those needed for production Streamlit
+├── packages.txt                     # List of Ubuntu packages required for Streamlit App
+├── Dockerfile                       # Instructions for building a Docker Image
+├── docker-compose.yml               # To set up a docker container for streamlit
+├── docker-compose.debug.yml         # To debug inside the docker container using Debugpy
+├── readme.md                        # Overview of the project and setup instructions
 ```
 
 ### Key Components
 
 #### 1. `app.py`
 This is the entry point for the **Streamlit** application. It initializes the app and renders the home page, and loads the model calculators having their pages in the `pages/` directory.
 
-#### 2. `models/`
+#### 2. `page_handler.py`
+The page_handler.py file manages the rendering of pages in the Predictive Calc application by reading configurations from the pages.json file. It dynamically loads page titles, icons, and model paths, ensuring a smooth user experience. The class integrates model prediction logic and utilizes the `FormHandler` to generate dynamic forms based on the specified configurations. It also manages multiple tabs, enhancing functionality and allowing for easy updates or additions of new models while maintaining a cohesive interface.
+
+#### 3. `form_handler.py`
+This script dynamically generates the input forms based on the JSON configuration files. It maps user inputs to the model’s expected parameters and passes the data to the prediction logic.
+
+#### 4. `models/`
 Each model gets its own folder within the `models/` directory, which contains all necessary files for that particular model. This includes:
 - **notebooks/**: Jupyter notebooks for model training and experimentation.
 - **model.py**: Code defining and training the finally chosen machine learning model.
@@ -43,20 +65,27 @@ Each model gets its own folder within the `models/` directory, which contains al
 - **data/**: Raw datasets used for training the model.
 - **modelEvaluation.py**: Scripts for model evaluation and reporting.
 
-#### 3. `pages/`
+#### 5. `pages/`
 Each model has a corresponding Streamlit page in the `pages/` folder. This page handles the frontend logic, rendering the forms for user input and displaying the prediction results. For example, the `house_price_calculator.py` page contains the interface for the house price prediction model.
 
-#### 4. `pages/pages.json`
+#### 6. `pages/pages.json`
 This file manages the configuration for all pages in the application, defining attributes such as titles, icons, model paths, and tab configurations for each calculator. This centralizes the configuration for easier updates and management of multiple pages.
 
-#### 5. `page_handler.py`
-The page_handler.py file manages the rendering of pages in the Predictive Calc application by reading configurations from the pages.json file. It dynamically loads page titles, icons, and model paths, ensuring a smooth user experience. The class integrates model prediction logic and utilizes the `FormHandler` to generate dynamic forms based on the specified configurations. It also manages multiple tabs, enhancing functionality and allowing for easy updates or additions of new models while maintaining a cohesive interface.
-
-#### 6. `form_configs/`
+#### 7. `form_configs/`
 The `form_configs/` folder contains JSON configuration files that define the input fields required by each model. These JSON files dictate how the forms are dynamically generated by `form_handler.py`. For example, the `house_price.json` file specifies the input fields (e.g., square footage, number of bedrooms, etc.) needed for the house price prediction model.
 
-#### 7. `form_handler.py`
-This script dynamically generates the input forms based on the JSON configuration files. It maps user inputs to the model’s expected parameters and passes the data to the prediction logic.
-
 #### 8. `docs/`
-Contains the project's documentation. This is where you can find information about how the system is structured and how to contribute to the project.
+Contains the project's documentation. This is where you can find information about how the system is structured and how to contribute to the project, more specifically the `tutorial.md` and `project-stuctures.md` files.
+
+#### 9. `requirements.txt`, `dev-requirements.txt`, `packages.txt`
+- `requirements.txt` contains the Python dependencies required to run the Streamlit application.
+- `dev-requirements.txt` includes additional dependencies for development purposes, such as Jupyter notebooks and other tools.
+- `packages.txt` lists the Ubuntu packages required for the Streamlit application to run correctly.
+
+#### 10. `Dockerfile`, `docker-compose.yml`, `docker-compose.debug.yml`
+- `Dockerfile` contains the instructions for building a Docker image that can run the Streamlit application.
+- `docker-compose.yml` sets up a Docker container for the Streamlit application.
+- `docker-compose.debug.yml` allows debugging inside the Docker container using Debugpy.
+
+#### 11. `assets/`
+This folder contains all the assets used in the main project.

docs/tutorial.md

@@ -34,4 +34,8 @@ In the `pages/pages.json` file, add an entry for your new model. This configurat
 - The page name on the sidebar will be same as the file name.
 
 ### 7. Update the Main App
-In `app.py`, update the list of available pages
+In `app.py`, update the list of available pages
+
+### 8. Update and Test the Dependencies
+- If you've added or updated any dependencies (packages/modules/libraries) for your model, update the `requirements.txt` file accordingly.
+- After updating, test the entire project to ensure there are no version conflicts between packages. This helps maintain a stable and reproducible environment for all the contributors.

form_configs/credit_card_fraud.json

@@ -0,0 +1,79 @@
+{
+    "Credit Card Fraud Estimator": {
+        "Average Amount per Transaction per Day": {
+            "type": "number",
+            "min_value": 0,
+            "max_value": 100000,
+            "default_value": 100,
+            "step": 100,
+            "field_name": "avg_amount_per_day"
+        },
+        "Transaction Amount": {
+            "type": "number",
+            "min_value": 0,
+            "max_value": 100000,
+            "default_value": 3000,
+            "step": 100,
+            "field_name": "transaction_amount"
+        },
+        "Is Declined": {
+            "type": "dropdown",
+            "options": [
+                "Yes",
+                "No"
+            ],
+            "default_value": "No",
+            "field_name": "Is_declined"
+        },
+        "Total Number of Declines per Day": {
+            "type": "number",
+            "min_value": 0,
+            "max_value": 100,
+            "default_value": 0,
+            "step": 1,
+            "field_name": "no_of_declines_per_day"
+        },
+        "Is Foreign Transaction": {
+            "type": "dropdown",
+            "options": [
+                "Yes",
+                "No"
+            ],
+            "default_value": "No",
+            "field_name": "Is_Foreign_transaction"
+        },
+        "Is High-Risk Country": {
+            "type": "dropdown",
+            "options": [
+                "Yes",
+                "No"
+            ],
+            "default_value": "No",
+            "field_name": "Is_High_Risk_country"
+        },
+        "Daily Chargeback Average Amount": {
+            "type": "number",
+            "min_value": 0,
+            "max_value": 10000,
+            "default_value": 0,
+            "step": 100,
+            "field_name": "Daily_chargeback_avg_amt"
+        },
+        "6-Month Average Chargeback Amount": {
+            "type": "number",
+            "min_value": 0,
+            "max_value": 10000,
+            "default_value": 0,
+            "step": 100,
+            "field_name": "six_month_avg_chbk_amt"
+        },
+        "6-Month Chargeback Frequency": {
+            "type": "number",
+            "min_value": 0,
+            "max_value": 100,
+            "default_value": 0,
+            "step": 1,
+            "field_name": "six_month_chbk_freq"
+        }
+    }
+}

form_configs/insurance_cost_predictor.json

@@ -0,0 +1,44 @@
+{
+    "Insurance Cost Form": {
+      "Age": {
+        "type": "slider",
+        "min_value": 0,
+        "default_value": 30,
+        "step": 1,
+        "field_name": "age"
+      },
+      "Sex": {
+        "type": "dropdown",
+        "options": ["Male", "Female"],
+        "default_value": "Male",
+        "field_name": "sex"
+      },
+      "BMI": {
+        "type": "number",
+        "min_value": 0.0,
+        "default_value": 25.0,
+        "step": 0.1,
+        "field_name": "bmi"
+      },
+      "Children": {
+        "type": "number",
+        "min_value": 0,
+        "default_value": 0,
+        "step": 1,
+        "field_name": "children"
+      },
+      "Smoker": {
+        "type": "dropdown",
+        "options": ["Yes", "No"],
+        "default_value": "No",
+        "field_name": "smoker"
+      },
+      "Region": {
+        "type": "dropdown",
+        "options": ["Southeast", "Southwest", "Northeast", "Northwest"],
+        "default_value": "Southeast",
+        "field_name": "region"
+      }
+    }
+  }
+