Skip to content
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

josema/ch93710/fix-wrong-username-error #1687

Merged
merged 4 commits into from
Sep 4, 2020
Merged

josema/ch93710/fix-wrong-username-error #1687

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aaaf99c
Not found decorator for CARTO
Sep 3, 2020
1899951
Moved user/table not found exception to ContextManager and handling o…
Sep 4, 2020
397336e
Autocalled decorator
Sep 4, 2020
b2b5d15
Returning generic exception when user or table not found
Sep 4, 2020
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
25 changes: 21 additions & 4 deletions cartoframes/io/managers/context_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
from carto.datasets import DatasetManager
from carto.exceptions import CartoException, CartoRateLimitException
from carto.sql import SQLClient, BatchSQLClient, CopySQLClient
from pyrestcli.exceptions import NotFoundException

from ..dataset_info import DatasetInfo
from ... import __version__
from ...auth.defaults import get_default_credentials
from ...utils.logger import log
from ...utils.geom_utils import encode_geometry_ewkb
from ...utils.utils import is_sql_query, check_credentials, encode_row, map_geom_type, PG_NULL, \
double_quote
from ...utils.columns import get_dataframe_columns_info, get_query_columns_info, obtain_converters, \
date_columns_names, normalize_name
from ...utils.utils import is_sql_query, check_credentials, encode_row, map_geom_type, PG_NULL, double_quote
from ...utils.columns import (get_dataframe_columns_info, get_query_columns_info, obtain_converters, date_columns_names,
normalize_name)

DEFAULT_RETRY_TIMES = 3

Expand All @@ -43,6 +43,21 @@ def wrapper(*args, **kwargs):
return wrapper


def not_found(func):
def decorator_func(*args, **kwargs):
try:
return func(*args, **kwargs)

except CartoException as e:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would simplify this to

except NotFoundException:
    raise Exception('Resource not found')

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That doesn't work :(

The exception is a CartoException, created with a NotFoundException as the only parameter, so we need to inspect the args.

if hasattr(e, 'args') and isinstance(e.args, (list, tuple)) and type(e.args[0]) == NotFoundException:
raise Exception('Resource not found') from None

else:
raise e

return decorator_func


class ContextManager:

def __init__(self, credentials):
Expand All @@ -54,9 +69,11 @@ def __init__(self, credentials):
self.copy_client = CopySQLClient(self.auth_client)
self.batch_sql_client = BatchSQLClient(self.auth_client)

@not_found
def execute_query(self, query, parse_json=True, do_post=True, format=None, **request_args):
return self.sql_client.send(query.strip(), parse_json, do_post, format, **request_args)

@not_found
def execute_long_running_query(self, query):
return self.batch_sql_client.create_and_wait_for_completion(query.strip())

Expand Down