rename py libs to avoid collisions with project libs

custom-recipes/api-connect/recipe.py

@@ -2,11 +2,11 @@
 import dataiku
 from dataiku.customrecipe import get_input_names_for_role, get_recipe_config, get_output_names_for_role
 import pandas as pd
-from safe_logger import SafeLogger
-from dku_utils import get_dku_key_values, get_endpoint_parameters, get_secure_credentials, get_user_secrets, get_retry_handler_parameters_from_config
-from rest_api_recipe_session import RestApiRecipeSession
-from dku_constants import DKUConstants
-from retry_handler import RetryHandler
+from api_connect_safe_logger import SafeLogger
+from api_connect_dku_utils import get_dku_key_values, get_endpoint_parameters, get_secure_credentials, get_user_secrets, get_retry_handler_parameters_from_config
+from api_connect_rest_api_recipe_session import RestApiRecipeSession
+from api_connect_dku_constants import DKUConstants
+from api_connect_retry_handler import RetryHandler
 
 
 logger = SafeLogger("api-connect plugin", forbidden_keys=DKUConstants.FORBIDDEN_KEYS)

python-connectors/api-connect_dataset/connector.py

@@ -1,15 +1,15 @@
 from dataiku.connector import Connector
 from dataikuapi.utils import DataikuException
-from safe_logger import SafeLogger
-from rest_api_client import RestAPIClient
-from dku_utils import (
+from api_connect_safe_logger import SafeLogger
+from api_connect_rest_api_client import RestAPIClient
+from api_connect_dku_utils import (
     get_dku_key_values, get_endpoint_parameters,
     parse_keys_for_json, get_value_from_path, get_secure_credentials,
     decode_csv_data, decode_bytes, get_user_secrets, get_retry_handler_parameters_from_config
 )
-from dku_constants import DKUConstants
+from api_connect_dku_constants import DKUConstants
 import json
-from retry_handler import RetryHandler
+from api_connect_retry_handler import RetryHandler
 
 
 logger = SafeLogger("api-connect plugin", forbidden_keys=DKUConstants.FORBIDDEN_KEYS)

python-lib/dku_utils.py → python-lib/api_connect_dku_utils.py

@@ -3,7 +3,7 @@
 import math
 from collections import defaultdict
 from jsonpath_ng.ext import parse
-from safe_logger import SafeLogger
+from api_connect_safe_logger import SafeLogger
 
 
 logger = SafeLogger("api-connect plugin utils")

python-lib/pagination.py → python-lib/api_connect_pagination.py

@@ -1,5 +1,5 @@
-from safe_logger import SafeLogger
-from dku_utils import get_value_from_path, extract_key_using_json_path, join_url
+from api_connect_safe_logger import SafeLogger
+from api_connect_dku_utils import get_value_from_path, extract_key_using_json_path, join_url
 
 
 logger = SafeLogger("api-connect plugin Pagination")

python-lib/rest_api_client.py → python-lib/api_connect_rest_api_client.py

@@ -2,13 +2,13 @@
 import time
 import copy
 import tempfile
-from pagination import Pagination
-from safe_logger import SafeLogger
-from loop_detector import LoopDetector
-from dku_utils import get_dku_key_values, get_dku_duplicated_key_values, template_dict, format_template, is_reponse_xml, xml_to_json
-from dku_constants import DKUConstants
-from rest_api_auth import get_auth
-from retry_handler import DefaultRetryHandler
+from api_connect_pagination import Pagination
+from api_connect_safe_logger import SafeLogger
+from api_connect_loop_detector import LoopDetector
+from api_connect_dku_utils import get_dku_key_values, get_dku_duplicated_key_values, template_dict, format_template, is_reponse_xml, xml_to_json
+from api_connect_dku_constants import DKUConstants
+from api_connect_rest_api_auth import get_auth
+from api_connect_retry_handler import DefaultRetryHandler
 
 
 logger = SafeLogger("api-connect plugin", forbidden_keys=DKUConstants.FORBIDDEN_KEYS)

python-lib/rest_api_recipe_session.py → python-lib/api_connect_rest_api_recipe_session.py

@@ -1,8 +1,8 @@
 from dataikuapi.utils import DataikuException
-from rest_api_client import RestAPIClient
-from safe_logger import SafeLogger
-from dku_utils import parse_keys_for_json, get_value_from_path, decode_csv_data, de_NaN, decode_bytes
-from dku_constants import DKUConstants
+from api_connect_rest_api_client import RestAPIClient
+from api_connect_safe_logger import SafeLogger
+from api_connect_dku_utils import parse_keys_for_json, get_value_from_path, decode_csv_data, de_NaN, decode_bytes
+from api_connect_dku_constants import DKUConstants
 import copy
 import json
 import requests

python-lib/retry_handler.py → python-lib/api_connect_retry_handler.py

@@ -1,6 +1,6 @@
 import requests
 import time
-from safe_logger import SafeLogger
+from api_connect_safe_logger import SafeLogger
 
 
 logger = SafeLogger("api-connect plugin retry handler")

tests/python/unit/test_common.py

@@ -1,4 +1,4 @@
-from dku_utils import template_dict, join_url
+from api_connect_dku_utils import template_dict, join_url
 import pytest