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

datacrunch/__version__.py

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

datacrunch/instances/instances.py

@@ -1,9 +1,11 @@
-from typing import List, Union, Optional, Dict
+from typing import List, Union, Optional, Dict, Literal
 from datacrunch.helpers import stringify_class_object_properties
 from datacrunch.constants import Locations
 
 INSTANCES_ENDPOINT = '/instances'
 
+Contract = Literal['LONG_TERM', 'PAY_AS_YOU_GO', 'SPOT']
+Pricing = Literal['DYNAMIC_PRICE', 'FIXED_PRICE']
 
 class Instance:
     """An instance model class"""
@@ -27,7 +29,9 @@ class Instance:
                  gpu_memory: dict,
                  location: str = Locations.FIN_01,
                  startup_script_id: str = None,
-                 is_spot: bool = False
+                 is_spot: bool = False,
+                 contract: Contract = None,
+                 pricing: Pricing = None,
                  ) -> None:
         """Initialize the instance object
 
@@ -89,6 +93,8 @@ class Instance:
         self._os_volume_id = os_volume_id
         self._gpu_memory = gpu_memory
         self._is_spot = is_spot
+        self._contract = contract
+        self._pricing = pricing
 
     @property
     def id(self) -> str:
@@ -261,6 +267,24 @@ class Instance:
         """
         return self._is_spot
 
+    @property
+    def contract(self) -> bool:
+        """Get contract type
+
+        :return: contract type
+        :rtype: str
+        """
+        return self._contract
+
+    @property
+    def pricing(self) -> bool:
+        """Get pricing type
+
+        :return: pricing type
+        :rtype: str
+        """
+        return self._pricing
+
     def __str__(self) -> str:
         """Returns a string of the json representation of the instance
 
@@ -306,7 +330,9 @@ class InstancesService:
             storage=instance_dict['storage'],
             os_volume_id=instance_dict['os_volume_id'] if 'os_volume_id' in instance_dict else None,
             gpu_memory=instance_dict['gpu_memory'] if 'gpu_memory' in instance_dict else None,
-            is_spot=instance_dict['is_spot'] if 'is_spot' in instance_dict else False
+            is_spot=instance_dict['is_spot'] if 'is_spot' in instance_dict else False,
+            contract=instance_dict['contract'] if 'contract' in instance_dict else False,
+            pricing=instance_dict['pricing'] if 'pricing' in instance_dict else False,
         ), instances_dict))
         return instances
 
@@ -340,7 +366,9 @@ class InstancesService:
             storage=instance_dict['storage'],
             os_volume_id=instance_dict['os_volume_id'] if 'os_volume_id' in instance_dict else None,
             gpu_memory=instance_dict['gpu_memory'] if 'gpu_memory' in instance_dict else None,
-            is_spot=instance_dict['is_spot'] if 'is_spot' in instance_dict else False
+            is_spot=instance_dict['is_spot'] if 'is_spot' in instance_dict else False,
+            contract=instance_dict['contract'] if 'contract' in instance_dict else False,
+            pricing=instance_dict['pricing'] if 'pricing' in instance_dict else False,
         )
         return instance
 
@@ -356,6 +384,8 @@ class InstancesService:
                existing_volumes: List[str] = None,
                os_volume: Dict = None,
                is_spot: bool = False,
+               contract: Contract = None,
+               pricing: Pricing = None,
                coupon: str = None) -> Instance:
         """Creates (deploys) a new instance
 
@@ -381,6 +411,10 @@ class InstancesService:
         :type os_volume: Dict, optional
         :param is_spot: Is spot instance
         :type is_spot: bool, optional
+        :param pricing: Pricing type
+        :type pricing: str, optional
+        :param contract: Contract type
+        :type contract: str, optional
         :param coupon: coupon code
         :type coupon: str, optional
         :return: the new instance object
@@ -398,8 +432,12 @@ class InstancesService:
             "volumes": volumes,
             "existing_volumes": existing_volumes,
             "is_spot": is_spot,
