diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index d9e8ae0cb0..7306478393 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -64,7 +64,7 @@ jobs: strategy: matrix: os: [macos-latest, ubuntu-latest, windows-latest] - python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15"] + python-version: ["3.11", "3.12", "3.13", "3.14", "3.15"] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} diff --git a/.tox.justfile b/.tox.justfile index 102789f34d..065f9dadcf 100644 --- a/.tox.justfile +++ b/.tox.justfile @@ -1,5 +1,5 @@ # Keep in sync with pyproject.toml and .github/workflows/build-artifacts.yml -supported_python_versions := '3.10,3.11,3.12,3.13,3.14,3.15' +supported_python_versions := '3.11,3.12,3.13,3.14,3.15' install_tox_msg := ''' tox is not installed; to install it using uv: diff --git a/AGENTS.md b/AGENTS.md index daacac7de1..75d0a5997c 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -20,7 +20,7 @@ Before touching a subsystem, read the relevant notes in `contributing/`: `ARCHIT - Frontend: from `frontend/` run `npm install`, `npm run build`, then copy `frontend/build` into `src/dstack/_internal/server/statics/`; for dev, `npm run start` with API on port 8000. ## Coding Style & Naming Conventions -- Python targets 3.10+ with 4-space indentation and max line length of 99 (see `pyproject.toml`; `E501` is ignored but keep lines readable). +- Python targets 3.11+ with 4-space indentation and max line length of 99 (see `pyproject.toml`; `E501` is ignored but keep lines readable). - Imports are sorted via Ruff’s isort settings (`dstack` treated as first-party). - Keep primary/public functions before local helper functions in a module section. - Roughly keep function definitions in the order they are referenced within a file so call flow stays easy to follow. diff --git a/examples/plugins/example_plugin/pyproject.toml b/examples/plugins/example_plugin/pyproject.toml index 66f954a59a..ed02fd6134 100644 --- a/examples/plugins/example_plugin/pyproject.toml +++ b/examples/plugins/example_plugin/pyproject.toml @@ -6,7 +6,7 @@ readme = "README.md" authors = [ { name = "Victor Skvortsov", email = "victor@dstack.ai" } ] -requires-python = ">=3.10" +requires-python = ">=3.11" dependencies = [] [build-system] diff --git a/examples/plugins/example_plugin_server/pyproject.toml b/examples/plugins/example_plugin_server/pyproject.toml index cc5d3b1c0a..8db3370199 100644 --- a/examples/plugins/example_plugin_server/pyproject.toml +++ b/examples/plugins/example_plugin_server/pyproject.toml @@ -3,7 +3,7 @@ name = "dstack-plugin-server" version = "0.1.0" description = "Example plugin server" readme = "README.md" -requires-python = ">=3.10" +requires-python = ">=3.11" dependencies = [ "fastapi", "uvicorn", diff --git a/pyproject.toml b/pyproject.toml index 3912c45065..027baa4057 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ name = "dstack" dynamic = ["version", "readme"] authors = [{ name = "Andrey Cheptsov", email = "andrey@dstack.ai" }] description = "dstack is an open-source orchestration engine for running AI workloads on any cloud or on-premises." -requires-python = ">=3.10" +requires-python = ">=3.11" classifiers = [ "Development Status :: 4 - Beta", "Topic :: Scientific/Engineering :: Artificial Intelligence", @@ -15,7 +15,6 @@ dependencies = [ "requests", "requests-unixsocket>=0.4.1", "typing-extensions>=4.0.0", - "tomli>=2.0; python_version < '3.11'", "cryptography", "packaging", "python-dateutil", @@ -90,7 +89,7 @@ ignore-case = true dstack-plugin-server = { path = "examples/plugins/example_plugin_server", editable = true } [tool.ruff] -target-version = "py310" +target-version = "py311" line-length = 99 [tool.ruff.lint] @@ -149,8 +148,6 @@ filterwarnings = [ # Fail on any use of a pydantic v1 shim (`.dict()`, `parse_obj_as`, class-based `Config`, ...) # so they cannot creep back after the v2 migration. "error::pydantic.PydanticDeprecatedSince20", - # Remove or change to 3.11 once support for Python 3.10 is dropped. - "ignore:You are using a Python version \\(3.10:FutureWarning:^google\\.", ] [tool.tox] diff --git a/scripts/docs/gen_schema_reference.py b/scripts/docs/gen_schema_reference.py index 1c9e9d3712..736698d1dc 100644 --- a/scripts/docs/gen_schema_reference.py +++ b/scripts/docs/gen_schema_reference.py @@ -9,13 +9,12 @@ import re from enum import Enum from fnmatch import fnmatch -from typing import Optional +from typing import Annotated, Any, Dict, Literal, Optional, Type, Union, get_args, get_origin import mkdocs_gen_files import yaml from pydantic import BaseModel, RootModel from pydantic_core import PydanticUndefined -from typing_extensions import Annotated, Any, Dict, Literal, Type, Union, get_args, get_origin from dstack._internal.core.models.resources import Range from mkdocs.structure.files import File diff --git a/scripts/setup_kubernetes.py b/scripts/setup_kubernetes.py index 22295ffebf..cab5f99b7c 100644 --- a/scripts/setup_kubernetes.py +++ b/scripts/setup_kubernetes.py @@ -1,5 +1,5 @@ # /// script -# requires-python = ">=3.10" +# requires-python = ">=3.11" # dependencies = [] # /// """ diff --git a/src/dstack/_internal/cli/models/presets.py b/src/dstack/_internal/cli/models/presets.py index 75d469d51a..d197df273c 100644 --- a/src/dstack/_internal/cli/models/presets.py +++ b/src/dstack/_internal/cli/models/presets.py @@ -1,8 +1,7 @@ from datetime import datetime -from typing import List, Literal, Optional, Union +from typing import Annotated, List, Literal, Optional, Union from pydantic import Field, PositiveInt -from typing_extensions import Annotated from dstack._internal.core.models.common import CoreModel from dstack._internal.core.models.configurations import PresetConfiguration diff --git a/src/dstack/_internal/cli/services/presets/agents/codex.py b/src/dstack/_internal/cli/services/presets/agents/codex.py index ae176a00c1..73f9badd2a 100644 --- a/src/dstack/_internal/cli/services/presets/agents/codex.py +++ b/src/dstack/_internal/cli/services/presets/agents/codex.py @@ -3,16 +3,12 @@ import json import os import re +import tomllib from pathlib import Path from typing import Literal, Optional, get_args from pydantic import ValidationError -try: - import tomllib -except ModuleNotFoundError: # Python 3.10 - import tomli as tomllib # type: ignore[import-not-found, no-redef] - from dstack._internal.cli.models.preset_agent import CodexStreamEvent, PresetAgentInfo from dstack._internal.cli.services.presets.agents.base import ( PresetAgentSpec, diff --git a/src/dstack/_internal/cli/services/presets/registry.py b/src/dstack/_internal/cli/services/presets/registry.py index 8b7239b83c..fc399ca650 100644 --- a/src/dstack/_internal/cli/services/presets/registry.py +++ b/src/dstack/_internal/cli/services/presets/registry.py @@ -239,7 +239,7 @@ def _extract_archive(blob: bytes, target: Path) -> None: try: archive.extractall(target.parent, members=members, filter="data") except TypeError: - # Python < 3.10.12 / < 3.11.4 has no extraction filter; the member + # Python < 3.11.4 has no extraction filter; the member # checks above are what make this safe. archive.extractall(target.parent, members=members) # nosec B202 diff --git a/src/dstack/_internal/core/backends/azure/models.py b/src/dstack/_internal/core/backends/azure/models.py index 086d1bd016..317529a398 100644 --- a/src/dstack/_internal/core/backends/azure/models.py +++ b/src/dstack/_internal/core/backends/azure/models.py @@ -1,7 +1,6 @@ -from typing import Annotated, Dict, List, Literal, Optional, Union +from typing import Annotated, Dict, List, Literal, Optional, Self, Union from pydantic import Field, RootModel, model_validator -from typing_extensions import Self from dstack._internal.core.models.common import CoreModel from dstack._internal.utils.common import get_or_error diff --git a/src/dstack/_internal/core/backends/gcp/models.py b/src/dstack/_internal/core/backends/gcp/models.py index 15eabb7222..4589eba2f8 100644 --- a/src/dstack/_internal/core/backends/gcp/models.py +++ b/src/dstack/_internal/core/backends/gcp/models.py @@ -1,7 +1,6 @@ -from typing import Annotated, Dict, List, Literal, Optional, Union +from typing import Annotated, Dict, List, Literal, Optional, Self, Union from pydantic import Field, RootModel, model_validator -from typing_extensions import Self from dstack._internal.core.backends.base.models import fill_data from dstack._internal.core.models.common import CoreModel diff --git a/src/dstack/_internal/core/backends/jarvislabs/compute.py b/src/dstack/_internal/core/backends/jarvislabs/compute.py index 01062ca051..59f83c7a9a 100644 --- a/src/dstack/_internal/core/backends/jarvislabs/compute.py +++ b/src/dstack/_internal/core/backends/jarvislabs/compute.py @@ -1,11 +1,11 @@ import shlex import subprocess import tempfile -from typing import Callable, List, Optional, cast +from typing import Callable, List, NotRequired, Optional, cast import gpuhunt from gpuhunt.providers.jarvislabs import JarvisLabsProvider -from typing_extensions import NotRequired, TypedDict +from typing_extensions import TypedDict from dstack._internal.core.backends.base.backend import Compute from dstack._internal.core.backends.base.compute import ( diff --git a/src/dstack/_internal/core/backends/kubernetes/compute.py b/src/dstack/_internal/core/backends/kubernetes/compute.py index 74922b78ce..ca929ac52c 100644 --- a/src/dstack/_internal/core/backends/kubernetes/compute.py +++ b/src/dstack/_internal/core/backends/kubernetes/compute.py @@ -8,11 +8,10 @@ from decimal import Decimal from enum import Enum from functools import partial -from typing import List, Optional +from typing import List, Optional, Self from gpuhunt import AcceleratorVendor from kubernetes import client -from typing_extensions import Self from dstack._internal.core.backends.base.authorized_keys import ( build_authorized_keys, diff --git a/src/dstack/_internal/core/backends/kubernetes/models.py b/src/dstack/_internal/core/backends/kubernetes/models.py index 5ea9f90a7c..15603c24e3 100644 --- a/src/dstack/_internal/core/backends/kubernetes/models.py +++ b/src/dstack/_internal/core/backends/kubernetes/models.py @@ -1,7 +1,6 @@ -from typing import Annotated, Literal, Optional, Union +from typing import Annotated, Literal, Optional, Self, Union from pydantic import Field, model_validator -from typing_extensions import Self from dstack._internal.core.backends.base.models import fill_data from dstack._internal.core.models.common import CoreModel diff --git a/src/dstack/_internal/core/backends/kubernetes/resources.py b/src/dstack/_internal/core/backends/kubernetes/resources.py index 8828c0e7b5..6cebdf8ab7 100644 --- a/src/dstack/_internal/core/backends/kubernetes/resources.py +++ b/src/dstack/_internal/core/backends/kubernetes/resources.py @@ -5,7 +5,7 @@ from collections.abc import Mapping from decimal import Decimal from enum import Enum -from typing import Callable, Literal, Optional, Protocol, Union, cast, get_args +from typing import Callable, Literal, Optional, Protocol, Self, Union, cast, get_args import gpuhunt from gpuhunt import KNOWN_AMD_GPUS, KNOWN_NVIDIA_GPUS, AcceleratorVendor @@ -18,7 +18,6 @@ V1Toleration, ) from kubernetes.utils.quantity import parse_quantity as _parse_quantity -from typing_extensions import Self from dstack._internal.core.backends.base.compute import normalize_arch from dstack._internal.core.backends.kubernetes.utils import try_delete_object_if_exists diff --git a/src/dstack/_internal/core/backends/kubernetes/utils.py b/src/dstack/_internal/core/backends/kubernetes/utils.py index 18d58eec00..9c8907007b 100644 --- a/src/dstack/_internal/core/backends/kubernetes/utils.py +++ b/src/dstack/_internal/core/backends/kubernetes/utils.py @@ -8,6 +8,7 @@ Generic, Literal, Optional, + ParamSpec, Protocol, TypeVar, Union, @@ -19,7 +20,7 @@ from kubernetes.client.exceptions import ApiException from kubernetes.watch import Watch from pydantic import Field -from typing_extensions import ParamSpec, TypedDict +from typing_extensions import TypedDict from dstack._internal.core.backends.kubernetes.api_client import ( API_CLIENT_EXCEPTIONS, diff --git a/src/dstack/_internal/core/backends/nebius/models.py b/src/dstack/_internal/core/backends/nebius/models.py index 34af0e6fa1..e62fd3f3de 100644 --- a/src/dstack/_internal/core/backends/nebius/models.py +++ b/src/dstack/_internal/core/backends/nebius/models.py @@ -1,9 +1,8 @@ import json from pathlib import Path -from typing import Annotated, Dict, Literal, Optional, Union +from typing import Annotated, Dict, Literal, Optional, Self, Union from pydantic import Field, field_serializer, model_validator -from typing_extensions import Self from dstack._internal.core.backends.base.models import fill_data from dstack._internal.core.models.common import CoreModel diff --git a/src/dstack/_internal/core/backends/oci/auth.py b/src/dstack/_internal/core/backends/oci/auth.py index 9681ef8eec..b0da41f6c3 100644 --- a/src/dstack/_internal/core/backends/oci/auth.py +++ b/src/dstack/_internal/core/backends/oci/auth.py @@ -1,5 +1,6 @@ +from typing import Any, Mapping + import oci -from typing_extensions import Any, Mapping from dstack._internal.core.backends.oci.exceptions import any_oci_exception from dstack._internal.core.backends.oci.models import AnyOCICreds, OCIDefaultCreds diff --git a/src/dstack/_internal/core/backends/oci/models.py b/src/dstack/_internal/core/backends/oci/models.py index f7d17c862b..c5f9566009 100644 --- a/src/dstack/_internal/core/backends/oci/models.py +++ b/src/dstack/_internal/core/backends/oci/models.py @@ -1,7 +1,6 @@ -from typing import Annotated, Dict, List, Literal, Optional, Union +from typing import Annotated, Dict, List, Literal, Optional, Self, Union from pydantic import Field, RootModel, model_validator -from typing_extensions import Self from dstack._internal.core.models.common import CoreModel diff --git a/src/dstack/_internal/core/backends/runpod/api_client.py b/src/dstack/_internal/core/backends/runpod/api_client.py index 9573e5ef59..bc4ac2ffe2 100644 --- a/src/dstack/_internal/core/backends/runpod/api_client.py +++ b/src/dstack/_internal/core/backends/runpod/api_client.py @@ -1,10 +1,9 @@ from collections.abc import Mapping from http import HTTPStatus -from typing import Any, Dict, List, Literal, Optional, TypedDict, cast +from typing import Any, Dict, List, Literal, NotRequired, Optional, TypedDict, cast import requests from gpuhunt.providers.runpod import RunpodProvider -from typing_extensions import NotRequired from dstack._internal.core.errors import BackendError, BackendInvalidCredentialsError from dstack._internal.utils.logging import get_logger diff --git a/src/dstack/_internal/core/backends/slurm/client.py b/src/dstack/_internal/core/backends/slurm/client.py index b3ea2740a1..9c52256088 100644 --- a/src/dstack/_internal/core/backends/slurm/client.py +++ b/src/dstack/_internal/core/backends/slurm/client.py @@ -4,10 +4,9 @@ import shlex import uuid from types import TracebackType -from typing import Optional +from typing import Optional, Self import paramiko -from typing_extensions import Self from dstack._internal.core.backends.slurm.resources import Node, ResolvedNode from dstack._internal.core.errors import ComputeError diff --git a/src/dstack/_internal/core/backends/slurm/models.py b/src/dstack/_internal/core/backends/slurm/models.py index ccb472b911..2f9d7bcead 100644 --- a/src/dstack/_internal/core/backends/slurm/models.py +++ b/src/dstack/_internal/core/backends/slurm/models.py @@ -1,7 +1,6 @@ -from typing import Annotated, Literal, Optional, Union +from typing import Annotated, Literal, Optional, Self, Union from pydantic import Field, model_validator -from typing_extensions import Self from dstack._internal.core.backends.base.models import fill_data from dstack._internal.core.models.common import CoreModel diff --git a/src/dstack/_internal/core/backends/slurm/resources.py b/src/dstack/_internal/core/backends/slurm/resources.py index 5f3fc23d8f..b1f85c2e9e 100644 --- a/src/dstack/_internal/core/backends/slurm/resources.py +++ b/src/dstack/_internal/core/backends/slurm/resources.py @@ -1,8 +1,7 @@ import dataclasses -from typing import Optional +from typing import Optional, Self import gpuhunt -from typing_extensions import Self from dstack._internal.core.models.instances import Gpu from dstack._internal.core.models.resources import ( diff --git a/src/dstack/_internal/core/backends/vastai/compute.py b/src/dstack/_internal/core/backends/vastai/compute.py index aff025e82c..96ed75e535 100644 --- a/src/dstack/_internal/core/backends/vastai/compute.py +++ b/src/dstack/_internal/core/backends/vastai/compute.py @@ -1,9 +1,8 @@ import time -from typing import List, Optional +from typing import List, Optional, assert_never import gpuhunt from gpuhunt.providers.vastai import VastAIProvider -from typing_extensions import assert_never from dstack._internal.core.backends.base.authorized_keys import build_authorized_keys from dstack._internal.core.backends.base.backend import Compute diff --git a/src/dstack/_internal/core/models/common.py b/src/dstack/_internal/core/models/common.py index d0142a1b54..55620fe1fa 100644 --- a/src/dstack/_internal/core/models/common.py +++ b/src/dstack/_internal/core/models/common.py @@ -1,5 +1,5 @@ from enum import Enum -from typing import Any, Optional, TypeVar, Union, overload +from typing import Annotated, Any, Optional, TypeVar, Union, overload from pydantic import ( BaseModel, @@ -7,7 +7,6 @@ Field, TypeAdapter, ) -from typing_extensions import Annotated # pydantic v2 generates draft 2020-12. The published `configuration.json` / `profiles.json` # advertise the dialect they were generated for, so this has to move with pydantic. diff --git a/src/dstack/_internal/core/models/config.py b/src/dstack/_internal/core/models/config.py index 0c068a3f54..c0878b272a 100644 --- a/src/dstack/_internal/core/models/config.py +++ b/src/dstack/_internal/core/models/config.py @@ -1,5 +1,6 @@ +from typing import Annotated, List, Optional + from pydantic.fields import Field -from typing_extensions import Annotated, List, Optional from dstack._internal.core.models.common import CoreModel from dstack._internal.core.models.repos.base import RepoType diff --git a/src/dstack/_internal/core/models/configurations.py b/src/dstack/_internal/core/models/configurations.py index 6cf8e423ff..93f32be414 100644 --- a/src/dstack/_internal/core/models/configurations.py +++ b/src/dstack/_internal/core/models/configurations.py @@ -3,7 +3,7 @@ from collections import Counter from enum import Enum from pathlib import PurePosixPath -from typing import Annotated, Any, Dict, List, Literal, Optional, Union +from typing import Annotated, Any, Dict, List, Literal, Optional, Self, Union from pydantic import ( BeforeValidator, @@ -20,7 +20,6 @@ model_validator, ) from pydantic_core import CoreSchema, core_schema -from typing_extensions import Self from dstack._internal.core.errors import ConfigurationError from dstack._internal.core.models.common import ( diff --git a/src/dstack/_internal/core/models/duration.py b/src/dstack/_internal/core/models/duration.py index e063a60de2..8790f84124 100644 --- a/src/dstack/_internal/core/models/duration.py +++ b/src/dstack/_internal/core/models/duration.py @@ -1,10 +1,9 @@ import re -from typing import Any, Optional, Union +from typing import Annotated, Any, Literal, Optional, Union, overload from pydantic import BeforeValidator, GetCoreSchemaHandler, GetJsonSchemaHandler from pydantic.json_schema import JsonSchemaValue from pydantic_core import CoreSchema, core_schema -from typing_extensions import Annotated, Literal, overload class Duration(int): diff --git a/src/dstack/_internal/core/models/envs.py b/src/dstack/_internal/core/models/envs.py index 92e1575a66..32851a5eec 100644 --- a/src/dstack/_internal/core/models/envs.py +++ b/src/dstack/_internal/core/models/envs.py @@ -1,8 +1,19 @@ import re -from typing import Dict, Iterable, Iterator, List, Mapping, NamedTuple, Tuple, Union, cast +from typing import ( + Annotated, + Dict, + Iterable, + Iterator, + List, + Mapping, + NamedTuple, + Self, + Tuple, + Union, + cast, +) from pydantic import ConfigDict, Field, RootModel, field_validator -from typing_extensions import Annotated, Self from dstack._internal.core.models.common import CoreModel diff --git a/src/dstack/_internal/core/models/files.py b/src/dstack/_internal/core/models/files.py index 1db962165a..8e36f253c2 100644 --- a/src/dstack/_internal/core/models/files.py +++ b/src/dstack/_internal/core/models/files.py @@ -1,11 +1,10 @@ import pathlib import string -from typing import Any +from typing import Annotated, Any, Self from uuid import UUID from pydantic import Field, GetCoreSchemaHandler, field_validator from pydantic_core import CoreSchema, core_schema -from typing_extensions import Annotated, Self from dstack._internal.core.models.common import CoreModel diff --git a/src/dstack/_internal/core/models/fleets.py b/src/dstack/_internal/core/models/fleets.py index 94c44037cb..fa7be4e4fd 100644 --- a/src/dstack/_internal/core/models/fleets.py +++ b/src/dstack/_internal/core/models/fleets.py @@ -2,7 +2,7 @@ import uuid from datetime import datetime from enum import Enum -from typing import Any, Dict, List, Optional, Union +from typing import Annotated, Any, Dict, List, Literal, Optional, Self, Union from pydantic import ( ConfigDict, @@ -12,7 +12,6 @@ model_serializer, model_validator, ) -from typing_extensions import Annotated, Literal, Self from dstack._internal.core.backends.profile_options import AnyBackendProfileOptions from dstack._internal.core.models.backends.base import BackendType diff --git a/src/dstack/_internal/core/models/gateways.py b/src/dstack/_internal/core/models/gateways.py index bff16d3e57..2201f8f829 100644 --- a/src/dstack/_internal/core/models/gateways.py +++ b/src/dstack/_internal/core/models/gateways.py @@ -1,10 +1,9 @@ import datetime import uuid from enum import Enum -from typing import Dict, Optional, Union +from typing import Annotated, Dict, Literal, Optional, Union from pydantic import Field, RootModel, field_validator -from typing_extensions import Annotated, Literal from dstack._internal.core.models.backends.base import BackendType from dstack._internal.core.models.common import ApplyAction, CoreModel diff --git a/src/dstack/_internal/core/models/presets.py b/src/dstack/_internal/core/models/presets.py index 95e87fb29f..7600651ffa 100644 --- a/src/dstack/_internal/core/models/presets.py +++ b/src/dstack/_internal/core/models/presets.py @@ -1,8 +1,7 @@ import re -from typing import Any, List, Literal, Optional, Sequence +from typing import Annotated, Any, List, Literal, Optional, Self, Sequence from pydantic import Field, PositiveFloat, PositiveInt, field_validator, model_validator -from typing_extensions import Annotated, Self from dstack._internal.core.models.common import CoreModel from dstack._internal.core.models.configurations import ( diff --git a/src/dstack/_internal/core/models/profiles.py b/src/dstack/_internal/core/models/profiles.py index 5e64ea2f0e..ae727618c3 100644 --- a/src/dstack/_internal/core/models/profiles.py +++ b/src/dstack/_internal/core/models/profiles.py @@ -1,5 +1,5 @@ from enum import Enum -from typing import Any, Dict, List, Optional, Union +from typing import Annotated, Any, Dict, List, Optional, Self, Union from pydantic import ( AfterValidator, @@ -9,7 +9,6 @@ field_validator, model_validator, ) -from typing_extensions import Annotated, Self from dstack._internal.core.backends.profile_options import AnyBackendProfileOptions from dstack._internal.core.models.backends.base import BackendType diff --git a/src/dstack/_internal/core/models/repos/local.py b/src/dstack/_internal/core/models/repos/local.py index a7e162e7c7..91597b3e99 100644 --- a/src/dstack/_internal/core/models/repos/local.py +++ b/src/dstack/_internal/core/models/repos/local.py @@ -1,10 +1,9 @@ import tarfile from pathlib import Path -from typing import BinaryIO, Optional +from typing import BinaryIO, Literal, Optional import ignore import ignore.overrides -from typing_extensions import Literal from dstack._internal.core.models.repos.base import BaseRepoInfo, Repo from dstack._internal.utils.common import sizeof_fmt diff --git a/src/dstack/_internal/core/models/repos/remote.py b/src/dstack/_internal/core/models/repos/remote.py index b047d147a5..15cbfb8752 100644 --- a/src/dstack/_internal/core/models/repos/remote.py +++ b/src/dstack/_internal/core/models/repos/remote.py @@ -3,12 +3,11 @@ import subprocess import time from dataclasses import dataclass -from typing import Annotated, BinaryIO, Callable, Dict, Optional, Union, cast +from typing import Annotated, BinaryIO, Callable, Dict, Literal, Optional, Union, cast import git import pydantic from pydantic import Field, TypeAdapter -from typing_extensions import Literal from dstack._internal.core.deprecated import Deprecated from dstack._internal.core.errors import ( diff --git a/src/dstack/_internal/core/models/resources.py b/src/dstack/_internal/core/models/resources.py index c6b1138583..ca6314222c 100644 --- a/src/dstack/_internal/core/models/resources.py +++ b/src/dstack/_internal/core/models/resources.py @@ -1,6 +1,6 @@ import math from collections.abc import Mapping -from typing import Any, Dict, Generic, List, Optional, Tuple, TypeVar, Union +from typing import Annotated, Any, Dict, Generic, List, Optional, Tuple, TypeVar, Union import gpuhunt from pydantic import ( @@ -14,7 +14,6 @@ ) from pydantic.json_schema import JsonSchemaValue from pydantic_core import CoreSchema, core_schema -from typing_extensions import Annotated from dstack._internal.core.models.common import CoreModel from dstack._internal.utils.common import pretty_resources diff --git a/src/dstack/_internal/core/models/routers.py b/src/dstack/_internal/core/models/routers.py index c97bd27cca..f427f04a66 100644 --- a/src/dstack/_internal/core/models/routers.py +++ b/src/dstack/_internal/core/models/routers.py @@ -1,8 +1,7 @@ from enum import Enum -from typing import Any +from typing import Annotated, Any from pydantic import Field, field_serializer, field_validator -from typing_extensions import Annotated from dstack._internal.core.models.common import CoreModel diff --git a/src/dstack/_internal/core/models/runs.py b/src/dstack/_internal/core/models/runs.py index f02165ae30..9f4dad43a6 100644 --- a/src/dstack/_internal/core/models/runs.py +++ b/src/dstack/_internal/core/models/runs.py @@ -1,10 +1,9 @@ from datetime import datetime, timedelta from enum import Enum -from typing import Any, Dict, List, Literal, Optional +from typing import Annotated, Any, Dict, List, Literal, Optional, Self from urllib.parse import urlparse from pydantic import UUID4, ConfigDict, Field, model_validator -from typing_extensions import Annotated, Self from dstack._internal.core.backends.profile_options import AnyBackendProfileOptions from dstack._internal.core.models.backends.base import BackendType diff --git a/src/dstack/_internal/core/models/services.py b/src/dstack/_internal/core/models/services.py index 8aa6395776..8ed2a6e19d 100644 --- a/src/dstack/_internal/core/models/services.py +++ b/src/dstack/_internal/core/models/services.py @@ -2,10 +2,9 @@ Data structures related to `type: service` runs. """ -from typing import Optional, Union +from typing import Annotated, Literal, Optional, Union from pydantic import Field -from typing_extensions import Annotated, Literal from dstack._internal.core.models.common import CoreModel diff --git a/src/dstack/_internal/core/models/unix.py b/src/dstack/_internal/core/models/unix.py index 1fe16f753c..92b5ca550b 100644 --- a/src/dstack/_internal/core/models/unix.py +++ b/src/dstack/_internal/core/models/unix.py @@ -1,7 +1,6 @@ -from typing import Optional +from typing import Annotated, Optional, Self from pydantic import Field -from typing_extensions import Annotated, Self from dstack._internal.core.models.common import CoreModel diff --git a/src/dstack/_internal/core/models/volumes.py b/src/dstack/_internal/core/models/volumes.py index 089faa31c3..41ed12feed 100644 --- a/src/dstack/_internal/core/models/volumes.py +++ b/src/dstack/_internal/core/models/volumes.py @@ -2,10 +2,9 @@ from datetime import datetime from enum import Enum from pathlib import PurePosixPath -from typing import Any, Dict, List, Literal, Optional, Tuple, Union +from typing import Annotated, Any, Dict, List, Literal, Optional, Self, Tuple, Union from pydantic import Field, RootModel, ValidationError, field_validator -from typing_extensions import Annotated, Self from dstack._internal.core.errors import ConfigurationError from dstack._internal.core.models.backends.base import BackendType diff --git a/src/dstack/_internal/proxy/gateway/routers/registry.py b/src/dstack/_internal/proxy/gateway/routers/registry.py index 954ae2933a..de1ac16391 100644 --- a/src/dstack/_internal/proxy/gateway/routers/registry.py +++ b/src/dstack/_internal/proxy/gateway/routers/registry.py @@ -1,5 +1,6 @@ +from typing import Annotated + from fastapi import APIRouter, Depends -from typing_extensions import Annotated import dstack._internal.proxy.gateway.services.registry as registry_services from dstack._internal.proxy.gateway.deps import get_gateway_proxy_repo, get_nginx diff --git a/src/dstack/_internal/proxy/gateway/services/nginx.py b/src/dstack/_internal/proxy/gateway/services/nginx.py index df71594f5d..d55f04ada9 100644 --- a/src/dstack/_internal/proxy/gateway/services/nginx.py +++ b/src/dstack/_internal/proxy/gateway/services/nginx.py @@ -3,11 +3,10 @@ import tempfile from asyncio import Lock from pathlib import Path -from typing import Optional +from typing import Literal, Optional import jinja2 from pydantic import BaseModel -from typing_extensions import Literal from dstack._internal.proxy.gateway.const import PROXY_PORT_ON_GATEWAY from dstack._internal.proxy.gateway.models import ACMESettings diff --git a/src/dstack/_internal/proxy/lib/deps.py b/src/dstack/_internal/proxy/lib/deps.py index 21528899ce..c080ca3e4e 100644 --- a/src/dstack/_internal/proxy/lib/deps.py +++ b/src/dstack/_internal/proxy/lib/deps.py @@ -1,9 +1,8 @@ from abc import ABC, abstractmethod -from typing import AsyncGenerator, Optional +from typing import Annotated, AsyncGenerator, Optional from fastapi import Depends, FastAPI, Request, Security, status from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer -from typing_extensions import Annotated from dstack._internal.proxy.lib.auth import BaseProxyAuthProvider from dstack._internal.proxy.lib.errors import ProxyError, UnexpectedProxyError diff --git a/src/dstack/_internal/proxy/lib/models.py b/src/dstack/_internal/proxy/lib/models.py index 44d5878bbd..45e4cc6145 100644 --- a/src/dstack/_internal/proxy/lib/models.py +++ b/src/dstack/_internal/proxy/lib/models.py @@ -1,10 +1,9 @@ """Things stored in BaseProxyRepo implementations.""" from datetime import datetime -from typing import Any, Iterable, Literal, Optional, Union +from typing import Annotated, Any, Iterable, Literal, Optional, Union from pydantic import BaseModel, ConfigDict, Field, model_validator -from typing_extensions import Annotated from dstack._internal.core.models.instances import SSHConnectionParams from dstack._internal.proxy.lib.const import DEFAULT_SERVICE_READ_TIMEOUT diff --git a/src/dstack/_internal/proxy/lib/routers/model_proxy.py b/src/dstack/_internal/proxy/lib/routers/model_proxy.py index 4e1cabab0a..f348957f4a 100644 --- a/src/dstack/_internal/proxy/lib/routers/model_proxy.py +++ b/src/dstack/_internal/proxy/lib/routers/model_proxy.py @@ -1,8 +1,7 @@ -from typing import AsyncIterator, Optional +from typing import Annotated, AsyncIterator, Optional from fastapi import APIRouter, Depends, status from fastapi.responses import StreamingResponse -from typing_extensions import Annotated from dstack._internal.proxy.lib.deps import ProxyAuth, get_proxy_repo, get_service_connection_pool from dstack._internal.proxy.lib.errors import ProxyError, UnexpectedProxyError diff --git a/src/dstack/_internal/server/schemas/events.py b/src/dstack/_internal/server/schemas/events.py index a99daec1f5..77251fc40a 100644 --- a/src/dstack/_internal/server/schemas/events.py +++ b/src/dstack/_internal/server/schemas/events.py @@ -1,10 +1,9 @@ import uuid from datetime import datetime -from typing import Annotated, Optional +from typing import Annotated, Optional, Self from uuid import UUID from pydantic import Field, model_validator -from typing_extensions import Self from dstack._internal.core.models.common import CoreModel from dstack._internal.core.models.events import EventTargetType diff --git a/src/dstack/_internal/server/schemas/presets.py b/src/dstack/_internal/server/schemas/presets.py index 6d301ac919..772af23855 100644 --- a/src/dstack/_internal/server/schemas/presets.py +++ b/src/dstack/_internal/server/schemas/presets.py @@ -1,9 +1,8 @@ from datetime import datetime -from typing import List, Optional +from typing import Annotated, List, Optional from uuid import UUID from pydantic import Field -from typing_extensions import Annotated from dstack._internal.core.models.common import CoreModel from dstack._internal.core.models.presets import PresetSpec diff --git a/src/dstack/_internal/server/services/config.py b/src/dstack/_internal/server/services/config.py index 223523ffe0..89564542b3 100644 --- a/src/dstack/_internal/server/services/config.py +++ b/src/dstack/_internal/server/services/config.py @@ -1,9 +1,8 @@ -from typing import List, Optional +from typing import Annotated, List, Optional import yaml from pydantic import Field, ValidationError from sqlalchemy.ext.asyncio import AsyncSession -from typing_extensions import Annotated import dstack._internal.core.backends.configurators from dstack._internal.core.backends.models import ( diff --git a/src/dstack/_internal/server/services/docker.py b/src/dstack/_internal/server/services/docker.py index 8518f30019..b29e8c843b 100644 --- a/src/dstack/_internal/server/services/docker.py +++ b/src/dstack/_internal/server/services/docker.py @@ -1,14 +1,13 @@ import contextlib import re from dataclasses import dataclass -from typing import List, Optional +from typing import Annotated, List, Optional import gpuhunt import requests from dxf import DXF from dxf.exceptions import DXFError from pydantic import Field, ValidationError, field_validator -from typing_extensions import Annotated from dstack._internal.core.errors import DockerRegistryError from dstack._internal.core.models.common import CoreModel, RegistryAuth, validate_json_extra_ignore diff --git a/src/dstack/_internal/server/services/encryption/keys/aes.py b/src/dstack/_internal/server/services/encryption/keys/aes.py index 56a533bc91..748a5dd771 100644 --- a/src/dstack/_internal/server/services/encryption/keys/aes.py +++ b/src/dstack/_internal/server/services/encryption/keys/aes.py @@ -1,10 +1,9 @@ import os from base64 import b64decode, b64encode -from typing import Literal +from typing import Annotated, Literal from cryptography.hazmat.primitives.ciphers.aead import AESGCM from pydantic import Field, field_validator -from typing_extensions import Annotated from dstack._internal.core.models.common import CoreModel from dstack._internal.server.services.encryption.keys.base import EncryptionKey diff --git a/src/dstack/_internal/server/services/encryption/keys/identity.py b/src/dstack/_internal/server/services/encryption/keys/identity.py index 040a68ed22..4a0a01c4e8 100644 --- a/src/dstack/_internal/server/services/encryption/keys/identity.py +++ b/src/dstack/_internal/server/services/encryption/keys/identity.py @@ -1,7 +1,6 @@ -from typing import Literal +from typing import Annotated, Literal from pydantic import Field -from typing_extensions import Annotated from dstack._internal.core.models.common import CoreModel from dstack._internal.server.services.encryption.keys.base import EncryptionKey diff --git a/src/dstack/_internal/server/services/permissions.py b/src/dstack/_internal/server/services/permissions.py index b3758e725c..ed9a3e7755 100644 --- a/src/dstack/_internal/server/services/permissions.py +++ b/src/dstack/_internal/server/services/permissions.py @@ -1,5 +1,6 @@ +from typing import Annotated + from pydantic import Field -from typing_extensions import Annotated from dstack._internal.core.models.common import CoreModel diff --git a/src/dstack/_internal/server/services/proxy/routers/service_proxy.py b/src/dstack/_internal/server/services/proxy/routers/service_proxy.py index 95582f2bb7..93282e888c 100644 --- a/src/dstack/_internal/server/services/proxy/routers/service_proxy.py +++ b/src/dstack/_internal/server/services/proxy/routers/service_proxy.py @@ -1,7 +1,8 @@ +from typing import Annotated + from fastapi import APIRouter, Depends, Request, status from fastapi.datastructures import URL from fastapi.responses import RedirectResponse, Response -from typing_extensions import Annotated from dstack._internal.proxy.lib.deps import ( ProxyAuth, diff --git a/src/dstack/_internal/server/services/requirements/combine.py b/src/dstack/_internal/server/services/requirements/combine.py index 36043b2117..54bb109e46 100644 --- a/src/dstack/_internal/server/services/requirements/combine.py +++ b/src/dstack/_internal/server/services/requirements/combine.py @@ -1,7 +1,6 @@ -from typing import Callable, List, Optional, Protocol, TypeVar +from typing import Callable, List, Optional, Protocol, Self, TypeVar from pydantic import BaseModel -from typing_extensions import Self from dstack._internal.core.backends.profile_options import AnyBackendProfileOptions from dstack._internal.core.models.profiles import Profile, SpotPolicy diff --git a/src/dstack/_internal/server/services/runner/client.py b/src/dstack/_internal/server/services/runner/client.py index f95bcf734a..c85465fa70 100644 --- a/src/dstack/_internal/server/services/runner/client.py +++ b/src/dstack/_internal/server/services/runner/client.py @@ -3,14 +3,13 @@ from collections.abc import Generator from http import HTTPStatus from pathlib import Path -from typing import BinaryIO, Dict, List, Literal, Optional, TypeVar, Union, overload +from typing import BinaryIO, Dict, List, Literal, Optional, Self, TypeVar, Union, overload import packaging.version import pydantic import requests import requests.exceptions import requests_unixsocket -from typing_extensions import Self from dstack._internal.core.consts import DSTACK_PROJECT_ENV from dstack._internal.core.errors import DstackError diff --git a/src/dstack/_internal/server/services/runner/ssh.py b/src/dstack/_internal/server/services/runner/ssh.py index 7823e09019..bbc1c2389c 100644 --- a/src/dstack/_internal/server/services/runner/ssh.py +++ b/src/dstack/_internal/server/services/runner/ssh.py @@ -1,9 +1,8 @@ import functools from collections.abc import Mapping -from typing import Callable, Optional, TypeVar +from typing import Callable, Concatenate, Optional, ParamSpec, TypeVar import requests -from typing_extensions import Concatenate, ParamSpec from dstack._internal.core.errors import SSHError from dstack._internal.core.models.runs import JobProvisioningData, JobRuntimeData diff --git a/src/dstack/_internal/utils/common.py b/src/dstack/_internal/utils/common.py index 9f0f4208ca..205323bfa7 100644 --- a/src/dstack/_internal/utils/common.py +++ b/src/dstack/_internal/utils/common.py @@ -9,12 +9,11 @@ from datetime import datetime, timedelta, timezone from functools import partial from pathlib import Path -from typing import Any, Final, Iterable, List, Optional, TypeVar, Union +from typing import Any, Final, Iterable, List, Optional, ParamSpec, TypeVar, Union from urllib.parse import urlparse from uuid import UUID from pydantic import TypeAdapter -from typing_extensions import ParamSpec from dstack._internal.core.models.duration import Duration from dstack._internal.utils.interpolator import InterpolatorError, VariablesInterpolator @@ -89,8 +88,8 @@ def parse_datetime(value: str) -> datetime: """ Parse a datetime the way the API parses one: an ISO 8601 string or a Unix timestamp. - Unlike `datetime.fromisoformat()` on Python 3.10, accepts the `Z` suffix and fractional - seconds of any precision. Raises `ValueError` if `value` is not a datetime. + Accepts the `Z` suffix and fractional seconds of any precision. Raises `ValueError` if + `value` is not a datetime. """ return _DATETIME_ADAPTER.validate_strings(value) diff --git a/src/dstack/api/server/_group.py b/src/dstack/api/server/_group.py index fae9dfcc87..7ed336fec0 100644 --- a/src/dstack/api/server/_group.py +++ b/src/dstack/api/server/_group.py @@ -1,8 +1,7 @@ from logging import Logger -from typing import Optional, Union +from typing import Optional, Protocol, Union import requests -from typing_extensions import Protocol class APIRequest(Protocol): diff --git a/src/dstack/plugins/builtin/rest_plugin/_models.py b/src/dstack/plugins/builtin/rest_plugin/_models.py index 28887bf86f..a656962797 100644 --- a/src/dstack/plugins/builtin/rest_plugin/_models.py +++ b/src/dstack/plugins/builtin/rest_plugin/_models.py @@ -1,7 +1,6 @@ -from typing import Generic, Optional, TypeVar +from typing import Annotated, Generic, Optional, TypeVar from pydantic import BaseModel, Field -from typing_extensions import Annotated from dstack._internal.core.models.fleets import FleetSpec from dstack._internal.core.models.gateways import GatewaySpec diff --git a/src/tests/_internal/core/backends/daytona/test_models.py b/src/tests/_internal/core/backends/daytona/test_models.py index 3b9a823084..c092b29fed 100644 --- a/src/tests/_internal/core/backends/daytona/test_models.py +++ b/src/tests/_internal/core/backends/daytona/test_models.py @@ -1,5 +1,6 @@ +from typing import Annotated + from pydantic import Field, TypeAdapter -from typing_extensions import Annotated from dstack._internal.core.backends.daytona.models import DaytonaBackendConfigWithCreds from dstack._internal.core.backends.models import ( diff --git a/src/tests/_internal/core/backends/lium/test_models.py b/src/tests/_internal/core/backends/lium/test_models.py index 96d27b4b2f..d43424db3d 100644 --- a/src/tests/_internal/core/backends/lium/test_models.py +++ b/src/tests/_internal/core/backends/lium/test_models.py @@ -1,6 +1,7 @@ +from typing import Annotated + import pytest from pydantic import Field, TypeAdapter, ValidationError -from typing_extensions import Annotated from dstack._internal.core.backends.lium.models import LiumBackendConfigWithCreds from dstack._internal.core.backends.models import (