fivetran-connector-sdk 1.1.2__tar.gz → 1.1.4__tar.gz

{fivetran_connector_sdk-1.1.2 → fivetran_connector_sdk-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fivetran_connector_sdk
-Version: 1.1.2
+Version: 1.1.4
 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-1.1.2 → fivetran_connector_sdk-1.1.4}/src/fivetran_connector_sdk/__init__.py

@@ -23,6 +23,7 @@ from datetime import datetime
 from enum import IntEnum
 from google.protobuf import timestamp_pb2
 from zipfile import ZipFile, ZIP_DEFLATED
+from http import HTTPStatus
 
 from fivetran_connector_sdk.protos import common_pb2
 from fivetran_connector_sdk.protos import connector_sdk_pb2
@@ -30,13 +31,13 @@ from fivetran_connector_sdk.protos import connector_sdk_pb2_grpc
 
 # Version format: <major_version>.<minor_version>.<patch_version>
 # (where Major Version = 1 for GA, Minor Version is incremental MM from Jan 25 onwards, Patch Version is incremental within a month)
-__version__ = "1.1.2"
+__version__ = "1.1.4"
 
 MAC_OS = "mac"
 WIN_OS = "windows"
 LINUX_OS = "linux"
 
-TESTER_VERSION = "0.25.0130.001"
+TESTER_VERSION = "0.25.0225.001"
 TESTER_FILENAME = "run_sdk_tester.jar"
 VERSION_FILENAME = "version.txt"
 UPLOAD_FILENAME = "code.zip"
@@ -76,7 +77,7 @@ INSTALLATION_SCRIPT = "installation.sh"
 DRIVERS = "drivers"
 JAVA_LONG_MAX_VALUE = 9223372036854775807
 MAX_CONFIG_FIELDS = 100
-SUPPORTED_PYTHON_VERSIONS = {"3.12.8", "3.11.11", "3.10.16", "3.9.21"}
+SUPPORTED_PYTHON_VERSIONS = ["3.12.8", "3.11.11", "3.10.16", "3.9.21"]
 DEFAULT_PYTHON_VERSION = "3.12.8"
 FIVETRAN_HD_AGENT_ID = "FIVETRAN_HD_AGENT_ID"
 
@@ -502,12 +503,12 @@ def validate_deploy_parameters(connection, deploy_key, python_version):
               "\t\t--destination <DESTINATION_NAME> (Becomes required if there are multiple destinations)\n"
               "\t\t--configuration <CONFIGURATION_FILE> (Completely replaces the existing configuration)", Logging.Level.SEVERE)
         os._exit(1)
-    if not is_connection_name_valid(connection):
+    elif not is_connection_name_valid(connection):
         print_library_log(f"Connection name: {connection} is invalid!\n The connection name should start with an "
               f"underscore or a lowercase letter (a-z), followed by any combination of underscores, lowercase "
               f"letters, or digits (0-9). Uppercase characters are not allowed.", Logging.Level.SEVERE)
         os._exit(1)
-    if python_version and python_version not in SUPPORTED_PYTHON_VERSIONS:
+    elif python_version and python_version not in SUPPORTED_PYTHON_VERSIONS:
         print_library_log(f"This Python version is not supported: {python_version}. "
                           f"We only support the following python versions: {SUPPORTED_PYTHON_VERSIONS} ", Logging.Level.SEVERE)
         os._exit(1)
@@ -774,29 +775,48 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             if version_mismatch_deps:
                 print_library_log("We recommend using the current stable version for the following:", Logging.Level.WARNING)
                 print(version_mismatch_deps)
+                if is_deploy and not force:
+                    confirm = input(
+                            f"Would you like us to update {REQUIREMENTS_TXT} to the current stable versions of the dependent libraries? (Y/N):")
+                    if confirm.lower() == "y":
+                        for requirement in version_mismatch_deps:
+                            requirements[requirement] = tmp_requirements[requirement]
 
             missing_deps = {key: tmp_requirements[key] for key in (tmp_requirements.keys() - requirements.keys())}
             if missing_deps:
                 self.handle_missing_deps(missing_deps)