-            "coupon": coupon
+            "coupon": coupon,
         }
+        if contract:
+            payload['contract'] = contract
+        if pricing:
+            payload['pricing'] = pricing
         id = self._http_client.post(INSTANCES_ENDPOINT, json=payload).text
         instance = self.get_by_id(id)
         return instance

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: datacrunch
-Version: 1.7.0
+Version: 1.7.3
 Summary: Official Python SDK for DataCrunch Public API
 Home-page: https://github.com/DataCrunch-io
 Author: DataCrunch Oy
@@ -27,6 +27,16 @@ 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"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # DataCrunch Python SDK
 
@@ -64,7 +74,7 @@ The official [DataCrunch.io](https://datacrunch.io) Python SDK.
 
 The SDK's documentation is available on [ReadTheDocs](https://datacrunch-python.readthedocs.io/en/latest/)
 
-DataCrunch's Public API documentation [is available here](https://datacrunch.stoplight.io/docs/datacrunch-public/docs/Overview/Introduction.md).
+DataCrunch's Public API documentation [is available here](https://api.datacrunch.io/v1/docs).
 
 ## Getting Started - Using the SDK:
 
@@ -74,7 +84,7 @@ DataCrunch's Public API documentation [is available here](https://datacrunch.sto
   pip3 install datacrunch
   ```
 
-- Generate your client credentials - [instructions in the public API docs](https://datacrunch.stoplight.io/docs/datacrunch-public/docs/Overview/Quick-Start-Guide.md).
+- Generate your client credentials - [instructions in the public API docs](https://api.datacrunch.io/v1/docs#description/quick-start-guide).
 
 - Add the client secret to an environment variable (don't want it to be hardcoded):
 

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

@@ -1,5 +1,5 @@
 datacrunch/__init__.py,sha256=OG-5Avmuq3NXyBs_66GMwyzscUi0c-T6vWW5sRIfnZg,51
-datacrunch/__version__.py,sha256=QQ5zfyEqpDHVIxQknvlXhMcoyjCpps5a0drNyuuGZO8,18
+datacrunch/__version__.py,sha256=Zvj-6xERFc_YUDACDP6hhJTmnVDFA3Nx7fSqUgkGYxs,18
 datacrunch/constants.py,sha256=uBtS1kTe6ip5oWzA4SKAVftdapkKwUU45GdLYOuBzAA,2354
 datacrunch/datacrunch.py,sha256=dFSaeh1_xrfAc4lOqu1vGxxUtRpn7BdAbnW2mHKAHgU,2898
 datacrunch/exceptions.py,sha256=uOP_YU2HEUi_mcMxQ9WYrIjqWUuUrwdube-RdL1C4Ps,781
@@ -15,7 +15,7 @@ datacrunch/images/images.py,sha256=hCAtSzozHcAAJ_UZOvnAbQSEU7BfCuixpIsmcd2RM2k,2
 datacrunch/instance_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/instances/instances.py,sha256=DAjFSQPwugN4_u-13Q9K4gyjrPYwdTrIw2exHwhJ1bw,16626
 datacrunch/locations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datacrunch/locations/locations.py,sha256=2f1OF2ObNaqGam_Mm0Btie1GymnAI9UzXulhqSSm7zo,404
 datacrunch/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.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.7.3.dist-info/LICENSE,sha256=LkdhbR2MArjDfV8M0dySL5mG_kfzxF2ntMgbJvWGyUQ,1069
+datacrunch-1.7.3.dist-info/METADATA,sha256=yh2jdxqU8ZZgBkPD02jFNtGRTMkKHXb6wtRD23-xIIU,6076
+datacrunch-1.7.3.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+datacrunch-1.7.3.dist-info/top_level.txt,sha256=FvH4EZJkbUxNm-aKx0RjmWwnduAMpfRT13Fo123i7yE,17
+datacrunch-1.7.3.dist-info/RECORD,,

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

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