Skip to content

fix: context close on Create/Update/Delete operations #2038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eakmanrq merged 3 commits into from
Jan 30, 2024
Merged

fix: context close on Create/Update/Delete operations #2038

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8a4f70
fix: context close on crud operations
eakmanrq Jan 29, 2024
e51d6ea
Use the existing error handler decorator to close the context
izeigerman Jan 30, 2024
6bfca9e
Remaining cleanup
izeigerman Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions sqlmesh/cli/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import click
from sqlglot.errors import SqlglotError

from sqlmesh.core.context import Context
from sqlmesh.utils import debug_mode_enabled
from sqlmesh.utils.concurrency import NodeExecutionFailedError
from sqlmesh.utils.errors import SQLMeshError
Expand All @@ -19,15 +20,21 @@ def error_handler(
func: t.Callable[..., DECORATOR_RETURN_TYPE]
) -> t.Callable[..., DECORATOR_RETURN_TYPE]:
@wraps(func)
def wrapper(*args: t.Any, **kwargs: t.Any) -> DECORATOR_RETURN_TYPE:
def wrapper(*args: t.List[t.Any], **kwargs: t.Any) -> DECORATOR_RETURN_TYPE:
context_or_obj = args[0]
sqlmesh_context = (
context_or_obj.obj if isinstance(context_or_obj, click.Context) else context_or_obj
)
if not isinstance(sqlmesh_context, Context):
sqlmesh_context = None
handler = _debug_exception_handler if debug_mode_enabled() else _default_exception_handler
return handler(lambda: func(*args, **kwargs))
return handler(sqlmesh_context, lambda: func(*args, **kwargs))

return wrapper


def _default_exception_handler(
func: t.Callable[[], DECORATOR_RETURN_TYPE]
context: t.Optional[Context], func: t.Callable[[], DECORATOR_RETURN_TYPE]
) -> DECORATOR_RETURN_TYPE:
try:
return func()
Expand All @@ -36,11 +43,19 @@ def _default_exception_handler(
raise click.ClickException(f"Failed processing {ex.node}. {cause}")
except (SQLMeshError, SqlglotError, ValueError) as ex:
raise click.ClickException(str(ex))
finally:
if context:
context.close()


def _debug_exception_handler(func: t.Callable[[], DECORATOR_RETURN_TYPE]) -> DECORATOR_RETURN_TYPE:
def _debug_exception_handler(
context: t.Optional[Context], func: t.Callable[[], DECORATOR_RETURN_TYPE]
) -> DECORATOR_RETURN_TYPE:
try:
return func()
except Exception:
logger.exception("Unhandled exception")
raise
finally:
if context:
context.close()