diff --git a/CHANGELOG.md b/CHANGELOG.md index c2ee5cb..41c70a5 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/datacrunch_compat/datacrunch/InferenceClient/__init__.py b/datacrunch_compat/datacrunch/InferenceClient/__init__.py index d351e4d..598f49e 100644 --- a/datacrunch_compat/datacrunch/InferenceClient/__init__.py +++ b/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'] diff --git a/datacrunch_compat/datacrunch/InferenceClient/inference_client.py b/datacrunch_compat/datacrunch/InferenceClient/inference_client.py index 83acb4a..7328eed 100644 --- a/datacrunch_compat/datacrunch/InferenceClient/inference_client.py +++ b/datacrunch_compat/datacrunch/InferenceClient/inference_client.py @@ -1 +1 @@ -from verda.InferenceClient.inference_client import * +from verda.inference_client import * diff --git a/datacrunch_compat/datacrunch/__init__.py b/datacrunch_compat/datacrunch/__init__.py index 5ade6ea..c1e5aea 100644 --- a/datacrunch_compat/datacrunch/__init__.py +++ b/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', diff --git a/datacrunch_compat/datacrunch/authentication/__init__.py b/datacrunch_compat/datacrunch/authentication/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/datacrunch_compat/datacrunch/authentication.py b/datacrunch_compat/datacrunch/authentication/authentication.py similarity index 100% rename from datacrunch_compat/datacrunch/authentication.py rename to datacrunch_compat/datacrunch/authentication/authentication.py diff --git a/datacrunch_compat/datacrunch/balance/__init__.py b/datacrunch_compat/datacrunch/balance/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/datacrunch_compat/datacrunch/balance.py b/datacrunch_compat/datacrunch/balance/balance.py similarity index 100% rename from datacrunch_compat/datacrunch/balance.py rename to datacrunch_compat/datacrunch/balance/balance.py diff --git a/datacrunch_compat/datacrunch/containers/__init__.py b/datacrunch_compat/datacrunch/containers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/datacrunch_compat/datacrunch/containers.py b/datacrunch_compat/datacrunch/containers/containers.py similarity index 100% rename from datacrunch_compat/datacrunch/containers.py rename to datacrunch_compat/datacrunch/containers/containers.py diff --git a/datacrunch_compat/datacrunch/datacrunch.py b/datacrunch_compat/datacrunch/datacrunch.py index 6725866..61d55b2 100644 --- a/datacrunch_compat/datacrunch/datacrunch.py +++ b/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__ = [ diff --git a/datacrunch_compat/datacrunch/http_client/__init__.py b/datacrunch_compat/datacrunch/http_client/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/datacrunch_compat/datacrunch/http_client.py b/datacrunch_compat/datacrunch/http_client/http_client.py similarity index 100% rename from datacrunch_compat/datacrunch/http_client.py rename to datacrunch_compat/datacrunch/http_client/http_client.py diff --git a/datacrunch_compat/datacrunch/images/__init__.py b/datacrunch_compat/datacrunch/images/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/datacrunch_compat/datacrunch/images.py b/datacrunch_compat/datacrunch/images/images.py similarity index 100% rename from datacrunch_compat/datacrunch/images.py rename to datacrunch_compat/datacrunch/images/images.py diff --git a/datacrunch_compat/datacrunch/instance_types/__init__.py b/datacrunch_compat/datacrunch/instance_types/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/datacrunch_compat/datacrunch/instance_types.py b/datacrunch_compat/datacrunch/instance_types/instance_types.py similarity index 100% rename from datacrunch_compat/datacrunch/instance_types.py rename to datacrunch_compat/datacrunch/instance_types/instance_types.py diff --git a/datacrunch_compat/datacrunch/instances/__init__.py b/datacrunch_compat/datacrunch/instances/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/datacrunch_compat/datacrunch/instances.py b/datacrunch_compat/datacrunch/instances/instances.py similarity index 100% rename from datacrunch_compat/datacrunch/instances.py rename to datacrunch_compat/datacrunch/instances/instances.py diff --git a/datacrunch_compat/datacrunch/locations/__init__.py b/datacrunch_compat/datacrunch/locations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/datacrunch_compat/datacrunch/locations.py b/datacrunch_compat/datacrunch/locations/locations.py similarity index 100% rename from datacrunch_compat/datacrunch/locations.py rename to datacrunch_compat/datacrunch/locations/locations.py diff --git a/datacrunch_compat/datacrunch/ssh_keys/__init__.py b/datacrunch_compat/datacrunch/ssh_keys/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/datacrunch_compat/datacrunch/ssh_keys.py b/datacrunch_compat/datacrunch/ssh_keys/ssh_keys.py similarity index 100% rename from datacrunch_compat/datacrunch/ssh_keys.py rename to datacrunch_compat/datacrunch/ssh_keys/ssh_keys.py diff --git a/datacrunch_compat/datacrunch/startup_scripts/__init__.py b/datacrunch_compat/datacrunch/startup_scripts/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/datacrunch_compat/datacrunch/startup_scripts.py b/datacrunch_compat/datacrunch/startup_scripts/startup_scripts.py similarity index 100% rename from datacrunch_compat/datacrunch/startup_scripts.py rename to datacrunch_compat/datacrunch/startup_scripts/startup_scripts.py diff --git a/datacrunch_compat/datacrunch/volume_types/__init__.py b/datacrunch_compat/datacrunch/volume_types/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/datacrunch_compat/datacrunch/volume_types.py b/datacrunch_compat/datacrunch/volume_types/volume_types.py similarity index 100% rename from datacrunch_compat/datacrunch/volume_types.py rename to datacrunch_compat/datacrunch/volume_types/volume_types.py diff --git a/datacrunch_compat/datacrunch/volumes/__init__.py b/datacrunch_compat/datacrunch/volumes/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/datacrunch_compat/datacrunch/volumes.py b/datacrunch_compat/datacrunch/volumes/volumes.py similarity index 100% rename from datacrunch_compat/datacrunch/volumes.py rename to datacrunch_compat/datacrunch/volumes/volumes.py diff --git a/datacrunch_compat/tests/test_datacrunch.py b/datacrunch_compat/tests/test_datacrunch.py index b16ee8d..37207a1 100644 --- a/datacrunch_compat/tests/test_datacrunch.py +++ b/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 diff --git a/examples/containers/calling_the_endpoint_asynchronously.py b/examples/containers/calling_the_endpoint_asynchronously.py index 12cb588..bca8877 100644 --- a/examples/containers/calling_the_endpoint_asynchronously.py +++ b/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') diff --git a/examples/containers/calling_the_endpoint_with_inference_key.py b/examples/containers/calling_the_endpoint_with_inference_key.py index e34820e..fc61a55 100644 --- a/examples/containers/calling_the_endpoint_with_inference_key.py +++ b/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') diff --git a/examples/containers/calling_the_endpoint_with_inference_key_async.py b/examples/containers/calling_the_endpoint_with_inference_key_async.py index d4da15f..1eabd7e 100644 --- a/examples/containers/calling_the_endpoint_with_inference_key_async.py +++ b/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') diff --git a/tests/unit_tests/authentication/test_authentication.py b/tests/unit_tests/authentication/test_authentication.py index 179e171..20db43a 100644 --- a/tests/unit_tests/authentication/test_authentication.py +++ b/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' diff --git a/tests/unit_tests/balance/test_balance.py b/tests/unit_tests/balance/test_balance.py index 4155edb..2ec4634 100644 --- a/tests/unit_tests/balance/test_balance.py +++ b/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): diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py index 3848b7a..5cba070 100644 --- a/tests/unit_tests/conftest.py +++ b/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' diff --git a/tests/unit_tests/containers/test_containers.py b/tests/unit_tests/containers/test_containers.py index b2ffc66..1c40724 100644 --- a/tests/unit_tests/containers/test_containers.py +++ b/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' diff --git a/tests/unit_tests/images/test_images.py b/tests/unit_tests/images/test_images.py index e067699..a5e9828 100644 --- a/tests/unit_tests/images/test_images.py +++ b/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): diff --git a/tests/unit_tests/instance_types/test_instance_types.py b/tests/unit_tests/instance_types/test_instance_types.py index 974f26e..459d809 100644 --- a/tests/unit_tests/instance_types/test_instance_types.py +++ b/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' diff --git a/tests/unit_tests/instances/test_instances.py b/tests/unit_tests/instances/test_instances.py index c0f1157..27d9bd1 100644 --- a/tests/unit_tests/instances/test_instances.py +++ b/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' diff --git a/tests/unit_tests/ssh_keys/test_ssh_keys.py b/tests/unit_tests/ssh_keys/test_ssh_keys.py index 3d572e5..a333cad 100644 --- a/tests/unit_tests/ssh_keys/test_ssh_keys.py +++ b/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' diff --git a/tests/unit_tests/startup_scripts/test_startup_scripts.py b/tests/unit_tests/startup_scripts/test_startup_scripts.py index 72426c4..845d6f6 100644 --- a/tests/unit_tests/startup_scripts/test_startup_scripts.py +++ b/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' diff --git a/tests/unit_tests/volume_types/test_volume_types.py b/tests/unit_tests/volume_types/test_volume_types.py index df8ce09..1354998 100644 --- a/tests/unit_tests/volume_types/test_volume_types.py +++ b/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 diff --git a/tests/unit_tests/volumes/test_volumes.py b/tests/unit_tests/volumes/test_volumes.py index 9a4b592..e573c4d 100644 --- a/tests/unit_tests/volumes/test_volumes.py +++ b/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' diff --git a/verda/InferenceClient/__init__.py b/verda/InferenceClient/__init__.py deleted file mode 100644 index e680d86..0000000 --- a/verda/InferenceClient/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from .inference_client import InferenceClient, InferenceResponse - -__all__ = ['InferenceClient', 'InferenceResponse'] diff --git a/verda/_verda.py b/verda/_verda.py index 3177d2a..b3d9922 100644 --- a/verda/_verda.py +++ b/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: diff --git a/verda/authentication/__init__.py b/verda/authentication/__init__.py index e69de29..4e0f98c 100644 --- a/verda/authentication/__init__.py +++ b/verda/authentication/__init__.py @@ -0,0 +1 @@ +from ._authentication import AuthenticationService diff --git a/verda/authentication/authentication.py b/verda/authentication/_authentication.py similarity index 98% rename from verda/authentication/authentication.py rename to verda/authentication/_authentication.py index c174de4..72288a9 100644 --- a/verda/authentication/authentication.py +++ b/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' diff --git a/verda/balance/__init__.py b/verda/balance/__init__.py index e69de29..8d5cdc8 100644 --- a/verda/balance/__init__.py +++ b/verda/balance/__init__.py @@ -0,0 +1 @@ +from ._balance import Balance, BalanceService diff --git a/verda/balance/balance.py b/verda/balance/_balance.py similarity index 100% rename from verda/balance/balance.py rename to verda/balance/_balance.py diff --git a/verda/containers/__init__.py b/verda/containers/__init__.py index 9633c37..39dbfbc 100644 --- a/verda/containers/__init__.py +++ b/verda/containers/__init__.py @@ -1,4 +1,4 @@ -from .containers import ( +from ._containers import ( AWSECRCredentials, BaseRegistryCredentials, ComputeResource, diff --git a/verda/containers/containers.py b/verda/containers/_containers.py similarity index 99% rename from verda/containers/containers.py rename to verda/containers/_containers.py index ac5bd0c..ca125ad 100644 --- a/verda/containers/containers.py +++ b/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' diff --git a/verda/http_client/__init__.py b/verda/http_client/__init__.py index e69de29..4c6df86 100644 --- a/verda/http_client/__init__.py +++ b/verda/http_client/__init__.py @@ -0,0 +1 @@ +from ._http_client import HTTPClient, handle_error diff --git a/verda/http_client/http_client.py b/verda/http_client/_http_client.py similarity index 100% rename from verda/http_client/http_client.py rename to verda/http_client/_http_client.py diff --git a/verda/images/__init__.py b/verda/images/__init__.py index e69de29..d27ded4 100644 --- a/verda/images/__init__.py +++ b/verda/images/__init__.py @@ -0,0 +1 @@ +from ._images import Image, ImagesService diff --git a/verda/images/images.py b/verda/images/_images.py similarity index 100% rename from verda/images/images.py rename to verda/images/_images.py diff --git a/verda/inference_client/__init__.py b/verda/inference_client/__init__.py new file mode 100644 index 0000000..a3d2ec9 --- /dev/null +++ b/verda/inference_client/__init__.py @@ -0,0 +1,7 @@ +from ._inference_client import ( + AsyncInferenceExecution, + AsyncStatus, + InferenceClient, + InferenceClientError, + InferenceResponse, +) diff --git a/verda/InferenceClient/inference_client.py b/verda/inference_client/_inference_client.py similarity index 100% rename from verda/InferenceClient/inference_client.py rename to verda/inference_client/_inference_client.py diff --git a/verda/instance_types/__init__.py b/verda/instance_types/__init__.py index e69de29..51fef16 100644 --- a/verda/instance_types/__init__.py +++ b/verda/instance_types/__init__.py @@ -0,0 +1 @@ +from ._instance_types import InstanceType, InstanceTypesService diff --git a/verda/instance_types/instance_types.py b/verda/instance_types/_instance_types.py similarity index 100% rename from verda/instance_types/instance_types.py rename to verda/instance_types/_instance_types.py diff --git a/verda/instances/__init__.py b/verda/instances/__init__.py index e69de29..e7ae61b 100644 --- a/verda/instances/__init__.py +++ b/verda/instances/__init__.py @@ -0,0 +1 @@ +from ._instances import Contract, Instance, InstancesService, Pricing diff --git a/verda/instances/instances.py b/verda/instances/_instances.py similarity index 100% rename from verda/instances/instances.py rename to verda/instances/_instances.py diff --git a/verda/locations/__init__.py b/verda/locations/__init__.py index e69de29..1c7b795 100644 --- a/verda/locations/__init__.py +++ b/verda/locations/__init__.py @@ -0,0 +1 @@ +from ._locations import LocationsService diff --git a/verda/locations/locations.py b/verda/locations/_locations.py similarity index 100% rename from verda/locations/locations.py rename to verda/locations/_locations.py diff --git a/verda/ssh_keys/__init__.py b/verda/ssh_keys/__init__.py index e69de29..3254b79 100644 --- a/verda/ssh_keys/__init__.py +++ b/verda/ssh_keys/__init__.py @@ -0,0 +1 @@ +from ._ssh_keys import SSHKey, SSHKeysService diff --git a/verda/ssh_keys/ssh_keys.py b/verda/ssh_keys/_ssh_keys.py similarity index 100% rename from verda/ssh_keys/ssh_keys.py rename to verda/ssh_keys/_ssh_keys.py diff --git a/verda/startup_scripts/__init__.py b/verda/startup_scripts/__init__.py index e69de29..f8a531c 100644 --- a/verda/startup_scripts/__init__.py +++ b/verda/startup_scripts/__init__.py @@ -0,0 +1 @@ +from ._startup_scripts import StartupScript, StartupScriptsService diff --git a/verda/startup_scripts/startup_scripts.py b/verda/startup_scripts/_startup_scripts.py similarity index 100% rename from verda/startup_scripts/startup_scripts.py rename to verda/startup_scripts/_startup_scripts.py diff --git a/verda/volume_types/__init__.py b/verda/volume_types/__init__.py index e69de29..5349808 100644 --- a/verda/volume_types/__init__.py +++ b/verda/volume_types/__init__.py @@ -0,0 +1 @@ +from ._volume_types import VolumeType, VolumeTypesService diff --git a/verda/volume_types/volume_types.py b/verda/volume_types/_volume_types.py similarity index 100% rename from verda/volume_types/volume_types.py rename to verda/volume_types/_volume_types.py diff --git a/verda/volumes/__init__.py b/verda/volumes/__init__.py index e69de29..a6815dc 100644 --- a/verda/volumes/__init__.py +++ b/verda/volumes/__init__.py @@ -0,0 +1 @@ +from ._volumes import Volume, VolumesService diff --git a/verda/volumes/volumes.py b/verda/volumes/_volumes.py similarity index 100% rename from verda/volumes/volumes.py rename to verda/volumes/_volumes.py