A bunch of fixes

Signed-off-by: Kurt Greaves <kurt.greaves@zepben.com>

Author: kgreav

src/zepben/ewb/model/cim/iec61968/common/street_detail.py

@@ -15,7 +15,7 @@ class StreetDetail(object):
     Street details, in the context of address.
     """
 
-    building_name: str = None
+    building_name: Optional[str] = None
     """
     (if applicable) In certain cases the physical location of the place of interest does not have a direct point of entry from the street, 
     but may be located inside a larger structure such as a building, complex, office block, apartment, etc.

src/zepben/ewb/model/cim/iec61968/metering/meter.py

@@ -21,7 +21,7 @@ def company_meter_id(self) -> Optional[str]:
         return self.name
 
     @company_meter_id.setter
-    def company_meter_id(self, meter_id: str):
+    def company_meter_id(self, meter_id: Optional[str]):
         """
         `meter_id` The ID to set for this Meter. Will use `IdentifiedObject.name` as a backing field.
         """

src/zepben/ewb/model/cim/iec61970/base/core/identified_object.py

@@ -51,11 +51,10 @@ def __init__(self, names: Optional[List[Name]] = None, **kwargs):
                 self.add_name(name.type, name.name)
 
     def __str__(self):
-        str = f'{self.__class__.__name__}'
+        class_name = f'{self.__class__.__name__}'
         if self.name:
-            return f'{str}{{{self.mrid}|{self.name}}}'
-        return f'{str}{{{self.mrid}}}'
-        return f'{self.__class__.__name__}{{{self.mrid}{f"|{self.name}" if self.name else ""}}}'
+            return f'{class_name}{{{self.mrid}|{self.name}}}'
+        return f'{class_name}{{{self.mrid}}}'
 
     @property
     def names(self) -> Generator[Name, None, None]:

src/zepben/ewb/model/cim/iec61970/base/wires/transformer_star_impedance.py

@@ -21,16 +21,16 @@ class TransformerStarImpedance(IdentifiedObject):
     For transmission networks use PowerTransformerEnd impedances (r, r0, x, x0, b, b0, g and g0).
     """
 
-    r: Optional[float] = 0.0
+    r: Optional[float] = None
     """ r : Resistance of the transformer end. Unit: Ohms  """
 
-    r0: Optional[float] = 0.0
+    r0: Optional[float] = None
     """ r0 : Zero sequence series resistance of the transformer end. Unit: Ohms"""
 
-    x: Optional[float] = 0.0
+    x: Optional[float] = None
     """ x : Positive sequence series reactance  of the transformer end. Unit: Ohms"""
 
-    x0: Optional[float] = 0.0
+    x0: Optional[float] = None
     """ x0 : Zero sequence series reactance of the transformer end. Unit: Ohms"""
 
     transformer_end_info: Optional['TransformerEndInfo'] = None

src/zepben/ewb/services/common/translator/base_cim2proto.py

@@ -41,8 +41,6 @@ def bind_to_pb(func: Callable[P, R]) -> Callable[P, R]:
 
 
 def set_or_null(**kwargs):
-    if 'invWattRespPAtV1' in kwargs.keys():
-        print('yo')
     return {f'{k}{"Null" if v is None else "Set"}': v if v is not None else NullValue.NULL_VALUE for k, v in kwargs.items()}
 
 

src/zepben/ewb/services/network/translator/network_cim2proto.py

@@ -595,7 +595,7 @@ def transformer_end_info_to_pb(cim: TransformerEndInfo) -> PBTransformerEndInfo:
     return PBTransformerEndInfo(
         ai=asset_info_to_pb(cim),
         connectionKind=_map_winding_connection.to_pb(cim.connection_kind),
-        endNumber=from_nullable_int(cim.end_number),
+        endNumber=cim.end_number,
         transformerTankInfoMRID=mrid_or_empty(cim.transformer_tank_info),
         transformerStarImpedanceMRID=mrid_or_empty(cim.transformer_star_impedance),
         energisedEndNoLoadTestsMRID=mrid_or_empty(cim.energised_end_no_load_tests),
@@ -966,12 +966,13 @@ def curve_to_pb(cim: Curve) -> PBCurve:
 
 
 def curve_data_to_pb(cim: CurveData) -> PBCurveData:
-    return PBCurveData(**set_or_null(
+    return PBCurveData(
         xValue=cim.x_value,
         y1Value=cim.y1_value,
-        y2Value=from_nullable_float(cim.y2_value),
-        y3Value=from_nullable_float(cim.y3_value)
-    )
+        **set_or_null(
+            y2Value=from_nullable_float(cim.y2_value),
+            y3Value=from_nullable_float(cim.y3_value)
+        )
     )
 
 
@@ -1832,10 +1833,8 @@ def transformer_end_to_pb(cim: TransformerEnd) -> PBTransformerEnd:
 
 def transformer_end_rated_s_to_pb(cim: TransformerEndRatedS) -> PBTransformerEndRatedS:
     return PBTransformerEndRatedS(
-        coolingType=_map_transformer_cooling_type.to_pb(cim.cooling_type)
-        **set_or_null(
-            ratedS=cim.rated_s,
-        )
+        coolingType=_map_transformer_cooling_type.to_pb(cim.cooling_type),
+        ratedS=cim.rated_s,
     )
 
 
@@ -1845,10 +1844,10 @@ def transformer_star_impedance_to_pb(cim: TransformerStarImpedance) -> PBTransfo
         io=identified_object_to_pb(cim),
         transformerEndInfoMRID=mrid_or_empty(cim.transformer_end_info),
         **set_or_null(
-            r=cim.r if cim.r else 0.0,
-            r0=cim.r0 if cim.r0 else 0.0,
-            x=cim.x if cim.x else 0.0,
-            x0=cim.x0 if cim.x0 else 0.0,
+            r=cim.r,
+            r0=cim.r0,
+            x=cim.x,
+            x0=cim.x0
         )
     )
 

src/zepben/ewb/services/network/translator/network_proto2cim.py

@@ -1119,8 +1119,8 @@ def curve_to_cim(pb: PBCurve, cim: Curve, network_service: NetworkService):
 
 def curve_data_to_cim(pb: PBCurveData) -> Optional[CurveData]:
     return CurveData(
-        get_nullable(pb, 'xValue'),
-        get_nullable(pb, 'y1Value'),
+        pb.xValue,
+        pb.y1Value,
         get_nullable(pb, 'y2Value'),
         get_nullable(pb, 'y3Value'),
     )
@@ -2160,7 +2160,7 @@ def transformer_end_to_cim(pb: PBTransformerEnd, cim: TransformerEnd, network_se
 
 
 def transformer_end_rated_s_to_cim(pb: PBTransformerEndRatedS) -> Optional[TransformerEndRatedS]:
-    return TransformerEndRatedS(cooling_type=TransformerCoolingType(pb.coolingType), rated_s=get_nullable(pb, 'ratedS'))
+    return TransformerEndRatedS(cooling_type=TransformerCoolingType(pb.coolingType), rated_s=pb.ratedS)
 
 
 @bind_to_cim