bugfix: generals

app.py

@@ -41,18 +41,18 @@ weights = {
     "Does the image show protective materials?": 0.05
 }
 
-#luminosity_classes = [
-#    'A well-lit room with abundant natural light, showcasing windows or a balcony through which sunlight passes unobstructed.',
-#    'A room depicted in darkness, where there is minimal or no visible light source.',
-#    'A room illuminated by artificial light sources such as lamps or ceiling lights.'
-#]
-
 luminosity_classes = [
-    "A room filled with natural daylight.",
-    "A room lit by artificial lights.",
-    "A dark room with no lights."
+    'A well-lit room with abundant natural light, showcasing windows or a balcony through which sunlight passes unobstructed.',
+    'A room depicted in darkness, where there is minimal or no visible light source.',
+    'A room illuminated by artificial light sources such as lamps or ceiling lights.'
 ]
 
+#luminosity_classes = [
+#    "A room filled with natural daylight.",
+#    "A room lit by artificial lights.",
+#    "A dark room with no lights."
+#]
+
 luminosity_labels = ['natural_light', 'no_light', 'artificial_light']
 
 view_questions = [
@@ -145,22 +145,18 @@ def calculate_is_render(processed_image):
 def generate_answer(image):
 
     processed_image = image
-    processed_image = processed_image.resize((256, 256))
 
     image_data = {
         "image_context": None,
+        "validation": None,
         "equipment_score": None,
-        "luminosity_score": {"score": None,
-        "has_window": {
-            "score": None,
-            "answer": None
-        }},
+        "luminosity_score": {"score": None},
         "view_type": {"views": None, "certainty_score": None}
     }
 
     space_type_score = calculate_space_type(processed_image)
     max_space_type = max(space_type_score, key=space_type_score.get)
-    if space_type_score[max_space_type] >= threshold:
+    if space_type_score[max_space_type] >= 0:
         space_type = max_space_type.lower()
         if space_type == "patio":
             space_type = "terrace"
@@ -168,27 +164,29 @@ def generate_answer(image):
 
     image_results = {}
     if max_space_type == "terrace":
-        for question in equipment_questions:
-            result = vqa_pipeline(processed_image, question, top_k=1)
-            answer = result[0]['answer'].lower() == "yes"
-            image_results[question] = answer
-        equipment_score = calculate_equipment_score(image_results, weights)
-        image_data["equipment_score"] = equipment_score
-
-    if max_space_type in ["bedroom", "living room", "kitchen"]:
-        luminosity_score = calculate_luminosity_score(processed_image)
-        image_data["luminosity_score"]['score'] = luminosity_score['natural_light']
-
-        result = vqa_pipeline(processed_image, "Is there a real window?", top_k=1)
-        has_window = result[0]
-        image_data["luminosity_score"]["has_window"] = has_window
-
-        view = views(processed_image)
-        image_data["view_type"]["views"] = view
-
-        certainty_score = certainty(processed_image)
-        certainty_score = list(certainty_score.values())[0]
-        image_data["view_type"]["certainty_score"] = certainty_score
+      for question in equipment_questions:
+          result = vqa_pipeline(processed_image, question, top_k=1)
+          answer = result[0]['answer'].lower() == "yes"
+          image_results[question] = answer
+      equipment_score = calculate_equipment_score(image_results, weights)
+      image_data["equipment_score"] = equipment_score
+
+    result = vqa_pipeline(processed_image, "Is there a real window?", top_k=1)
+    has_window = result[0]
+    image_data["validation"] = "pass validation" if has_window['score'] > 0.9 else "No candidate"
+
+    window_exists = has_window["answer"].lower() == "yes" and has_window["score"] > 0.9
+
+    if window_exists:
+      luminosity_score = calculate_luminosity_score(processed_image)
+      image_data["luminosity_score"]['score'] = luminosity_score['natural_light']
+
+      view = views(processed_image)
+      image_data["view_type"]["views"] = view
+
+      certainty_score = certainty(processed_image)
+      certainty_score = list(certainty_score.values())[0]
+      image_data["view_type"]["certainty_score"] = certainty_score
 
     #is_render = calculate_is_render(processed_image)
     #image_data["is_render"] = is_render