fivetran-connector-sdk 0.12.9.2__tar.gz → 0.12.17.1__tar.gz

{fivetran_connector_sdk-0.12.9.2 → fivetran_connector_sdk-0.12.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fivetran_connector_sdk
-Version: 0.12.9.2
+Version: 0.12.17.1
 Summary: Build custom connectors on Fivetran platform
 Author-email: Fivetran <developers@fivetran.com>
 Project-URL: Homepage, https://fivetran.com/docs/connectors/connector-sdk

{fivetran_connector_sdk-0.12.9.2 → fivetran_connector_sdk-0.12.17.1}/src/fivetran_connector_sdk/__init__.py

@@ -26,18 +26,19 @@ from fivetran_connector_sdk.protos import common_pb2
 from fivetran_connector_sdk.protos import connector_sdk_pb2
 from fivetran_connector_sdk.protos import connector_sdk_pb2_grpc
 
-__version__ = "0.12.09.2"
+__version__ = "0.12.17.1"
 
 MAC_OS = "mac"
 WIN_OS = "windows"
 LINUX_OS = "linux"
 
-TESTER_VERSION = "0.24.1113.001"
+TESTER_VERSION = "0.24.1209.001"
 TESTER_FILENAME = "run_sdk_tester.jar"
 VERSION_FILENAME = "version.txt"
 UPLOAD_FILENAME = "code.zip"
 LAST_VERSION_CHECK_FILE = "_last_version_check"
 ROOT_LOCATION = ".ft_sdk_connector_tester"
+CONFIG_FILE = "_config.json"
 OUTPUT_FILES_DIR = "files"
 REQUIREMENTS_TXT = "requirements.txt"
 PYPI_PACKAGE_DETAILS_URL = "https://pypi.org/pypi/fivetran_connector_sdk/json"
@@ -57,9 +58,11 @@ COMMANDS_AND_SYNONYMS = {
 CONNECTION_SCHEMA_NAME_PATTERN = r'^[_a-z][_a-z0-9]*$'
 DEBUGGING = False
 EXECUTED_VIA_CLI = False
+PRODUCTION_BASE_URL = "https://api.fivetran.com"
 TABLES = {}
 
 JAVA_LONG_MAX_VALUE = 9223372036854775807
+MAX_CONFIG_FIELDS = 100
 
 
 class Logging:
@@ -507,6 +510,18 @@ def get_available_port():
     return None
 
 
+def update_base_url_if_required():
+    config_file_path = os.path.join(_tester_root_dir(), CONFIG_FILE)
+    if os.path.isfile(config_file_path):
+        with open(config_file_path, 'r') as f:
+            data = json.load(f)
+            base_url = data.get('production_base_url')
+            if base_url is not None:
+                global PRODUCTION_BASE_URL
+                PRODUCTION_BASE_URL = base_url
+                print_library_log(f"Updating PRODUCTION_BASE_URL to: {base_url}")
+
+
 class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
     def __init__(self, update, schema=None):
         """Initializes the Connector instance.
@@ -521,6 +536,8 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         self.configuration = None
         self.state = None
 
+        update_base_url_if_required()
+
     @staticmethod
     def fetch_requirements_from_file(file_path: str) -> list[str]:
         """Reads a requirements file and returns a list of dependencies.
@@ -650,6 +667,8 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         global EXECUTED_VIA_CLI
         EXECUTED_VIA_CLI = True
 
+        print_library_log("We support only `.py` files and a `requirements.txt` file as part of the code upload. *No other code files* are supported or uploaded during the deployment process. Ensure that your code is structured accordingly and all dependencies are listed in `requirements.txt`")
+
         validate_deploy_parameters(connection, deploy_key)
 
         _check_dict(configuration, True)
@@ -743,7 +762,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         if not config["secrets_list"]:
             del config["secrets_list"]
 
-        resp = rq.patch(f"https://api.fivetran.com/v1/connectors/{id}",
+        resp = rq.patch(f"{PRODUCTION_BASE_URL}/v1/connectors/{id}",
                         headers={"Authorization": f"Basic {deploy_key}"},
                         json={
                             "config": config,
@@ -768,7 +787,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         Returns:
             str: The connection ID, or None
         """
-        resp = rq.get(f"https://api.fivetran.com/v1/groups/{group_id}/connectors",
+        resp = rq.get(f"{PRODUCTION_BASE_URL}/v1/groups/{group_id}/connectors",
                       headers={"Authorization": f"Basic {deploy_key}"},
                       params={"schema": name})
         if not resp.ok:
@@ -793,7 +812,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         Returns:
             rq.Response: The response object.
         """
-        response = rq.post(f"https://api.fivetran.com/v1/connectors",
+        response = rq.post(f"{PRODUCTION_BASE_URL}/v1/connectors",
                            headers={"Authorization": f"Basic {deploy_key}"},
                            json={
                                "group_id": group_id,
@@ -885,7 +904,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             bool: True if the upload was successful, False otherwise.
         """
         print_library_log("Uploading your project...")
-        response = rq.post(f"https://api.fivetran.com/v1/deploy/{group_id}/{connection}",
+        response = rq.post(f"{PRODUCTION_BASE_URL}/v1/deploy/{group_id}/{connection}",
                            files={'file': open(local_path, 'rb')},
                            headers={"Authorization": f"Basic {deploy_key}"})
         if response.ok:
@@ -908,7 +927,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             bool: True if the cleanup was successful, False otherwise.
         """
         print_library_log("INFO: Cleaning up your uploaded project ")
-        response = rq.post(f"https://api.fivetran.com/v1/cleanup_code/{group_id}/{connection}",
+        response = rq.post(f"{PRODUCTION_BASE_URL}/v1/cleanup_code/{group_id}/{connection}",
                            headers={"Authorization": f"Basic {deploy_key}"})
         if response.ok:
             print("✓")
@@ -944,7 +963,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         Returns:
             tuple[str, str]: A tuple containing the group ID and group name.
         """
-        groups_url = "https://api.fivetran.com/v1/groups"
+        groups_url = f"{PRODUCTION_BASE_URL}/v1/groups"
 
         params = {"limit": 500}
         headers = {"Authorization": f"Basic {deploy_key}"}
@@ -1093,8 +1112,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                 print("✓")
             except:
                 shutil.rmtree(tester_root_dir)
-                raise RuntimeError(f"\nSEVERE: Failed to install the connector tester. Error details: ",
-                                   traceback.format_exc())
+                raise RuntimeError(f"\nSEVERE: Failed to install the connector tester. Error details: {traceback.format_exc()}")
 
         project_path = os.getcwd() if project_path is None else project_path
         self.validate_requirements_file(project_path, False)
@@ -1111,7 +1129,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         # server.wait_for_termination()
 
         try:
-            print_library_log(f"Running connector tester...")
+            print_library_log("Running connector tester...")
             for log_msg in self.__run_tester(java_exe, tester_root_dir, project_path, available_port):
                 print(log_msg, end="")
         except:
@@ -1146,12 +1164,11 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         Yields:
             str: Each line from the stream after replacing the matched pattern with the replacement string.
         """
-        pattern = re.compile(r'com\.fivetran\.fivetran_sdk\.tools\.testers\.\S+')
-        replacement = 'Fivetran SDK Tester'
+        pattern = r'com\.fivetran\.fivetran_sdk.*\.tools\.testers\.\S+'
 
         for line in iter(stream.readline, ""):
-            modified_line = pattern.sub(replacement, line)
-            yield modified_line
+            if not re.search(pattern, line):
+                yield line
 
     @staticmethod
     def __run_tester(java_exe: str, root_dir: str, project_path: str, port: int):
@@ -1504,6 +1521,8 @@ def validate_and_load_configuration(args, configuration):
         if os.path.isfile(json_filepath):
             with open(json_filepath, 'r') as fi:
                 configuration = json.load(fi)
+            if len(configuration) > MAX_CONFIG_FIELDS:
+                raise ValueError(f"Configuration field count exceeds maximum of {MAX_CONFIG_FIELDS}. Reduce the field count.")
         else:
             raise ValueError(
                 "Configuration must be provided as a JSON file. Please check your input. Reference: "

{fivetran_connector_sdk-0.12.9.2 → fivetran_connector_sdk-0.12.17.1}/src/fivetran_connector_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fivetran_connector_sdk
-Version: 0.12.9.2
+Version: 0.12.17.1
 Summary: Build custom connectors on Fivetran platform
 Author-email: Fivetran <developers@fivetran.com>
 Project-URL: Homepage, https://fivetran.com/docs/connectors/connector-sdk