types: rename dvc/types.py to dvc/_types.py to remove stdlib shadow

The previous two attempts at #11035 (53d6d6b: `-m dvc`, then 26b5514:
`-c "from dvc.cli import main; ..."`) both broke
`tests/func/experiments/test_experiments.py::test_run_celery` on every
Python version (3.9-3.14) on Windows. Master is green for that test
including 3.14, so the Windows-specific celery worker spawn path
genuinely depends on the script form -- changing the launch shape is
not a viable fix even when both alternatives keep sys.path[0] empty.

Address the root cause structurally instead: rename the internal
`dvc/types.py` module (containing `StrPath`, `DictStrAny`, `TargetType`,
etc.) to `dvc/_types.py`. The leading underscore both signals "private"
and -- more importantly -- removes any name collision with stdlib
`types`, so no matter how the daemon worker is launched (script form,
`-m dvc`, `-c`, pipx-installed shim, ...) no entry on sys.path can
shadow stdlib `types` via the dvc package.

Daemon launch shape is reverted to the original script form
(`python <site-packages>/dvc/__main__.py ...`) -- identical to master.
This is what kept the Windows celery worker test green for years, and
is what we want to keep working. The `dvc/_types.py` rename is what
fixes the underlying Python 3.14 shadow risk for the user-reported
case (#11035 reporter installs via pipx).

Files updated:
- dvc/types.py -> dvc/_types.py (rename, content unchanged)
- 19 internal call sites: `from dvc.types import X` -> `from dvc._types import X`
- dvc/daemon.py: revert _get_dvc_args to master's script form
- tests/unit/test_daemon.py: regression test asserting `dvc/types.py`
  does not exist and that stdlib `types` is not resolved to a dvc
  module. This guards against someone reintroducing the file later.

The rename is a backward-incompatible internal API change in principle,
but `dvc/types.py` was undocumented and the aliases are only meant for
internal use (see imports across the codebase -- all internal). No
external consumers are likely to depend on `from dvc.types import ...`
because the public type surface is exposed via `dvc.api`, `dvc.repo`,
etc., not via the type-alias module.

Author: jbbqqf

dvc/types.py dvc/_types.pydvc/types.py renamed to dvc/_types.py

@@ -17,7 +17,7 @@
 
 if TYPE_CHECKING:
     from dvc.fs import FileSystem
-    from dvc.types import DictStrAny
+    from dvc._types import DictStrAny
 
 logger = logger.getChild(__name__)
 

dvc/config.py

@@ -59,29 +59,9 @@ def _win_detached_subprocess(args: Sequence[str], **kwargs) -> int:
 def _get_dvc_args() -> list[str]:
     args = [sys.executable]
     if not is_binary():
-        # Launch via `python -c "<bootstrap>"` rather than
-        # `python .../dvc/__main__.py`. Running a script directly puts the
-        # script's directory at sys.path[0] (PEP 338), which makes
-        # dvc/types.py shadow the stdlib `types` module -- fatal on
-        # Python 3.14+ where stdlib re/enum import from `types` early
-        # during interpreter startup, before any user code runs.
-        #
-        # `-m dvc` would also avoid the script-dir-on-sys.path problem,
-        # but it sets `__main__.__spec__.name = "dvc.__main__"`, which on
-        # Windows changes how billiard / celery's main-module fixup picks
-        # up the parent module in spawned children and crashes the celery
-        # worker that backs `dvc queue start` (see #11037 CI). `-c` keeps
-        # `__main__` script-shaped (no `__spec__`) so billiard's existing
-        # main-module path is preserved, while still leaving sys.path[0]
-        # empty so dvc/types.py never shadows stdlib `types`.
-        #
-        # daemonize() prepends site-packages to PYTHONPATH (see below),
-        # so `from dvc.cli import main` resolves without script-dir
-        # injection. Fixes https://github.com/iterative/dvc/issues/11035.
-        args += [
-            "-c",
-            "import sys; from dvc.cli import main; sys.exit(main(sys.argv[1:]))",
-        ]
+        root_dir = os.path.abspath(os.path.dirname(__file__))
+        main_entrypoint = os.path.join(root_dir, "__main__.py")
+        args.append(main_entrypoint)
     return args
 
 

dvc/daemon.py

@@ -12,7 +12,7 @@
 from dvc import env
 from dvc.exceptions import DvcException
 from dvc.log import logger
-from dvc.types import StrOrBytesPath
+from dvc._types import StrOrBytesPath
 from dvc.utils import env2bool
 
 if TYPE_CHECKING:

dvc/database.py

@@ -17,7 +17,7 @@
 
 if TYPE_CHECKING:
     from dvc.repo import Repo
-    from dvc.types import StrOrBytesPath
+    from dvc._types import StrOrBytesPath
 
     from .parsing import DataResolver
     from .stage import Stage

dvc/dvcfile.py

@@ -22,7 +22,7 @@
     from contextlib import AbstractContextManager
 
     from dvc.repo import Repo
-    from dvc.types import DictStrAny, StrPath
+    from dvc._types import DictStrAny, StrPath
 
     from .callbacks import Callback
 

dvc/fs/dvc.py

@@ -32,7 +32,7 @@
     from typing import NoReturn
 
     from dvc.repo import Repo
-    from dvc.types import DictStrAny
+    from dvc._types import DictStrAny
 
     from .context import SeqOrMap
 

dvc/parsing/__init__.py

@@ -7,7 +7,7 @@
 from . import Converter
 
 if TYPE_CHECKING:
-    from dvc.types import StrPath
+    from dvc._types import StrPath
 
 
 class ImageConverter(Converter):

dvc/render/converter/image.py

@@ -12,7 +12,7 @@
 from .convert import _get_converter
 
 if TYPE_CHECKING:
-    from dvc.types import StrPath
+    from dvc._types import StrPath
     from dvc_render.base import Renderer
 
 

dvc/render/match.py

@@ -23,7 +23,7 @@
     from dvc.output import Output
     from dvc.scm import Git, NoSCM
     from dvc.stage import Stage
-    from dvc.types import DictStrAny
+    from dvc._types import DictStrAny
     from dvc_data.hashfile.state import StateBase
     from dvc_data.index import DataIndex, DataIndexEntry