fivetran-connector-sdk 0.11.21.1__tar.gz → 0.12.12.1__tar.gz

{fivetran_connector_sdk-0.11.21.1 → fivetran_connector_sdk-0.12.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fivetran_connector_sdk
-Version: 0.11.21.1
+Version: 0.12.12.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.11.21.1 → fivetran_connector_sdk-0.12.12.1}/src/fivetran_connector_sdk/__init__.py

@@ -14,6 +14,7 @@ import sys
 import time
 import traceback
 import re
+import socket
 
 from concurrent import futures
 from datetime import datetime
@@ -25,13 +26,13 @@ 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.11.21.1"
+__version__ = "0.12.12.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"
@@ -55,8 +56,12 @@ COMMANDS_AND_SYNONYMS = {
 
 CONNECTION_SCHEMA_NAME_PATTERN = r'^[_a-z][_a-z0-9]*$'
 DEBUGGING = False
+EXECUTED_VIA_CLI = False
 TABLES = {}
 
+JAVA_LONG_MAX_VALUE = 9223372036854775807
+MAX_CONFIG_FIELDS = 100
+
 
 class Logging:
     class Level(IntEnum):
@@ -76,9 +81,10 @@ class Logging:
             message (str): The message to log.
         """
         if DEBUGGING:
-            print(message)
+            current_time = datetime.now().strftime("%b %d, %Y %I:%M:%S %p")
+            print(f"{current_time} {level.name}: {message}")
         else:
-            print(f'{{"level":"{level.name}", "message": "{message}", "message-origin": "connector_sdk"}}')
+            print(f'{{"level":"{level.name}", "message": "{message}", "message_origin": "connector_sdk"}}')
 
     @staticmethod
     def fine(message: str):
@@ -257,7 +263,7 @@ def check_newer_version():
             data = json.loads(response.text)
             latest_version = data["info"]["version"]
             if __version__ < latest_version:
-                print(f"[notice] A new release of 'fivetran-connector-sdk' is available: {latest_version}\n" +
+                print_library_log(f"[notice] A new release of 'fivetran-connector-sdk' is available: {latest_version}\n" +
                       f"[notice] To update, run: pip install --upgrade fivetran-connector-sdk\n")
 
             with open(last_check_file_path, 'w') as f_out:
@@ -265,7 +271,7 @@ def check_newer_version():
             break
         except Exception:
             retry_after = 2 ** index
-            print(f"WARNING: Unable to check if a newer version of `fivetran-connector-sdk` is available. Retrying again after {retry_after} seconds")
+            print_library_log(f"Unable to check if a newer version of `fivetran-connector-sdk` is available. Retrying again after {retry_after} seconds", Logging.Level.WARNING)
             time.sleep(retry_after)
 
 
@@ -316,10 +322,10 @@ def _map_data_to_columns(data: dict, columns: dict) -> dict:
 def map_inferred_data_type(k, mapped_data, v):
     # We can infer type from the value
     if isinstance(v, int):
-        if abs(v) > 2147483647:
-            mapped_data[k] = common_pb2.ValueType(long=v)
+        if abs(v) > JAVA_LONG_MAX_VALUE:
+            mapped_data[k] = common_pb2.ValueType(float=v)
         else:
-            mapped_data[k] = common_pb2.ValueType(int=v)
+            mapped_data[k] = common_pb2.ValueType(long=v)
     elif isinstance(v, float):
         mapped_data[k] = common_pb2.ValueType(float=v)
     elif isinstance(v, bool):
@@ -404,8 +410,8 @@ def _yield_check(stack):
     calling_code = stack[1].code_context[0]
     if f"{called_method}(" in calling_code:
         if 'yield' not in calling_code:
-            print(
-                f"SEVERE: Please add 'yield' to '{called_method}' operation on line {stack[1].lineno} in file '{stack[1].filename}'")
+            print_library_log(
+                f"Please add 'yield' to '{called_method}' operation on line {stack[1].lineno} in file '{stack[1].filename}'", Logging.Level.SEVERE)
             os._exit(1)
     else:
         # This should never happen
@@ -433,8 +439,8 @@ def _check_dict(incoming: dict, string_only: bool = False) -> dict:
     if string_only:
         for k, v in incoming.items():
             if not isinstance(v, str):
-                print(
-                    "SEVERE: All values in the configuration must be STRING. Please check your configuration and ensure that every value is a STRING.")
+                print_library_log(
+                    "All values in the configuration must be STRING. Please check your configuration and ensure that every value is a STRING.", Logging.Level.SEVERE)
                 os._exit(1)
 
     return incoming
@@ -454,28 +460,53 @@ def is_connection_name_valid(connection: str):
 
 
 def log_unused_deps_error(package_name: str, version: str):
-    print(f"ERROR: Please remove `{package_name}` from requirements.txt."
+    print_library_log(f"Please remove `{package_name}` from requirements.txt."
           f" The latest version of `{package_name}` is always available when executing your code."
-          f" Current version: {version}")
+          f" Current version: {version}", Logging.Level.SEVERE)
     os._exit(1)
 
 
 def validate_deploy_parameters(connection, deploy_key):
     if not deploy_key or not connection:
-        print("SEVERE: The deploy command needs the following parameters:"
+        print_library_log("The deploy command needs the following parameters:"
               "\n\tRequired:\n"
               "\t\t--api-key <BASE64-ENCODED-FIVETRAN-API-KEY-FOR-DEPLOYMENT>\n"
               "\t\t--connection <VALID-CONNECTOR-SCHEMA_NAME>\n"
               "\t(Optional):\n"
               "\t\t--destination <DESTINATION_NAME> (Becomes required if there are multiple destinations)\n"
-              "\t\t--configuration <CONFIGURATION_FILE> (Completely replaces the existing configuration)")
+              "\t\t--configuration <CONFIGURATION_FILE> (Completely replaces the existing configuration)", Logging.Level.SEVERE)
         os._exit(1)
     if not is_connection_name_valid(connection):
-        print(f"SEVERE: Connection name: {connection} is invalid!\n The connection name should start with an "
+        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.")
+              f"letters, or digits (0-9). Uppercase characters are not allowed.", 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.
+
+    Args:
+        level (Logging.Level): The logging level.
+        message (str): The message to log.
+    """
+    if DEBUGGING or EXECUTED_VIA_CLI:
+        current_time = datetime.now().strftime("%b %d, %Y %I:%M:%S %p")
+        print(f'{current_time} {level.name}: {message}')
+    else:
+        print(f'{{"level":"{level.name}", "message": "{message}", "message_origin": "library"}}')
+
+
+def is_port_in_use(port: int):
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        return s.connect_ex(('127.0.0.1', port)) == 0
+
+
+def get_available_port():
+    for port in range(50051, 50061):
+        if not is_port_in_use(port):
+            return port
+    return None
+
 
 class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
     def __init__(self, update, schema=None):
@@ -524,7 +555,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                 key = re.split(r"==|>=|<=|>|<", requirement)[0]
                 requirements_dict[key.lower()] = requirement.lower()
             except ValueError:
-                print(f"Error: Invalid requirement format: '{requirement}'")
+                print_library_log(f"Invalid requirement format: '{requirement}'", Logging.Level.SEVERE)
         return requirements_dict
 
     def validate_requirements_file(self, project_path: str, is_deploy: bool):
@@ -557,7 +588,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                                      (requirements.keys() & tmp_requirements.keys())
                                      if requirements[key] != tmp_requirements[key]}
             if version_mismatch_deps:
