Fix wrapping unknown exceptions (#214)

Author: droserasprout

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 Please use [this](https://docs.gitlab.com/ee/development/changelog.html) document as guidelines to keep a changelog.
 
+## [unreleased]
+
+### Fixed
+
+* cli: Fixed stacktraces missing on exception.
+* cli: Fixed wrapping `OSError` with `ConfigurationError` during config loading.
+
+### Changed
+
+* cli: Unknown exceptions are no longer wrapped with `DipDupError`.
+
 ## 4.1.0 - 2022-01-24
 
 ### Added

src/dipdup/cli.py

@@ -1,4 +1,5 @@
 import asyncio
+import atexit
 import logging
 import os
 import signal
@@ -7,6 +8,7 @@
 from contextlib import AsyncExitStack
 from contextlib import suppress
 from dataclasses import dataclass
+from functools import partial
 from functools import wraps
 from os import listdir
 from os.path import dirname
@@ -82,15 +84,13 @@ async def wrapper(*args, **kwargs) -> None:
         loop = asyncio.get_running_loop()
         loop.add_signal_handler(signal.SIGINT, lambda: asyncio.ensure_future(shutdown()))
         try:
-            with DipDupError.wrap():
-                await fn(*args, **kwargs)
+            await fn(*args, **kwargs)
         except (KeyboardInterrupt, asyncio.CancelledError):
             pass
-        except DipDupError as e:
-            # FIXME: No traceback in test logs
-            _logger.critical(e.__repr__())
-            _logger.info(e.format())
-            quit(1)
+        except Exception as e:
+            help_message = e.format() if isinstance(e, DipDupError) else DipDupError().format()
+            atexit.register(partial(click.echo, help_message, err=True))
+            raise
 
     return wrapper
 

src/dipdup/config.py

@@ -1041,7 +1041,6 @@ def load(
         paths: List[str],
         environment: bool = True,
     ) -> 'DipDupConfig':
-
         current_workdir = os.path.join(os.getcwd())
 
         json_config: Dict[str, Any] = {}
@@ -1050,8 +1049,11 @@ def load(
             path = os.path.join(current_workdir, path)
 
             _logger.debug('Loading config from %s', path)
-            with open(path) as file:
-                raw_config = file.read()
+            try:
+                with open(path) as file:
+                    raw_config = file.read()
+            except OSError as e:
+                raise ConfigurationError(str(e))
 
             if environment:
                 _logger.debug('Substituting environment variables')

src/dipdup/exceptions.py

@@ -1,22 +1,18 @@
 import textwrap
-import traceback
-from contextlib import contextmanager
 from dataclasses import dataclass
 from dataclasses import field
 from typing import Any
 from typing import Dict
-from typing import Iterator
 from typing import Optional
 from typing import Type
 
-import sentry_sdk
 from tabulate import tabulate
 from tortoise.models import Model
 
 from dipdup import spec_version_mapping
 from dipdup.enums import ReindexingReason
 
-_tab = '\n\n' + ('_' * 80) + '\n\n'
+_tab = ('_' * 80) + '\n\n'
 
 
 def unindent(text: str) -> str:
@@ -48,6 +44,7 @@ def __repr__(self) -> str:
         return f'{self.__class__.__name__}: {self.__doc__}'
 
     def _help(self) -> str:
+        # TODO: Update guide
         return """
             Unexpected error occurred!
 
@@ -61,18 +58,7 @@ def help(self) -> str:
         return unindent(self._help())
 
     def format(self) -> str:
-        exc = f'\n\n{traceback.format_exc()}'.rstrip()
-        return _tab.join([exc, self.help() + '\n'])
-
-    @contextmanager
-    def wrap(ctx: Optional[Any] = None) -> Iterator[None]:
-        try:
-            yield
-        except DipDupError:
-            raise
-        except Exception as e:
-            sentry_sdk.capture_exception(e)
-            raise DipDupError from e
+        return _tab + self.help() + '\n'
 
 
 @dataclass(frozen=True, repr=False)
@@ -138,7 +124,7 @@ def _help(self) -> str:
             ],
             headers=['', 'spec_version', 'DipDup version'],
         )
-        reindex = _tab + ReindexingRequiredError(ReindexingReason.MIGRATION).help() if self.reindex else ''
+        reindex = '\n\n' + _tab + ReindexingRequiredError(ReindexingReason.MIGRATION).help() if self.reindex else ''
         return f"""
             Project migration required!
 

src/dipdup/index.py

@@ -194,7 +194,7 @@ async def process(self) -> None:
         sync_levels = {self.datasource.get_sync_level(s) for s in self._config.subscriptions}
         sync_level = sync_levels.pop()
         if sync_levels:
-            raise Exception
+            raise RuntimeError(f'Multiple sync levels: {sync_levels}')
         level = self.state.level
 
         if sync_level is None: