fivetran-connector-sdk 1.4.2__tar.gz → 1.4.4__tar.gz

{fivetran_connector_sdk-1.4.2 → fivetran_connector_sdk-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fivetran_connector_sdk
-Version: 1.4.2
+Version: 1.4.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.4.2 → fivetran_connector_sdk-1.4.4}/src/fivetran_connector_sdk/__init__.py

@@ -32,13 +32,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.4.2"
+__version__ = "1.4.4"
 
 MAC_OS = "mac"
 WIN_OS = "windows"
 LINUX_OS = "linux"
 
-TESTER_VERSION = "0.25.0507.001"
+TESTER_VERSION = "0.25.0515.001"
 TESTER_FILENAME = "run_sdk_tester.jar"
 VERSION_FILENAME = "version.txt"
 UPLOAD_FILENAME = "code.zip"
@@ -84,8 +84,8 @@ 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"]
-DEFAULT_PYTHON_VERSION = "3.12.8"
+SUPPORTED_PYTHON_VERSIONS = ["3.12", "3.11", "3.10", "3.9"]
+DEFAULT_PYTHON_VERSION = "3.12"
 FIVETRAN_HD_AGENT_ID = "FIVETRAN_HD_AGENT_ID"
 UTF_8 = "utf-8"
 
@@ -324,8 +324,8 @@ def check_newer_version():
             data = json.loads(response.text)
             latest_version = data["info"]["version"]
             if __version__ < latest_version:
-                print_library_log(f"[notice] A new release of 'fivetran-connector-sdk' is available: {latest_version}\n" +
-                      "[notice] To update, run: pip install --upgrade fivetran-connector-sdk\n")
+                print_library_log(f"[notice] A new release of 'fivetran-connector-sdk' is available: {latest_version}")
+                print_library_log("[notice] To update, run: pip install --upgrade fivetran-connector-sdk")
 
             with open(last_check_file_path, 'w', encoding=UTF_8) as f_out:
                 f_out.write(f"{int(time.time())}")
@@ -555,7 +555,7 @@ def log_unused_deps_error(package_name: str, version: str):
           f" Current version: {version}", Logging.Level.SEVERE)
 
 
-def validate_deploy_parameters(connection, deploy_key, python_version):
+def validate_deploy_parameters(connection, deploy_key):
     if not deploy_key or not connection:
         print_library_log("The deploy command needs the following parameters:"
               "\n\tRequired:\n"
@@ -570,10 +570,6 @@ def validate_deploy_parameters(connection, deploy_key, python_version):
               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)
