fivetran-connector-sdk 1.2.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

fivetran_connector_sdk/__init__.py

@@ -31,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.2.0"
+__version__ = "1.3.0"
 
 MAC_OS = "mac"
 WIN_OS = "windows"
 LINUX_OS = "linux"
 
-TESTER_VERSION = "0.25.0225.001"
+TESTER_VERSION = "0.25.0403.001"
 TESTER_FILENAME = "run_sdk_tester.jar"
 VERSION_FILENAME = "version.txt"
 UPLOAD_FILENAME = "code.zip"
@@ -49,6 +49,8 @@ REQUIREMENTS_TXT = "requirements.txt"
 PYPI_PACKAGE_DETAILS_URL = "https://pypi.org/pypi/fivetran_connector_sdk/json"
 ONE_DAY_IN_SEC = 24 * 60 * 60
 MAX_RETRIES = 3
+LOGGING_PREFIX = "Fivetran-Connector-SDK"
+LOGGING_DELIMITER = ": "
 VIRTUAL_ENV_CONFIG = "pyvenv.cfg"
 
 # Compile patterns used in the implementation
@@ -162,7 +164,8 @@ class Operations:
         Returns:
             list[connector_sdk_pb2.UpdateResponse]: A list of update responses.
         """
-        _yield_check(inspect.stack())
+        if DEBUGGING:
+            _yield_check(inspect.stack())
 
         responses = []
 
@@ -200,7 +203,8 @@ class Operations:
         Returns:
             connector_sdk_pb2.UpdateResponse: The update response.
         """
-        _yield_check(inspect.stack())
+        if DEBUGGING:
+            _yield_check(inspect.stack())
 
         table = get_renamed_table_name(table)
         columns = _get_columns(table)
@@ -226,7 +230,8 @@ class Operations:
         Returns:
             connector_sdk_pb2.UpdateResponse: The delete response.
         """
-        _yield_check(inspect.stack())
+        if DEBUGGING:
+            _yield_check(inspect.stack())
 
         table = get_renamed_table_name(table)
         columns = _get_columns(table)
@@ -262,7 +267,9 @@ class Operations:
         Returns:
             connector_sdk_pb2.UpdateResponse: The checkpoint response.
         """
-        _yield_check(inspect.stack())
+        if DEBUGGING:
+            _yield_check(inspect.stack())
+
         return connector_sdk_pb2.UpdateResponse(
             operation=connector_sdk_pb2.Operation(checkpoint=connector_sdk_pb2.Checkpoint(
                 state_json=json.dumps(state))))
@@ -401,10 +408,7 @@ def map_defined_data_type(columns, k, mapped_data, v):
         mapped_data[k] = common_pb2.ValueType(naive_datetime=timestamp)
     elif columns[k].type == common_pb2.DataType.UTC_DATETIME:
         timestamp = timestamp_pb2.Timestamp()
-        if '.' in v:
-            dt = datetime.strptime(v, "%Y-%m-%dT%H:%M:%S.%f%z")
-        else:
-            dt = datetime.strptime(v, "%Y-%m-%dT%H:%M:%S%z")
+        dt = v if isinstance(v, datetime) else _parse_datetime_str(v)
         timestamp.FromDatetime(dt)
         mapped_data[k] = common_pb2.ValueType(utc_datetime=timestamp)
     elif columns[k].type == common_pb2.DataType.BINARY:
@@ -420,6 +424,10 @@ def map_defined_data_type(columns, k, mapped_data, v):
         raise ValueError(f"Unsupported data type encountered: {columns[k].type}. Please use valid data types.")
 
 
