Merge branch 'release/1.6.1'

Author: tamirse

CHANGELOG.rst

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+v1.6.1 (2023-10-02)
+-------------------
+
+* Added spot price to instance types
+
 v1.6.0 (2023-09-15)
 -------------------
 

datacrunch/__version__.py

@@ -1 +1 @@
-VERSION = '1.6.0'
+VERSION = '1.6.1'

datacrunch/instance_types/instance_types.py

@@ -9,6 +9,7 @@ def __init__(self,
                  id: str,
                  instance_type: str,
                  price_per_hour: float,
+                 spot_price_per_hour: float,
                  description: str,
                  cpu: dict,
                  gpu: dict,
@@ -23,6 +24,8 @@ def __init__(self,
         :type instance_type: str
         :param price_per_hour: price per hour
         :type price_per_hour: float
+        :param spot_price_per_hour: spot price per hour
+        :type spot_price_per_hour: float
         :param description: instance type description
         :type description: str
         :param cpu: cpu details
@@ -39,6 +42,7 @@ def __init__(self,
         self._id = id
         self._instance_type = instance_type
         self._price_per_hour = float(price_per_hour)
+        self._spot_price_per_hour = float(spot_price_per_hour)
         self._description = description
         self._cpu = cpu
         self._gpu = gpu
@@ -73,6 +77,15 @@ def price_per_hour(self) -> float:
         """
         return self._price_per_hour
 
+    @property
+    def spot_price_per_hour(self) -> float:
+        """Get the instance spot price per hour
+
+        :return: spot price per hour
+        :rtype: float
+        """
+        return self._spot_price_per_hour
+
     @property
     def description(self) -> str:
         """Get the instance type description
@@ -136,6 +149,7 @@ def __str__(self) -> str:
         return (f'id: {self._id}\n'
                 f'instance type: {self._instance_type}\n'
                 f'price_per_hour: ${self._price_per_hour}\n'
+                f'spot_price_per_hour: ${self._spot_price_per_hour}\n'
                 f'description: {self._description}\n'
                 f'cpu: {self._cpu}\n'
                 f'gpu: {self._gpu}\n'
@@ -162,6 +176,7 @@ def get(self) -> List[InstanceType]:
             id=instance_type['id'],
             instance_type=instance_type['instance_type'],
             price_per_hour=instance_type['price_per_hour'],
+            spot_price_per_hour=instance_type['spot_price'],
             description=instance_type['description'],
             cpu=instance_type['cpu'],
             gpu=instance_type['gpu'],

tests/unit_tests/instance_types/test_instance_types.py

@@ -15,6 +15,7 @@
 STORAGE_SIZE = 1800
 INSTANCE_TYPE_DESCRIPTION = "Dedicated Bare metal Server"
 PRICE_PER_HOUR = 5.0
+SPOT_PRICE_PER_HOUR = 2.5
 INSTANCE_TYPE = "8V100.48M"
 
 
@@ -48,6 +49,7 @@ def test_instance_types(http_client):
                 },
                 "description": INSTANCE_TYPE_DESCRIPTION,
                 "price_per_hour": "5.00",
+                "spot_price": "2.50",
                 "instance_type": INSTANCE_TYPE
             }
         ],
@@ -67,6 +69,7 @@ def test_instance_types(http_client):
     assert instance_type.id == TYPE_ID
     assert instance_type.description == INSTANCE_TYPE_DESCRIPTION
     assert instance_type.price_per_hour == PRICE_PER_HOUR
+    assert instance_type.spot_price_per_hour == SPOT_PRICE_PER_HOUR
     assert instance_type.instance_type == INSTANCE_TYPE
     assert type(instance_type.cpu) == dict
     assert type(instance_type.gpu) == dict