-                print("WARNING: We recommend using the current stable version for the following:")
+                print_library_log("We recommend using the current stable version for the following:", Logging.Level.WARNING)
                 print(version_mismatch_deps)
 
             missing_deps = {key: tmp_requirements[key] for key in (tmp_requirements.keys() - requirements.keys())}
@@ -569,11 +600,11 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                 self.handle_unused_deps(unused_deps)
         else:
             if os.path.exists(REQUIREMENTS_TXT):
-                print("WARNING: `requirements.txt` is not required as no additional "
+                print_library_log("`requirements.txt` is not required as no additional "
                       "Python libraries are required or all required libraries for "
-                      "your code are pre-installed.")
+                      "your code are pre-installed.", Logging.Level.WARNING)
 
-        if is_deploy: print("Successful validation of requirements.txt")
+        if is_deploy: print_library_log("Successful validation of requirements.txt")
 
     def handle_unused_deps(self, unused_deps):
         if 'fivetran_connector_sdk' in unused_deps:
@@ -581,18 +612,16 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         elif 'requests' in unused_deps:
             log_unused_deps_error("requests", "2.32.3")
         else:
-            print("INFO: The following dependencies are not needed, "
+            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)
 
     def handle_missing_deps(self, is_deploy, missing_deps):
-        log_level = "ERROR" if is_deploy else "WARNING"
-        print(log_level +
-              ":  Please include the following dependency libraries in requirements.txt, to be used by "
+        print_library_log("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"
-              "#workingwithrequirementstxtfile")
+              "#workingwithrequirementstxtfile", Logging.Level.SEVERE)
         print(*list(missing_deps.values()))
         if is_deploy:
             os._exit(1)
@@ -604,7 +633,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             with open(REQUIREMENTS_TXT, 'w'):
                 pass
             requirements = {}
-            print("WARNING: Adding `requirements.txt` file to your project folder.")
+            print_library_log("Adding `requirements.txt` file to your project folder.", Logging.Level.WARNING)
         return requirements
 
     # Call this method to deploy the connector to Fivetran platform
@@ -619,6 +648,11 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             connection (str): The connection name.
             configuration (dict): The configuration dictionary.
         """
+        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)
@@ -642,8 +676,8 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
 
         if connection_id:
             if service != 'connector_sdk':
-                print(
-                    f"SEVERE: The connection '{connection}' already exists and does not use the 'Connector SDK' service. You cannot update this connection.")
+                print_library_log(
+                    f"The connection '{connection}' already exists and does not use the 'Connector SDK' service. You cannot update this connection.", Logging.Level.SEVERE)
                 os._exit(1)
             else:
                 if force:
@@ -652,17 +686,17 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                     confirm = input(
                         f"The connection '{connection}' already exists in the destination '{group}'. Updating it will overwrite the existing code and configuration. Do you want to proceed with the update? (Y/N): ")
                 if confirm.lower() == "y":
-                    print("INFO: Updating the connection...\n")
+                    print_library_log("Updating the connection...\n")
                     self.__upload_project(
                         project_path, deploy_key, group_id, group_name, connection)
                     self.__update_connection(
                         connection_id, connection, group_name, connection_config, deploy_key)
                     print("✓")
-                    print(f"INFO: Connector ID: {connection_id}")
-                    print(
-                        f"INFO: Visit the Fivetran dashboard to manage the connection: https://fivetran.com/dashboard/connectors/{connection_id}/status")
+                    print_library_log(f"Connector ID: {connection_id}")
+                    print_library_log(
+                        f"Visit the Fivetran dashboard to manage the connection: https://fivetran.com/dashboard/connectors/{connection_id}/status")
                 else:
-                    print("INFO: Update canceled. The process is now terminating.")
+                    print_library_log("Update canceled. The process is now terminating.")
                     os._exit(1)
         else:
             self.__upload_project(project_path, deploy_key,
@@ -670,20 +704,22 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             response = self.__create_connection(
                 deploy_key, group_id, connection_config)
             if response.ok:
-                print(
-                    f"INFO: The connection '{connection}' has been created successfully.\n")
+                print_library_log(
+                    f"The connection '{connection}' has been created successfully.\n")
                 connection_id = response.json()['data']['id']
-                print(f"INFO: Connector ID: {connection_id}")
-                print(
-                    f"INFO: Visit the Fivetran dashboard to start the initial sync: https://fivetran.com/dashboard/connectors/{connection_id}/status")
+                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(
-                    f"SEVERE: Unable to create a new connection, failed with error: {response.json()['message']}")
+                print_library_log(
+                    f"Unable to create a new connection, failed with error: {response.json()['message']}", Logging.Level.SEVERE)
+                self.__cleanup_uploaded_project(deploy_key,group_id, connection)
+                print_library_log("Please try again with the deploy command after resolving the issue!")
                 os._exit(1)
 
     def __upload_project(self, project_path: str, deploy_key: str, group_id: str, group_name: str, connection: str):
-        print(
-            f"INFO: Deploying '{project_path}' to connection '{connection}' in destination '{group_name}'.\n")
+        print_library_log(
+            f"Deploying '{project_path}' to connection '{connection}' in destination '{group_name}'.\n")
         upload_file_path = self.__create_upload_file(project_path)
         upload_result = self.__upload(
             upload_file_path, deploy_key, group_id, connection)
@@ -691,6 +727,11 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         if not upload_result:
             os._exit(1)
 
+    def __cleanup_uploaded_project(self, deploy_key: str, group_id: str, connection: str):
+        cleanup_result = self.__cleanup_uploaded_code(deploy_key, group_id, connection)
+        if not cleanup_result:
+            os._exit(1)
+
     @staticmethod
     def __update_connection(id: str, name: str, group: str, config: dict, deploy_key: str):
         """Updates the connection with the given ID, name, group, configuration, and deployment key.
