logger: type-safe logger.trace (#10083)

* use logger.getChild from `dvc.log` instead of `logging.getLogger`

I got tired adding `# type: ignore[attr-defined]` while using `logger.trace`.
So, now you need to import logger from `from dvc.log import logger` and
create a child logger using `logger.getChild(__name__)`. `logger.getChild`
will return a logger type-hinted as a logger having a `trace` method.

So, from now on, instead of:
```python
import logging

logger = logging.getogger(__name__)
```

you'll have to do following:
```python
from dvc.log import logger

logger = logger.getChild(__name__)
```

* remove all dvc imports from dvc.logger

* use Tqdm back
This commit is contained in:
skshetry
2023-11-10 12:55:49 +05:45
committed by GitHub
parent cbc111b519
commit 519cce3fe4
132 changed files with 328 additions and 349 deletions
+7 -8
View File
@@ -1,10 +1,11 @@
import json
import logging
import os
from dvc.log import logger
from .env import DVC_ANALYTICS_ENDPOINT, DVC_NO_ANALYTICS
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def collect_and_send_report(args=None, return_code=None):
@@ -35,9 +36,7 @@ def collect_and_send_report(args=None, return_code=None):
with tempfile.NamedTemporaryFile(delete=False, mode="w") as fobj:
json.dump(report, fobj)
logger.trace( # type: ignore[attr-defined]
"Saving analytics report to %s", fobj.name
)
logger.trace("Saving analytics report to %s", fobj.name)
daemon(["analytics", fobj.name])
@@ -78,15 +77,15 @@ def send(path):
report.update(_runtime_info())
logger.debug("uploading report to %s", url)
logger.trace("Sending %s to %s", report, url) # type: ignore[attr-defined]
logger.trace("Sending %s to %s", report, url)
try:
requests.post(url, json=report, headers=headers, timeout=5)
except requests.exceptions.RequestException as e:
logger.trace("", exc_info=True) # type: ignore[attr-defined]
logger.trace("", exc_info=True)
logger.debug("failed to send analytics report %s", str(e))
logger.trace("removing report %s", path) # type: ignore[attr-defined]
logger.trace("removing report %s", path)
os.remove(path)
+5 -8
View File
@@ -2,16 +2,15 @@
import logging
import sys
from typing import Optional
from dvc.log import logger
# Workaround for CPython bug. See [1] and [2] for more info.
# [1] https://github.com/aws/aws-cli/blob/1.16.277/awscli/clidriver.py#L55
# [2] https://bugs.python.org/issue29288
from typing import Optional
"".encode("idna")
logger = logging.getLogger("dvc")
class DvcParserError(Exception):
"""Base class for CLI parser errors."""
@@ -197,7 +196,7 @@ def main(argv=None): # noqa: C901, PLR0912, PLR0915
logger.debug("v%s%s, %s on %s", __version__, pkg, pyv, platform())
logger.debug("command: %s", " ".join(argv or sys.argv))
logger.trace(args) # type: ignore[attr-defined]
logger.trace(args)
if sys.stdout and not sys.stdout.closed and not args.quiet:
from dvc.ui import ui
@@ -241,9 +240,7 @@ def main(argv=None): # noqa: C901, PLR0912, PLR0915
if analytics.is_enabled():
analytics.collect_and_send_report(args, ret)
logger.trace( # type: ignore[attr-defined]
"Process %s exiting with %s", os.getpid(), ret
)
logger.trace("Process %s exiting with %s", os.getpid(), ret)
return ret
finally:
+3 -2
View File
@@ -1,12 +1,13 @@
import logging
import os
from abc import ABC, abstractmethod
from typing import TYPE_CHECKING, Any
from dvc.log import logger
if TYPE_CHECKING:
from dvc.config import Config
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdBase(ABC):
+2 -2
View File
@@ -1,6 +1,5 @@
"""Main parser for the dvc cli."""
import argparse
import logging
import os
from functools import lru_cache
@@ -46,10 +45,11 @@ from dvc.commands import (
update,
version,
)
from dvc.log import logger
from . import DvcParserError
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
COMMANDS = [
init,
+2 -2
View File
@@ -1,11 +1,11 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdAdd(CmdBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBaseNoRepo
from dvc.cli.utils import DictAction, append_doc_link, fix_subparsers
from dvc.exceptions import DvcException
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdArtifactsGet(CmdBaseNoRepo):
+2 -2
View File
@@ -1,11 +1,11 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdCommit(CmdBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli.command import CmdBaseNoRepo
from dvc.cli.completion import PREAMBLE
from dvc.cli.utils import append_doc_link
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
SUPPORTED_SHELLS = ["bash", "zsh"]
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
import os
from dvc.cli.command import CmdBaseNoRepo
from dvc.cli.utils import append_doc_link
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
NAME_REGEX = r"^(?P<remote>remote\.)?(?P<section>[^\.]*)\.(?P<option>[^\.]*)$"
+2 -3
View File
@@ -1,10 +1,9 @@
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBaseNoRepo
from dvc.cli.utils import fix_subparsers
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdDaemonBase(CmdBaseNoRepo):
+3 -3
View File
@@ -1,11 +1,11 @@
import argparse
import logging
from typing import TYPE_CHECKING
from funcy import chunks, compact, log_durations
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link, fix_subparsers
from dvc.log import logger
from dvc.ui import ui
from dvc.utils import colorize
@@ -13,7 +13,7 @@ if TYPE_CHECKING:
from dvc.repo.data import Status as DataStatus
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdDataStatus(CmdBase):
@@ -106,7 +106,7 @@ class CmdDataStatus(CmdBase):
return 0
def run(self) -> int:
with log_durations(logger.trace, "in data_status"): # type: ignore[attr-defined]
with log_durations(logger.trace, "in data_status"):
status = self.repo.data_status(
granular=self.args.granular,
untracked_files=self.args.untracked_files,
+2 -2
View File
@@ -1,11 +1,11 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdDataBase(CmdBase):
+2 -2
View File
@@ -1,10 +1,10 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdDestroy(CmdBase):
+2 -2
View File
@@ -1,13 +1,13 @@
import argparse
import logging
import os
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def _digest(checksum):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdExperimentsApply(CmdBase):
+2 -2
View File
@@ -1,10 +1,10 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdExperimentsBranch(CmdBase):
+2 -2
View File
@@ -1,10 +1,10 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdExperimentsClean(CmdBase):
+2 -2
View File
@@ -1,14 +1,14 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.commands.metrics import DEFAULT_PRECISION
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdExperimentsDiff(CmdBase):
+2 -3
View File
@@ -1,8 +1,7 @@
import logging
from dvc.cli.command import CmdBaseNoRepo
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdExecutorRun(CmdBaseNoRepo):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.exceptions import InvalidArgumentError
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdExperimentsList(CmdBase):
+2 -2
View File
@@ -1,11 +1,11 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdExperimentsPull(CmdBase):
+2 -2
View File
@@ -1,13 +1,13 @@
import argparse
import logging
from typing import Any, Dict
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdExperimentsPush(CmdBase):
+2 -3
View File
@@ -1,8 +1,7 @@
import logging
from dvc.cli.command import CmdBase
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdQueueWorker(CmdBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.exceptions import InvalidArgumentError
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdExperimentsRemove(CmdBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.exceptions import InvalidArgumentError
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdExperimentsRename(CmdBase):
+2 -2
View File
@@ -1,11 +1,11 @@
import argparse
import logging
from dvc.cli.utils import append_doc_link
from dvc.commands.repro import CmdRepro
from dvc.commands.repro import add_arguments as add_repro_arguments
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdExperimentsRun(CmdRepro):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdExperimentsSave(CmdBase):
+2 -2
View File
@@ -1,5 +1,4 @@
import argparse
import logging
import re
from datetime import date, datetime
from typing import TYPE_CHECKING, Dict, Iterable
@@ -10,6 +9,7 @@ from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.commands.metrics import DEFAULT_PRECISION
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.ui import ui
from dvc.utils.serialize import encode_exception
@@ -21,7 +21,7 @@ FILL_VALUE = "-"
FILL_VALUE_ERRORED = "!"
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
experiment_types = {
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.exceptions import DvcException
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdFreezeBase(CmdBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
import os
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdGC(CmdBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBaseNoRepo
from dvc.cli.utils import DictAction, append_doc_link
from dvc.exceptions import DvcException
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdGet(CmdBaseNoRepo):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBaseNoRepo
from dvc.cli.utils import DictAction, append_doc_link
from dvc.exceptions import DvcException
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdGetUrl(CmdBaseNoRepo):
+2 -2
View File
@@ -1,11 +1,11 @@
import logging
import os
from dvc.cli.command import CmdBaseNoRepo
from dvc.cli.utils import fix_subparsers
from dvc.exceptions import NotDvcRepoError
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdHookBase(CmdBaseNoRepo):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import DictAction, append_doc_link
from dvc.exceptions import DvcException
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdImport(CmdBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import DictAction, append_doc_link
from dvc.exceptions import DvcException
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdImportUrl(CmdBase):
+2 -2
View File
@@ -1,15 +1,15 @@
import argparse
import logging
import colorama
from dvc import analytics
from dvc.cli.command import CmdBaseNoRepo
from dvc.cli.utils import append_doc_link
from dvc.log import logger
from dvc.utils import boxify
from dvc.utils import format_link as fmt_link
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def _welcome_message():
+2 -2
View File
@@ -1,11 +1,11 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.exceptions import DvcException
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdInstall(CmdBase):
+2 -2
View File
@@ -1,14 +1,14 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBaseNoRepo
from dvc.cli.utils import DictAction, append_doc_link
from dvc.commands.ls.ls_colors import LsColors
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def _format_entry(entry, fmt):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli.command import CmdBaseNoRepo
from dvc.cli.utils import DictAction, append_doc_link
from dvc.log import logger
from .ls import show_entries
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdListUrl(CmdBaseNoRepo):
+2 -2
View File
@@ -1,13 +1,13 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link, fix_subparsers
from dvc.log import logger
from dvc.ui import ui
from dvc.utils.serialize import encode_exception
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
DEFAULT_PRECISION = 5
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.exceptions import DvcException
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdMove(CmdBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link, fix_subparsers
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdParamsDiff(CmdBase):
+2 -2
View File
@@ -1,5 +1,4 @@
import argparse
import logging
import os
from typing import TYPE_CHECKING, Dict, List, Optional
@@ -9,6 +8,7 @@ from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link, fix_subparsers
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.ui import ui
from dvc.utils import format_link
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
from dvc.render.match import RendererWithErrors
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def _show_json(
+2 -2
View File
@@ -1,10 +1,10 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdQueueKill(CmdBase):
+2 -2
View File
@@ -1,10 +1,10 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdQueueLogs(CmdBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.exceptions import InvalidArgumentError
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdQueueRemove(CmdBase):
+2 -2
View File
@@ -1,11 +1,11 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdQueueStart(CmdBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.compare import TabularData
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdQueueStatus(CmdBase):
+2 -2
View File
@@ -1,11 +1,11 @@
import argparse
import logging
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdQueueStop(CmdBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.exceptions import DvcException
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdRemove(CmdBase):
+2 -2
View File
@@ -1,11 +1,11 @@
import argparse
import logging
from dvc.cli.command import CmdBaseNoRepo
from dvc.cli.utils import append_doc_link
from dvc.log import logger
from dvc.utils import relpath
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdRoot(CmdBaseNoRepo):
+3 -4
View File
@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING, Dict, Iterable, List
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link, fix_subparsers
from dvc.log import logger
from dvc.utils.cli_parse import parse_params
from dvc.utils.humanize import truncate_text
@@ -14,7 +15,7 @@ if TYPE_CHECKING:
from dvc.output import Output
from dvc.stage import Stage
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
MAX_TEXT_LENGTH = 80
@@ -67,9 +68,7 @@ class CmdStageList(CmdBase):
def _get_stages(self) -> Iterable["Stage"]:
if self.args.all:
stages: List["Stage"] = self.repo.index.stages
logger.trace( # type: ignore[attr-defined]
"%d no. of stages found", len(stages)
)
logger.trace("%d no. of stages found", len(stages))
return stages
# removing duplicates while maintaining order
+2 -3
View File
@@ -1,11 +1,10 @@
import logging
from dvc.commands.data_sync import CmdDataBase
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.ui import ui
from dvc.utils import format_link
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdDataStatus(CmdDataBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.exceptions import DvcException
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdUnprotect(CmdBase):
+2 -2
View File
@@ -1,12 +1,12 @@
import argparse
import logging
from dvc.cli import completion
from dvc.cli.command import CmdBase
from dvc.cli.utils import append_doc_link
from dvc.exceptions import DvcException
from dvc.log import logger
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdUpdate(CmdBase):
+2 -2
View File
@@ -1,11 +1,11 @@
import argparse
import logging
from dvc.cli.command import CmdBaseNoRepo
from dvc.cli.utils import append_doc_link
from dvc.log import logger
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class CmdVersion(CmdBaseNoRepo):
+2 -2
View File
@@ -1,5 +1,4 @@
"""DVC config objects."""
import logging
import os
import re
from contextlib import contextmanager
@@ -9,6 +8,7 @@ from typing import TYPE_CHECKING, Dict, Optional
from funcy import compact, memoize, re_find
from dvc.exceptions import DvcException, NotDvcRepoError
from dvc.log import logger
from .utils.objects import cached_property
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
from dvc.fs import FileSystem
from dvc.types import DictStrAny, StrPath
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class ConfigError(DvcException):
+3 -2
View File
@@ -1,4 +1,3 @@
import logging
import os
from urllib.parse import urlparse
@@ -16,7 +15,9 @@ from voluptuous import (
Schema,
)
logger = logging.getLogger(__name__)
from dvc.log import logger
logger = logger.getChild(__name__)
Bool = All(
Lower,
+3 -1
View File
@@ -8,6 +8,8 @@ import sys
from contextlib import nullcontext
from typing import TYPE_CHECKING, Any, List, Mapping, Optional, Sequence, Union
from dvc.log import logger
if TYPE_CHECKING:
from typing import ContextManager
@@ -15,7 +17,7 @@ from dvc.env import DVC_DAEMON, DVC_DAEMON_LOGFILE
from dvc.utils import fix_env, is_binary
from dvc.utils.collections import ensure_list
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def _suppress_resource_warning(popen: subprocess.Popen) -> None:
+3 -2
View File
@@ -1,6 +1,5 @@
"""Draws DAG in ASCII."""
import logging
import math
import os
@@ -8,7 +7,9 @@ from grandalf.graphs import Edge, Graph, Vertex
from grandalf.layouts import SugiyamaLayout
from grandalf.routing import EdgeViewer, route_with_lines
logger = logging.getLogger(__name__)
from dvc.log import logger
logger = logger.getChild(__name__)
class VertexViewer:
+2 -2
View File
@@ -1,10 +1,10 @@
"""Manages dvc remotes that user can use with push/pull/status commands."""
import logging
from typing import TYPE_CHECKING, Iterable, Optional, Set, Tuple
from dvc.config import NoRemoteError, RemoteConfigError
from dvc.fs.callbacks import Callback
from dvc.log import logger
from dvc.utils.objects import cached_property
from dvc_data.hashfile.db import get_index
from dvc_data.hashfile.transfer import TransferResult
@@ -15,7 +15,7 @@ if TYPE_CHECKING:
from dvc_data.hashfile.hash_info import HashInfo
from dvc_data.hashfile.status import CompareStatusResult
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class Remote:
+2 -2
View File
@@ -1,4 +1,3 @@
import logging
import os
import typing
from collections import defaultdict
@@ -7,6 +6,7 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional
import dpath
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.utils.serialize import ParseError, load_path
from dvc_data.hashfile.hash_info import HashInfo
@@ -15,7 +15,7 @@ from .base import Dependency
if TYPE_CHECKING:
from dvc.fs import FileSystem
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class MissingParamsError(DvcException):
+2 -2
View File
@@ -1,5 +1,4 @@
import contextlib
import logging
import os
from typing import (
TYPE_CHECKING,
@@ -14,6 +13,7 @@ from typing import (
)
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.stage import serialize
from dvc.stage.exceptions import (
StageFileBadNameError,
@@ -32,7 +32,7 @@ if TYPE_CHECKING:
from .parsing import DataResolver
from .stage import Stage
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
_T = TypeVar("_T")
DVC_FILE_SUFFIX = ".dvc"
+2 -2
View File
@@ -1,8 +1,8 @@
import functools
import logging
import os
from typing import TYPE_CHECKING
from dvc.log import logger
from dvc.utils import as_posix
from dvc_objects.fs.base import FileSystem
@@ -10,7 +10,7 @@ if TYPE_CHECKING:
from dvc_data.fs import DataFileSystem as _DataFileSystem
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class DataFileSystem(FileSystem):
+2 -2
View File
@@ -1,6 +1,5 @@
import errno
import functools
import logging
import ntpath
import os
import posixpath
@@ -11,6 +10,7 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, Optional, Tuple, Type, Un
from fsspec.spec import AbstractFileSystem
from funcy import wrap_with
from dvc.log import logger
from dvc_objects.fs.base import FileSystem
from dvc_objects.fs.path import Path
@@ -20,7 +20,7 @@ if TYPE_CHECKING:
from dvc.repo import Repo
from dvc.types import DictStrAny, StrPath
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
RepoFactory = Union[Callable[..., "Repo"], Type["Repo"]]
Key = Tuple[str, ...]
+2 -2
View File
@@ -1,4 +1,3 @@
import logging
import os
import re
from collections import namedtuple
@@ -10,12 +9,13 @@ from pathspec.util import normalize_file
from pygtrie import Trie
from dvc.fs import Schemes, localfs
from dvc.log import logger
from dvc.pathspec_math import PatternInfo, merge_patterns
if TYPE_CHECKING:
from dvc.fs import AnyFSPath, FileSystem
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class DvcIgnore:
+10
View File
@@ -0,0 +1,10 @@
# using a separate module instead of using `dvc.logger` to not create an import-cycle.
import logging
class LoggerWithTrace(logging.Logger):
# only for type checking
trace = logging.debug
logger: "LoggerWithTrace" = logging.getLogger("dvc") # type: ignore[assignment]
+6 -8
View File
@@ -8,7 +8,6 @@ import sys
import colorama
from dvc.env import DVC_SHOW_TRACEBACK
from dvc.progress import Tqdm
@@ -181,11 +180,12 @@ def set_loggers_level(level: int = logging.INFO) -> None:
def setup(level: int = logging.INFO, log_colors: bool = True) -> None:
from dvc.utils import isatty
colorama.init()
formatter = ColorFormatter(log_colors=log_colors and isatty(sys.stdout))
color_out = log_colors and bool(sys.stdout) and sys.stdout.isatty()
color_err = log_colors and bool(sys.stderr) and sys.stderr.isatty()
formatter = ColorFormatter(log_colors=color_out)
console_info = LoggerHandler(sys.stdout)
console_info.setLevel(logging.INFO)
@@ -204,10 +204,8 @@ def setup(level: int = logging.INFO, log_colors: bool = True) -> None:
console_trace.setFormatter(formatter)
console_trace.addFilter(exclude_filter(logging.DEBUG))
show_traceback = bool(os.environ.get(DVC_SHOW_TRACEBACK))
err_formatter = ColorFormatter(
log_colors=log_colors and isatty(sys.stderr), show_traceback=show_traceback
)
show_traceback = bool(os.environ.get("DVC_SHOW_TRACEBACK"))
err_formatter = ColorFormatter(log_colors=color_err, show_traceback=show_traceback)
console_errors = LoggerHandler(sys.stderr)
console_errors.setLevel(logging.WARNING)
console_errors.setFormatter(err_formatter)
+2 -2
View File
@@ -1,5 +1,4 @@
import errno
import logging
import os
import posixpath
from collections import defaultdict
@@ -20,6 +19,7 @@ from dvc.exceptions import (
DvcException,
MergeError,
)
from dvc.log import logger
from dvc.utils import format_link
from dvc.utils.objects import cached_property
from dvc_data.hashfile import check as ocheck
@@ -47,7 +47,7 @@ if TYPE_CHECKING:
from .ignore import DvcIgnoreFilter
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
CHECKSUM_SCHEMA = Any(
+4 -5
View File
@@ -18,6 +18,7 @@ from typing import (
from funcy import collecting, first, isa, join, reraise
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.parsing.interpolate import ParseError
from dvc.utils.objects import cached_property
@@ -45,7 +46,7 @@ if TYPE_CHECKING:
from .context import SeqOrMap
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
STAGES_KWD = "stages"
VARS_KWD = "vars"
@@ -192,7 +193,7 @@ class DataResolver:
def resolve(self):
"""Used for testing purposes, otherwise use resolve_one()."""
data = join(map(self.resolve_one, self.get_keys()))
logger.trace("Resolved dvc.yaml:\n%s", data) # type: ignore[attr-defined]
logger.trace("Resolved dvc.yaml:\n%s", data)
return {STAGES_KWD: data}
def has_key(self, key: str):
@@ -283,9 +284,7 @@ class EntryDefinition:
except VarsAlreadyLoaded as exc:
format_and_raise(exc, f"'{self.where}.{name}.vars'", self.relpath)
logger.trace( # type: ignore[attr-defined]
"Context during resolution of stage %s:\n%s", name, context
)
logger.trace("Context during resolution of stage %s:\n%s", name, context)
with context.track() as tracked_data:
# NOTE: we do not pop "wdir", and resolve it again
+3 -3
View File
@@ -1,4 +1,3 @@
import logging
from abc import ABC, abstractmethod
from collections import defaultdict
from collections.abc import Mapping, MutableMapping, MutableSequence, Sequence
@@ -10,6 +9,7 @@ from typing import Any, Dict, List, Optional, Union
from funcy import identity, lfilter, nullcontext, select
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.parsing.interpolate import (
get_expression,
get_matches,
@@ -20,7 +20,7 @@ from dvc.parsing.interpolate import (
validate_value,
)
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
SeqOrMap = Union[Sequence, Mapping]
DictStr = Dict[str, Any]
@@ -434,7 +434,7 @@ class Context(CtxDict):
self.merge_from(fs, default, wdir)
else:
msg = "%s does not exist, it won't be used in parametrization"
logger.trace(msg, to_import) # type: ignore[attr-defined]
logger.trace(msg, to_import)
stage_name = stage_name or ""
for index, item in enumerate(vars_):
+3 -2
View File
@@ -1,10 +1,11 @@
"""Manages user prompts."""
import logging
from getpass import getpass
from typing import Collection, Optional
logger = logging.getLogger(__name__)
from dvc.log import logger
logger = logger.getChild(__name__)
def ask(prompt: str, limited_to: Optional[Collection[str]] = None):
+2 -2
View File
@@ -1,4 +1,3 @@
import logging
import os
from collections import defaultdict
from typing import TYPE_CHECKING, DefaultDict, Dict, List, NamedTuple, Optional
@@ -7,6 +6,7 @@ import dpath
import dpath.options
from funcy import get_in, last
from dvc.log import logger
from dvc.repo.plots import _normpath, infer_data_sources
from dvc.utils.plots import group_definitions_by_id
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
dpath.options.ALLOW_EMPTY_STRING_KEYS = True
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def _squash_plots_properties(data: List) -> Dict:
+2 -2
View File
@@ -1,4 +1,3 @@
import logging
import os
from collections import defaultdict
from contextlib import contextmanager
@@ -15,6 +14,7 @@ from typing import (
from dvc.exceptions import NotDvcRepoError, OutputNotFoundError
from dvc.ignore import DvcIgnoreFilter
from dvc.log import logger
from dvc.utils.objects import cached_property
if TYPE_CHECKING:
@@ -32,7 +32,7 @@ if TYPE_CHECKING:
from .index import Index
from .scm_context import SCMContext
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
@contextmanager
+4 -4
View File
@@ -1,4 +1,3 @@
import logging
import os
import posixpath
from pathlib import Path
@@ -12,6 +11,7 @@ from dvc.exceptions import (
FileExistsLocallyError,
InvalidArgumentError,
)
from dvc.log import logger
from dvc.utils import relpath, resolve_output
from dvc.utils.objects import cached_property
from dvc.utils.serialize import modify_yaml
@@ -23,7 +23,7 @@ if TYPE_CHECKING:
from dvc.repo import Repo
from dvc.scm import Git
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def check_name_format(name: str) -> None:
@@ -286,7 +286,7 @@ class Artifacts:
name = _reformat_name(name)
saved_exc: Optional[Exception] = None
try:
logger.trace("Trying studio-only config") # type: ignore[attr-defined]
logger.trace("Trying studio-only config")
return cls._download_studio(
url,
name,
@@ -311,7 +311,7 @@ class Artifacts:
remote=remote,
remote_config=remote_config,
) as repo:
logger.trace("Trying repo [studio] config") # type: ignore[attr-defined]
logger.trace("Trying repo [studio] config")
dvc_studio_config = dict(repo.config.get("studio"))
try:
return cls._download_studio(
+5 -5
View File
@@ -1,16 +1,16 @@
import logging
from contextlib import contextmanager
from typing import TYPE_CHECKING, Iterator, Optional, Tuple
from scmrepo.git import Git
from dvc.exceptions import NotDvcRepoError
from dvc.log import logger
from dvc.scm import iter_revs
if TYPE_CHECKING:
from dvc.repo import Repo
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def brancher(
@@ -71,7 +71,7 @@ def brancher(
scm = self.scm
logger.trace("switching fs to workspace") # type: ignore[attr-defined]
logger.trace("switching fs to workspace")
self.fs = LocalFileSystem(url=self.root_dir)
yield "workspace"
@@ -115,11 +115,11 @@ def _switch_fs(
from dvc.fs import GitFileSystem, LocalFileSystem
if rev == "workspace":
logger.trace("switching fs to workspace") # type: ignore[attr-defined]
logger.trace("switching fs to workspace")
repo.fs = LocalFileSystem(url=repo.root_dir)
return
logger.trace("switching fs to revision %s", rev[:7]) # type: ignore[attr-defined]
logger.trace("switching fs to revision %s", rev[:7])
assert isinstance(repo.scm, Git)
fs = GitFileSystem(scm=repo.scm, rev=rev)
root_dir = repo.fs.path.join("/", *repo_root_parts)
+2 -2
View File
@@ -1,4 +1,3 @@
import logging
import os
from typing import TYPE_CHECKING, Dict, List
@@ -8,6 +7,7 @@ from dvc.exceptions import (
DvcException,
NoOutputOrStageError,
)
from dvc.log import logger
from dvc.ui import ui
from dvc.utils import relpath
@@ -17,7 +17,7 @@ if TYPE_CHECKING:
from dvc_data.index import BaseDataIndex, DataIndexEntry
from dvc_objects.fs.base import FileSystem
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def _fspath_dir(path):
+3 -2
View File
@@ -1,11 +1,12 @@
import logging
from typing import TYPE_CHECKING, Callable, Iterable, List, Optional, Tuple
from dvc.log import logger
if TYPE_CHECKING:
from dvc.output import Output
from dvc.repo import Repo
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
FilterFn = Callable[["Output"], bool]
+2 -2
View File
@@ -1,13 +1,13 @@
import errno
import logging
import os
from collections import defaultdict
from typing import Dict, List, Optional
from dvc.log import logger
from dvc.repo import locked
from dvc.ui import ui
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def _path(entry):
+2 -2
View File
@@ -1,10 +1,10 @@
import logging
import os
import re
from typing import TYPE_CHECKING, Dict, Iterable, List, Optional
from funcy import chain, first
from dvc.log import logger
from dvc.ui import ui
from dvc.utils import relpath
from dvc.utils.objects import cached_property
@@ -36,7 +36,7 @@ if TYPE_CHECKING:
from .queue.workspace import WorkspaceQueue
from .stash import ExpStashEntry
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class Experiments:
+2 -2
View File
@@ -1,7 +1,7 @@
import logging
import os
from typing import TYPE_CHECKING, Optional
from dvc.log import logger
from dvc.repo import locked
from dvc.repo.scm_context import scm_context
from dvc.scm import Git
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
from dvc.repo import Repo
from dvc.repo.experiments import Experiments
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
@locked
+2 -3
View File
@@ -1,6 +1,5 @@
import logging
from dvc.exceptions import InvalidArgumentError
from dvc.log import logger
from dvc.repo import locked
from dvc.repo.scm_context import scm_context
from dvc.scm import RevError
@@ -8,7 +7,7 @@ from dvc.scm import RevError
from .exceptions import InvalidExpRevError
from .utils import exp_refs_by_rev
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
@locked
+5 -11
View File
@@ -1,8 +1,8 @@
import logging
import os
from typing import TYPE_CHECKING, Optional, Union
from dvc.fs import localfs
from dvc.log import logger
from dvc_objects.db import ObjectDB
from .serialize import DeserializeError, SerializableError, SerializableExp
@@ -11,7 +11,7 @@ from .utils import EXEC_TMP_DIR
if TYPE_CHECKING:
from dvc.repo import Repo
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class ExpCache:
@@ -45,9 +45,7 @@ class ExpCache:
except FileNotFoundError:
pass
self.odb.add_bytes(rev, exp.as_bytes())
logger.trace( # type: ignore[attr-defined]
"ExpCache: cache put '%s'", rev[:7]
)
logger.trace("ExpCache: cache put '%s'", rev[:7])
def get(self, rev: str) -> Optional[Union[SerializableExp, SerializableError]]:
obj = self.odb.get(rev)
@@ -55,16 +53,12 @@ class ExpCache:
with obj.fs.open(obj.path, "rb") as fobj:
data = fobj.read()
except FileNotFoundError:
logger.trace( # type: ignore[attr-defined]
"ExpCache: cache miss '%s'", rev[:7]
)
logger.trace("ExpCache: cache miss '%s'", rev[:7])
return None
for typ in (SerializableExp, SerializableError):
try:
exp = typ.from_bytes(data) # type: ignore[attr-defined]
logger.trace( # type: ignore[attr-defined]
"ExpCache: cache load '%s'", rev[:7]
)
logger.trace("ExpCache: cache load '%s'", rev[:7])
return exp
except DeserializeError:
continue
+2 -2
View File
@@ -1,5 +1,4 @@
import itertools
import logging
import os
from dataclasses import fields
from datetime import datetime
@@ -18,6 +17,7 @@ from typing import (
from funcy import first
from scmrepo.exceptions import SCMError as InnerSCMError
from dvc.log import logger
from dvc.scm import Git, SCMError, iter_revs
from .exceptions import InvalidExpRefError
@@ -30,7 +30,7 @@ if TYPE_CHECKING:
from .cache import ExpCache
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def collect_rev(
+2 -3
View File
@@ -1,9 +1,8 @@
import logging
from dvc.log import logger
from dvc.utils.diff import diff as _diff
from dvc.utils.diff import format_dict
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def diff(repo, *args, a_rev=None, b_rev=None, param_deps=False, **kwargs):
+3 -4
View File
@@ -27,6 +27,7 @@ from scmrepo.exceptions import SCMError
from dvc.env import DVC_EXP_AUTO_PUSH, DVC_EXP_GIT_REMOTE
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.repo.experiments.exceptions import ExperimentExistsError
from dvc.repo.experiments.refs import EXEC_BASELINE, EXEC_BRANCH, ExpRefInfo
from dvc.repo.experiments.utils import to_studio_params
@@ -45,7 +46,7 @@ if TYPE_CHECKING:
from dvc.scm import Git
from dvc.stage import PipelineStage, Stage
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class ExecutorResult(NamedTuple):
@@ -492,9 +493,7 @@ class BaseExecutor(ABC):
targets = kwargs.get("targets")
repro_force = kwargs.get("force", False)
logger.trace( # type: ignore[attr-defined]
"Executor repro with force = '%s'", str(repro_force)
)
logger.trace("Executor repro with force = '%s'", str(repro_force))
repro_dry = kwargs.get("dry")
+2 -2
View File
@@ -1,4 +1,3 @@
import logging
import os
from contextlib import ExitStack
from tempfile import mkdtemp
@@ -9,6 +8,7 @@ from funcy import retry
from shortuuid import uuid
from dvc.lock import LockError
from dvc.log import logger
from dvc.repo.experiments.refs import (
EXEC_BASELINE,
EXEC_BRANCH,
@@ -30,7 +30,7 @@ if TYPE_CHECKING:
from dvc.repo.experiments.stash import ExpStashEntry
from dvc.scm import NoSCM
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class BaseLocalExecutor(BaseExecutor):
+2 -2
View File
@@ -1,14 +1,14 @@
import logging
from collections import defaultdict
from typing import Dict, List, Optional, Tuple, Union
from dvc.log import logger
from dvc.repo import locked
from dvc.repo.scm_context import scm_context
from dvc.scm import iter_revs
from .utils import exp_refs_by_baseline
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
@locked
+2 -2
View File
@@ -1,9 +1,9 @@
import logging
from typing import Iterable, List, Mapping, Optional, Set, Union
from funcy import group_by
from scmrepo.git.backend.base import SyncStatus
from dvc.log import logger
from dvc.repo import locked
from dvc.repo.scm_context import scm_context
from dvc.scm import TqdmGit, iter_revs
@@ -13,7 +13,7 @@ from .exceptions import UnresolvedExpNamesError
from .refs import ExpRefInfo
from .utils import exp_commits, exp_refs, exp_refs_by_baseline, resolve_name
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
@locked
+2 -2
View File
@@ -1,4 +1,3 @@
import logging
from typing import (
TYPE_CHECKING,
Any,
@@ -16,6 +15,7 @@ from scmrepo.git.backend.base import SyncStatus
from dvc.env import DVC_STUDIO_TOKEN, DVC_STUDIO_URL
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.repo import locked
from dvc.repo.scm_context import scm_context
from dvc.scm import Git, TqdmGit, iter_revs
@@ -29,7 +29,7 @@ from .utils import exp_commits, exp_refs, exp_refs_by_baseline, resolve_name
if TYPE_CHECKING:
from dvc.repo import Repo
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class UploadError(DvcException):
+2 -2
View File
@@ -1,4 +1,3 @@
import logging
import os
from abc import ABC, abstractmethod
from dataclasses import asdict, dataclass
@@ -23,6 +22,7 @@ from funcy import retry
from dvc.dependency import ParamsDependency
from dvc.env import DVC_EXP_BASELINE_REV, DVC_EXP_NAME, DVC_ROOT
from dvc.lock import LockError
from dvc.log import logger
from dvc.repo.experiments.exceptions import ExperimentExistsError
from dvc.repo.experiments.executor.base import BaseExecutor
from dvc.repo.experiments.executor.local import WorkspaceExecutor
@@ -46,7 +46,7 @@ if TYPE_CHECKING:
from dvc.repo.experiments.serialize import ExpRange
from dvc.scm import Git
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
@dataclass(frozen=True)
+5 -10
View File
@@ -21,6 +21,7 @@ from funcy import first
from dvc.daemon import daemonize
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.repo.experiments.exceptions import (
UnresolvedQueueExpNamesError,
UnresolvedRunningExpNamesError,
@@ -48,7 +49,7 @@ if TYPE_CHECKING:
from .base import QueueGetResult
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class _MessageEntry(NamedTuple):
@@ -209,9 +210,7 @@ class LocalCeleryQueue(BaseStashQueue):
continue
args, kwargs, _embed = msg.decode()
entry_dict = kwargs.get("entry_dict", args[0])
logger.trace( # type: ignore[attr-defined]
"Found queued task %s", entry_dict["stash_rev"]
)
logger.trace("Found queued task %s", entry_dict["stash_rev"])
yield _MessageEntry(msg, QueueEntry.from_dict(entry_dict))
def _iter_processed(self) -> Generator[_MessageEntry, None, None]:
@@ -227,9 +226,7 @@ class LocalCeleryQueue(BaseStashQueue):
task_id = msg.headers["id"]
result: AsyncResult = AsyncResult(task_id)
if not result.ready():
logger.trace( # type: ignore[attr-defined]
"Found active task %s", entry.stash_rev
)
logger.trace("Found active task %s", entry.stash_rev)
yield _TaskEntry(result, entry)
def _iter_done_tasks(self) -> Generator[_TaskEntry, None, None]:
@@ -237,9 +234,7 @@ class LocalCeleryQueue(BaseStashQueue):
task_id = msg.headers["id"]
result: AsyncResult = AsyncResult(task_id)
if result.ready():
logger.trace( # type: ignore[attr-defined]
"Found done task %s", entry.stash_rev
)
logger.trace("Found done task %s", entry.stash_rev)
yield _TaskEntry(result, entry)
def iter_active(self) -> Generator[QueueEntry, None, None]:
+2 -2
View File
@@ -1,4 +1,3 @@
import logging
import os
from collections import defaultdict
from typing import TYPE_CHECKING, Collection, Dict, Generator, List, Optional
@@ -6,6 +5,7 @@ from typing import TYPE_CHECKING, Collection, Dict, Generator, List, Optional
from funcy import first
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.repo.experiments.exceptions import ExpQueueEmptyError
from dvc.repo.experiments.executor.base import ExecutorInfo, TaskStatus
from dvc.repo.experiments.executor.local import TempDirExecutor
@@ -22,7 +22,7 @@ if TYPE_CHECKING:
from dvc.repo.experiments.serialize import ExpRange
from dvc_task.proc.manager import ProcessManager
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
_STANDALONE_TMP_DIR = os.path.join(EXEC_TMP_DIR, "standalone")
+2 -2
View File
@@ -1,13 +1,13 @@
import logging
from typing import TYPE_CHECKING, Dict, List
from scmrepo.exceptions import SCMError
from dvc.log import logger
from dvc.repo.experiments.executor.base import ExecutorInfo, TaskStatus
from dvc.repo.experiments.refs import EXEC_NAMESPACE, EXPS_NAMESPACE, EXPS_STASH
from dvc.repo.experiments.utils import get_exp_rwlock, iter_remote_refs
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
if TYPE_CHECKING:
+2 -2
View File
@@ -1,5 +1,4 @@
import json
import logging
import os
from collections import defaultdict
from typing import TYPE_CHECKING, Collection, Dict, Generator, List, Optional
@@ -8,6 +7,7 @@ import psutil
from funcy import first
from dvc.exceptions import DvcException
from dvc.log import logger
from dvc.repo.experiments.exceptions import ExpQueueEmptyError
from dvc.repo.experiments.executor.base import ExecutorInfo, TaskStatus
from dvc.repo.experiments.executor.local import WorkspaceExecutor
@@ -25,7 +25,7 @@ if TYPE_CHECKING:
from .base import QueueDoneResult
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
class WorkspaceQueue(BaseStashQueue):
+2 -2
View File
@@ -1,6 +1,6 @@
import logging
from typing import TYPE_CHECKING, Dict, Iterable, List, Optional, Union
from dvc.log import logger
from dvc.repo import locked
from dvc.repo.scm_context import scm_context
from dvc.scm import Git, iter_revs
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
from .refs import ExpRefInfo
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
@locked
+2 -2
View File
@@ -1,6 +1,6 @@
import logging
from typing import TYPE_CHECKING, Dict, List, Optional, Union
from dvc.log import logger
from dvc.repo.experiments.exceptions import (
ExperimentExistsError,
UnresolvedExpNamesError,
@@ -13,7 +13,7 @@ from .refs import ExpRefInfo
if TYPE_CHECKING:
from dvc.repo import Repo
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def rename(
+2 -2
View File
@@ -1,13 +1,13 @@
import logging
from typing import Dict, Iterable, Optional
from dvc.dependency.param import ParamsDependency
from dvc.exceptions import InvalidArgumentError
from dvc.log import logger
from dvc.repo import locked
from dvc.ui import ui
from dvc.utils.cli_parse import to_path_overrides
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
@locked
+3 -2
View File
@@ -1,14 +1,15 @@
import logging
import os
from typing import TYPE_CHECKING, List, Optional
from funcy import first
from dvc.log import logger
if TYPE_CHECKING:
from dvc.repo import Repo
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def save(
+2 -2
View File
@@ -1,4 +1,3 @@
import logging
from collections import Counter, defaultdict
from datetime import date, datetime
from typing import (
@@ -18,6 +17,7 @@ from typing import (
)
from dvc.exceptions import InvalidArgumentError
from dvc.log import logger
from dvc.scm import Git
from dvc.ui import ui
from dvc.utils.flatten import flatten
@@ -31,7 +31,7 @@ if TYPE_CHECKING:
from .serialize import ExpRange, ExpState
logger = logging.getLogger(__name__)
logger = logger.getChild(__name__)
def show(

Some files were not shown because too many files have changed in this diff Show More