+                if is_deploy and not force:
+                    confirm = input(
+                            f"Would you like us to update {REQUIREMENTS_TXT} to add missing dependent libraries? (Y/N):")
+                    if confirm.lower() == "n":
+                        print_library_log(f"Please fix your {REQUIREMENTS_TXT} file to proceed with deployment.")
+                        os._exit(1)
+                    elif confirm.lower() == "y":
+                        for requirement in missing_deps:
+                            requirements[requirement] = tmp_requirements[requirement]
 
             unused_deps = list(requirements.keys() - tmp_requirements.keys())
             if unused_deps:
                 self.handle_unused_deps(unused_deps)
+                if is_deploy and not force:
+                    confirm = input(f"Would you like us to update {REQUIREMENTS_TXT} to remove the unused libraries? (Y/N):")
+                    if confirm.lower() == "n":
+                        if 'fivetran_connector_sdk' in unused_deps or 'requests' in unused_deps:
+                            print_library_log(f"Please fix your {REQUIREMENTS_TXT} file by removing pre-installed dependencies to proceed with deployment.")
+                            os._exit(1)
+                    elif confirm.lower() == "y":
+                        for requirement in unused_deps:
+                            del requirements[requirement]
+
 
             if is_deploy and (version_mismatch_deps or missing_deps or unused_deps):
                 if force:
-                    confirm = "y"
-                else:
-                    confirm = input("We detected issues in your requirements.txt. "
-                                    "Would you like us to update it to reflect the necessary changes? (Y/N):")
-                if confirm.lower() == "y":
-                    with open(REQUIREMENTS_TXT, "w") as file:
-                        file.write("\n".join(tmp_requirements.values()))
-                    print_library_log(f"`{REQUIREMENTS_TXT}` has been updated successfully")
-                else:
-                    if missing_deps or 'fivetran_connector_sdk' in unused_deps or 'requests' in unused_deps:
-                        print_library_log(f"Please fix your {REQUIREMENTS_TXT} file to proceed with deployment.")
-                        os._exit(1)
+                    requirements = tmp_requirements
+
+                with open(REQUIREMENTS_TXT, "w") as file:
+                    file.write("\n".join(requirements.values()))
+                print_library_log(f"`{REQUIREMENTS_TXT}` has been updated successfully")
+
         else:
             if os.path.exists(REQUIREMENTS_TXT):
                 print_library_log("`requirements.txt` is not required as no additional "
@@ -808,15 +828,14 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
     def handle_unused_deps(self, unused_deps):
         if 'fivetran_connector_sdk' in unused_deps:
             log_unused_deps_error("fivetran_connector_sdk", __version__)
-        elif 'requests' in unused_deps:
+        if 'requests' in unused_deps:
             log_unused_deps_error("requests", "2.32.3")
-        else:
-            print_library_log("The following dependencies are not needed, "
-                  "they are not used or already installed. Please remove them from requirements.txt:")
-            print(*unused_deps)
+        print_library_log("The following dependencies are not needed, "
+              f"they are not used or already installed. Please remove them from {REQUIREMENTS_TXT}:")
+        print(*unused_deps)
 
     def handle_missing_deps(self, missing_deps):
-        print_library_log("Please include the following dependency libraries in requirements.txt, to be used by "
+        print_library_log(f"Please include the following dependency libraries in {REQUIREMENTS_TXT}, to be used by "
               "Fivetran production. "
               "For more information, please visit: "
               "https://fivetran.com/docs/connectors/connector-sdk/detailed-guide"
@@ -909,15 +928,18 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                                   group_id, group_name, connection)
             response = self.__create_connection(
                 deploy_key, group_id, connection_config, hd_agent_id)
-            if response.ok:
-                print_library_log(
-                    f"The connection '{connection}' has been created successfully.\n")
-                connection_id = response.json()['data']['id']
-                # Python Version is not passed into connection_config as default value will be picked up from ConnectorSdkCredentials.java class.
-                print_library_log(f"Python Version: {args.python_version if args.python_version else DEFAULT_PYTHON_VERSION}", Logging.Level.INFO)
-                print_library_log(f"Connector ID: {connection_id}")
-                print_library_log(
-                    f"Visit the Fivetran dashboard to start the initial sync: https://fivetran.com/dashboard/connectors/{connection_id}/status")
+            if response.ok and response.status_code == HTTPStatus.CREATED:
+                if Connector.__are_setup_tests_failing(response):
+                    Connector.__handle_failing_tests_message_and_exit(response, "The connection was created, but setup tests failed!")
+                else:
+                    print_library_log(
+                        f"The connection '{connection}' has been created successfully.\n")
+                    connection_id = response.json()['data']['id']
+                    # Python Version is not passed into connection_config as default value will be picked up from ConnectorSdkCredentials.java class.
+                    print_library_log(f"Python Version: {args.python_version if args.python_version else DEFAULT_PYTHON_VERSION}", Logging.Level.INFO)
+                    print_library_log(f"Connector ID: {connection_id}")
+                    print_library_log(
+                        f"Visit the Fivetran dashboard to start the initial sync: https://fivetran.com/dashboard/connectors/{connection_id}/status")
             else:
                 print_library_log(
                     f"Unable to create a new connection, failed with error: {response.json()['message']}", Logging.Level.SEVERE)
@@ -956,7 +978,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         if not args.configuration:
             del config["secrets_list"]
 
-        resp = rq.patch(f"{PRODUCTION_BASE_URL}/v1/connectors/{id}",
+        response = rq.patch(f"{PRODUCTION_BASE_URL}/v1/connectors/{id}",
                         headers={"Authorization": f"Basic {deploy_key}"},
                         json={
                             "config": config,
@@ -964,11 +986,53 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                             "run_setup_tests": True
                         })
 
-        if not resp.ok:
+        if response.ok and response.status_code == HTTPStatus.OK:
+            if Connector.__are_setup_tests_failing(response):
+                Connector.__handle_failing_tests_message_and_exit(response, "The connection was updated, but setup tests failed!")
+            else:
+                print_library_log(f"Connection '{name}' in group '{group}' updated successfully.", Logging.Level.INFO)
+
+        else:
             print_library_log(
-                f"Unable to update Connection '{name}' in destination '{group}', failed with error: '{resp.json()['message']}'.", Logging.Level.SEVERE)
+                f"Unable to update Connection '{name}' in destination '{group}', failed with error: '{response.json()['message']}'.", Logging.Level.SEVERE)
             os._exit(1)
 
+    @staticmethod
+    def __handle_failing_tests_message_and_exit(resp, log_message):
+        print_library_log(log_message, Logging.Level.SEVERE)
+        Connector.__print_failing_setup_tests(resp)
+        connection_id = resp.json().get('data', {}).get('id')
+        print_library_log(f"Connector ID: {connection_id}")
+        print_library_log("Please try again with the deploy command after resolving the issue!")
+        os._exit(1)
+
+    @staticmethod
+    def __are_setup_tests_failing(response) -> bool:
+        """Checks for failed setup tests in the response and returns True if any test has failed, otherwise False."""
+        response_json = response.json()
+        setup_tests = response_json.get("data", {}).get("setup_tests", [])
+
+        # Return True if any test has "FAILED" status, otherwise False
+        return any(test.get("status") == "FAILED" or test.get("status") == "JOB_FAILED" for test in setup_tests)
+
+
+    @staticmethod
+    def __print_failing_setup_tests(response):
+        """Checks for failed setup tests in the response and print errors."""
+        response_json = response.json()
+        setup_tests = response_json.get("data", {}).get("setup_tests", [])
+
+        # Collect failed setup tests
+        failed_tests = [test for test in setup_tests if test.get("status") == "FAILED" or test.get("status") == "JOB_FAILED"]
+
+        if failed_tests:
+            print_library_log("Following setup tests have failed!", Logging.Level.WARNING)
+            for test in failed_tests:
+                print_library_log(f"Test: {test.get('title')}", Logging.Level.WARNING)
+                print_library_log(f"Status: {test.get('status')}", Logging.Level.WARNING)
+                print_library_log(f"Message: {test.get('message')}", Logging.Level.WARNING)
+
+
     @staticmethod
     def __get_connection_id(name: str, group: str, group_id: str, deploy_key: str) -> Optional[Tuple[str, str]]:
         """Retrieves the connection ID for the specified connection schema name, group, and deployment key.

{fivetran_connector_sdk-1.1.2 → fivetran_connector_sdk-1.1.4}/src/fivetran_connector_sdk.egg-info/PKG-INFO

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