From 8df6e2a65855fa8205c57f4d8d4d82b80e84f421 Mon Sep 17 00:00:00 2001 From: Agustin Date: Fri, 9 Aug 2024 15:59:44 -0300 Subject: [PATCH] HDX_CONFIG_DIR was fixed if it doesn't exist --- src/hdx_cli/cli_interface/common/cached_operations.py | 8 +------- src/hdx_cli/library_api/common/config_constants.py | 8 +++++++- src/hdx_cli/main.py | 2 -- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/hdx_cli/cli_interface/common/cached_operations.py b/src/hdx_cli/cli_interface/common/cached_operations.py index 7a5970c..b001180 100644 --- a/src/hdx_cli/cli_interface/common/cached_operations.py +++ b/src/hdx_cli/cli_interface/common/cached_operations.py @@ -1,7 +1,7 @@ -import sys import json import requests +from ...library_api.common.config_constants import HDX_CONFIG_DIR from ...library_api.common.exceptions import HdxCliException, ResourceNotFoundException from ...library_api.common.context import ProfileUserContext from ...library_api.utility.decorators import find_in_disk_cache @@ -10,12 +10,6 @@ logger = get_logger() -try: - from ...library_api.common.config_constants import HDX_CONFIG_DIR -except FileNotFoundError as e: - logger.error(f'{e}') - sys.exit(1) - def find_kafka(user_ctx: ProfileUserContext): return access_resource(user_ctx, diff --git a/src/hdx_cli/library_api/common/config_constants.py b/src/hdx_cli/library_api/common/config_constants.py index e7bfe14..84c0192 100644 --- a/src/hdx_cli/library_api/common/config_constants.py +++ b/src/hdx_cli/library_api/common/config_constants.py @@ -1,6 +1,11 @@ import os +import sys from pathlib import Path +from hdx_cli.library_api.common.logging import get_logger + +logger = get_logger() + __all__ = ['HDX_CONFIG_DIR', 'PROFILE_CONFIG_FILE', 'PROFILE_CACHE_DIR'] HDX_CONFIG_DIR_DEFAULT = Path.home() / '.hdx_cli' @@ -12,4 +17,5 @@ if HDX_CONFIG_DIR_ENV and not HDX_CONFIG_DIR.exists(): - raise FileNotFoundError(f"The specified directory in 'HDX_CONFIG_DIR': {HDX_CONFIG_DIR} does not exist.") + logger.error(f"The specified directory in 'HDX_CONFIG_DIR': {HDX_CONFIG_DIR} does not exist.") + sys.exit(1) diff --git a/src/hdx_cli/main.py b/src/hdx_cli/main.py index 6e16c5f..4465ac2 100644 --- a/src/hdx_cli/main.py +++ b/src/hdx_cli/main.py @@ -1,5 +1,3 @@ -import dataclasses as dc - import click from trogon import tui