datacrunch: fix imports from datacrunch.instances.instances and friends

CHANGELOG.md

@@ -7,6 +7,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- `datacrunch`: fix imports from `datacrunch.instances.instances` and other similar modules
+
+### Changed 
+
+- `verda`: removed repeating submodules like `.instances.instances`.
+- `verda`: renamed `.InferenceClient.inference_client` module to `.inference_client`.
+
+Was:
+
+```python
+from datacrunch.instances.instances import InstancesService
+from datacrunch.InferenceClient.inference_client import InferenceClient
+```
+
+Now:
+
+```python
+from verda.instances import InstancesService
+from verda.inference_client import InferenceClient
+```
+
 ## [1.17.2] - 2025-11-27
 
 ### Fixed

datacrunch_compat/datacrunch/InferenceClient/__init__.py

@@ -1,3 +1,3 @@
-from verda.InferenceClient import InferenceClient, InferenceResponse
+from verda.inference_client import InferenceClient, InferenceResponse
 
 __all__ = ['InferenceClient', 'InferenceResponse']

datacrunch_compat/datacrunch/InferenceClient/inference_client.py

@@ -1 +1 @@
-from verda.InferenceClient.inference_client import *
+from verda.inference_client import *

datacrunch_compat/datacrunch/__init__.py

@@ -1,7 +1,7 @@
 # Compatibility layer for deprecated `datacrunch` package
 
+from verda import VerdaClient as DataCrunchClient
 from verda import (
-    InferenceClient,
     __version__,
     authentication,
     balance,
@@ -19,12 +19,12 @@
     volume_types,
     volumes,
 )
