Compare commits

...

2 Commits

Author SHA1 Message Date
LABS\s478989 3dc1bcf466 Crop type affects the output 2024-01-16 16:02:04 +01:00
LABS\s478989 d8ac8c32a5 Weather api added 2024-01-16 15:30:46 +01:00
2 changed files with 345 additions and 248 deletions

View File

@ -2,69 +2,168 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>YOLOv8 Object Detection</title>
<title>TomAIto</title>
<style>
canvas {
display:block;
border: 1px solid black;
margin-top:10px;
display: flex;
flex-direction: column;
max-width: 300px; /* Ustaw maksymalną szerokość formularza */
margin: auto; /* Centruj formularz na stronie */
margin-top: 10px;
}
#weatherInfo {
display: flex;
flex-direction: column;
max-width: 300px; /* Ustaw maksymalną szerokość formularza */
margin: auto; /* Centruj formularz na stronie */
margin-top: 10px;
}
form {
display: flex;
flex-direction: column;
max-width: 300px; /* Ustaw maksymalną szerokość formularza */
margin: auto; /* Centruj formularz na stronie */
}
label {
margin-top: 10px;
}
button {
margin-top: 10px;
}
</style>
</head>
<body>
<input id="uploadInput" type="file"/>
<form id="uploadForm">
<label for="cropType">Crop Type:</label>
<select id="cropType" name="cropType">
<option value="external">External</option>
<option value="internal">Internal</option>
<option value="greenhouse">Greenhouse</option>
</select>
<label for="location">Location:</label>
<input type="text" id="location" name="location" required/>
<label for="variety">Variety:</label>
<input type="text" id="variety" name="variety" required/>
<label for="uploadInput">Choose an image:</label>
<input id="uploadInput" type="file" required/>
<button type="Sprawdz">Sprawdz</button>
</form>
<canvas></canvas>
<div id="weatherInfo"></div>
<script>
/**
* "Upload" button onClick handler: uploads selected
* image file to backend, receives an array of
* detected objects and draws them on top of image
*/
const input = document.getElementById("uploadInput");
input.addEventListener("change",async(event) => {
const file = event.target.files[0];
const data = new FormData();
data.append("image_file",file,"image_file");
const response = await fetch("/detect",{
method:"post",
body:data
});
const boxes = await response.json();
draw_image_and_boxes(file,boxes);
})
const form = document.getElementById("uploadForm");
/**
* Function draws the image from provided file
* and bounding boxes of detected objects on
* top of the image
* @param file Uploaded file object
* @param boxes Array of bounding boxes in format
[[x1,y1,x2,y2,object_type,probability],...]
*/
function draw_image_and_boxes(file,boxes) {
const img = new Image()
img.src = URL.createObjectURL(file);
img.onload = () => {
const canvas = document.querySelector("canvas");
canvas.width = img.width;
canvas.height = img.height;
const ctx = canvas.getContext("2d");
ctx.drawImage(img,0,0);
ctx.strokeStyle = "#00FF00";
ctx.lineWidth = 5;
ctx.font = "20px serif";
boxes.forEach(([x1,y1,x2,y2,object_type, prob]) => {
form.addEventListener("submit", async (event) => {
event.preventDefault();
const label = `${object_type} ${prob.toFixed(2)}`;
ctx.strokeRect(x1,y1,x2-x1,y2-y1);
ctx.fillStyle = "#00ff00";
const width = ctx.measureText(label).width;
ctx.fillRect(x1,y1,width+10,25);
ctx.fillStyle = "#000000";
ctx.fillText(label,x1,y1+18);
});
}
}
</script>
const fileInput = document.getElementById("uploadInput");
const cropTypeInput = document.getElementById("cropType");
const locationInput = document.getElementById("location");
const varietyInput = document.getElementById("variety");
const file = fileInput.files[0];
const data = new FormData();
data.append("image_file", file);
data.append("cropType", cropTypeInput.value);
data.append("location", locationInput.value);
data.append("variety", varietyInput.value);
const response = await fetch("/detect", {
method: "post",
body: data
});
const boxes = await response.json();
draw_image_and_boxes(file, boxes);
const location = locationInput.value;
if (cropTypeInput.value == "external") {
getWeather(location);
}
else {
const randomTips = [
"water your tomatoes every day.",
"keep the temperature between 20-25 degrees Celsius.",
"place the tomatoes in sunlight."];
const randomTip = randomTips[Math.floor(Math.random() * randomTips.length)];
document.getElementById("weatherInfo").innerText = "TIP! To maximalize your yields " + randomTip;
}
});
function draw_image_and_boxes(file, boxes) {
const img = new Image()
img.src = URL.createObjectURL(file);
img.onload = () => {
const canvas = document.querySelector("canvas");
canvas.width = img.width;
canvas.height = img.height;
const ctx = canvas.getContext("2d");
ctx.drawImage(img, 0, 0);
ctx.strokeStyle = "#00FF00";
ctx.lineWidth = 5;
ctx.font = "20px serif";
boxes.forEach(([x1, y1, x2, y2, object_type, prob]) => {
const label = `${object_type} ${prob.toFixed(2)}`;
ctx.strokeRect(x1, y1, x2 - x1, y2 - y1);
ctx.fillStyle = "#00ff00";
const width = ctx.measureText(label).width;
ctx.fillRect(x1, y1, width + 10, 25);
ctx.fillStyle = "#000000";
ctx.fillText(label, x1, y1 + 18);
});
}
}
async function getWeather(location) {
const apiKey = "1fc6a52c96331d035a828cc0c1606241";
const apiUrl = `https://api.openweathermap.org/data/2.5/weather?q=${location}&appid=${apiKey}`;
try {
const weatherResponse = await fetch(apiUrl);
const weatherData = await weatherResponse.json();
if (weatherData.main && weatherData.main.temp) {
const temperatureKelvin = weatherData.main.temp;
const temperatureCelsius = temperatureKelvin - 273.15;
const tempRound = Math.round(temperatureCelsius);
const weatherCondition = weatherData.weather[0].main;
const isRaining = weatherCondition === 'Rain';
let additionalInfo = `${isRaining ? 'Rain is expected in your town today, so you dont have to water your tomatoes' :
'No rainfall is expected in the city today, so you need to water your tomatoes!'} Temperature in ${location} is ${tempRound} °C.`;
if (tempRound < 15) {
additionalInfo += ' So you need to cover your tomatoes!';
}
document.getElementById("weatherInfo").innerText = additionalInfo;
} else {
document.getElementById("weatherInfo").innerText = "Unable to fetch weather data.";
}
} catch (error) {
console.error("Error fetching weather data:", error);
document.getElementById("weatherInfo").innerText = "Error fetching weather data.";
}
}
</script>
</body>
</html>

View File

@ -4,6 +4,7 @@ from waitress import serve
from PIL import Image
import onnxruntime as ort
import numpy as np
import requests
#my changes
import os
@ -24,6 +25,7 @@ yolo_classes = ["b_fully_ripened",
app = Flask(__name__)
@app.route("/")
def root():
"""
@ -33,22 +35,18 @@ def root():
with open("index.html") as file:
return file.read()
@app.route("/detect", methods=["POST"])
def detect():
"""
Handler of /detect POST endpoint
Receives uploaded file with a name "image_file", passes it
through YOLOv8 object detection network and returns and array
of bounding boxes.
:return: a JSON array of objects bounding boxes in format [[x1,y1,x2,y2,object_type,probability],..]
"""
buf = request.files["image_file"]
crop_type = request.form.get("cropType")
location = request.form.get("location")
variety = request.form.get("variety")
boxes, orientation = detect_objects_on_image(buf.stream)
#print(boxes)
#print(orientation)
# Do something with crop_type, location, and variety here (e.g., store in database)
return jsonify(boxes)
def detect_objects_on_image(buf):
input, img_width, img_height = prepare_input(buf)
output = run_model(input)