2025-summer/team-10
10
Fork 0
Code Issues Pull requests Projects Releases Activity

final changes to the ui

Browse source
This commit is contained in:
Nicolò 2025-08-02 12:08:52 +02:00
commit a0d4476350
1 changed files with 131 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app.py
View file

@ -1,6 +1,5 @@
# app.py # app.py
import streamlit as st import streamlit as st
from PIL import Image
from llama_cpp import Llama from llama_cpp import Llama
from image_generation import generate_image from image_generation import generate_image
@ -9,6 +8,7 @@ st.title("🌱 GreenThumber")
@st.cache_resource(hash_funcs={Llama: lambda _: None}) @st.cache_resource(hash_funcs={Llama: lambda _: None})
def load_mistral_model(): def load_mistral_model():
llm = Llama( llm = Llama(
@ -23,7 +23,6 @@ def load_mistral_model():
llm = load_mistral_model() llm = load_mistral_model()
# Generate a description using the Mistral model
def generate_growth_description(plant_type, plant_age, soil_type, sunlight_hours, water_frequency, def generate_growth_description(plant_type, plant_age, soil_type, sunlight_hours, water_frequency,
fertilizer_type, temperature, humidity, days, additional_info): fertilizer_type, temperature, humidity, days, additional_info):
prompt = ( prompt = (
@ -32,6 +31,8 @@ def generate_growth_description(plant_type, plant_age, soil_type, sunlight_hours
f"based on these conditions:\n" f"based on these conditions:\n"
f"Important environment conditions: {additional_info}\n" f"Important environment conditions: {additional_info}\n"
f"- Plant age: {plant_age}\n" f"- Plant age: {plant_age}\n"
f"Important environment conditions: {additional_info}\n"
f"- Plant age: {plant_age}\n"
f"- Soil Type: {soil_type}\n" f"- Soil Type: {soil_type}\n"
f"- Sunlight: {sunlight_hours} hours per day\n" f"- Sunlight: {sunlight_hours} hours per day\n"
f"- Water Frequency: {water_frequency} times per week\n" f"- Water Frequency: {water_frequency} times per week\n"
@ -54,9 +55,11 @@ if plant_input_mode == "Type name":
plant_age = st.number_input("Enter Plant Age (in days)", min_value=1, max_value=365, value=25) plant_age = st.number_input("Enter Plant Age (in days)", min_value=1, max_value=365, value=25)
elif plant_input_mode == "Upload image": elif plant_input_mode == "Upload image":
plant_type = st.selectbox("Select Plant Type", ["Basil", "Tomato", "Lettuce"]) plant_type = st.selectbox("Select Plant Type", ["Basil", "Tomato", "Lettuce"])
plant_age = st.number_input("Enter Plant Age (in days)", min_value=1, max_value=365, value=25) plant_age = st.number_input("Enter Plant Age (in days)", min_value=1, max_value=365, value=25)
plant_age = st.number_input("Enter Plant Age (in days)", min_value=1, max_value=365, value=25)
image_file = st.file_uploader("Upload an image of your plant", type=["jpg", "jpeg", "png"]) image_file = st.file_uploader("Upload an image of your plant", type=["jpg", "jpeg", "png"])
if image_file: if image_file:
uploaded_image = Image.open(image_file) uploaded_image = Image.open(image_file)
@ -66,6 +69,7 @@ elif plant_input_mode == "Upload image":
col1, col2 = st.columns(2) col1, col2 = st.columns(2)
with col1: with col1:
st.markdown("<h3 style='text-align: center;'>Environmental Parameters</h3>", unsafe_allow_html=True)
st.markdown("<h3 style='text-align: center;'>Environmental Parameters</h3>", unsafe_allow_html=True) st.markdown("<h3 style='text-align: center;'>Environmental Parameters</h3>", unsafe_allow_html=True)
soil_options = ["Sandy", "Clay", "Loamy", "Peaty", "Chalky", "Silty"] soil_options = ["Sandy", "Clay", "Loamy", "Peaty", "Chalky", "Silty"]
@ -74,6 +78,7 @@ with col1:
water_frequency = st.slider("Water Frequency (times per week)", 0, 14, 3) water_frequency = st.slider("Water Frequency (times per week)", 0, 14, 3)
with col2: with col2:
st.markdown("---")
st.markdown("---") st.markdown("---")
fertilizer_options = ["Organic", "Chemical", "None"] fertilizer_options = ["Organic", "Chemical", "None"]
@ -83,9 +88,22 @@ with col2:
days = st.slider("Prediction Interval (in days)", min_value=1, max_value=30, value=7) days = st.slider("Prediction Interval (in days)", min_value=1, max_value=30, value=7)
days = st.slider("Prediction Interval (in days)", min_value=1, max_value=30, value=7)
additional_info = st.text_area("Feel free to include any additional detail", "- e.g. 'I'm adding compost to the soil.'", height=100)
additional_info = st.text_area("Feel free to include any additional detail", "- e.g. 'I'm adding compost to the soil.'", height=100) additional_info = st.text_area("Feel free to include any additional detail", "- e.g. 'I'm adding compost to the soil.'", height=100)
#if st.button("Start Prediction"):
if plant_type and plant_type.strip() != "":
with st.spinner("Analyzing data and generating description..."):
description = generate_growth_description(
plant_type, plant_age, soil_type, sunlight_hours, water_frequency,
fertilizer_type, temperature, humidity, days, additional_info
)
st.subheader(f"📝 Predicted Plant Condition in {days} Days:")
st.write(description)
#if st.button("Start Prediction"): #if st.button("Start Prediction"):
if plant_type and plant_type.strip() != "": if plant_type and plant_type.strip() != "":
with st.spinner("Analyzing data and generating description..."): with st.spinner("Analyzing data and generating description..."):
@ -99,6 +117,11 @@ if plant_type and plant_type.strip() != "":
manipulated_img = generate_image(plant_type, description, plant_age) manipulated_img = generate_image(plant_type, description, plant_age)
st.image(manipulated_img, caption="Predicted Plant Condition Image") st.image(manipulated_img, caption="Predicted Plant Condition Image")
# else:
# st.warning("Please select or enter a plant type.")
manipulated_img = generate_image(plant_type, description, plant_age)
st.image(manipulated_img, caption="Predicted Plant Condition Image")
# else: # else:
# st.warning("Please select or enter a plant type.") # st.warning("Please select or enter a plant type.")