-from verda import VerdaClient as DataCrunchClient
+from verda import inference_client as Inference_client
 
 # For old `from datacrunch import *``
 __all__ = [
     'DataCrunchClient',
-    'InferenceClient',
+    'Inference_client',
     '__version__',
     'authentication',
     'balance',

datacrunch_compat/datacrunch/datacrunch.py

@@ -2,19 +2,19 @@
 
 from verda import VerdaClient as DataCrunchClient
 from verda._version import __version__
-from verda.authentication.authentication import AuthenticationService
-from verda.balance.balance import BalanceService
+from verda.authentication import AuthenticationService
+from verda.balance import BalanceService
 from verda.constants import Constants
-from verda.containers.containers import ContainersService
-from verda.http_client.http_client import HTTPClient
-from verda.images.images import ImagesService
-from verda.instance_types.instance_types import InstanceTypesService
-from verda.instances.instances import InstancesService
-from verda.locations.locations import LocationsService
-from verda.ssh_keys.ssh_keys import SSHKeysService
-from verda.startup_scripts.startup_scripts import StartupScriptsService
-from verda.volume_types.volume_types import VolumeTypesService
-from verda.volumes.volumes import VolumesService
+from verda.containers import ContainersService
+from verda.http_client import HTTPClient
+from verda.images import ImagesService
+from verda.instance_types import InstanceTypesService
+from verda.instances import InstancesService
+from verda.locations import LocationsService
+from verda.ssh_keys import SSHKeysService
+from verda.startup_scripts import StartupScriptsService
+from verda.volume_types import VolumeTypesService
+from verda.volumes import VolumesService
 
 # for `from datacrunch.datacrunch import *`
 __all__ = [

datacrunch_compat/tests/test_datacrunch.py

@@ -68,3 +68,8 @@ def test_datacrunch_inference_submodule():
         from datacrunch.InferenceClient.inference_client import AsyncStatus
 
     assert AsyncStatus.Initialized == 'Initialized'
+
+
+def test_datacrunch_instances_instances():
+    with pytest.warns(DeprecationWarning, match='datacrunch is deprecated'):
+        from datacrunch.instances.instances import InstancesService

examples/containers/calling_the_endpoint_asynchronously.py

@@ -2,7 +2,7 @@
 from time import sleep
 
 from verda import VerdaClient
-from verda.InferenceClient.inference_client import AsyncStatus
+from verda.inference_client import AsyncStatus
 
 # Configuration - replace with your deployment name
 DEPLOYMENT_NAME = os.environ.get('VERDA_DEPLOYMENT_NAME')

examples/containers/calling_the_endpoint_with_inference_key.py

@@ -1,6 +1,6 @@
 import os
 
-from verda.InferenceClient import InferenceClient
+from verda.inference_client import InferenceClient
 
 # Get inference key and endpoint base url from environment variables
 INFERENCE_KEY = os.environ.get('VERDA_INFERENCE_KEY')

examples/containers/calling_the_endpoint_with_inference_key_async.py

@@ -1,8 +1,7 @@
 import os
 from time import sleep
 
-from verda.InferenceClient import InferenceClient
-from verda.InferenceClient.inference_client import AsyncStatus
+from verda.inference_client import AsyncStatus, InferenceClient
 
 # Get inference key and endpoint base url from environment variables
 INFERENCE_KEY = os.environ.get('VERDA_INFERENCE_KEY')

tests/unit_tests/authentication/test_authentication.py

@@ -4,7 +4,7 @@
 import responses  # https://github.com/getsentry/responses
 from responses import matchers
 
-from verda.authentication.authentication import AuthenticationService
+from verda.authentication import AuthenticationService
 from verda.exceptions import APIException
 
 INVALID_REQUEST = 'invalid_request'

tests/unit_tests/balance/test_balance.py

@@ -1,6 +1,6 @@
 import responses  # https://github.com/getsentry/responses
 
-from verda.balance.balance import Balance, BalanceService
+from verda.balance import Balance, BalanceService
 
 
 def test_balance(http_client):

tests/unit_tests/conftest.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from verda.http_client.http_client import HTTPClient
+from verda.http_client import HTTPClient
 
 BASE_URL = 'https://api.example.com/v1'
 ACCESS_TOKEN = 'test-token'

tests/unit_tests/containers/test_containers.py

@@ -2,11 +2,7 @@
 import responses  # https://github.com/getsentry/responses
 from responses import matchers
 
-from verda.containers.containers import (
-    CONTAINER_DEPLOYMENTS_ENDPOINT,
-    CONTAINER_REGISTRY_CREDENTIALS_ENDPOINT,
-    SECRETS_ENDPOINT,
-    SERVERLESS_COMPUTE_RESOURCES_ENDPOINT,
+from verda.containers import (
     AWSECRCredentials,
     ComputeResource,
     Container,
@@ -33,6 +29,12 @@
     VolumeMount,
     VolumeMountType,
 )
+from verda.containers._containers import (
+    CONTAINER_DEPLOYMENTS_ENDPOINT,
+    CONTAINER_REGISTRY_CREDENTIALS_ENDPOINT,
+    SECRETS_ENDPOINT,
+    SERVERLESS_COMPUTE_RESOURCES_ENDPOINT,
+)
 from verda.exceptions import APIException
 
 DEPLOYMENT_NAME = 'test-deployment'

tests/unit_tests/images/test_images.py

@@ -1,6 +1,6 @@
 import responses  # https://github.com/getsentry/responses
 
-from verda.images.images import Image, ImagesService
+from verda.images import Image, ImagesService
 
 
 def test_images(http_client):

tests/unit_tests/instance_types/test_instance_types.py

@@ -1,6 +1,6 @@
 import responses  # https://github.com/getsentry/responses
 
-from verda.instance_types.instance_types import InstanceType, InstanceTypesService
+from verda.instance_types import InstanceType, InstanceTypesService
 
 TYPE_ID = '01cf5dc1-a5d2-4972-ae4e-d429115d055b'
 CPU_DESCRIPTION = '48 CPU 3.5GHz'

tests/unit_tests/instances/test_instances.py

@@ -3,7 +3,7 @@
 
 from verda.constants import Actions, ErrorCodes, Locations
 from verda.exceptions import APIException
-from verda.instances.instances import Instance, InstancesService
+from verda.instances import Instance, InstancesService
 
 INVALID_REQUEST = ErrorCodes.INVALID_REQUEST
 INVALID_REQUEST_MESSAGE = 'Your existence is invalid'

tests/unit_tests/ssh_keys/test_ssh_keys.py

@@ -2,7 +2,7 @@
 import responses  # https://github.com/getsentry/responses
 
 from verda.exceptions import APIException
-from verda.ssh_keys.ssh_keys import SSHKey, SSHKeysService
+from verda.ssh_keys import SSHKey, SSHKeysService
 
 INVALID_REQUEST = 'invalid_request'
 INVALID_REQUEST_MESSAGE = 'Your existence is invalid'

tests/unit_tests/startup_scripts/test_startup_scripts.py

@@ -2,10 +2,7 @@
 import responses  # https://github.com/getsentry/responses
 
 from verda.exceptions import APIException
-from verda.startup_scripts.startup_scripts import (
-    StartupScript,
-    StartupScriptsService,
-)
+from verda.startup_scripts import StartupScript, StartupScriptsService
 
 INVALID_REQUEST = 'invalid_request'
 INVALID_REQUEST_MESSAGE = 'Your existence is invalid'

tests/unit_tests/volume_types/test_volume_types.py

@@ -1,7 +1,7 @@
 import responses  # https://github.com/getsentry/responses
 
 from verda.constants import VolumeTypes
-from verda.volume_types.volume_types import VolumeType, VolumeTypesService
+from verda.volume_types import VolumeType, VolumeTypesService
 
 USD = 'usd'
 NVMe_PRICE = 0.2

tests/unit_tests/volumes/test_volumes.py

@@ -10,7 +10,7 @@
     VolumeTypes,
 )
 from verda.exceptions import APIException
-from verda.volumes.volumes import Volume, VolumesService
+from verda.volumes import Volume, VolumesService
 
 INVALID_REQUEST = ErrorCodes.INVALID_REQUEST
 INVALID_REQUEST_MESSAGE = 'Your existence is invalid'

verda/_verda.py

@@ -1,17 +1,17 @@
 from verda._version import __version__
-from verda.authentication.authentication import AuthenticationService
-from verda.balance.balance import BalanceService
+from verda.authentication import AuthenticationService
+from verda.balance import BalanceService
 from verda.constants import Constants
-from verda.containers.containers import ContainersService
-from verda.http_client.http_client import HTTPClient
-from verda.images.images import ImagesService
-from verda.instance_types.instance_types import InstanceTypesService
-from verda.instances.instances import InstancesService
-from verda.locations.locations import LocationsService
-from verda.ssh_keys.ssh_keys import SSHKeysService
-from verda.startup_scripts.startup_scripts import StartupScriptsService
-from verda.volume_types.volume_types import VolumeTypesService
-from verda.volumes.volumes import VolumesService
+from verda.containers import ContainersService
+from verda.http_client import HTTPClient
+from verda.images import ImagesService
+from verda.instance_types import InstanceTypesService
+from verda.instances import InstancesService
+from verda.locations import LocationsService
+from verda.ssh_keys import SSHKeysService
+from verda.startup_scripts import StartupScriptsService
+from verda.volume_types import VolumeTypesService
+from verda.volumes import VolumesService
 
 
 class VerdaClient:

verda/authentication/__init__.py

@@ -0,0 +1 @@
+from ._authentication import AuthenticationService

verda/authentication/authentication.py → verda/authentication/_authentication.py

@@ -2,7 +2,7 @@
 
 import requests
 
-from verda.http_client.http_client import handle_error
+from verda.http_client import handle_error
 
 TOKEN_ENDPOINT = '/oauth2/token'
 

verda/balance/__init__.py

@@ -0,0 +1 @@
+from ._balance import Balance, BalanceService

verda/containers/__init__.py

@@ -1,4 +1,4 @@
-from .containers import (
+from ._containers import (
     AWSECRCredentials,
     BaseRegistryCredentials,
     ComputeResource,

verda/containers/containers.py → verda/containers/_containers.py

@@ -12,8 +12,8 @@
 
 from dataclasses_json import Undefined, dataclass_json  # type: ignore
 
-from verda.http_client.http_client import HTTPClient
-from verda.InferenceClient import InferenceClient, InferenceResponse
+from verda.http_client import HTTPClient
+from verda.inference_client import InferenceClient, InferenceResponse
 
 # API endpoints
 CONTAINER_DEPLOYMENTS_ENDPOINT = '/container-deployments'

verda/http_client/__init__.py

@@ -0,0 +1 @@
+from ._http_client import HTTPClient, handle_error

verda/images/__init__.py

@@ -0,0 +1 @@
+from ._images import Image, ImagesService

verda/inference_client/__init__.py

@@ -0,0 +1,7 @@
+from ._inference_client import (
+    AsyncInferenceExecution,
+    AsyncStatus,
+    InferenceClient,
+    InferenceClientError,
+    InferenceResponse,
+)

verda/instance_types/__init__.py

@@ -0,0 +1 @@
+from ._instance_types import InstanceType, InstanceTypesService

verda/instances/__init__.py

@@ -0,0 +1 @@
+from ._instances import Contract, Instance, InstancesService, Pricing

verda/locations/__init__.py

@@ -0,0 +1 @@
+from ._locations import LocationsService

verda/ssh_keys/__init__.py

@@ -0,0 +1 @@
+from ._ssh_keys import SSHKey, SSHKeysService

verda/startup_scripts/__init__.py

@@ -0,0 +1 @@
+from ._startup_scripts import StartupScript, StartupScriptsService

verda/volume_types/__init__.py

@@ -0,0 +1 @@
+from ._volume_types import VolumeType, VolumeTypesService

verda/volumes/__init__.py

@@ -0,0 +1 @@
+from ._volumes import Volume, VolumesService