datacrunch 1.13.2__py3-none-any.whl → 1.15.0__py3-none-any.whl

datacrunch/__version__.py

@@ -1 +1 @@
-VERSION = '1.13.2'
+VERSION = '1.15.0'

datacrunch/containers/__init__.py

@@ -7,6 +7,8 @@ from .containers import (
     EntrypointOverridesSettings,
     VolumeMount,
     SecretMount,
+    SharedFileSystemMount,
+    GeneralStorageMount,
     VolumeMountType,
     Container,
     ContainerRegistryCredentials,

datacrunch/containers/containers.py

@@ -8,7 +8,7 @@ import base64
 import os
 from dataclasses import dataclass, field
 from dataclasses_json import dataclass_json, Undefined  # type: ignore
-from typing import List, Optional, Dict, Any
+from typing import List, Optional, Dict, Any, Union
 from enum import Enum
 
 from datacrunch.http_client.http_client import HTTPClient
@@ -43,6 +43,7 @@ class VolumeMountType(str, Enum):
     SCRATCH = "scratch"
     SECRET = "secret"
     MEMORY = "memory"
+    SHARED = "shared"
 
 
 class ContainerRegistryType(str, Enum):
@@ -119,25 +120,88 @@ class EnvVar:
 @dataclass_json(undefined=Undefined.EXCLUDE)
 @dataclass
 class VolumeMount:
-    """Volume mount configuration for containers.
+    """Base class for volume mount configurations.
 
     Attributes:
         type: Type of volume mount.
         mount_path: Path where the volume should be mounted in the container.
-        size_in_mb: Size of the memory volume in megabytes, only used for memory volume mounts
+        size_in_mb: Size of the volume in megabytes. Deprecated: use MemoryMount for memory volumes instead.
     """
 
     type: VolumeMountType
     mount_path: str
-    size_in_mb: Optional[int] = None
+    # Deprecated: use MemoryMount for memory volumes instead.
+    size_in_mb: Optional[int] = field(default=None, kw_only=True)
 
 
-@dataclass_json
+@dataclass_json(undefined=Undefined.EXCLUDE)
 @dataclass
-class SecretMount:
-    mount_path: str
+class GeneralStorageMount(VolumeMount):
+    """General storage volume mount configuration.
+    """
+
+    def __init__(self, mount_path: str):
+        """Initialize a general scratch volume mount.
+
+        Args:
+            mount_path: Path where the volume should be mounted in the container.
+        """
+        super().__init__(type=VolumeMountType.SCRATCH, mount_path=mount_path)
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass
+class SecretMount(VolumeMount):
+    """Secret volume mount configuration.
+
+    A secret volume mount allows mounting secret files into the container.
+
+    Attributes:
+        secret_name: The name of the fileset secret to mount. This secret must be created in advance, for example using `create_fileset_secret_from_file_paths`
+        file_names: List of file names that are part of the fileset secret.
+    """
+
     secret_name: str
-    type: VolumeMountType = VolumeMountType.SECRET
+    file_names: Optional[List[str]] = None
+
+    def __init__(self, mount_path: str, secret_name: str, file_names: Optional[List[str]] = None):
+        self.secret_name = secret_name
+        self.file_names = file_names
+        super().__init__(type=VolumeMountType.SECRET, mount_path=mount_path)
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass
+class MemoryMount(VolumeMount):
+    """Memory volume mount configuration.
+
+    A memory volume mount provides high-speed, ephemeral in-memory storage inside your container.
+    The mount path is currently hardcoded to /dev/shm and cannot be changed.
+
+    Attributes:
+        size_in_mb: Size of the memory volume in megabytes.
+    """
+
+    size_in_mb: int
+
+    def __init__(self, size_in_mb: int):
+        super().__init__(type=VolumeMountType.MEMORY, mount_path='/dev/shm')
+        self.size_in_mb = size_in_mb
+
+
+@dataclass_json(undefined=Undefined.EXCLUDE)
+@dataclass
+class SharedFileSystemMount(VolumeMount):
+    """Shared filesystem volume mount configuration.
+
+    A shared filesystem volume mount allows mounting a shared filesystem into the container.
+    """
+
+    volume_id: str  # The ID of the shared filesystem volume to mount, needs to be created first
+
+    def __init__(self, mount_path: str, volume_id: str):
+        super().__init__(type=VolumeMountType.SHARED, mount_path=mount_path)
+        self.volume_id = volume_id
 
 
 @dataclass_json
@@ -155,7 +219,7 @@ class Container:
         volume_mounts: Optional list of volume mounts.
     """
 
-    image: str
+    image: Union[str, dict]
     exposed_port: int
     name: Optional[str] = None
     healthcheck: Optional[HealthcheckSettings] = None

datacrunch/instances/instances.py

@@ -1,4 +1,5 @@
 import time
+import itertools
 from typing import List, Union, Optional, Dict, Literal
 from dataclasses import dataclass
 from dataclasses_json import dataclass_json
@@ -123,7 +124,12 @@ class InstancesService:
                is_spot: bool = False,
                contract: Optional[Contract] = None,
                pricing: Optional[Pricing] = None,
-               coupon: Optional[str] = None) -> Instance:
+               coupon: Optional[str] = None,
+               *,
+               max_wait_time: float = 180,
+               initial_interval: float = 0.5,
+               max_interval: float = 5,
+               backoff_coefficient: float = 2.0) -> Instance:
         """Creates and deploys a new cloud instance.
 
         Args:
@@ -141,6 +147,10 @@ class InstancesService:
             contract: Optional contract type for the instance.
             pricing: Optional pricing model for the instance.
             coupon: Optional coupon code for discounts.
+            max_wait_time: Maximum total wait for the instance to start provisioning, in seconds (default: 180)
+            initial_interval: Initial interval, in seconds (default: 0.5)
+            max_interval: The longest single delay allowed between retries, in seconds (default: 5)
+            backoff_coefficient: Coefficient to calculate the next retry interval (default 2.0)
 
         Returns:
             The newly created instance object.
@@ -169,20 +179,19 @@ class InstancesService:
         id = self._http_client.post(INSTANCES_ENDPOINT, json=payload).text
 
         # Wait for instance to enter provisioning state with timeout
-        MAX_WAIT_TIME = 60  # Maximum wait time in seconds
-        POLL_INTERVAL = 0.5  # Time between status checks
-
-        start_time = time.time()
-        while True:
+        deadline = time.monotonic() + max_wait_time
+        for i in itertools.count():
             instance = self.get_by_id(id)
             if instance.status != InstanceStatus.ORDERED:
                 return instance
 
-            if time.time() - start_time > MAX_WAIT_TIME:
+            now = time.monotonic()
+            if now >= deadline:
                 raise TimeoutError(
-                    f"Instance {id} did not enter provisioning state within {MAX_WAIT_TIME} seconds")
+                    f"Instance {id} did not enter provisioning state within {max_wait_time:.1f} seconds")
 
-            time.sleep(POLL_INTERVAL)
+            interval = min(initial_interval * backoff_coefficient ** i, max_interval, deadline - now)
+            time.sleep(interval)
 
     def action(self, id_list: Union[List[str], str], action: str, volume_ids: Optional[List[str]] = None) -> None:
         """Performs an action on one or more instances.

