fivetran-connector-sdk 0.13.30.1__tar.gz → 1.1.2__tar.gz

{fivetran_connector_sdk-0.13.30.1 → fivetran_connector_sdk-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fivetran_connector_sdk
-Version: 0.13.30.1
+Version: 1.1.2
 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.13.30.1 → fivetran_connector_sdk-1.1.2}/src/fivetran_connector_sdk/__init__.py

@@ -28,8 +28,9 @@ 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 format: <major_version>.<MM>.<DD>.<iteration> (where MM is incremental value from Jan 2024)
-__version__ = "0.13.30.1"
+# 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.1.2"
 
 MAC_OS = "mac"
 WIN_OS = "windows"
@@ -76,6 +77,8 @@ DRIVERS = "drivers"
 JAVA_LONG_MAX_VALUE = 9223372036854775807
 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"
 
 
 class Logging:
@@ -706,7 +709,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                 continue
             try:
                 key = re.split(r"==|>=|<=|>|<", requirement)[0]
-                requirements_dict[key.lower()] = requirement.lower()
+                requirements_dict[key.lower().replace('-', '_')] = requirement.lower()
             except ValueError:
                 print_library_log(f"Invalid requirement format: '{requirement}'", Logging.Level.SEVERE)
         return requirements_dict
@@ -831,7 +834,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         return requirements
 
     # Call this method to deploy the connector to Fivetran platform
-    def deploy(self, args: dict, deploy_key: str, group: str, connection: str, configuration: dict = None):
+    def deploy(self, args: dict, deploy_key: str, group: str, connection: str, hd_agent_id: str, configuration: dict = None):
         """Deploys the connector to the Fivetran platform.
 
         Args:
@@ -839,6 +842,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             deploy_key (str): The deployment key.
             group (str): The group name.
             connection (str): The connection name.
+            hd_agent_id (str): The hybrid deployment agent ID within the Fivetran system.
             configuration (dict): The configuration dictionary.
         """
         global EXECUTED_VIA_CLI
@@ -880,6 +884,8 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             else:
                 if args.force:
                     confirm = "y"
+                    if args.configuration:
+                        confirm_config = "y"
                 else:
                     confirm = input(
                         f"The connection '{connection}' already exists in the destination '{group}'. Updating it will overwrite the existing code. Do you want to proceed with the update? (Y/N): ")
@@ -890,7 +896,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                     self.__upload_project(
                         args.project_path, deploy_key, group_id, group_name, connection)
                     self.__update_connection(
-                        args, connection_id, connection, group_name, connection_config, deploy_key)
+                        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(
@@ -902,11 +908,13 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             self.__upload_project(args.project_path, deploy_key,
                                   group_id, group_name, connection)
             response = self.__create_connection(
-                deploy_key, group_id, connection_config)
+                deploy_key, group_id, connection_config, hd_agent_id)
             if response.ok:
                 print_library_log(
                     f"The connection '{connection}' has been created successfully.\n")
                 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"Visit the Fivetran dashboard to start the initial sync: https://fivetran.com/dashboard/connectors/{connection_id}/status")
@@ -933,7 +941,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             os._exit(1)
 
     @staticmethod
-    def __update_connection(args: dict, id: str, name: str, group: str, config: dict, deploy_key: str):
+    def __update_connection(args: dict, id: str, name: str, group: str, config: dict, deploy_key: str, hd_agent_id: str):
         """Updates the connection with the given ID, name, group, configuration, and deployment key.
 
         Args:
@@ -943,6 +951,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             group (str): The group name.
             config (dict): The configuration dictionary.
             deploy_key (str): The deployment key.
+            hd_agent_id (str): The hybrid deployment agent ID within the Fivetran system.
         """
         if not args.configuration:
             del config["secrets_list"]
@@ -951,6 +960,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                         headers={"Authorization": f"Basic {deploy_key}"},
                         json={
                             "config": config,
+                            "hybrid_deployment_agent_id": hd_agent_id,
                             "run_setup_tests": True
                         })
 
@@ -986,13 +996,14 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         return None
 
     @staticmethod
-    def __create_connection(deploy_key: str, group_id: str, config: dict) -> rq.Response:
+    def __create_connection(deploy_key: str, group_id: str, config: dict, hd_agent_id: str) -> rq.Response:
         """Creates a new connection with the given deployment key, group ID, and configuration.
 
         Args:
             deploy_key (str): The deployment key.
             group_id (str): The group ID.
             config (dict): The configuration dictionary.
+            hd_agent_id (str): The hybrid deployment agent ID within the Fivetran system.
 
         Returns:
             rq.Response: The response object.
@@ -1006,6 +1017,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                                "paused": True,
                                "run_setup_tests": True,
                                "sync_frequency": "360",
+                               "hybrid_deployment_agent_id": hd_agent_id
                            })
         return response
 
@@ -1443,6 +1455,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             connector_sdk_pb2.SchemaResponse: The schema response.
         """
         global TABLES
+        table_list = {}
 
         if not self.schema_method:
             return connector_sdk_pb2.SchemaResponse(schema_response_not_supported=True)
@@ -1451,7 +1464,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                 configuration = self.configuration if self.configuration else request.configuration
                 print_library_log("Initiating the 'schema' method call...", Logging.Level.INFO)
                 response = self.schema_method(configuration)
-                self.process_tables(response)
+                self.process_tables(response, table_list)
                 return connector_sdk_pb2.SchemaResponse(without_schema=common_pb2.TableList(tables=TABLES.values()))
 
             except Exception as e:
@@ -1460,14 +1473,14 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
                 print_library_log(error_message, Logging.Level.SEVERE)
                 raise RuntimeError(error_message) from e
 
-    def process_tables(self, response):
+    def process_tables(self, response, table_list):
         for entry in response:
             if 'table' not in entry:
                 raise ValueError("Entry missing table name: " + entry)
 
             table_name = get_renamed_table_name(entry['table'])
 
-            if table_name in TABLES:
+            if table_name in table_list:
                 raise ValueError("Table already defined: " + table_name)
 
             table = common_pb2.Table(name=table_name)
@@ -1481,6 +1494,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
 
             table.columns.extend(columns.values())
             TABLES[table_name] = table
+            table_list[table_name] = table
 
     def process_primary_keys(self, columns, entry):
         for pkey_name in entry["primary_key"]:
@@ -1690,6 +1704,7 @@ def main():
     parser.add_argument("--connection", type=str, default=None, help="Connection name (aka 'destination schema')")
     parser.add_argument("-f", "--force", action="store_true", help="Force update an existing connection")
     parser.add_argument("--python-version", "--python", type=str, help=f"Supported Python versions you can use: {SUPPORTED_PYTHON_VERSIONS}. Defaults to 3.12.8")
+    parser.add_argument("--hybrid-deployment-agent-id", type=str, help=argparse.SUPPRESS)
 
     args = parser.parse_args()
 
@@ -1709,6 +1724,7 @@ def main():
     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)
+    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)
 
@@ -1718,7 +1734,7 @@ def main():
     if args.command.lower() == "deploy":
         if args.state:
             print_library_log("'state' parameter is not used for 'deploy' command", Logging.Level.WARNING)
-        connector_object.deploy(args, ft_deploy_key, ft_group, ft_connection, configuration)
+        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)

{fivetran_connector_sdk-0.13.30.1 → fivetran_connector_sdk-1.1.2}/src/fivetran_connector_sdk.egg-info/PKG-INFO

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