+def _parse_datetime_str(dt):
+    return datetime.strptime(dt, "%Y-%m-%dT%H:%M:%S.%f%z" if '.' in dt else "%Y-%m-%dT%H:%M:%S%z")
+
+
 def _yield_check(stack):
     """Checks for the presence of 'yield' in the calling code.
     Args:
@@ -432,8 +440,6 @@ def _yield_check(stack):
     # the file paths. This can lead to unexpected behavior, such as yield returning None or
     # the failure to retrieve the module inside a frozen app
     # (Reference: https://github.com/pyinstaller/pyinstaller/issues/5963)
-    if not DEBUGGING:
-        return
 
     called_method = stack[0].function
     calling_code = stack[1].code_context[0]
@@ -524,9 +530,9 @@ def print_library_log(message: str, level: Logging.Level = Logging.Level.INFO):
     if DEBUGGING or EXECUTED_VIA_CLI:
         current_time = datetime.now().strftime("%b %d, %Y %I:%M:%S %p")
         escaped_message = json.dumps(message).strip('"')
-        print(f"{current_time} {level.name}: {escaped_message}")
+        print(f"{current_time} {level.name} {LOGGING_PREFIX}: {escaped_message}")
     else:
-        escaped_message = json.dumps(message)
+        escaped_message = json.dumps(LOGGING_PREFIX + LOGGING_DELIMITER + message)
         log_message = f'{{"level":"{level.name}", "message": {escaped_message}, "message_origin": "library"}}'
         print(log_message)
 
@@ -925,7 +931,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                     self.__update_connection(
                         args, connection_id, connection, group_name, connection_config, deploy_key, hd_agent_id)
                     print("✓")
-                    print_library_log(f"Connector ID: {connection_id}")
+                    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")
                 else:
@@ -945,7 +951,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                     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"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")
             else:
@@ -986,13 +992,19 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         if not args.configuration:
             del config["secrets_list"]
 
+        json_payload = {
+            "config": config,
+            "run_setup_tests": True
+        }
+
+        # hybrid_deployment_agent_id is optional when redeploying your connection.
+        # Customer can use it to change existing hybrid_deployment_agent_id.
+        if hd_agent_id:
+            json_payload["hybrid_deployment_agent_id"] = hd_agent_id
+
         response = rq.patch(f"{PRODUCTION_BASE_URL}/v1/connectors/{id}",
                         headers={"Authorization": f"Basic {deploy_key}"},
-                        json={
-                            "config": config,
-                            "hybrid_deployment_agent_id": hd_agent_id,
-                            "run_setup_tests": True
-                        })
+                        json=json_payload)
 
         if response.ok and response.status_code == HTTPStatus.OK:
             if Connector.__are_setup_tests_failing(response):
@@ -1010,7 +1022,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         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(f"Connection ID: {connection_id}")
         print_library_log("Please try again with the deploy command after resolving the issue!")
         os._exit(1)
 
@@ -1755,6 +1767,20 @@ def edit_distance(first_string: str, second_string: str) -> int:
     return previous_row[second_string_length]
 
 
+def get_input_from_cli(prompt : str, default_value: str) -> str:
+    """
+    Prompts the user for input.
+    """
+    if default_value:
+        value = input(f"{prompt} [Default : {default_value}]: ").strip() or default_value
+    else:
+        value = input(f"{prompt}: ").strip()
+
+    if not value:
+        raise ValueError("Missing required input: Expected a value but received None")
+    return value or None
+
+
 def main():
     """The main entry point for the script.
     Parses command line arguments and passes them to connector object methods
@@ -1794,9 +1820,9 @@ def main():
         sys.exit(1)
 
     # Process optional args
-    ft_group = args.destination if args.destination else os.getenv('FIVETRAN_DESTINATION_NAME', None)
-    ft_connection = args.connection if args.connection else os.getenv('FIVETRAN_CONNECTION_NAME', None)
-    ft_deploy_key = args.api_key if args.api_key else os.getenv('FIVETRAN_API_KEY', None)
+    ft_group = args.destination if args.destination else None
+    ft_connection = args.connection if args.connection else None
+    ft_deploy_key = args.api_key if args.api_key else None
     hd_agent_id = args.hybrid_deployment_agent_id if args.hybrid_deployment_agent_id else os.getenv(FIVETRAN_HD_AGENT_ID, None)
     configuration = args.configuration if args.configuration else None
     state = args.state if args.state else os.getenv('FIVETRAN_STATE', None)
@@ -1804,14 +1830,27 @@ def main():
     configuration = validate_and_load_configuration(args, configuration)
     state = validate_and_load_state(args, state)
 
+    FIVETRAN_API_KEY = os.getenv('FIVETRAN_API_KEY', None)
+    FIVETRAN_DESTINATION_NAME = os.getenv('FIVETRAN_DESTINATION_NAME', None)
+    FIVETRAN_CONNECTION_NAME = os.getenv('FIVETRAN_CONNECTION_NAME', None)
+
     if args.command.lower() == "deploy":
         if args.state:
             print_library_log("'state' parameter is not used for 'deploy' command", Logging.Level.WARNING)
