@@ -25,7 +25,7 @@ def component_connection_from_proto(
2525 minor_issues : list [str ] = []
2626
2727 connection = component_connection_from_proto_with_issues (
28- message , major_issues = major_issues , minor_issues = minor_issues
28+ message , major_issues = major_issues
2929 )
3030
3131 if major_issues :
@@ -48,7 +48,6 @@ def component_connection_from_proto_with_issues(
4848 message : electrical_components_pb2 .ElectricalComponentConnection ,
4949 * ,
5050 major_issues : list [str ],
51- minor_issues : list [str ],
5251) -> ComponentConnection | None :
5352 """Create a `ComponentConnection` from a protobuf message collecting issues.
5453
@@ -58,7 +57,6 @@ def component_connection_from_proto_with_issues(
5857 Args:
5958 message: The protobuf message to parse.
6059 major_issues: A list to collect major issues found during parsing.
61- minor_issues: A list to collect minor issues found during parsing.
6260
6361 Returns:
6462 A `ComponentConnection` object created from the protobuf message, or
@@ -73,9 +71,11 @@ def component_connection_from_proto_with_issues(
7371 )
7472 return None
7573
76- lifetime = _get_operational_lifetime_from_proto (
77- message , major_issues = major_issues , minor_issues = minor_issues
78- )
74+ try :
75+ lifetime = _get_operational_lifetime_from_proto (message )
76+ except ValueError as exc :
77+ major_issues .append (f"connection ignored: invalid operational lifetime ({ exc } )" )
78+ return None
7979
8080 return ComponentConnection (
8181 source = source_component_id ,
@@ -86,21 +86,8 @@ def component_connection_from_proto_with_issues(
8686
8787def _get_operational_lifetime_from_proto (
8888 message : electrical_components_pb2 .ElectricalComponentConnection ,
89- * ,
90- major_issues : list [str ],
91- minor_issues : list [str ],
92- ) -> Lifetime :
89+ ) -> Lifetime | None :
9390 """Get the operational lifetime from a protobuf message."""
9491 if message .HasField ("operational_lifetime" ):
95- try :
96- return lifetime_from_proto (message .operational_lifetime )
97- except ValueError as exc :
98- major_issues .append (
99- f"invalid operational lifetime ({ exc } ), considering it as missing "
100- "(i.e. always operational)" ,
101- )
102- else :
103- minor_issues .append (
104- "missing operational lifetime, considering it always operational" ,
105- )
106- return Lifetime ()
92+ return lifetime_from_proto (message .operational_lifetime )
93+ return None
0 commit comments