-    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)
 
 def print_library_log(message: str, level: Logging.Level = Logging.Level.INFO):
     """Logs a library message with the specified logging level.
@@ -844,6 +840,9 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         for requirement in corrupt_requirements:
             del tmp_requirements[requirement]
 
+        update_version_requirements = False
+        update_missing_requirements = False
+        update_unused_requirements = False
         if len(tmp_requirements) > 0:
             requirements = self.load_or_add_requirements_file(requirements_file_path)
 
@@ -857,8 +856,11 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                     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":
+                        update_version_requirements = True
                         for requirement in version_mismatch_deps:
                             requirements[requirement] = tmp_requirements[requirement]
+                    elif confirm.lower() == "n":
+                        print_library_log(f"Ignored the identified dependency version conflicts. These changes are NOT made to {REQUIREMENTS_TXT}")
 
             missing_deps = {key: tmp_requirements[key] for key in (tmp_requirements.keys() - requirements.keys())}
             if missing_deps:
@@ -867,9 +869,9 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                     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)
+                        print_library_log(f"Ignored dependencies identified as needed. These changes are NOT made to {REQUIREMENTS_TXT}. Please review the requirements as this can fail after deploy.")
                     elif confirm.lower() == "y":
+                        update_missing_requirements = True
                         for requirement in missing_deps:
                             requirements[requirement] = tmp_requirements[requirement]
 
@@ -882,29 +884,28 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                         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)
+                        print_library_log(f"Ignored libraries identified as unused. These changes are NOT made to {REQUIREMENTS_TXT}")
                     elif confirm.lower() == "y":
+                        update_unused_requirements = True
                         for requirement in unused_deps:
                             del requirements[requirement]
 
 
-            if is_deploy and (version_mismatch_deps or missing_deps or unused_deps):
-                if force:
-                    requirements = tmp_requirements
-
+            if update_version_requirements or update_missing_requirements or update_unused_requirements:
                 with open(requirements_file_path, "w", encoding=UTF_8) as file:
                     file.write("\n".join(requirements.values()))
-                print_library_log(f"`{REQUIREMENTS_TXT}` has been updated successfully")
+                    print_library_log(f"`{REQUIREMENTS_TXT}` has been updated successfully.")
 
         else:
             if os.path.exists(requirements_file_path):
-                print_library_log("`requirements.txt` is not required as no additional "
+                print_library_log(f"{REQUIREMENTS_TXT} is not required as no additional "
                       "Python libraries are required or all required libraries for "
                       "your code are pre-installed.", Logging.Level.WARNING)
                 with open(requirements_file_path, 'w') as file:
                     file.write("")
 
 
-        if is_deploy: print_library_log("Successful validation of requirements.txt")
+        if is_deploy: print_library_log(f"Validation of {REQUIREMENTS_TXT} completed.")
 
     def handle_unused_deps(self, unused_deps):
         if 'fivetran_connector_sdk' in unused_deps:
@@ -964,7 +965,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
 
         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, args.python_version)
+        validate_deploy_parameters(connection, deploy_key)
 
         _check_dict(configuration, True)
 
@@ -979,10 +980,8 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             "sync_method": "DIRECT"
         }
 
-        # args.python_version is already validated in validate_deploy_parameters - so its safe to add in connection_config
         if args.python_version:
             connection_config["python_version"] = args.python_version
-            print_library_log(f"Python version {args.python_version} to be used at runtime.", Logging.Level.INFO)
 
         self.validate_requirements_file(args.project_path, True, args.force)
 
@@ -1008,9 +1007,11 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                     print_library_log("Updating the connection...\n")
                     self.__upload_project(
                         args.project_path, deploy_key, group_id, group_name, connection)
-                    self.__update_connection(
+                    response = self.__update_connection(
                         args, connection_id, connection, group_name, connection_config, deploy_key, hd_agent_id)
                     print("✓")
+                    print_library_log(f"Python version {response.json()['data']['config']['python_version']} to be used at runtime.",
+                                      Logging.Level.INFO)
                     print_library_log(f"Connection ID: {connection_id}")
                     print_library_log(
                         f"Visit the Fivetran dashboard to manage the connection: https://fivetran.com/dashboard/connectors/{connection_id}/status")
@@ -1029,8 +1030,8 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                     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"Python version {response.json()['data']['config']['python_version']} to be used at runtime.",
+                                      Logging.Level.INFO)
                     print_library_log(f"Connection ID: {connection_id}")
                     print_library_log(
                         f"Visit the Fivetran dashboard to start the initial sync: https://fivetran.com/dashboard/connectors/{connection_id}/status")
@@ -1096,6 +1097,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             print_library_log(
                 f"Unable to update Connection '{name}' in destination '{group}', failed with error: '{response.json()['message']}'.", Logging.Level.SEVERE)
             os._exit(1)
+        return response
 
     @staticmethod
     def __handle_failing_tests_message_and_exit(resp, log_message):
@@ -1896,7 +1898,7 @@ def main():
     parser.add_argument("--destination", type=str, default=None, help="Destination name (aka 'group name')")
     parser.add_argument("--connection", type=str, default=None, help="Connection name (aka 'destination schema')")
     parser.add_argument("-f", "--force", action="store_true", help="Force update an existing connection")
-    parser.add_argument("--python-version", "--python", type=str, help=f"Supported Python versions you can use: {SUPPORTED_PYTHON_VERSIONS}. Defaults to 3.12.8")
+    parser.add_argument("--python-version", "--python", type=str, help=f"Supported Python versions you can use: {SUPPORTED_PYTHON_VERSIONS}. Defaults to {DEFAULT_PYTHON_VERSION}")
     parser.add_argument("--hybrid-deployment-agent-id", type=str, help="The Hybrid Deployment agent within the Fivetran system. If nothing is passed, the default agent of the destination is used.")
 
     args = parser.parse_args()

{fivetran_connector_sdk-1.4.2 → fivetran_connector_sdk-1.4.4}/src/fivetran_connector_sdk.egg-info/PKG-INFO

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