@@ -713,8 +754,8 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                         })
 
         if not resp.ok:
-            print(
-                f"SEVERE: Unable to update Connection '{name}' in destination '{group}', failed with error: '{resp.json()['message']}'.")
+            print_library_log(
+                f"Unable to update Connection '{name}' in destination '{group}', failed with error: '{resp.json()['message']}'.", Logging.Level.SEVERE)
             os._exit(1)
 
     @staticmethod
@@ -734,8 +775,8 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                       headers={"Authorization": f"Basic {deploy_key}"},
                       params={"schema": name})
         if not resp.ok:
-            print(
-                f"SEVERE: Unable to fetch connection list in destination '{group}'")
+            print_library_log(
+                f"Unable to fetch connection list in destination '{group}'", Logging.Level.SEVERE)
             os._exit(1)
 
         if resp.json()['data']['items']:
@@ -776,7 +817,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         Returns:
             str: The path to the upload file.
         """
-        print("INFO: Packaging your project for upload...")
+        print_library_log("Packaging your project for upload...")
         zip_file_path = self.__zip_folder(project_path)
         print("✓")
         return zip_file_path
@@ -803,8 +844,8 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                     zipf.write(file_path, arcname)
 
         if not connector_file_exists:
-            print(
-                "SEVERE: The 'connector.py' file is missing. Please ensure that 'connector.py' is present in your project directory, and that the file name is in lowercase letters. All custom connectors require this file because Fivetran calls it to start a sync.")
+            print_library_log(
+                "The 'connector.py' file is missing. Please ensure that 'connector.py' is present in your project directory, and that the file name is in lowercase letters. All custom connectors require this file because Fivetran calls it to start a sync.", Logging.Level.SEVERE)
             os._exit(1)
         return upload_filepath
 
@@ -846,15 +887,37 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         Returns:
             bool: True if the upload was successful, False otherwise.
         """
