fivetran-connector-sdk 1.4.6__tar.gz → 1.5.0__tar.gz

{fivetran_connector_sdk-1.4.6 → fivetran_connector_sdk-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fivetran_connector_sdk
-Version: 1.4.6
+Version: 1.5.0
 Summary: Build custom connectors on Fivetran platform
 Author-email: Fivetran <developers@fivetran.com>
 Project-URL: Homepage, https://fivetran.com/docs/connectors/connector-sdk
@@ -11,11 +11,11 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: grpcio==1.60.1
-Requires-Dist: grpcio-tools==1.60.1
+Requires-Dist: grpcio==1.71.0
+Requires-Dist: grpcio-tools==1.71.0
 Requires-Dist: requests==2.32.3
 Requires-Dist: pipreqs==0.5.0
-Requires-Dist: unidecode==1.3.8
+Requires-Dist: unidecode==1.4.0
 
 # **fivetran-connector-sdk**
 [![Downloads](https://static.pepy.tech/badge/fivetran-connector-sdk)](https://pepy.tech/project/fivetran-connector-sdk)

{fivetran_connector_sdk-1.4.6 → fivetran_connector_sdk-1.5.0}/pyproject.toml

@@ -13,11 +13,11 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-  "grpcio==1.60.1",
-  "grpcio-tools==1.60.1",
+  "grpcio==1.71.0",
+  "grpcio-tools==1.71.0",
   "requests==2.32.3",
   "pipreqs==0.5.0",
-  "unidecode==1.3.8"
+  "unidecode==1.4.0"
 ]
 
 [project.scripts]

{fivetran_connector_sdk-1.4.6 → fivetran_connector_sdk-1.5.0}/src/fivetran_connector_sdk/__init__.py

@@ -39,7 +39,7 @@ from fivetran_connector_sdk.connector_helper import (
 
 # 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.6"
+__version__ = "1.5.0"
 TESTER_VERSION = TESTER_VER
 
 __all__ = [cls.__name__ for cls in [Logging, Operations]]
@@ -420,7 +420,7 @@ 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_BASE_64_ENCODED_API_KEY = os.getenv('FIVETRAN_BASE_64_ENCODED_API_KEY', None)
     FIVETRAN_DESTINATION_NAME = os.getenv('FIVETRAN_DESTINATION_NAME', None)
     FIVETRAN_CONNECTION_NAME = os.getenv('FIVETRAN_CONNECTION_NAME', None)
 
@@ -429,7 +429,7 @@ def main():
             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)
+            ft_deploy_key = get_input_from_cli("Please provide the API Key", FIVETRAN_BASE_64_ENCODED_API_KEY)
 
         if not ft_group:
             ft_group = get_input_from_cli("Please provide the destination", FIVETRAN_DESTINATION_NAME)

{fivetran_connector_sdk-1.4.6 → fivetran_connector_sdk-1.5.0}/src/fivetran_connector_sdk/helpers.py

@@ -304,8 +304,11 @@ def validate_and_load_state(args, state):
 
 def reset_local_file_directory(args):
     files_path = os.path.join(args.project_path, OUTPUT_FILES_DIR)
-    confirm = input(
-        "This will delete your current state and `warehouse.db` files. Do you want to continue? (Y/N): ")
+    if args.force:
+        confirm = "y"
+    else:
+        confirm = input(
+            "This will delete your current state and `warehouse.db` files. Do you want to continue? (Y/N): ")
     if confirm.lower() != "y":
         print_library_log("Reset canceled")
     else:

{fivetran_connector_sdk-1.4.6 → fivetran_connector_sdk-1.5.0}/src/fivetran_connector_sdk/logger.py

@@ -24,12 +24,20 @@ class Logging:
         """
         if constants.DEBUGGING:
             current_time = datetime.now().strftime("%b %d, %Y %I:%M:%S %p")
-            print(f"{Logging.get_color(level)}{current_time} {level.name}: {message} {Logging.reset_color()}")
+            prefix = f"{current_time} {level.name}: "
+            message = Logging.get_formatted_log(message, prefix)
+            print(f"{Logging.get_color(level)}{prefix}{message} {Logging.reset_color()}")
         else:
             escaped_message = json.dumps(message)
             log_message = f'{{"level":"{level.name}", "message": {escaped_message}, "message_origin": "connector_sdk"}}'
             print(log_message)
 
+    @staticmethod
+    def get_formatted_log(message, prefix):
+        lines = message.split('\n')
+        padding = "\n" + " " * len(prefix)
+        return padding.join(lines)
+
     @staticmethod
     def get_color(level):
         if level == Logging.Level.WARNING:
@@ -81,11 +89,8 @@ class Logging:
             exception (Exception, optional): Exception to be logged if provided.
         """
         if Logging.LOG_LEVEL <= Logging.Level.SEVERE:
-            Logging.__log(Logging.Level.SEVERE, message)
-
             if exception:
                 exc_type, exc_value, exc_traceback = type(exception), exception, exception.__traceback__
                 tb_str = "".join(traceback.format_exception(exc_type, exc_value, exc_traceback, limit=1))
-
-                for error in tb_str.split("\n"):
-                    Logging.__log(Logging.Level.SEVERE, error)
+                message += "\n" + tb_str
+            Logging.__log(Logging.Level.SEVERE, message)

{fivetran_connector_sdk-1.4.6 → fivetran_connector_sdk-1.5.0}/src/fivetran_connector_sdk/operations.py

@@ -18,6 +18,29 @@ from fivetran_connector_sdk.helpers import (
 from fivetran_connector_sdk.logger import Logging
 from fivetran_connector_sdk.protos import connector_sdk_pb2, common_pb2
 
+_TYPE_HANDLERS = {
+    common_pb2.DataType.BOOLEAN: lambda val: common_pb2.ValueType(bool=val),
+    common_pb2.DataType.SHORT: lambda val: common_pb2.ValueType(short=val),
+    common_pb2.DataType.INT: lambda val: common_pb2.ValueType(int=val),
+    common_pb2.DataType.LONG: lambda val: common_pb2.ValueType(long=val),
+    common_pb2.DataType.DECIMAL: lambda val: common_pb2.ValueType(decimal=val),
+    common_pb2.DataType.FLOAT: lambda val: common_pb2.ValueType(float=val),
+    common_pb2.DataType.DOUBLE: lambda val: common_pb2.ValueType(double=val),
+    common_pb2.DataType.NAIVE_DATE: lambda val: common_pb2.ValueType(naive_date=
+                                                                     timestamp_pb2.Timestamp().FromDatetime(
+                                                                         datetime.strptime(val, "%Y-%m-%d")) or timestamp_pb2.Timestamp()),
+    common_pb2.DataType.NAIVE_DATETIME: lambda val: common_pb2.ValueType(naive_datetime=
+                                                                         timestamp_pb2.Timestamp().FromDatetime(
+                                                                             datetime.strptime(val + ".0" if '.' not in val else val, "%Y-%m-%dT%H:%M:%S.%f")) or timestamp_pb2.Timestamp()),
+    common_pb2.DataType.UTC_DATETIME: lambda val: common_pb2.ValueType(utc_datetime=
+                                                                       timestamp_pb2.Timestamp().FromDatetime(
+                                                                           val if isinstance(val, datetime) else _parse_datetime_str(val)) or timestamp_pb2.Timestamp()),
+    common_pb2.DataType.BINARY: lambda val: common_pb2.ValueType(binary=val),
+    common_pb2.DataType.XML: lambda val: common_pb2.ValueType(xml=val),
+    common_pb2.DataType.STRING: lambda val: common_pb2.ValueType(string=val if isinstance(val, str) else str(val)),
+    common_pb2.DataType.JSON: lambda val: common_pb2.ValueType(json=json.dumps(val))
+}
+
 class Operations:
     @staticmethod
     def upsert(table: str, data: dict) -> list[connector_sdk_pb2.UpdateResponse]:
@@ -174,7 +197,7 @@ def _map_data_to_columns(data: dict, columns: dict) -> dict:
         if v is None:
             mapped_data[key] = common_pb2.ValueType(null=True)
         elif (key in columns) and columns[key].type != common_pb2.DataType.UNSPECIFIED:
-            map_defined_data_type(columns, key, mapped_data, v)
+            map_defined_data_type(columns[key].type, key, mapped_data, v)
         else:
             map_inferred_data_type(key, mapped_data, v)
     return mapped_data
@@ -203,49 +226,12 @@ def map_inferred_data_type(k, mapped_data, v):
         # Convert arbitrary objects to string
         mapped_data[k] = common_pb2.ValueType(string=str(v))
 
-
-def map_defined_data_type(columns, k, mapped_data, v):
-    if columns[k].type == common_pb2.DataType.BOOLEAN:
-        mapped_data[k] = common_pb2.ValueType(bool=v)
-    elif columns[k].type == common_pb2.DataType.SHORT:
-        mapped_data[k] = common_pb2.ValueType(short=v)
-    elif columns[k].type == common_pb2.DataType.INT:
-        mapped_data[k] = common_pb2.ValueType(int=v)
-    elif columns[k].type == common_pb2.DataType.LONG:
-        mapped_data[k] = common_pb2.ValueType(long=v)
-    elif columns[k].type == common_pb2.DataType.DECIMAL:
-        mapped_data[k] = common_pb2.ValueType(decimal=v)
-    elif columns[k].type == common_pb2.DataType.FLOAT:
-        mapped_data[k] = common_pb2.ValueType(float=v)
-    elif columns[k].type == common_pb2.DataType.DOUBLE:
-        mapped_data[k] = common_pb2.ValueType(double=v)
-    elif columns[k].type == common_pb2.DataType.NAIVE_DATE:
-        timestamp = timestamp_pb2.Timestamp()
-        dt = datetime.strptime(v, "%Y-%m-%d")
-        timestamp.FromDatetime(dt)
-        mapped_data[k] = common_pb2.ValueType(naive_date=timestamp)
-    elif columns[k].type == common_pb2.DataType.NAIVE_DATETIME:
-        if '.' not in v: v = v + ".0"
-        timestamp = timestamp_pb2.Timestamp()
-        dt = datetime.strptime(v, "%Y-%m-%dT%H:%M:%S.%f")
-        timestamp.FromDatetime(dt)
-        mapped_data[k] = common_pb2.ValueType(naive_datetime=timestamp)
-    elif columns[k].type == common_pb2.DataType.UTC_DATETIME:
-        timestamp = timestamp_pb2.Timestamp()
-        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:
-        mapped_data[k] = common_pb2.ValueType(binary=v)
-    elif columns[k].type == common_pb2.DataType.XML:
-        mapped_data[k] = common_pb2.ValueType(xml=v)
-    elif columns[k].type == common_pb2.DataType.STRING:
-        incoming = v if isinstance(v, str) else str(v)
-        mapped_data[k] = common_pb2.ValueType(string=incoming)
-    elif columns[k].type == common_pb2.DataType.JSON:
-        mapped_data[k] = common_pb2.ValueType(json=json.dumps(v))
+def map_defined_data_type(data_type, k, mapped_data, v):
+    handler = _TYPE_HANDLERS.get(data_type)
+    if handler:
+        mapped_data[k] = handler(v)
     else:
-        raise ValueError(f"Unsupported data type encountered: {columns[k].type}. Please use valid data types.")
+        raise ValueError(f"Unsupported data type encountered: {data_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")

{fivetran_connector_sdk-1.4.6 → fivetran_connector_sdk-1.5.0}/src/fivetran_connector_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fivetran_connector_sdk
-Version: 1.4.6
+Version: 1.5.0
 Summary: Build custom connectors on Fivetran platform
 Author-email: Fivetran <developers@fivetran.com>
 Project-URL: Homepage, https://fivetran.com/docs/connectors/connector-sdk
@@ -11,11 +11,11 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: grpcio==1.60.1
-Requires-Dist: grpcio-tools==1.60.1
+Requires-Dist: grpcio==1.71.0
+Requires-Dist: grpcio-tools==1.71.0
 Requires-Dist: requests==2.32.3
 Requires-Dist: pipreqs==0.5.0
-Requires-Dist: unidecode==1.3.8
+Requires-Dist: unidecode==1.4.0
 
 # **fivetran-connector-sdk**
 [![Downloads](https://static.pepy.tech/badge/fivetran-connector-sdk)](https://pepy.tech/project/fivetran-connector-sdk)

fivetran_connector_sdk-1.5.0/src/fivetran_connector_sdk.egg-info/requires.txt

@@ -0,0 +1,5 @@
+grpcio==1.71.0
+grpcio-tools==1.71.0
+requests==2.32.3
+pipreqs==0.5.0
+unidecode==1.4.0

fivetran_connector_sdk-1.4.6/src/fivetran_connector_sdk.egg-info/requires.txt

@@ -1,5 +0,0 @@
-grpcio==1.60.1
-grpcio-tools==1.60.1
-requests==2.32.3
-pipreqs==0.5.0
-unidecode==1.3.8