From 66068e5f07ac7af85533adeed33326b5569a4b45 Mon Sep 17 00:00:00 2001 From: Alex Bourret Date: Wed, 5 Aug 2026 14:29:56 +0700 Subject: [PATCH 1/2] rename py libs to avoid collisions with project libs --- custom-recipes/api-connect/recipe.py | 10 +++++----- python-connectors/api-connect_dataset/connector.py | 10 +++++----- ...u_constants.py => api_connect_dku_constants.py} | 0 .../{dku_utils.py => api_connect_dku_utils.py} | 2 +- ...op_detector.py => api_connect_loop_detector.py} | 0 .../{pagination.py => api_connect_pagination.py} | 4 ++-- ...st_api_auth.py => api_connect_rest_api_auth.py} | 0 ...pi_client.py => api_connect_rest_api_client.py} | 14 +++++++------- ...n.py => api_connect_rest_api_recipe_session.py} | 8 ++++---- ...try_handler.py => api_connect_retry_handler.py} | 2 +- .../{safe_logger.py => api_connect_safe_logger.py} | 0 tests/python/integration/test_scenario.py | 2 +- tests/python/unit/test_common.py | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) rename python-lib/{dku_constants.py => api_connect_dku_constants.py} (100%) rename python-lib/{dku_utils.py => api_connect_dku_utils.py} (99%) rename python-lib/{loop_detector.py => api_connect_loop_detector.py} (100%) rename python-lib/{pagination.py => api_connect_pagination.py} (98%) rename python-lib/{rest_api_auth.py => api_connect_rest_api_auth.py} (100%) rename python-lib/{rest_api_client.py => api_connect_rest_api_client.py} (97%) rename python-lib/{rest_api_recipe_session.py => api_connect_rest_api_recipe_session.py} (97%) rename python-lib/{retry_handler.py => api_connect_retry_handler.py} (98%) rename python-lib/{safe_logger.py => api_connect_safe_logger.py} (100%) diff --git a/custom-recipes/api-connect/recipe.py b/custom-recipes/api-connect/recipe.py index 882dcaf..b5d2e98 100644 --- a/custom-recipes/api-connect/recipe.py +++ b/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) diff --git a/python-connectors/api-connect_dataset/connector.py b/python-connectors/api-connect_dataset/connector.py index 3e88c26..64512ee 100644 --- a/python-connectors/api-connect_dataset/connector.py +++ b/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) diff --git a/python-lib/dku_constants.py b/python-lib/api_connect_dku_constants.py similarity index 100% rename from python-lib/dku_constants.py rename to python-lib/api_connect_dku_constants.py diff --git a/python-lib/dku_utils.py b/python-lib/api_connect_dku_utils.py similarity index 99% rename from python-lib/dku_utils.py rename to python-lib/api_connect_dku_utils.py index 498238b..a784183 100644 --- a/python-lib/dku_utils.py +++ b/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") diff --git a/python-lib/loop_detector.py b/python-lib/api_connect_loop_detector.py similarity index 100% rename from python-lib/loop_detector.py rename to python-lib/api_connect_loop_detector.py diff --git a/python-lib/pagination.py b/python-lib/api_connect_pagination.py similarity index 98% rename from python-lib/pagination.py rename to python-lib/api_connect_pagination.py index 252c6b6..91d165f 100644 --- a/python-lib/pagination.py +++ b/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") diff --git a/python-lib/rest_api_auth.py b/python-lib/api_connect_rest_api_auth.py similarity index 100% rename from python-lib/rest_api_auth.py rename to python-lib/api_connect_rest_api_auth.py diff --git a/python-lib/rest_api_client.py b/python-lib/api_connect_rest_api_client.py similarity index 97% rename from python-lib/rest_api_client.py rename to python-lib/api_connect_rest_api_client.py index b789b6d..2745f2d 100644 --- a/python-lib/rest_api_client.py +++ b/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) diff --git a/python-lib/rest_api_recipe_session.py b/python-lib/api_connect_rest_api_recipe_session.py similarity index 97% rename from python-lib/rest_api_recipe_session.py rename to python-lib/api_connect_rest_api_recipe_session.py index f4753da..ecdc74b 100644 --- a/python-lib/rest_api_recipe_session.py +++ b/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 diff --git a/python-lib/retry_handler.py b/python-lib/api_connect_retry_handler.py similarity index 98% rename from python-lib/retry_handler.py rename to python-lib/api_connect_retry_handler.py index de20b13..0ef803b 100644 --- a/python-lib/retry_handler.py +++ b/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") diff --git a/python-lib/safe_logger.py b/python-lib/api_connect_safe_logger.py similarity index 100% rename from python-lib/safe_logger.py rename to python-lib/api_connect_safe_logger.py diff --git a/tests/python/integration/test_scenario.py b/tests/python/integration/test_scenario.py index 9fabb73..f873ef6 100644 --- a/tests/python/integration/test_scenario.py +++ b/tests/python/integration/test_scenario.py @@ -1,4 +1,4 @@ -from dku_plugin_test_utils import dss_scenario +from api_connect_dku_plugin_test_utils import dss_scenario TEST_PROJECT_KEY = "PLUGINTESTAPICONNECT" diff --git a/tests/python/unit/test_common.py b/tests/python/unit/test_common.py index ddc6e6f..9678370 100644 --- a/tests/python/unit/test_common.py +++ b/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 From 02a2ef4f5ce7de4f2f86fbdd297f0e57177572aa Mon Sep 17 00:00:00 2001 From: Alex Bourret Date: Wed, 5 Aug 2026 14:36:37 +0700 Subject: [PATCH 2/2] went too far --- tests/python/integration/test_scenario.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/python/integration/test_scenario.py b/tests/python/integration/test_scenario.py index f873ef6..9fabb73 100644 --- a/tests/python/integration/test_scenario.py +++ b/tests/python/integration/test_scenario.py @@ -1,4 +1,4 @@ -from api_connect_dku_plugin_test_utils import dss_scenario +from dku_plugin_test_utils import dss_scenario TEST_PROJECT_KEY = "PLUGINTESTAPICONNECT"