Upload 2 files

app/main.py

@@ -644,6 +644,13 @@ class HVACCalculator:
                     latitude=outdoor_conditions['latitude'],
                     shading_coefficient=window.shading_coefficient
                 )
+                # Ensure load_dict has a 'total' key
+                if 'total' not in load_dict:
+                    if 'conduction' in load_dict and 'solar' in load_dict:
+                        load_dict['total'] = load_dict['conduction'] + load_dict['solar']
+                    else:
+                        load_dict['total'] = window.u_value * window.area * (outdoor_conditions['temperature'] - indoor_conditions['temperature'])
+                
                 # Pass latitude directly to get_scl method which has its own validation
                 results['detailed_loads']['windows'].append({
                     'name': window.name,
@@ -685,13 +692,17 @@ class HVACCalculator:
                             activity_level=load['activity_level'],
                             hour=design_loads['design_hour']
                         )
+                        # Ensure load_dict has a 'total' key
+                        if 'total' not in load_dict and ('sensible' in load_dict or 'latent' in load_dict):
+                            load_dict['total'] = load_dict.get('sensible', 0) + load_dict.get('latent', 0)
                     elif load_type == 'lighting':
-                        load_dict = {'total': self.cooling_calculator.calculate_lights_cooling_load(
+                        light_load = self.cooling_calculator.calculate_lights_cooling_load(
                             power=load['power'],
                             use_factor=load['usage_factor'],
                             special_allowance=0.1,
                             hour=design_loads['design_hour']
-                        )}
+                        )
+                        load_dict = {'total': light_load if light_load is not None else 0}
                     else:
                         load_dict = self.cooling_calculator.calculate_equipment_cooling_load(
                             power=load['power'],
@@ -699,17 +710,20 @@ class HVACCalculator:
                             radiation_factor=load['radiation_fraction'],
                             hour=design_loads['design_hour']
                         )
+                        # Ensure load_dict has a 'total' key
+                        if 'total' not in load_dict and ('sensible' in load_dict or 'latent' in load_dict):
+                            load_dict['total'] = load_dict.get('sensible', 0) + load_dict.get('latent', 0)
                     results['detailed_loads']['internal'].append({
                         'type': load_type.capitalize(),
                         'name': load['name'],
                         'quantity': load.get('num_people', load.get('power', 1)),
-                        'heat_gain': load_dict.get('sensible', load_dict['total']),
+                        'heat_gain': load_dict.get('sensible', load_dict.get('total', 0)),
                         'clf': self.cooling_calculator.ashrae_tables.get_clf_people(
                             zone_type='A',
                             hours_occupied=f"{load['hours_in_operation']}h",
                             hour=design_loads['design_hour']
                         ) if load_type == 'people' else 1.0,
-                        'load': load_dict['total'] / 1000
+                        'load': load_dict.get('total', 0) / 1000
                     })
             
             if st.session_state.get('debug_mode', False):