Merge pull request #2395 from dstackai/issue_2372_backend_configs

Move backend/compute configs from config.py to models.py

Author: r4victor

contributing/BACKENDS.md

@@ -127,7 +127,7 @@ Refer to examples:
 ##### 2.4.5. Create and register the backend config models
 
 Under the backend directory, create the `models.py` file and define the backend config model classes there.
-Every backend must define two models: 
+Every backend must define at least two models: 
 
 * `*BackendConfig` that contains all backend parameters available for user configuration except for creds.
 * `*BackendConfigWithCreds` that contains all backends parameters available for user configuration and also creds.
@@ -136,7 +136,7 @@ These models are used in server/config.yaml, the API, and for backend configurat
 
 The models should be added to `AnyBackendConfig*` unions in [`src/dstack/_internal/core/backends/models.py`](https://github.com/dstackai/dstack/blob/master/src/dstack/_internal/core/backends/models.py).
 
-It's not required but recommended to define `*BackendStoredConfig` that extends `*BackendConfig` to be able to store extra parameters in the DB. By the same logic, it's recommended to define `*Config` that extends `*BackendStoredConfig` with creds and use it as the main `Backend` and `Compute` config instead of using `*BackendConfigWithCreds` directly.
+It's not required but recommended to also define `*BackendStoredConfig` that extends `*BackendConfig` to be able to store extra parameters in the DB. By the same logic, it's recommended to define `*Config` that extends `*BackendStoredConfig` with creds and use it as the main `Backend` and `Compute` config instead of using `*BackendConfigWithCreds` directly.
 
 Refer to examples: 
 [datacrunch](https://github.com/dstackai/dstack/blob/master/src/dstack/_internal/core/backends/datacrunch/models.py), 

src/dstack/_internal/core/backends/aws/backend.py

@@ -1,7 +1,7 @@
 import botocore.exceptions
 
 from dstack._internal.core.backends.aws.compute import AWSCompute
-from dstack._internal.core.backends.aws.config import AWSConfig
+from dstack._internal.core.backends.aws.models import AWSConfig
 from dstack._internal.core.backends.base.backend import Backend
 from dstack._internal.core.errors import BackendInvalidCredentialsError
 from dstack._internal.core.models.backends.base import BackendType

src/dstack/_internal/core/backends/aws/compute.py

@@ -8,8 +8,7 @@
 
 import dstack._internal.core.backends.aws.resources as aws_resources
 from dstack._internal import settings
-from dstack._internal.core.backends.aws.config import AWSConfig
-from dstack._internal.core.backends.aws.models import AWSAccessKeyCreds
+from dstack._internal.core.backends.aws.models import AWSAccessKeyCreds, AWSConfig
 from dstack._internal.core.backends.base.compute import (
     Compute,
     ComputeWithCreateInstanceSupport,

src/dstack/_internal/core/backends/aws/config.py

@@ -6,12 +6,12 @@
 
 from dstack._internal.core.backends.aws import auth, compute, resources
 from dstack._internal.core.backends.aws.backend import AWSBackend
-from dstack._internal.core.backends.aws.config import AWSConfig
 from dstack._internal.core.backends.aws.models import (
     AnyAWSBackendConfig,
     AWSAccessKeyCreds,
     AWSBackendConfig,
     AWSBackendConfigWithCreds,
+    AWSConfig,
     AWSCreds,
     AWSDefaultCreds,
     AWSStoredConfig,

src/dstack/_internal/core/backends/aws/configurator.py

@@ -117,3 +117,19 @@ class AWSBackendConfigWithCreds(AWSBackendConfig):
 
 class AWSStoredConfig(AWSBackendConfig):
     pass
+
+
+class AWSConfig(AWSStoredConfig):
+    creds: AnyAWSCreds
+
+    @property
+    def allocate_public_ips(self) -> bool:
+        if self.public_ips is not None:
+            return self.public_ips
+        return True
+
+    @property
+    def use_default_vpcs(self) -> bool:
+        if self.default_vpcs is not None:
+            return self.default_vpcs
+        return True

src/dstack/_internal/core/backends/aws/models.py

@@ -1,6 +1,6 @@
 from dstack._internal.core.backends.azure import auth
 from dstack._internal.core.backends.azure.compute import AzureCompute
-from dstack._internal.core.backends.azure.config import AzureConfig
+from dstack._internal.core.backends.azure.models import AzureConfig
 from dstack._internal.core.backends.base.backend import Backend
 from dstack._internal.core.models.backends.base import BackendType
 

src/dstack/_internal/core/backends/azure/backend.py

@@ -36,7 +36,7 @@
 from dstack._internal import settings
 from dstack._internal.core.backends.azure import resources as azure_resources
 from dstack._internal.core.backends.azure import utils as azure_utils
-from dstack._internal.core.backends.azure.config import AzureConfig
+from dstack._internal.core.backends.azure.models import AzureConfig
 from dstack._internal.core.backends.base.compute import (
     Compute,
     ComputeWithCreateInstanceSupport,

src/dstack/_internal/core/backends/azure/compute.py

@@ -22,12 +22,12 @@
 from dstack._internal.core.backends.azure import auth, compute, resources
 from dstack._internal.core.backends.azure import utils as azure_utils
 from dstack._internal.core.backends.azure.backend import AzureBackend
-from dstack._internal.core.backends.azure.config import AzureConfig
 from dstack._internal.core.backends.azure.models import (
     AnyAzureBackendConfig,
     AzureBackendConfig,
     AzureBackendConfigWithCreds,
     AzureClientCreds,
+    AzureConfig,
     AzureCreds,
     AzureDefaultCreds,
     AzureStoredConfig,