-        print("INFO: Uploading your project...", end="", flush=True)
-        response = rq.post(f"https://api.fivetran.com/v2/deploy/{group_id}/{connection}",
+        print_library_log("Uploading your project...")
+        response = rq.post(f"https://api.fivetran.com/v1/deploy/{group_id}/{connection}",
                            files={'file': open(local_path, 'rb')},
                            headers={"Authorization": f"Basic {deploy_key}"})
         if response.ok:
             print("✓")
             return True
 
-        print("SEVERE: Unable to upload the project, failed with error: ", response.reason)
+        print_library_log(f"Unable to upload the project, failed with error: {response.reason}", Logging.Level.SEVERE)
+        return False
+
+    @staticmethod
+    def __cleanup_uploaded_code(deploy_key: str, group_id: str, connection: str) -> bool:
+        """Cleans up the uploaded code file for the specified group and connection, if creation fails.
+
+        Args:
+            deploy_key (str): The deployment key.
+            group_id (str): The group ID.
+            connection (str): The connection name.
+
+        Returns:
+            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}",
+                           headers={"Authorization": f"Basic {deploy_key}"})
+        if response.ok:
+            print("✓")
+            return True
+
+        print_library_log(f"SEVERE: Unable to cleanup the project, failed with error: {response.reason}", Logging.Level.SEVERE)
         return False
 
     @staticmethod
@@ -891,23 +954,23 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         resp = rq.get(groups_url, headers=headers, params=params)
 
         if not resp.ok:
-            print(
-                f"SEVERE: Unable to retrieve destination details. The request failed with status code: {resp.status_code}. Please ensure you're using a valid base64-encoded API key and try again.")
+            print_library_log(
+                f"Unable to retrieve destination details. The request failed with status code: {resp.status_code}. Please ensure you're using a valid base64-encoded API key and try again.", Logging.Level.SEVERE)
             os._exit(1)
 
         data = resp.json().get("data", {})
         groups = data.get("items")
 
         if not groups:
-            print("SEVERE: No destinations defined in the account")
+            print_library_log("No destinations defined in the account", Logging.Level.SEVERE)
             os._exit(1)
 
         if not group:
             if len(groups) == 1:
                 return groups[0]['id'], groups[0]['name']
             else:
-                print(
-                    "SEVERE: Destination name is required when there are multiple destinations in the account")
+                print_library_log(
+                    "Destination name is required when there are multiple destinations in the account", Logging.Level.SEVERE)
                 os._exit(1)
         else:
             while True:
@@ -924,8 +987,8 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                 data = resp.json().get("data", {})
                 groups = data.get("items", [])
 
-        print(
-            f"SEVERE: The specified destination '{group}' was not found in your account.")
+        print_library_log(
+            f"The specified destination '{group}' was not found in your account.", Logging.Level.SEVERE)
         os._exit(1)
 
     # Call this method to run the connector in production
@@ -950,7 +1013,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         Logging.LOG_LEVEL = log_level
 
         if not DEBUGGING:
-            print(f"Running on fivetran_connector_sdk: {__version__}")
+            print_library_log(f"Running on fivetran_connector_sdk: {__version__}")
 
         server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))
         connector_sdk_pb2_grpc.add_ConnectorServicer_to_server(self, server)
@@ -1006,7 +1069,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             download_filename = f"sdk-connector-tester-{os_name}-{TESTER_VERSION}.zip"
             download_filepath = os.path.join(tester_root_dir, download_filename)
             try:
-                print(f"INFO: Downloading connector tester version: {TESTER_VERSION} ", end="", flush=True)
+                print_library_log(f"Downloading connector tester version: {TESTER_VERSION} ")
                 download_url = f"https://github.com/fivetran/fivetran_sdk_tools/releases/download/{TESTER_VERSION}/{download_filename}"
                 r = rq.get(download_url)
                 if r.ok:
@@ -1038,15 +1101,21 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
 
         project_path = os.getcwd() if project_path is None else project_path
         self.validate_requirements_file(project_path, False)
-        print(f"INFO: Debugging connector at: {project_path}")
-        server = self.run(50051, configuration, state, log_level=log_level)
+        print_library_log(f"Debugging connector at: {project_path}")
+        available_port = get_available_port()
+
+        if available_port is None:
+            raise RuntimeError("SEVERE: Unable to allocate a port in the range 50051-50061. "
+                               "Please ensure a port is available and try again")
+
+        server = self.run(available_port, configuration, state, log_level=log_level)
 
         # Uncomment this to run the tester manually
         # server.wait_for_termination()
 
         try:
-            print(f"INFO: Running connector tester...")
-            for log_msg in self.__run_tester(java_exe, tester_root_dir, project_path, 50051):
+            print_library_log(f"Running connector tester...")
+            for log_msg in self.__run_tester(java_exe, tester_root_dir, project_path, available_port):
                 print(log_msg, end="")
         except:
             print(traceback.format_exc())
@@ -1080,15 +1149,14 @@ 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 = 50051):
+    def __run_tester(java_exe: str, root_dir: str, project_path: str, port: int):
         """Runs the connector tester.
 
         Args:
@@ -1168,10 +1236,16 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         if not self.schema_method:
             return connector_sdk_pb2.SchemaResponse(schema_response_not_supported=True)
         else:
-            configuration = self.configuration if self.configuration else request.configuration
-            response = self.schema_method(configuration)
-            self.process_tables(response)
-            return connector_sdk_pb2.SchemaResponse(without_schema=common_pb2.TableList(tables=TABLES.values()))
+            try:
+                configuration = self.configuration if self.configuration else request.configuration
+                response = self.schema_method(configuration)
+                self.process_tables(response)
+                return connector_sdk_pb2.SchemaResponse(without_schema=common_pb2.TableList(tables=TABLES.values()))
+
+            except Exception as e:
+                tb = traceback.format_exc()
+                error_message = f"Error: {str(e)}\n{tb}"
+                raise RuntimeError(error_message) from e
 
     def process_tables(self, response):
         for entry in response:
@@ -1229,7 +1303,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         elif type.upper() == "SHORT":
             column.type = common_pb2.DataType.SHORT
         elif type.upper() == "INT":
-            column.type = common_pb2.DataType.SHORT
+            column.type = common_pb2.DataType.INT
         elif type.upper() == "LONG":
             column.type = common_pb2.DataType.LONG
         elif type.upper() == "DECIMAL":
@@ -1280,6 +1354,11 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             if str(e) != "'NoneType' object is not iterable":
                 raise e
 
+        except Exception as e:
+            tb = traceback.format_exc()
+            error_message = f"Error: {str(e)}\n{tb}"
+            raise RuntimeError(error_message) from e
+
 
 def find_connector_object(project_path) -> Connector:
     """Finds the connector object in the given project path.
@@ -1303,8 +1382,8 @@ def find_connector_object(project_path) -> Connector:
             if '<fivetran_connector_sdk.Connector object at' in str(obj_attr):
                 return obj_attr
 
-    print(
-        "SEVERE: The connector object is missing. Please ensure that you have defined a connector object using the correct syntax in your `connector.py` file. Reference: https://fivetran.com/docs/connectors/connector-sdk/technical-reference#technicaldetailsrequiredobjectconnector")
+    print_library_log(
+        "The connector object is missing. Please ensure that you have defined a connector object using the correct syntax in your `connector.py` file. Reference: https://fivetran.com/docs/connectors/connector-sdk/technical-reference#technicaldetailsrequiredobjectconnector", Logging.Level.SEVERE)
     sys.exit(1)
 
 
@@ -1371,6 +1450,8 @@ def main():
     """The main entry point for the script.
     Parses command line arguments and passes them to connector object methods
     """
+    global EXECUTED_VIA_CLI
+    EXECUTED_VIA_CLI = True
 
     parser = argparse.ArgumentParser(allow_abbrev=False)
 
@@ -1389,7 +1470,7 @@ def main():
     args = parser.parse_args()
 
     if args.command.lower() == "version":
-        print("fivetran_connector_sdk " + __version__)
+        print_library_log("fivetran_connector_sdk " + __version__)
         return
 
     connector_object = find_connector_object(args.project_path)
@@ -1406,7 +1487,7 @@ def main():
 
     if args.command.lower() == "deploy":
         if args.state:
-            print("WARNING: 'state' parameter is not used for 'deploy' command")
+            print_library_log("'state' parameter is not used for 'deploy' command", Logging.Level.WARNING)
         connector_object.deploy(args.project_path, args.force, ft_deploy_key, ft_group, ft_connection, configuration)
 
     elif args.command.lower() == "debug":
@@ -1425,11 +1506,16 @@ 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: "
                 "https://fivetran.com/docs/connectors/connector-sdk/detailed-guide#workingwithconfigurationjsonfile")
     else:
+        json_filepath = os.path.join(args.project_path, "configuration.json")
+        if os.path.exists(json_filepath):
+            print_library_log("Configuration file detected in the project, but no configuration input provided via the command line", Logging.Level.WARNING)
         configuration = {}
     return configuration
 
@@ -1452,14 +1538,14 @@ def reset_local_file_directory(args):
     confirm = input(
         "This will delete your current state and `warehouse.db` files. Do you want to continue? (Y/N): ")
     if confirm.lower() != "y":
-        print("INFO: Reset canceled")
+        print_library_log("Reset canceled")
     else:
         try:
             if os.path.exists(files_path) and os.path.isdir(files_path):
                 shutil.rmtree(files_path)
-            print("INFO: Reset Successful")
+            print_library_log("Reset Successful")
         except Exception as e:
-            print("ERROR: Reset Failed")
+            print_library_log("Reset Failed", Logging.Level.SEVERE)
             raise e
 
 

{fivetran_connector_sdk-0.11.21.1 → fivetran_connector_sdk-0.12.12.1}/src/fivetran_connector_sdk.egg-info/PKG-INFO

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