@@ -12,18 +12,18 @@ class Temperature(Model):
1212 value = FloatType (required = True )
1313
1414 class TemperatureMetrics (Enum ):
15- CELSIUS = 1
16- FAHRENHEIT = 2
17- KELVIN = 3
15+ CELSIUS = 'celsius'
16+ FAHRENHEIT = 'fahrenheit'
17+ KELVIN = 'kelvin'
1818
1919 @serializable (type = FloatType , serialized_name = 'value' )
2020 def get_temperature (self , * args , ** kwargs ):
2121 if hasattr (self , 'context' ):
2222 temperature = self .context .get ('temperature' , 'kelvin' )
2323
24- if temperature .upper () == self .TemperatureMetrics .CELSIUS .name :
24+ if temperature .lower () == self .TemperatureMetrics .CELSIUS .value :
2525 value = round (self .value - 273.0 , 2 ) # Converts Kelvin temperature to Celsius
26- elif temperature .upper () == self .TemperatureMetrics .FAHRENHEIT .name :
26+ elif temperature .lower () == self .TemperatureMetrics .FAHRENHEIT .value :
2727 value = round (1.8 * (self .value - 273.0 )+ 32.0 , 2 ) # Converts Kelvin temperature to Fahrenheit
2828 else :
2929 value = round (self .value , 2 ) # Returns Kelvin temperature
@@ -36,33 +36,33 @@ def get_unit(self, *args, **kwargs):
3636 if hasattr (self , 'context' ):
3737 unit = self .context .get ('temperature' , 'kelvin' )
3838
39- if unit .upper () == self .TemperatureMetrics .CELSIUS .name :
39+ if unit .lower () == self .TemperatureMetrics .CELSIUS .value :
4040 unit = self .TemperatureMetrics .CELSIUS
41- elif unit .upper () == self .TemperatureMetrics .FAHRENHEIT .name :
41+ elif unit .lower () == self .TemperatureMetrics .FAHRENHEIT .value :
4242 unit = self .TemperatureMetrics .FAHRENHEIT
4343 else :
4444 unit = self .TemperatureMetrics .KELVIN
4545 else :
4646 unit = self .TemperatureMetrics .KELVIN
47- return unit .name . lower ()
47+ return unit .value
4848
4949
5050class Distance (Model ):
5151 value = FloatType (required = True )
5252
5353 class DistanceMetrics (Enum ):
54- METERS = 1
55- KILOMETERS = 2
56- MILES = 3
54+ METERS = 'meters'
55+ KILOMETERS = 'kilometers'
56+ MILES = 'miles'
5757
5858 @serializable (type = FloatType , serialized_name = 'value' )
5959 def get_distance (self , * args , ** kwargs ):
6060 if hasattr (self , 'context' ):
6161 distance = self .context .get ('distance' , 'meters' )
6262
63- if distance .upper () == self .DistanceMetrics .KILOMETERS .name :
63+ if distance .lower () == self .DistanceMetrics .KILOMETERS .value :
6464 value = round (self .value / 1000 , 2 ) # Converts Meters distance to Kilometers
65- elif distance .upper () == self .DistanceMetrics .MILES .name :
65+ elif distance .lower () == self .DistanceMetrics .MILES .value :
6666 value = round (self .value / 1609.344 , 2 ) # Converts Meters distance to Miles
6767 else :
6868 value = round (self .value , 2 ) # Returns Meters distance
@@ -73,17 +73,17 @@ def get_distance(self, *args, **kwargs):
7373 @serializable (type = StringType , serialized_name = 'unit' )
7474 def get_unit (self , * args , ** kwargs ):
7575 if hasattr (self , 'context' ):
76- unit = self .context .get ('distance' , 'kelvin ' )
76+ unit = self .context .get ('distance' , 'meters ' )
7777
78- if unit .upper () == self .DistanceMetrics .KILOMETERS .name :
78+ if unit .lower () == self .DistanceMetrics .KILOMETERS .value :
7979 unit = self .DistanceMetrics .KILOMETERS
80- elif unit .upper () == self .DistanceMetrics .MILES .name :
80+ elif unit .lower () == self .DistanceMetrics .MILES .value :
8181 unit = self .DistanceMetrics .MILES
8282 else :
8383 unit = self .DistanceMetrics .METERS
8484 else :
8585 unit = self .DistanceMetrics .METERS
86- return unit .name . lower ()
86+ return unit .value
8787
8888
8989class City (Model ):
0 commit comments