fivetran-connector-sdk 1.3.2__py3-none-any.whl → 1.3.3__py3-none-any.whl

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.3.2"
+__version__ = "1.3.3"
 
 MAC_OS = "mac"
 WIN_OS = "windows"
 LINUX_OS = "linux"
 
-TESTER_VERSION = "0.25.0415.001"
+TESTER_VERSION = "0.25.0423.001"
 TESTER_FILENAME = "run_sdk_tester.jar"
 VERSION_FILENAME = "version.txt"
 UPLOAD_FILENAME = "code.zip"
@@ -87,6 +87,7 @@ 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"
 FIVETRAN_HD_AGENT_ID = "FIVETRAN_HD_AGENT_ID"
+UTF_8 = "utf-8"
 
 
 class Logging:
@@ -298,7 +299,7 @@ def check_newer_version():
 
     if os.path.isfile(last_check_file_path):
         # Is it time to check again?
-        with open(last_check_file_path, 'r') as f_in:
+        with open(last_check_file_path, 'r', encoding=UTF_8) as f_in:
             timestamp = int(f_in.read())
             if (int(time.time()) - timestamp) < ONE_DAY_IN_SEC:
                 return
@@ -314,7 +315,7 @@ def check_newer_version():
                 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:
+            with open(last_check_file_path, 'w', encoding=UTF_8) as f_out:
                 f_out.write(f"{int(time.time())}")
             break
         except Exception:
@@ -363,10 +364,35 @@ def _map_data_to_columns(data: dict, columns: dict) -> dict:
         elif (key in columns) and columns[key].type != common_pb2.DataType.UNSPECIFIED:
             map_defined_data_type(columns, key, mapped_data, v)
         else:
-            mapped_data[key] = common_pb2.ValueType(string=str(v))
+            map_inferred_data_type(key, mapped_data, v)
     return mapped_data
 
 
+def map_inferred_data_type(k, mapped_data, v):
+    # We can infer type from the value
+    if isinstance(v, int):
+        if abs(v) > JAVA_LONG_MAX_VALUE:
+            mapped_data[k] = common_pb2.ValueType(float=v)
+        else:
+            mapped_data[k] = common_pb2.ValueType(long=v)
+    elif isinstance(v, float):
+        mapped_data[k] = common_pb2.ValueType(float=v)
+    elif isinstance(v, bool):
+        mapped_data[k] = common_pb2.ValueType(bool=v)
+    elif isinstance(v, bytes):
+        mapped_data[k] = common_pb2.ValueType(binary=v)
+    elif isinstance(v, list):
+        raise ValueError(
+            "Values for the columns cannot be of type 'list'. Please ensure that all values are of a supported type. Reference: https://fivetran.com/docs/connectors/connector-sdk/technical-reference#supporteddatatypes")
+    elif isinstance(v, dict):
+        mapped_data[k] = common_pb2.ValueType(json=json.dumps(v))
+    elif isinstance(v, str):
+        mapped_data[k] = common_pb2.ValueType(string=v)
+    else:
+        # 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)
@@ -425,7 +451,7 @@ def _exit_check(project_path):
     # exit() or sys.exit() in between some yields can cause the connector to be stuck without processing further upsert calls
 
     filepath = os.path.join(project_path, ROOT_FILENAME)
-    with open(filepath, "r") as f:
+    with open(filepath, "r", encoding=UTF_8) as f:
         try:
             tree = ast.parse(f.read())
             for node in ast.walk(tree):
@@ -569,7 +595,7 @@ def get_available_port():
 def update_base_url_if_required():
     config_file_path = os.path.join(_tester_root_dir(), CONFIG_FILE)
     if os.path.isfile(config_file_path):
-        with open(config_file_path, 'r') as f:
+        with open(config_file_path, 'r', encoding=UTF_8) as f:
             data = json.load(f)
             base_url = data.get('production_base_url')
             if base_url is not None:
@@ -719,7 +745,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         Returns:
             list[str]: A list of dependencies as strings.
         """
-        with open(file_path, 'r') as f:
+        with open(file_path, 'r', encoding=UTF_8) as f:
             return f.read().splitlines()
 
     @staticmethod
@@ -850,7 +876,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                 if force:
                     requirements = tmp_requirements
 
-                with open(REQUIREMENTS_TXT, "w") as file:
+                with open(REQUIREMENTS_TXT, "w", encoding=UTF_8) as file:
                     file.write("\n".join(requirements.values()))
                 print_library_log(f"`{REQUIREMENTS_TXT}` has been updated successfully")
 
@@ -883,7 +909,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         if os.path.exists(REQUIREMENTS_TXT):
             requirements = self.fetch_requirements_as_dict(self, os.path.join(project_path, 'requirements.txt'))
         else:
-            with open(REQUIREMENTS_TXT, 'w'):
+            with open(REQUIREMENTS_TXT, 'w', encoding=UTF_8):
                 pass
             requirements = {}
             print_library_log("Adding `requirements.txt` file to your project folder.", Logging.Level.WARNING)
@@ -929,8 +955,6 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         self.validate_requirements_file(args.project_path, True, args.force)
 
         group_id, group_name = self.__get_group_info(group, deploy_key)
-        if hd_agent_id is None:
-            hd_agent_id = self.__get_hd_agent_id(group_id, deploy_key)
         connection_id, service = self.__get_connection_id(connection, group, group_id, deploy_key) or (None, None)
 
         if connection_id:
@@ -1272,31 +1296,6 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             return LINUX_OS
         raise ValueError(f"Unrecognized OS: {os_sysname}")
 
-
-    @staticmethod
-    def __get_hd_agent_id(destination_id: str, deploy_key: str) -> str:
-        """Retrieves the destination information for the specified destination ID and deployment key.
-
-        Args:
-            destination_id (str): The destination ID.
-            deploy_key (str): The deployment key.
-
-        Returns:
-            str: The hybrid_deployment_agent_id if HD enabled destination else returns None
-        """
-        destinations_url = f"{PRODUCTION_BASE_URL}/v1/destinations/{destination_id}"
-
-        headers = {"Authorization": f"Basic {deploy_key}"}
-        resp = rq.get(destinations_url, headers=headers)
-
-        if not resp.ok:
-            print_library_log(
-                f"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", {})
-        return data.get("hybrid_deployment_agent_id")
-
     @staticmethod
     def __get_group_info(group: str, deploy_key: str) -> tuple[str, str]:
         """Retrieves the group information for the specified group and deployment key.
@@ -1413,7 +1412,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         version_file = os.path.join(tester_root_dir, VERSION_FILENAME)
         if os.path.isfile(version_file):
             # Check version number & update if different
-            with open(version_file, 'r') as fi:
+            with open(version_file, 'r', encoding=UTF_8) as fi:
                 current_version = fi.readline()
 
             if current_version != TESTER_VERSION:
@@ -1912,7 +1911,7 @@ def validate_and_load_configuration(args, configuration):
     if configuration:
         json_filepath = os.path.join(args.project_path, args.configuration)
         if os.path.isfile(json_filepath):
-            with open(json_filepath, 'r') as fi:
+            with open(json_filepath, 'r', encoding=UTF_8) 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.")
@@ -1936,7 +1935,7 @@ def validate_and_load_state(args, state):
 
     if os.path.exists(json_filepath):
         if os.path.isfile(json_filepath):
-            with open(json_filepath, 'r') as fi:
+            with open(json_filepath, 'r', encoding=UTF_8) as fi:
                 state = json.load(fi)
         elif state.lstrip().startswith("{"):
             state = json.loads(state)

{fivetran_connector_sdk-1.3.2.dist-info → fivetran_connector_sdk-1.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fivetran_connector_sdk
-Version: 1.3.2
+Version: 1.3.3
 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.3.2.dist-info → fivetran_connector_sdk-1.3.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fivetran_connector_sdk/__init__.py,sha256=NU9PygEtaibP-4ugblU8kieDGEJRBdLQcfSvlo9YYkY,83637
+fivetran_connector_sdk/__init__.py,sha256=sltQUs9T18U5aCkagxVdfT6-BO4d81FWWyaNEBj5NJ8,83830
 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.3.2.dist-info/METADATA,sha256=Z0t971CmSiseBUZcJ8RwFGdizkgGTO0CPKhNjqZGcvY,2967
-fivetran_connector_sdk-1.3.2.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-fivetran_connector_sdk-1.3.2.dist-info/entry_points.txt,sha256=uQn0KPnFlQmXJfxlk0tifdNsSXWfVlnAFzNqjXZM_xM,57
-fivetran_connector_sdk-1.3.2.dist-info/top_level.txt,sha256=-_xk2MFY4psIh7jw1lJePMzFb5-vask8_ZtX-UzYWUI,23
-fivetran_connector_sdk-1.3.2.dist-info/RECORD,,
+fivetran_connector_sdk-1.3.3.dist-info/METADATA,sha256=6T4trCMBQS0wnx2-iMOyX01xpU8yo3R9VqRI-d5uwhQ,2967
+fivetran_connector_sdk-1.3.3.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+fivetran_connector_sdk-1.3.3.dist-info/entry_points.txt,sha256=uQn0KPnFlQmXJfxlk0tifdNsSXWfVlnAFzNqjXZM_xM,57
+fivetran_connector_sdk-1.3.3.dist-info/top_level.txt,sha256=-_xk2MFY4psIh7jw1lJePMzFb5-vask8_ZtX-UzYWUI,23
+fivetran_connector_sdk-1.3.3.dist-info/RECORD,,