{datacrunch-1.13.2.dist-info → datacrunch-1.15.0.dist-info}/METADATA

@@ -1,12 +1,11 @@
 Metadata-Version: 2.4
 Name: datacrunch
-Version: 1.13.2
+Version: 1.15.0
 Summary: Official Python SDK for DataCrunch Public API
 Home-page: https://github.com/DataCrunch-io
 Author: DataCrunch Oy
 Author-email: info@datacrunch.io
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -16,7 +15,7 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Natural Language :: English
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests<3,>=2.25.1

{datacrunch-1.13.2.dist-info → datacrunch-1.15.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 datacrunch/__init__.py,sha256=OG-5Avmuq3NXyBs_66GMwyzscUi0c-T6vWW5sRIfnZg,51
-datacrunch/__version__.py,sha256=8IckzI0uUmhYiB-ovZrtHma7D20LkhqldG1saLuXwus,19
+datacrunch/__version__.py,sha256=v0NuAYy8C6njG7SDCjPG68hLvRFV00bt7g3lqwOYITU,19
 datacrunch/constants.py,sha256=i0jCX91H2lKp1Uvk4GDsaTeXk0WmjyeSGpMfPs69BB4,2378
 datacrunch/datacrunch.py,sha256=2IqrTY39sLuwtuQ_QP3jCI1d5AaCwriYgAUEFoZZzPU,3488
 datacrunch/exceptions.py,sha256=uOP_YU2HEUi_mcMxQ9WYrIjqWUuUrwdube-RdL1C4Ps,781
@@ -10,8 +10,8 @@ datacrunch/authentication/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 datacrunch/authentication/authentication.py,sha256=CThTxA99jseh7TKIdUR1M9RErIJoXvTB8CbF1VGFPCE,3589
 datacrunch/balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datacrunch/balance/balance.py,sha256=rkqqXC3MLVxk6ym9Hlp9tsLbLWJculIn8q3BYbsme28,1240
-datacrunch/containers/__init__.py,sha256=WxkSyF_O-K_V2aZA-fucfGmRgQmrHhPSpUjxp3ayzO0,692
-datacrunch/containers/containers.py,sha256=M7q6_XAgwiAbkD7FKI3QwTgDuHvFRFfCSNPYOSX3N9U,33276
+datacrunch/containers/__init__.py,sha256=qNxgk3tS9Dx251ugXjmsDWeab2MO7EAFLd6aRo1XpmQ,744
+datacrunch/containers/containers.py,sha256=BSjPQ-VGvc7z9CYwCKkjVuM5ZV4oVgfOUyTe56BvXMY,35604
 datacrunch/http_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datacrunch/http_client/http_client.py,sha256=tmpVd3p7-NAIaTM4E13inFZWUetdVEFZnRE38p5eVk0,8285
 datacrunch/images/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,7 +19,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=GKPpZshn5JBsduR5zyT57fonB0GDdOLkPfPmGqgJQow,9239
+datacrunch/instances/instances.py,sha256=fHHQdJcdudE3-Nee3NWAeCjN2c43mlgtfpJ-1Lfm6x4,9862
 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
@@ -30,7 +30,7 @@ datacrunch/volume_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 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=aAH4UIVG-7NehjHu-a_4MGSdZ1jmeApV-kKh-X6TB-s,11908
-datacrunch-1.13.2.dist-info/licenses/LICENSE,sha256=LkdhbR2MArjDfV8M0dySL5mG_kfzxF2ntMgbJvWGyUQ,1069
+datacrunch-1.15.0.dist-info/licenses/LICENSE,sha256=LkdhbR2MArjDfV8M0dySL5mG_kfzxF2ntMgbJvWGyUQ,1069
 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
@@ -63,7 +63,7 @@ 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.13.2.dist-info/METADATA,sha256=ALmti6J4zvesLEDW3Jzqq2VDhjAJAQZgNfQzmO_BzUQ,6261
-datacrunch-1.13.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-datacrunch-1.13.2.dist-info/top_level.txt,sha256=FvH4EZJkbUxNm-aKx0RjmWwnduAMpfRT13Fo123i7yE,17
-datacrunch-1.13.2.dist-info/RECORD,,
+datacrunch-1.15.0.dist-info/METADATA,sha256=NYPMZAHvH2JmTs7fY37EXJM8hIamIT9rlZ_UgEljito,6212
+datacrunch-1.15.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+datacrunch-1.15.0.dist-info/top_level.txt,sha256=FvH4EZJkbUxNm-aKx0RjmWwnduAMpfRT13Fo123i7yE,17
+datacrunch-1.15.0.dist-info/RECORD,,