fivetran-connector-sdk 1.1.4__py3-none-any.whl → 1.2.1__py3-none-any.whl

fivetran_connector_sdk/__init__.py

@@ -31,7 +31,7 @@ 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.1.4"
+__version__ = "1.2.1"
 
 MAC_OS = "mac"
 WIN_OS = "windows"
@@ -49,6 +49,7 @@ 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
+VIRTUAL_ENV_CONFIG = "pyvenv.cfg"
 
 # Compile patterns used in the implementation
 WORD_DASH_DOT_PATTERN = re.compile(r'^[\w.-]*$')
@@ -161,7 +162,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 = []
 
@@ -199,7 +201,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)
@@ -225,7 +228,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)
@@ -261,7 +265,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))))
@@ -431,8 +437,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]
@@ -444,7 +448,7 @@ def _yield_check(stack):
     else:
         # This should never happen
         raise RuntimeError(
-            f"The '{called_method}' function is missing in the connector. Please ensure that the '{called_method}' function is properly defined in your code to proceed. Reference: https://fivetran.com/docs/connectors/connector-sdk/technical-reference#technicaldetailsmethods")
+            f"The '{called_method}' function is missing in the connector calling code '{calling_code}'. Please ensure that the '{called_method}' function is properly defined in your code to proceed. Reference: https://fivetran.com/docs/connectors/connector-sdk/technical-reference#technicaldetailsmethods")
 
 
 def _check_dict(incoming: dict, string_only: bool = False) -> dict:
@@ -729,6 +733,13 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             force (bool): Force update an existing connection.
 
         """
+        # Detect and exclude virtual environment directories
+        venv_dirs = [name for name in os.listdir(project_path)
+                     if os.path.isdir(os.path.join(project_path, name)) and
+                     VIRTUAL_ENV_CONFIG in os.listdir(os.path.join(project_path, name))]
+
+        ignored_dirs = EXCLUDED_PIPREQS_DIRS + venv_dirs if venv_dirs else EXCLUDED_PIPREQS_DIRS
+
         # tmp_requirements is only generated when pipreqs command is successful
         tmp_requirements_file_path = os.path.join(project_path, 'tmp_requirements.txt')
         # Run the pipreqs command and capture stderr
@@ -736,7 +747,7 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
         while attempt < MAX_RETRIES:
             attempt += 1
             result = subprocess.run(
-                ["pipreqs", project_path, "--savepath", tmp_requirements_file_path, "--ignore"] + EXCLUDED_PIPREQS_DIRS,
+                ["pipreqs", project_path, "--savepath", tmp_requirements_file_path, "--ignore", ",".join(ignored_dirs)],
                 stderr=subprocess.PIPE,
                 text=True  # Ensures output is in string format
             )
@@ -1151,7 +1162,8 @@ class Connector(connector_sdk_pb2_grpc.ConnectorServicer):
             path = os.path.join(top, name)
             if os.path.isdir(path):
                 if (name not in EXCLUDED_DIRS) and (not name.startswith(".")):
-                    dirs.append(name)
+                    if VIRTUAL_ENV_CONFIG not in os.listdir(path):  # Check for virtual env indicator
+                        dirs.append(name)
             else:
                 # Include all files if in `drivers` folder
                 if os.path.basename(top) == DRIVERS:
@@ -1746,6 +1758,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
@@ -1785,9 +1811,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)
@@ -1795,14 +1821,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.1.4.dist-info → fivetran_connector_sdk-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: fivetran_connector_sdk
-Version: 1.1.4
+Version: 1.2.1
 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.1.4.dist-info → fivetran_connector_sdk-1.2.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fivetran_connector_sdk/__init__.py,sha256=YBheEV1zFD2kAO8oF1qCNi3Pa73XNUP90PlnKhNgUDM,78705
+fivetran_connector_sdk/__init__.py,sha256=3Kp8MaT8ZtvrOo_dNGFGt5mdumojUSPhYwNL7x6CBvE,80242
 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.1.4.dist-info/METADATA,sha256=aZIJmSPr_90F58xBksv8MAnEGkVIKM7Ox1j5Ar8Ku_o,2967
-fivetran_connector_sdk-1.1.4.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-fivetran_connector_sdk-1.1.4.dist-info/entry_points.txt,sha256=uQn0KPnFlQmXJfxlk0tifdNsSXWfVlnAFzNqjXZM_xM,57
-fivetran_connector_sdk-1.1.4.dist-info/top_level.txt,sha256=-_xk2MFY4psIh7jw1lJePMzFb5-vask8_ZtX-UzYWUI,23
-fivetran_connector_sdk-1.1.4.dist-info/RECORD,,
+fivetran_connector_sdk-1.2.1.dist-info/METADATA,sha256=3h_7qvx3Wv4GvLUTsNnTx2CLWCZpHtVTi-H-vScF4wA,2967
+fivetran_connector_sdk-1.2.1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+fivetran_connector_sdk-1.2.1.dist-info/entry_points.txt,sha256=uQn0KPnFlQmXJfxlk0tifdNsSXWfVlnAFzNqjXZM_xM,57
+fivetran_connector_sdk-1.2.1.dist-info/top_level.txt,sha256=-_xk2MFY4psIh7jw1lJePMzFb5-vask8_ZtX-UzYWUI,23
+fivetran_connector_sdk-1.2.1.dist-info/RECORD,,

{fivetran_connector_sdk-1.1.4.dist-info → fivetran_connector_sdk-1.2.1.dist-info}/WHEEL

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