datacrunch 1.6.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

datacrunch/__version__.py

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

datacrunch/constants.py

@@ -13,7 +13,7 @@ class VolumeActions:
     ATTACH = 'attach'
     DETACH = 'detach'
     RENAME = 'rename'
-    INCREASE_SIZE = 'increase-size'
+    INCREASE_SIZE = 'resize'
     DELETE = 'delete'
     CLONE = 'clone'
 

datacrunch/instance_types/instance_types.py

@@ -9,6 +9,7 @@ class InstanceType:
                  id: str,
                  instance_type: str,
                  price_per_hour: float,
+                 spot_price_per_hour: float,
                  description: str,
                  cpu: dict,
                  gpu: dict,
@@ -23,6 +24,8 @@ class InstanceType:
         :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 @@ class InstanceType:
         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 @@ class InstanceType:
         """
         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 @@ class InstanceType:
         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 @@ class InstanceTypesService:
             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'],

datacrunch/volumes/volumes.py

@@ -179,7 +179,21 @@ class Volume:
         :return: Volume
         :rtype: Volume
         """
-        return cls(**volume_dict)
+
+        return cls(
+            id = volume_dict['id'],
+            status = volume_dict['status'],
+            name = volume_dict['name'],
+            size = volume_dict['size'],
+            type = volume_dict['type'],
+            is_os_volume = volume_dict['is_os_volume'],
+            created_at = volume_dict['created_at'],
+            target = volume_dict['target'],
+            location = volume_dict['location'],
+            instance_id = volume_dict['instance_id'],
+            ssh_key_ids = volume_dict['ssh_key_ids'],
+            deleted_at = volume_dict.get('deleted_at'),
+        )
 
     def __str__(self) -> str:
         """Returns a string of the json representation of the volume

{datacrunch-1.6.0.dist-info → datacrunch-1.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datacrunch
-Version: 1.6.0
+Version: 1.7.0
 Summary: Official Python SDK for DataCrunch Public API
 Home-page: https://github.com/DataCrunch-io
 Author: DataCrunch Oy
@@ -20,13 +20,13 @@ Classifier: Natural Language :: English
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: requests <3,>=2.25.1
+Requires-Dist: requests<3,>=2.25.1
 Provides-Extra: dev
 Provides-Extra: test
-Requires-Dist: pytest <7,>=6.2.1 ; extra == 'test'
-Requires-Dist: pytest-cov <3,>=2.10.1 ; extra == 'test'
-Requires-Dist: pytest-responses <1,>=0.4.0 ; extra == 'test'
-Requires-Dist: responses <1,>=0.12.1 ; extra == 'test'
+Requires-Dist: pytest<7,>=6.2.1; extra == "test"
+Requires-Dist: pytest-cov<3,>=2.10.1; extra == "test"
+Requires-Dist: pytest-responses<1,>=0.4.0; extra == "test"
+Requires-Dist: responses<1,>=0.12.1; extra == "test"
 
 # DataCrunch Python SDK
 

{datacrunch-1.6.0.dist-info → datacrunch-1.7.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 datacrunch/__init__.py,sha256=OG-5Avmuq3NXyBs_66GMwyzscUi0c-T6vWW5sRIfnZg,51
-datacrunch/__version__.py,sha256=2Sgdn0cIyeJqQJLhe7xBocPdlxnfeDXK0xpKZZBnf64,18
-datacrunch/constants.py,sha256=QxV-xp0fa8Q52idsEknwuexYnXTN9wNlzAjs3mG9ICE,2361
+datacrunch/__version__.py,sha256=QQ5zfyEqpDHVIxQknvlXhMcoyjCpps5a0drNyuuGZO8,18
+datacrunch/constants.py,sha256=uBtS1kTe6ip5oWzA4SKAVftdapkKwUU45GdLYOuBzAA,2354
 datacrunch/datacrunch.py,sha256=dFSaeh1_xrfAc4lOqu1vGxxUtRpn7BdAbnW2mHKAHgU,2898
 datacrunch/exceptions.py,sha256=uOP_YU2HEUi_mcMxQ9WYrIjqWUuUrwdube-RdL1C4Ps,781
 datacrunch/helpers.py,sha256=Eq5htNxpJUCJG9D6QxbnWwch3ppmi2lfi-rFCGXf3fs,634
@@ -13,7 +13,7 @@ datacrunch/http_client/http_client.py,sha256=6A35jNH6BHRZCL_3yst8ud82lsnpM-GFore
 datacrunch/images/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datacrunch/images/images.py,sha256=hCAtSzozHcAAJ_UZOvnAbQSEU7BfCuixpIsmcd2RM2k,2167
 datacrunch/instance_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datacrunch/instance_types/instance_types.py,sha256=ywrlzJQrvic8nB6Ax4ryf_KxxqcpMqWHSMrP9GZBaO8,4732
+datacrunch/instance_types/instance_types.py,sha256=NLkUI6UdfXg-zDkMu9j9RzVISLG8jdABhT_R7XpfBdA,5289
 datacrunch/instances/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datacrunch/instances/instances.py,sha256=jkaVfSMiXpeSZcP1pOFZq1rkn2_2T4lfhT-NDr-7j0A,15306
 datacrunch/locations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,7 +25,7 @@ datacrunch/startup_scripts/startup_scripts.py,sha256=EnWiuT48uN_soVHpbnDMUQ9kab2
 datacrunch/volume_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datacrunch/volume_types/volume_types.py,sha256=CNJ8kfd_nxmF99x-UAJeku-uN4Gdh-yg15Aa8WGLgWU,1828
 datacrunch/volumes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datacrunch/volumes/volumes.py,sha256=X6vxwp05QHS0iFZbLjYV78NubHvsUiZdoCavpjnMP60,11347
+datacrunch/volumes/volumes.py,sha256=aAH4UIVG-7NehjHu-a_4MGSdZ1jmeApV-kKh-X6TB-s,11908
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/integration_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/integration_tests/conftest.py,sha256=PWf6K1G3NoddebmDIy_Pk02dHQrEKfrNxpWwqE8Eqrk,546
@@ -45,7 +45,7 @@ tests/unit_tests/http_client/test_http_client.py,sha256=JfEy7pADx0gS9KNNwVLVeG-b
 tests/unit_tests/images/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/images/test_images.py,sha256=Tbsu5U1bUoD66ATibUWmipDmHYvhScI2XRzKtt-I-qg,1204
 tests/unit_tests/instance_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/unit_tests/instance_types/test_instance_types.py,sha256=y0J7OEr5hCiz7F9_qycsbMcTN2ViHMn5D9wFJsxpzuI,3178
+tests/unit_tests/instance_types/test_instance_types.py,sha256=DHpzSDG91Y8BOT5OVq5sKoO-akKRBK-X04c6_35HtGQ,3310
 tests/unit_tests/instances/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/instances/test_instances.py,sha256=UYClrgJV76IX32Y-ATUgorCoKjjqIsa9MQ04If6RXM4,16892
 tests/unit_tests/ssh_keys/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -56,8 +56,8 @@ tests/unit_tests/volume_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 tests/unit_tests/volume_types/test_volume_types.py,sha256=vGuC3dWjhQLD8bTYgw_we3dZ6vlUKRmKZbb9yCfhe0w,1386
 tests/unit_tests/volumes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit_tests/volumes/test_volumes.py,sha256=p53eSIHddWKL7U9oLLTnxo849LrJSoi6A5lpWF6ydHs,20672
-datacrunch-1.6.0.dist-info/LICENSE,sha256=LkdhbR2MArjDfV8M0dySL5mG_kfzxF2ntMgbJvWGyUQ,1069
-datacrunch-1.6.0.dist-info/METADATA,sha256=XbE82VGp4UvNVm9Z_laIUAzNChKrwmfch-CCSuabXH8,5941
-datacrunch-1.6.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-datacrunch-1.6.0.dist-info/top_level.txt,sha256=FvH4EZJkbUxNm-aKx0RjmWwnduAMpfRT13Fo123i7yE,17
-datacrunch-1.6.0.dist-info/RECORD,,
+datacrunch-1.7.0.dist-info/LICENSE,sha256=LkdhbR2MArjDfV8M0dySL5mG_kfzxF2ntMgbJvWGyUQ,1069
+datacrunch-1.7.0.dist-info/METADATA,sha256=P9QVlSJlKOssEJARerj90R54NGe-B64LUXM985uT7wg,5932
+datacrunch-1.7.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+datacrunch-1.7.0.dist-info/top_level.txt,sha256=FvH4EZJkbUxNm-aKx0RjmWwnduAMpfRT13Fo123i7yE,17
+datacrunch-1.7.0.dist-info/RECORD,,

{datacrunch-1.6.0.dist-info → datacrunch-1.7.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/unit_tests/instance_types/test_instance_types.py

@@ -15,6 +15,7 @@ STORAGE_DESCRIPTION = "1800GB NVME"
 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