[chore]: Drop is_core_model_instance

src/dstack/_internal/cli/services/configurators/base.py

@@ -5,7 +5,6 @@
 
 from dstack._internal.cli.services.args import env_var
 from dstack._internal.core.errors import ConfigurationError
-from dstack._internal.core.models.common import is_core_model_instance
 from dstack._internal.core.models.configurations import (
     AnyApplyConfiguration,
     ApplyConfigurationType,
@@ -100,7 +99,7 @@ def apply_env_vars(self, env: Env, configurator_args: argparse.Namespace) -> Non
         for k, v in cast(List[EnvVarTuple], configurator_args.env_vars):
             env[k] = v
         for k, v in env.items():
-            if is_core_model_instance(v, EnvSentinel):
+            if isinstance(v, EnvSentinel):
                 try:
                     env[k] = v.from_env(os.environ)
                 except ValueError as e:

src/dstack/_internal/cli/utils/run.py

@@ -4,7 +4,6 @@
 from rich.table import Table
 
 from dstack._internal.cli.utils.common import NO_OFFERS_WARNING, add_row_from_dict, console
-from dstack._internal.core.models.common import is_core_model_instance
 from dstack._internal.core.models.configurations import DevEnvironmentConfiguration
 from dstack._internal.core.models.instances import InstanceAvailability
 from dstack._internal.core.models.profiles import (
@@ -41,7 +40,7 @@ def print_run_plan(run_plan: RunPlan, offers_limit: int = 3):
         else "-"
     )
     inactivity_duration = None
-    if is_core_model_instance(run_plan.run_spec.configuration, DevEnvironmentConfiguration):
+    if isinstance(run_plan.run_spec.configuration, DevEnvironmentConfiguration):
         inactivity_duration = "-"
         if isinstance(run_plan.run_spec.configuration.inactivity_duration, int):
             inactivity_duration = format_pretty_duration(

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

@@ -4,7 +4,6 @@
 
 from dstack._internal.core.backends.aws.models import AnyAWSCreds, AWSAccessKeyCreds
 from dstack._internal.core.errors import BackendAuthError
-from dstack._internal.core.models.common import is_core_model_instance
 
 
 def authenticate(creds: AnyAWSCreds, region: str) -> Session:
@@ -14,7 +13,7 @@ def authenticate(creds: AnyAWSCreds, region: str) -> Session:
 
 
 def get_session(creds: AnyAWSCreds, region: str) -> Session:
-    if is_core_model_instance(creds, AWSAccessKeyCreds):
+    if isinstance(creds, AWSAccessKeyCreds):
         return boto3.session.Session(
             region_name=region,
             aws_access_key_id=creds.access_key,

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

@@ -28,7 +28,7 @@
 from dstack._internal.core.backends.base.offers import get_catalog_offers
 from dstack._internal.core.errors import ComputeError, NoCapacityError, PlacementGroupInUseError
 from dstack._internal.core.models.backends.base import BackendType
-from dstack._internal.core.models.common import CoreModel, is_core_model_instance
+from dstack._internal.core.models.common import CoreModel
 from dstack._internal.core.models.gateways import (
     GatewayComputeConfiguration,
     GatewayProvisioningData,
@@ -79,7 +79,7 @@ class AWSCompute(
     def __init__(self, config: AWSConfig):
         super().__init__()
         self.config = config
-        if is_core_model_instance(config.creds, AWSAccessKeyCreds):
+        if isinstance(config.creds, AWSAccessKeyCreds):
             self.session = boto3.Session(
                 aws_access_key_id=config.creds.access_key,
                 aws_secret_access_key=config.creds.secret_key,

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

@@ -29,7 +29,6 @@
 from dstack._internal.core.models.backends.base import (
     BackendType,
 )
-from dstack._internal.core.models.common import is_core_model_instance
 from dstack._internal.utils.logging import get_logger
 
 logger = get_logger(__name__)
@@ -58,12 +57,12 @@ class AWSConfigurator(Configurator):
     BACKEND_CLASS = AWSBackend
 
     def validate_config(self, config: AWSBackendConfigWithCreds, default_creds_enabled: bool):
-        if is_core_model_instance(config.creds, AWSDefaultCreds) and not default_creds_enabled:
+        if isinstance(config.creds, AWSDefaultCreds) and not default_creds_enabled:
             raise_invalid_credentials_error(fields=[["creds"]])
         try:
             session = auth.authenticate(creds=config.creds, region=MAIN_REGION)
         except Exception:
-            if is_core_model_instance(config.creds, AWSAccessKeyCreds):
+            if isinstance(config.creds, AWSAccessKeyCreds):
                 raise_invalid_credentials_error(
                     fields=[
                         ["creds", "access_key"],

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

@@ -9,7 +9,6 @@
     AzureClientCreds,
 )
 from dstack._internal.core.errors import BackendAuthError
-from dstack._internal.core.models.common import is_core_model_instance
 
 AzureCredential = Union[ClientSecretCredential, DefaultAzureCredential]
 
@@ -21,7 +20,7 @@ def authenticate(creds: AnyAzureCreds) -> Tuple[AzureCredential, str]:
 
 
 def get_credential(creds: AnyAzureCreds) -> Tuple[AzureCredential, str]:
-    if is_core_model_instance(creds, AzureClientCreds):
+    if isinstance(creds, AzureClientCreds):
         credential = ClientSecretCredential(
             tenant_id=creds.tenant_id,
             client_id=creds.client_id,

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

@@ -46,7 +46,6 @@
 from dstack._internal.core.models.backends.base import (
     BackendType,
 )
-from dstack._internal.core.models.common import is_core_model_instance
 
 LOCATIONS = [
     ("(US) Central US", "centralus"),
@@ -76,14 +75,14 @@ class AzureConfigurator(Configurator):
     BACKEND_CLASS = AzureBackend
 
     def validate_config(self, config: AzureBackendConfigWithCreds, default_creds_enabled: bool):
-        if is_core_model_instance(config.creds, AzureDefaultCreds) and not default_creds_enabled:
+        if isinstance(config.creds, AzureDefaultCreds) and not default_creds_enabled:
             raise_invalid_credentials_error(fields=[["creds"]])
-        if is_core_model_instance(config.creds, AzureClientCreds):
+        if isinstance(config.creds, AzureClientCreds):
             self._set_client_creds_tenant_id(config.creds, config.tenant_id)
         try:
             credential, _ = auth.authenticate(config.creds)
         except BackendAuthError:
-            if is_core_model_instance(config.creds, AzureClientCreds):
+            if isinstance(config.creds, AzureClientCreds):
                 raise_invalid_credentials_error(
                     fields=[
                         ["creds", "tenant_id"],
@@ -105,7 +104,7 @@ def create_backend(
     ) -> BackendRecord:
         if config.regions is None:
             config.regions = DEFAULT_LOCATIONS
-        if is_core_model_instance(config.creds, AzureClientCreds):
+        if isinstance(config.creds, AzureClientCreds):
             self._set_client_creds_tenant_id(config.creds, config.tenant_id)
         credential, _ = auth.authenticate(config.creds)
         if config.resource_group is None:

src/dstack/_internal/core/backends/gcp/auth.py

@@ -13,7 +13,6 @@
     GCPServiceAccountCreds,
 )
 from dstack._internal.core.errors import BackendAuthError
-from dstack._internal.core.models.common import is_core_model_instance
 
 
 def authenticate(creds: AnyGCPCreds, project_id: Optional[str] = None) -> Tuple[Credentials, str]:
@@ -30,7 +29,7 @@ def authenticate(creds: AnyGCPCreds, project_id: Optional[str] = None) -> Tuple[
 
 
 def get_credentials(creds: AnyGCPCreds) -> Tuple[Credentials, Optional[str]]:
-    if is_core_model_instance(creds, GCPServiceAccountCreds):
+    if isinstance(creds, GCPServiceAccountCreds):
         try:
             service_account_info = json.loads(creds.data)
             credentials = service_account.Credentials.from_service_account_info(

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

@@ -24,7 +24,6 @@
 from dstack._internal.core.models.backends.base import (
     BackendType,
 )
-from dstack._internal.core.models.common import is_core_model_instance
 
 LOCATIONS = [
     {
@@ -115,15 +114,15 @@ class GCPConfigurator(Configurator):
     BACKEND_CLASS = GCPBackend
 
     def validate_config(self, config: GCPBackendConfigWithCreds, default_creds_enabled: bool):
-        if is_core_model_instance(config.creds, GCPDefaultCreds) and not default_creds_enabled:
+        if isinstance(config.creds, GCPDefaultCreds) and not default_creds_enabled:
             raise_invalid_credentials_error(fields=[["creds"]])
         try:
             credentials, _ = auth.authenticate(creds=config.creds, project_id=config.project_id)
         except BackendAuthError as e:
             details = None
             if len(e.args) > 0:
                 details = e.args[0]
-            if is_core_model_instance(config.creds, GCPServiceAccountCreds):
+            if isinstance(config.creds, GCPServiceAccountCreds):
                 raise_invalid_credentials_error(fields=[["creds", "data"]], details=details)
             else:
                 raise_invalid_credentials_error(fields=[["creds"]], details=details)

src/dstack/_internal/core/backends/oci/auth.py

@@ -3,11 +3,10 @@
 
 from dstack._internal.core.backends.oci.exceptions import any_oci_exception
 from dstack._internal.core.backends.oci.models import AnyOCICreds, OCIDefaultCreds
-from dstack._internal.core.models.common import is_core_model_instance
 
 
 def get_client_config(creds: AnyOCICreds) -> Mapping[str, Any]:
-    if is_core_model_instance(creds, OCIDefaultCreds):
+    if isinstance(creds, OCIDefaultCreds):
         return oci.config.from_file(file_location=creds.file, profile_name=creds.profile)
     return creds.dict(exclude={"type"})
 

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

@@ -27,7 +27,6 @@
 from dstack._internal.core.models.backends.base import (
     BackendType,
 )
-from dstack._internal.core.models.common import is_core_model_instance
 
 # where dstack images are published
 SUPPORTED_REGIONS = frozenset(
@@ -48,7 +47,7 @@ class OCIConfigurator(Configurator):
     BACKEND_CLASS = OCIBackend
 
     def validate_config(self, config: OCIBackendConfigWithCreds, default_creds_enabled: bool):
-        if is_core_model_instance(config.creds, OCIDefaultCreds) and not default_creds_enabled:
+        if isinstance(config.creds, OCIDefaultCreds) and not default_creds_enabled:
             raise_invalid_credentials_error(
                 fields=[["creds"]],
                 details="Default credentials are forbidden by dstack settings",

src/dstack/_internal/core/models/common.py

@@ -1,10 +1,10 @@
 import re
 from enum import Enum
-from typing import Any, Type, TypeVar, Union
+from typing import Union
 
 from pydantic import Field
 from pydantic_duality import DualBaseModel
-from typing_extensions import Annotated, TypeGuard
+from typing_extensions import Annotated
 
 
 # DualBaseModel creates two classes for the model:
@@ -74,15 +74,3 @@ class ApplyAction(str, Enum):
 class NetworkMode(str, Enum):
     HOST = "host"
     BRIDGE = "bridge"
-
-
-_CM = TypeVar("_CM", bound=CoreModel)
-
-
-def is_core_model_instance(instance: Any, class_: Type[_CM]) -> TypeGuard[_CM]:
-    """
-    Implements isinstance check for CoreModel such that
-    models parsed with MyModel.__response__ pass the check against MyModel.
-    See https://github.com/dstackai/dstack/issues/1124
-    """
-    return isinstance(instance, class_) or isinstance(instance, class_.__response__)

src/dstack/_internal/core/models/envs.py

@@ -4,7 +4,7 @@
 from pydantic import BaseModel, Field, validator
 from typing_extensions import Annotated, Self
 
-from dstack._internal.core.models.common import CoreModel, is_core_model_instance
+from dstack._internal.core.models.common import CoreModel
 
 # VAR_NAME=VALUE, VAR_NAME=, or VAR_NAME
 _ENV_STRING_REGEX = r"^([a-zA-Z_][a-zA-Z0-9_]*)(=.*$|$)"
@@ -118,7 +118,7 @@ def as_dict(self) -> Dict[str, str]:
         unresolved: List[str] = []
         dct: Dict[str, str] = {}
         for k, v in self.items():
-            if is_core_model_instance(v, EnvSentinel):
+            if isinstance(v, EnvSentinel):
                 unresolved.append(k)
             else:
                 # cast is required since TypeGuard is for positive cases only

src/dstack/_internal/server/background/tasks/process_running_jobs.py

@@ -10,7 +10,7 @@
 from dstack._internal.core.consts import DSTACK_RUNNER_HTTP_PORT, DSTACK_SHIM_HTTP_PORT
 from dstack._internal.core.errors import GatewayError
 from dstack._internal.core.models.backends.base import BackendType
-from dstack._internal.core.models.common import NetworkMode, RegistryAuth, is_core_model_instance
+from dstack._internal.core.models.common import NetworkMode, RegistryAuth
 from dstack._internal.core.models.configurations import DevEnvironmentConfiguration
 from dstack._internal.core.models.instances import (
     InstanceStatus,
@@ -422,9 +422,9 @@ def _process_provisioning_with_shim(
     volume_mounts: List[VolumeMountPoint] = []
     instance_mounts: List[InstanceMountPoint] = []
     for mount in run.run_spec.configuration.volumes:
-        if is_core_model_instance(mount, VolumeMountPoint):
+        if isinstance(mount, VolumeMountPoint):
             volume_mounts.append(mount.copy())
-        elif is_core_model_instance(mount, InstanceMountPoint):
+        elif isinstance(mount, InstanceMountPoint):
             instance_mounts.append(mount)
         else:
             assert False, f"unexpected mount point: {mount!r}"
@@ -657,7 +657,7 @@ def _terminate_if_inactivity_duration_exceeded(
     run_model: RunModel, job_model: JobModel, no_connections_secs: Optional[int]
 ) -> None:
     conf = RunSpec.__response__.parse_raw(run_model.run_spec).configuration
-    if not is_core_model_instance(conf, DevEnvironmentConfiguration) or not isinstance(
+    if not isinstance(conf, DevEnvironmentConfiguration) or not isinstance(
         conf.inactivity_duration, int
     ):
         # reset in case inactivity_duration was disabled via in-place update

src/dstack/_internal/server/services/fleets.py

@@ -15,7 +15,6 @@
     ResourceExistsError,
     ServerClientError,
 )
-from dstack._internal.core.models.common import is_core_model_instance
 from dstack._internal.core.models.envs import Env
 from dstack._internal.core.models.fleets import (
     Fleet,
@@ -630,7 +629,7 @@ def _validate_fleet_spec(spec: FleetSpec):
         if spec.configuration.ssh_config.ssh_key is not None:
             _validate_ssh_key(spec.configuration.ssh_config.ssh_key)
         for host in spec.configuration.ssh_config.hosts:
-            if is_core_model_instance(host, SSHHostParams) and host.ssh_key is not None:
+            if isinstance(host, SSHHostParams) and host.ssh_key is not None:
                 _validate_ssh_key(host.ssh_key)
         _validate_internal_ips(spec.configuration.ssh_config)
 

src/dstack/_internal/server/services/jobs/__init__.py

@@ -20,7 +20,6 @@
     SSHError,
 )
 from dstack._internal.core.models.backends.base import BackendType
-from dstack._internal.core.models.common import is_core_model_instance
 from dstack._internal.core.models.configurations import RunConfigurationType
 from dstack._internal.core.models.instances import InstanceStatus
 from dstack._internal.core.models.runs import (
@@ -585,7 +584,7 @@ async def get_job_configured_volume_models(
         job_volumes = interpolate_job_volumes(run_spec.configuration.volumes, job_num)
     volume_models = []
     for mount_point in job_volumes:
-        if not is_core_model_instance(mount_point, VolumeMountPoint):
+        if not isinstance(mount_point, VolumeMountPoint):
             continue
         if isinstance(mount_point.name, str):
             names = [mount_point.name]

src/dstack/_internal/server/services/jobs/configurators/base.py

@@ -7,7 +7,7 @@
 
 import dstack.version as version
 from dstack._internal.core.errors import DockerRegistryError, ServerClientError
-from dstack._internal.core.models.common import RegistryAuth, is_core_model_instance
+from dstack._internal.core.models.common import RegistryAuth
 from dstack._internal.core.models.configurations import (
     PortMapping,
     PythonVersion,
@@ -274,7 +274,7 @@ def interpolate_job_volumes(
         if isinstance(mount_point, str):
             # pydantic validator ensures strings are converted to MountPoint
             continue
-        if not is_core_model_instance(mount_point, VolumeMountPoint):
+        if not isinstance(mount_point, VolumeMountPoint):
             job_volumes.append(mount_point.copy())
             continue
         if isinstance(mount_point.name, str):

src/dstack/_internal/server/services/projects.py

@@ -14,7 +14,6 @@
 )
 from dstack._internal.core.backends.models import BackendInfo
 from dstack._internal.core.errors import ForbiddenError, ResourceExistsError, ServerClientError
-from dstack._internal.core.models.common import is_core_model_instance
 from dstack._internal.core.models.projects import Member, MemberPermissions, Project
 from dstack._internal.core.models.users import GlobalRole, ProjectRole
 from dstack._internal.server.models import MemberModel, ProjectModel, UserModel
@@ -386,7 +385,7 @@ def project_model_to_project(
             backend_config = get_backend_config_from_backend_model(
                 configurator, b, include_creds=False
             )
-            if is_core_model_instance(backend_config, DstackBackendConfig):
+            if isinstance(backend_config, DstackBackendConfig):
                 for backend_type in backend_config.base_backends:
                     backends.append(
                         BackendInfo(

src/dstack/_internal/server/services/proxy/repo.py

@@ -7,7 +7,6 @@
 
 import dstack._internal.server.services.jobs as jobs_services
 from dstack._internal.core.consts import DSTACK_RUNNER_SSH_PORT
-from dstack._internal.core.models.common import is_core_model_instance
 from dstack._internal.core.models.configurations import ServiceConfiguration
 from dstack._internal.core.models.instances import RemoteConnectionInfo, SSHConnectionParams
 from dstack._internal.core.models.runs import (
@@ -64,7 +63,7 @@ async def get_service(self, project_name: str, run_name: str) -> Optional[Servic
             return None
         run = jobs[0].run
         run_spec = RunSpec.__response__.parse_raw(run.run_spec)
-        if not is_core_model_instance(run_spec.configuration, ServiceConfiguration):
+        if not isinstance(run_spec.configuration, ServiceConfiguration):
             return None
         replicas = []
         for job in jobs:

src/dstack/_internal/server/services/runs.py

@@ -15,7 +15,7 @@
     ResourceNotExistsError,
     ServerClientError,
 )
-from dstack._internal.core.models.common import ApplyAction, is_core_model_instance
+from dstack._internal.core.models.common import ApplyAction
 from dstack._internal.core.models.configurations import AnyRunConfiguration
 from dstack._internal.core.models.instances import (
     InstanceAvailability,
@@ -748,7 +748,7 @@ async def _generate_run_name(
 
 def check_run_spec_requires_instance_mounts(run_spec: RunSpec) -> bool:
     return any(
-        is_core_model_instance(mp, InstanceMountPoint) and not mp.optional
+        isinstance(mp, InstanceMountPoint) and not mp.optional
         for mp in run_spec.configuration.volumes
     )