fivetran-connector-sdk 2.1.1__tar.gz → 2.2.1__tar.gz

{fivetran_connector_sdk-2.1.1 → fivetran_connector_sdk-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fivetran_connector_sdk
-Version: 2.1.1
+Version: 2.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
@@ -11,8 +11,8 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: grpcio==1.71.0
-Requires-Dist: grpcio-tools==1.71.0
+Requires-Dist: grpcio==1.74.0
+Requires-Dist: grpcio-tools==1.74.0
 Requires-Dist: requests==2.32.5
 Requires-Dist: pipreqs-fivetran==1.0.1
 Requires-Dist: prompt-toolkit==3.0.51

{fivetran_connector_sdk-2.1.1 → fivetran_connector_sdk-2.2.1}/pyproject.toml

@@ -13,8 +13,8 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-  "grpcio==1.71.0",
-  "grpcio-tools==1.71.0",
+  "grpcio==1.74.0",
+  "grpcio-tools==1.74.0",
   "requests==2.32.5",
   "pipreqs-fivetran==1.0.1",
   "prompt-toolkit==3.0.51",

{fivetran_connector_sdk-2.1.1 → fivetran_connector_sdk-2.2.1}/src/fivetran_connector_sdk/__init__.py

@@ -1,5 +1,6 @@
 import os
 import sys
+import uuid
 import grpc
 import json
 import shutil
@@ -8,6 +9,7 @@ import traceback
 import requests as rq
 import threading
 import queue
+import subprocess
 from types import GeneratorType
 from http import HTTPStatus
 from zipfile import ZipFile
@@ -37,12 +39,12 @@ from fivetran_connector_sdk.connector_helper import (
     get_available_port, tester_root_dir_helper,
     check_dict, check_newer_version, cleanup_uploaded_project,
     get_destination_group, get_connection_name, get_api_key, get_state,
-    get_python_version, get_hd_agent_id, get_configuration
+    get_python_version, get_hd_agent_id, get_configuration, evaluate_project
 )
 
 # Version format: <major_version>.<minor_version>.<patch_version>
 # (where Major Version = 2, Minor Version is incremental MM from Aug 25 onwards, Patch Version is incremental within a month)
-__version__ = "2.1.1"
+__version__ = "2.2.1"
 TESTER_VERSION = TESTER_VER
 MAX_MESSAGE_LENGTH = 32 * 1024 * 1024 # 32MB
 
@@ -64,6 +66,9 @@ class Connector(connector_sdk_pb2_grpc.SourceConnectorServicer):
 
         update_base_url_if_required()
 
+    def evaluate(self, project_path: str, deploy_key: str):
+        evaluate_project(project_path, deploy_key)
+
     # Call this method to deploy the connector to Fivetran platform
     def deploy(self, project_path: str, deploy_key: str, group: str, connection: str, hd_agent_id: str,
                configuration: dict = None, config_path = None, python_version: str = None, force: bool = False):
@@ -299,8 +304,12 @@ class Connector(connector_sdk_pb2_grpc.SourceConnectorServicer):
             print_library_log("Running connector tester...")
             for log_msg in run_tester(java_exe, tester_root_dir, project_path, available_port, json.dumps(self.state), json.dumps(self.configuration)):
                 print(log_msg, end="")
-        except:
+        except subprocess.CalledProcessError as e:
+            print(traceback.format_exc())
+            raise e
+        except Exception as e:
             print(traceback.format_exc())
+            raise e
         finally:
             server.stop(grace=2.0)
 
@@ -471,6 +480,12 @@ def main():
     if not connector_object:
         sys.exit(1)
 
+    if args.command.lower() == "evaluate":
+        print_library_log("Evaluating the connector code...")
+        ft_deploy_key = get_api_key(args)
+        connector_object.evaluate(args.project_path, ft_deploy_key)
+        sys.exit(0)
+
     if args.command.lower() == "deploy":
         ft_group = get_destination_group(args)
         ft_connection = get_connection_name(args)
@@ -486,7 +501,19 @@ def main():
     elif args.command.lower() == "debug":
         configuration, config_path = get_configuration(args)
         state = get_state(args)
-        connector_object.debug(args.project_path, configuration, state)
+        try:
+            os.environ["FIVETRAN_CONNECTION_ID"] = "test_connection_id"
+            os.environ["FIVETRAN_DEPLOYMENT_MODEL"] = "local_debug"
+            connector_object.debug(args.project_path, configuration, state)
+        except subprocess.CalledProcessError as e:
+            print_library_log(f"Connector tester failed with exit code: {e.returncode}", Logging.Level.SEVERE)
+            sys.exit(e.returncode)
+        except Exception as e:
+            print_library_log(f"Debug command failed: {str(e)}", Logging.Level.SEVERE)
+            sys.exit(1)
+        finally:
+            del os.environ["FIVETRAN_CONNECTION_ID"]
+            del os.environ["FIVETRAN_DEPLOYMENT_MODEL"]
     else:
         if not suggest_correct_command(args.command):
             raise NotImplementedError(f"Invalid command: {args.command}, see `fivetran --help`")

{fivetran_connector_sdk-2.1.1 → fivetran_connector_sdk-2.2.1}/src/fivetran_connector_sdk/connector_helper.py

@@ -1,3 +1,4 @@
+import io
 import os
 import re
 import ast
@@ -476,6 +477,19 @@ def remove_unwanted_packages(requirements: dict):
     if requirements.get('requests') is not None:
         requirements.pop("requests")
 
+def evaluate_project(project_path: str, deploy_key: str):
+    print_library_log(f"Evaluating '{project_path}'...")
+    upload_file_path = create_upload_file(project_path)
+    try:
+        evaluation_report = evaluate(upload_file_path, deploy_key)
+        if not evaluation_report:
+            print_library_log(
+                "Project evaluation failed. No evaluation report was generated. Please check your project for errors and try again.",
+                Logging.Level.SEVERE
+            )
+            sys.exit(1)
+    finally:
+        delete_file_if_exists(upload_file_path)
 
 def upload_project(project_path: str, deploy_key: str, group_id: str, group_name: str, connection: str):
     print_library_log(
@@ -702,6 +716,55 @@ def dir_walker(top):
         for x in dir_walker(new_path):
             yield x
 
+
+def evaluate(local_path: str, deploy_key: str):
+    """Uploads the local code file for evaluation and returns the evaluation report.
+
+    The server responds with a file containing JSON. This function streams the
+    file safely, parses the JSON, and prints it.
+
+    Args:
+        local_path (str): The local file path.
+        deploy_key (str): The deployment key.
+
+    Returns:
+        dict | None: Parsed evaluation report if successful, None otherwise.
+    """
+    print_library_log("Uploading your project for evaluation...")
+
+    with open(local_path, 'rb') as f:
+        response = rq.post(
+            f"{constants.PRODUCTION_BASE_URL}{constants.EVALUATE_ENDPOINT}",
+            files={'file': f},
+            headers={"Authorization": f"Basic {deploy_key}"},
+            stream=True  # stream to handle file responses safely
+        )
+
+    if response.ok:
+        try:
+            buffer = io.BytesIO()
+            for chunk in response.iter_content(chunk_size=8192):
+                buffer.write(chunk)
+            buffer.seek(0)
+
+            evaluation_data = json.load(buffer)
+
+            print_library_log("✓ Evaluation Report:")
+            print(json.dumps(evaluation_data, indent=4))
+
+            return evaluation_data
+
+        except json.JSONDecodeError as e:
+            print_library_log(f"Failed to parse evaluation report: {e}", Logging.Level.SEVERE)
+            return None
+
+    print_library_log(
+        f"Unable to upload the project for evaluation, failed with error: {response.text}",
+        Logging.Level.SEVERE
+    )
+    return None
+
+
 def upload(local_path: str, deploy_key: str, group_id: str, connection: str) -> bool:
     """Uploads the local code file for the specified group and connection.
 

{fivetran_connector_sdk-2.1.1 → fivetran_connector_sdk-2.2.1}/src/fivetran_connector_sdk/constants.py

@@ -1,7 +1,7 @@
 import os
 import re
 
-TESTER_VER = "2.25.0903.001"
+TESTER_VER = "2.25.0918.001"
 
 WIN_OS = "windows"
 ARM_64 = "arm64"
@@ -64,6 +64,7 @@ COMMANDS_AND_SYNONYMS = {
 
 CONNECTION_SCHEMA_NAME_PATTERN = r'^[_a-z][_a-z0-9]*$'
 PRODUCTION_BASE_URL = "https://api.fivetran.com"
+EVALUATE_ENDPOINT = "/v1/evaluate"
 INSTALLATION_SCRIPT_MISSING_MESSAGE = "The 'installation.sh' file is missing in the 'drivers' directory. Please ensure that 'installation.sh' is present to properly configure drivers."
 INSTALLATION_SCRIPT = "installation.sh"
 DRIVERS = "drivers"

{fivetran_connector_sdk-2.1.1 → fivetran_connector_sdk-2.2.1}/src/fivetran_connector_sdk/operations.py

@@ -181,20 +181,20 @@ def _map_data_to_columns(data: dict, columns: dict, table: str = "") -> dict:
 
 def map_inferred_data_type(k, mapped_data, v, table=""):
     # 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)
-        if _LOG_DATA_TYPE_INFERENCE.get("boolean_" + table, True) and isinstance(v, bool):
+    if isinstance(v, bool):
+        mapped_data[k] = common_pb2.ValueType(bool=v)
+        if _LOG_DATA_TYPE_INFERENCE.get("boolean_" + table, True):
             print_library_log("Fivetran: Boolean Datatype has been inferred for " + table, Logging.Level.INFO, True)
             if not _get_table_pk(table):
                 print_library_log("Fivetran: Boolean Datatype inference issue for " + table, Logging.Level.INFO, True)
             _LOG_DATA_TYPE_INFERENCE["boolean_" + table] = False
+    elif 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):

{fivetran_connector_sdk-2.1.1 → fivetran_connector_sdk-2.2.1}/src/fivetran_connector_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fivetran_connector_sdk
-Version: 2.1.1
+Version: 2.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
@@ -11,8 +11,8 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: grpcio==1.71.0
-Requires-Dist: grpcio-tools==1.71.0
+Requires-Dist: grpcio==1.74.0
+Requires-Dist: grpcio-tools==1.74.0
 Requires-Dist: requests==2.32.5
 Requires-Dist: pipreqs-fivetran==1.0.1
 Requires-Dist: prompt-toolkit==3.0.51

{fivetran_connector_sdk-2.1.1 → fivetran_connector_sdk-2.2.1}/src/fivetran_connector_sdk.egg-info/requires.txt

@@ -1,5 +1,5 @@
-grpcio==1.71.0
-grpcio-tools==1.71.0
+grpcio==1.74.0
+grpcio-tools==1.74.0
 requests==2.32.5
 pipreqs-fivetran==1.0.1
 prompt-toolkit==3.0.51