Skip to content

Commit 5d06cb3

Browse files
Merge pull request #1 from pnnl-int/fix-types
fix type
2 parents 9ac5e1b + cadb970 commit 5d06cb3

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

comcheck_api/managers/components/envelope/ag_wall.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,15 @@ class AgWallListManager(DataManager[AgWall]):
3030
def add_new_thermal_bridge(
3131
self,
3232
ag_wall: AgWall,
33-
thermal_bridge_type: ThermalBridgeTypeOptions = ThermalBridgeTypeOptions.THERMAL_BRIDGE_OTHER,
34-
thermal_bridge_category: ThermalBridgeCategoryOptions = ThermalBridgeCategoryOptions.THERMAL_BRIDGE_UNCATEGORIZED,
35-
thermal_bridge_compliance_type: ThermalBridgeComplianceTypeOptions = ThermalBridgeComplianceTypeOptions.THERMAL_BRIDGE_NON_PRESCRIPTIVE,
33+
thermal_bridge_type: (
34+
ThermalBridgeTypeOptions | None
35+
) = ThermalBridgeTypeOptions.THERMAL_BRIDGE_OTHER,
36+
thermal_bridge_category: (
37+
ThermalBridgeCategoryOptions | None
38+
) = ThermalBridgeCategoryOptions.THERMAL_BRIDGE_UNCATEGORIZED,
39+
thermal_bridge_compliance_type: (
40+
ThermalBridgeComplianceTypeOptions | None
41+
) = ThermalBridgeComplianceTypeOptions.THERMAL_BRIDGE_NON_PRESCRIPTIVE,
3642
psi_factor: float = 0.0,
3743
chi_factor: float = 0.0,
3844
thermal_bridge_length: float = 0.0,

comcheck_api/project_operations/project_envelope_operations.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ def remove_skylight_from_project(
401401
if location_type == "orphaned":
402402
parent_obj = updated_project.envelope
403403
elif location_type == "roof":
404-
parent_obj = updated_project.envelope.roof[roof_index] # type: ignore[index]
404+
parent_obj = updated_project.envelope.roof[roof_index] # type: ignore
405405
parent_obj.remove_from_subcomponent_list(
406406
subcomponent_id=skylight_assembly_type, subcomponent_name="skylight"
407407
)
@@ -442,7 +442,7 @@ def update_skylight_in_project(
442442
if location_type == "orphaned":
443443
parent_obj = updated_project.envelope
444444
elif location_type == "roof":
445-
parent_obj = updated_project.envelope.roof[roof_index] # type: ignore[index]
445+
parent_obj = updated_project.envelope.roof[roof_index] # type: ignore
446446
parent_obj.update_subcomponent_list(
447447
subcomponent_updates=updates,
448448
subcomponent_id=skylight_assembly_type,
@@ -708,14 +708,14 @@ def add_thermal_bridge_to_project(
708708
project: ComBuilding,
709709
building_area_key: str,
710710
ag_wall: AgWall,
711-
thermal_bridge_type: Union[
712-
ThermalBridgeTypeOptions, str
713-
] = ThermalBridgeTypeOptions.THERMAL_BRIDGE_OTHER,
711+
thermal_bridge_type: (
712+
ThermalBridgeTypeOptions | None
713+
) = ThermalBridgeTypeOptions.THERMAL_BRIDGE_OTHER,
714714
thermal_bridge_category: Union[
715-
ThermalBridgeCategoryOptions, str
715+
ThermalBridgeCategoryOptions | None
716716
] = ThermalBridgeCategoryOptions.THERMAL_BRIDGE_UNCATEGORIZED,
717717
thermal_bridge_compliance_type: Union[
718-
ThermalBridgeComplianceTypeOptions, str
718+
ThermalBridgeComplianceTypeOptions | None
719719
] = ThermalBridgeComplianceTypeOptions.THERMAL_BRIDGE_NON_PRESCRIPTIVE,
720720
psi_factor: float = 0.0,
721721
chi_factor: float = 0.0,

0 commit comments

Comments
 (0)