Merge pull request #456 from efiop/master

exceptions rfc
This commit is contained in:
Ruslan Kuprieiev
2018-02-06 18:42:38 +02:00
committed by GitHub
11 changed files with 68 additions and 37 deletions
+1 -1
View File
@@ -8,6 +8,6 @@ class CmdAdd(CmdBase):
try:
self.project.add(target)
except DvcException as ex:
self.project.logger.error('Failed to add {}: {}'.format(target, str(ex)))
self.project.logger.error('Failed to add {}', ex)
return 1
return 0
+1 -1
View File
@@ -31,7 +31,7 @@ class CmdBase(object):
with self.project.lock:
return self.run()
except LockError as ex:
self.project.logger.error(str(ex))
self.project.logger.error('Failed to lock before running a command', ex)
return 1
# Abstract methods that have to be implemented by any inheritance class
+21 -4
View File
@@ -1,14 +1,27 @@
import dvc.cloud.base as cloud
from dvc.command.common.base import CmdBase
from dvc.exceptions import DvcException
class CmdDataPull(CmdBase):
def run(self):
self.project.pull(self.args.jobs)
try:
self.project.pull(self.args.jobs)
except DvcException as exc:
self.project.logger.error('Failed to pull data from the cloud', exc)
return 1
return 0
class CmdDataPush(CmdBase):
def run(self):
self.project.push(self.args.jobs)
try:
self.project.push(self.args.jobs)
except DvcException as exc:
self.project.logger.error('Failed to push data to the cloud', exc)
return 1
return 0
class CmdDataStatus(CmdBase):
@@ -28,6 +41,10 @@ class CmdDataStatus(CmdBase):
self.project.logger.info('\t{}\t{}'.format(prefix_map[ret], target))
def run(self):
status = self.project.status(self.args.jobs)
self._show(status)
try:
status = self.project.status(self.args.jobs)
self._show(status)
except DvcException as exc:
self.project.logger.error('Failed to obtain data status', exc)
return 1
return 0
+1 -1
View File
@@ -8,6 +8,6 @@ class CmdRemove(CmdBase):
try:
self.project.remove(target)
except DvcException as ex:
self.project.logger.error('Failed to remove {}: {}'.format(target, str(ex)))
self.project.logger.error('Failed to remove {}', ex)
return 1
return 0
+4 -3
View File
@@ -11,10 +11,11 @@ class CmdRepro(CmdBase):
recursive=recursive,
force=self.args.force)
except ReproductionError as ex:
self.project.logger.error(ex)
msg = 'Failed to reproduce \'{}\''.format(target)
self.project.logger.error(msg, ex)
return 1
except Exception as ex:
msg = 'Failed to reproduce \'{}\' - unexpected error: {}'.format(target, ex)
self.project.logger.error(msg)
msg = 'Failed to reproduce \'{}\' - unexpected error'.format(target)
self.project.logger.error(msg, ex)
return 1
return 0
+1 -1
View File
@@ -19,7 +19,7 @@ class CmdRun(CmdBase):
cwd=self.args.cwd,
no_exec=self.args.no_exec)
except DvcException as ex:
self.project.logger.error('Failed to run command: {}'.format(str(ex)))
self.project.logger.error('Failed to run command', ex)
return 1
return 0
+7 -1
View File
@@ -1,2 +1,8 @@
import traceback
class DvcException(Exception):
pass
def __init__(self, msg, cause=None):
self.cause = cause
self.cause_tb = traceback.format_exc() if cause else None
super(DvcException, self).__init__(msg)
+26 -9
View File
@@ -1,6 +1,7 @@
import sys
import logging
import colorama
import traceback
from dvc.config import Config
@@ -70,18 +71,34 @@ class Logger(object):
return u'{}{}{}'.format(header, msg, footer)
@staticmethod
def error(msg, **kwargs):
exc_info = Logger.logger().getEffectiveLevel() == logging.DEBUG
return Logger.logger().error(Logger.colorize(msg, 'error'), exc_info=exc_info, **kwargs)
def parse_exc(exc, tb=None):
str_tb = tb if tb else None
str_exc = ': {}'.format(str(exc)) if exc else ""
if exc and hasattr(exc, 'cause') and exc.cause:
cause_str_exc, cause_str_tb = Logger.parse_exc(exc.cause, exc.cause_tb)
str_tb = cause_str_tb
str_exc = '{}{}'.format(str_exc, cause_str_exc)
return (str_exc, str_tb)
@staticmethod
def warn(msg, **kwargs):
return Logger.logger().warn(Logger.colorize(msg, 'warn'), **kwargs)
def error(msg, exc=None):
str_exc, str_tb = Logger.parse_exc(exc)
if Logger.logger().getEffectiveLevel() == logging.DEBUG and exc:
str_tb = str_tb if str_tb else traceback.format_exc()
Logger.logger().error(str_tb)
return Logger.logger().error(Logger.colorize(msg + str_exc, 'error'))
@staticmethod
def debug(msg, **kwargs):
return Logger.logger().debug(Logger.colorize(msg, 'debug'), **kwargs)
def warn(msg):
return Logger.logger().warn(Logger.colorize(msg, 'warn'))
@staticmethod
def info(msg, **kwargs):
return Logger.logger().info(Logger.colorize(msg, 'info'), **kwargs)
def debug(msg):
return Logger.logger().debug(Logger.colorize(msg, 'debug'))
@staticmethod
def info(msg):
return Logger.logger().info(Logger.colorize(msg, 'info'))
+2 -2
View File
@@ -9,13 +9,13 @@ def main(argv=None):
try:
cmd = args.func(args)
except Exception as ex:
Logger.error('Initialization error: {}'.format(str(ex)))
Logger.error('Initialization error', ex)
return 255
try:
ret = cmd.run_cmd()
except Exception as ex:
Logger.error('Unexpected error: {}'.format(str(ex)))
Logger.error('Unexpected error', ex)
return 254
return ret
+4 -13
View File
@@ -13,14 +13,6 @@ from dvc.cache import Cache
from dvc.cloud.data_cloud import DataCloud
class PipelineError(DvcException):
pass
class StageNotInPipelineError(PipelineError):
pass
class StageNotFoundError(DvcException):
def __init__(self, path):
msg = 'Stage file {} does not exist'.format(path)
@@ -28,10 +20,9 @@ class StageNotFoundError(DvcException):
class ReproductionError(DvcException):
def __init__(self, dvc_file_name, msg):
self.dvc_file_name = dvc_file_name
self.msg = msg
super(ReproductionError, self).__init__(u'Failed to reproduce \'{}\': {}'.format(dvc_file_name, msg))
def __init__(self, dvc_file_name, ex):
msg = 'Failed to reproduce \'{}\''.format(dvc_file_name)
super(ReproductionError, self).__init__(msg, cause=ex)
class Project(object):
@@ -161,7 +152,7 @@ class Project(object):
try:
result += self._reproduce_stage(stages, n, force)
except Exception as ex:
raise ReproductionError(n, str(ex))
raise ReproductionError(n, ex)
return result
def checkout(self):
-1
View File
@@ -83,7 +83,6 @@ def map_progress(func, targets, n_threads):
try:
ret = pool.map(func, targets)
except Exception as exc:
# Logger.error('Unexpected exception while processing targets: {}'.format(exc), exc_info=True)
raise
finally:
progress.finish()