fivetran-connector-sdk 1.2.1__tar.gz → 1.3.0__tar.gz

{fivetran_connector_sdk-1.2.1 → fivetran_connector_sdk-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fivetran_connector_sdk
-Version: 1.2.1
+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.1 → fivetran_connector_sdk-1.3.0}/src/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.1"
+__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
@@ -406,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:
@@ -425,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:
@@ -527,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)
 
@@ -928,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:
@@ -948,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:
@@ -989,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):
@@ -1013,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)
 

{fivetran_connector_sdk-1.2.1 → fivetran_connector_sdk-1.3.0}/src/fivetran_connector_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: fivetran_connector_sdk
-Version: 1.2.1
+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