+
+        if not ft_deploy_key:
+            ft_deploy_key = get_input_from_cli("Please provide the API Key", FIVETRAN_API_KEY)
+
+        if not ft_group:
+            ft_group = get_input_from_cli("Please provide the destination", FIVETRAN_DESTINATION_NAME)
+
+        if not ft_connection:
+            ft_connection = get_input_from_cli("Please provide the connection name",FIVETRAN_CONNECTION_NAME)
+
         connector_object.deploy(args, ft_deploy_key, ft_group, ft_connection, hd_agent_id, configuration)
 
     elif args.command.lower() == "debug":
         connector_object.debug(args.project_path, configuration, state)
-
     else:
         if not suggest_correct_command(args.command):
             raise NotImplementedError(f"Invalid command: {args.command}, see `fivetran --help`")

{fivetran_connector_sdk-1.2.0.dist-info → fivetran_connector_sdk-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fivetran_connector_sdk
-Version: 1.2.0
+Version: 1.3.0
 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.2.0.dist-info → fivetran_connector_sdk-1.3.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fivetran_connector_sdk/__init__.py,sha256=XlVgreErkBABrP22wD702qUH9XsxFyqVGe_f9lb1HRI,79263
+fivetran_connector_sdk/__init__.py,sha256=ubzp6kUWV4j8A3hgC-GRqtcX4WIQV5vMk5gdVkOZw4s,80578
 fivetran_connector_sdk/protos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fivetran_connector_sdk/protos/common_pb2.py,sha256=kUwVcyZHgLigNR-KnHZn7dHrlxaMnUXqzprsRx6T72M,6831
 fivetran_connector_sdk/protos/common_pb2.pyi,sha256=S0hdIzoXyyOKD5cjiGeDDLYpQ9J3LjAvu4rCj1JvJWE,9038
@@ -6,8 +6,8 @@ fivetran_connector_sdk/protos/common_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXH
 fivetran_connector_sdk/protos/connector_sdk_pb2.py,sha256=9Ke_Ti1s0vAeXapfXT-EryrT2-TSGQb8mhs4gxTpUMk,7732
 fivetran_connector_sdk/protos/connector_sdk_pb2.pyi,sha256=FWYxRgshEF3QDYAE0TM_mv4N2gGvkxCH_uPpxnMc4oA,8406
 fivetran_connector_sdk/protos/connector_sdk_pb2_grpc.py,sha256=ZfJLp4DW7uP4pFOZ74s_wQ6tD3eIPi-08UfnLwe4tzo,7163
-fivetran_connector_sdk-1.2.0.dist-info/METADATA,sha256=vxP6elBzDjGbZ-e67pjRf8MyPLEJISbEx9UAdsXM25U,2967
-fivetran_connector_sdk-1.2.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-fivetran_connector_sdk-1.2.0.dist-info/entry_points.txt,sha256=uQn0KPnFlQmXJfxlk0tifdNsSXWfVlnAFzNqjXZM_xM,57
-fivetran_connector_sdk-1.2.0.dist-info/top_level.txt,sha256=-_xk2MFY4psIh7jw1lJePMzFb5-vask8_ZtX-UzYWUI,23
-fivetran_connector_sdk-1.2.0.dist-info/RECORD,,
+fivetran_connector_sdk-1.3.0.dist-info/METADATA,sha256=ilFpUA6zFnHz4_tEpKpG7IZxORmHqdcMdW0wb0z2sME,2967
+fivetran_connector_sdk-1.3.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+fivetran_connector_sdk-1.3.0.dist-info/entry_points.txt,sha256=uQn0KPnFlQmXJfxlk0tifdNsSXWfVlnAFzNqjXZM_xM,57
+fivetran_connector_sdk-1.3.0.dist-info/top_level.txt,sha256=-_xk2MFY4psIh7jw1lJePMzFb5-vask8_ZtX-UzYWUI,23
+fivetran_connector_sdk-1.3.0.dist-info/RECORD,,

{fivetran_connector_sdk-1.2.0.dist-info → fivetran_connector_sdk-1.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any