fivetran-connector-sdk 1.7.3__tar.gz → 1.7.5__tar.gz

{fivetran_connector_sdk-1.7.3 → fivetran_connector_sdk-1.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fivetran_connector_sdk
-Version: 1.7.3
+Version: 1.7.5
 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.7.3 → fivetran_connector_sdk-1.7.5}/src/fivetran_connector_sdk/__init__.py

@@ -22,8 +22,7 @@ from fivetran_connector_sdk.operations import Operations
 from fivetran_connector_sdk import constants
 from fivetran_connector_sdk.constants import (
     TESTER_VER, VERSION_FILENAME, UTF_8,
-    VALID_COMMANDS, DEFAULT_PYTHON_VERSION, SUPPORTED_PYTHON_VERSIONS, TABLES,
-    CONNECTOR_SDK_NO_YIELD_LABEL
+    VALID_COMMANDS, DEFAULT_PYTHON_VERSION, SUPPORTED_PYTHON_VERSIONS, TABLES
 )
 from fivetran_connector_sdk.helpers import (
     print_library_log, reset_local_file_directory, find_connector_object, suggest_correct_command,
@@ -43,7 +42,7 @@ from fivetran_connector_sdk.connector_helper import (
 
 # 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.7.3"
+__version__ = "1.7.5"
 TESTER_VERSION = TESTER_VER
 MAX_MESSAGE_LENGTH = 32 * 1024 * 1024 # 32MB
 
@@ -376,42 +375,34 @@ class Connector(connector_sdk_pb2_grpc.SourceConnectorServicer):
         try:
             print_library_log("Initiating the 'update' method call...", Logging.Level.INFO)
 
-            if os.environ.get(CONNECTOR_SDK_NO_YIELD_LABEL, "false").lower() == "true":
-                def run_update():
-                    try:
-                        result = self.update_method(configuration=configuration, state=state)
-                        # If the customer's update method returns a generator (i.e., uses yield),
-                        # exhaust the generator responses, they are None. From this point on, all operations
-                        # push update_response to a queue, and we yield from the queue instead.
-                        # We return None here intentionally.
-                        if isinstance(result, GeneratorType):
-                            for _ in result:
-                                pass
-                        # If the update method doesn't use yield, skip the response returned.
-                        else:
+            def run_update():
+                try:
+                    result = self.update_method(configuration=configuration, state=state)
+                    # If the customer's update method returns a generator (i.e., uses yield),
+                    # exhaust the generator responses, they are None. From this point on, all operations
+                    # push update_response to a queue, and we yield from the queue instead.
+                    # We return None here intentionally.
+                    if isinstance(result, GeneratorType):
+                        for _ in result:
                             pass
-                    except Exception as exc:
-                        exception_queue.put(exc)
-                    finally:
-                        Operations.operation_stream.mark_done()
+                    # If the update method doesn't use yield, skip the response returned.
+                    else:
+                        pass
+                except Exception as exc:
+                    exception_queue.put(exc)
+                finally:
+                    Operations.operation_stream.mark_done()
 
-                thread = threading.Thread(target=run_update)
-                thread.start()
+            thread = threading.Thread(target=run_update)
+            thread.start()
 
-                yield from Operations.operation_stream
+            yield from Operations.operation_stream
 
-                thread.join()
+            thread.join()
 
-                # Check if any exception was raised during the update
-                if not exception_queue.empty():
-                    raise exception_queue.get()
-            else:
-                for update_response in self.update_method(configuration=configuration, state=state):
-                    if isinstance(update_response, list):
-                        for response in update_response:
-                            yield response
-                    else:
-                        yield update_response
+            # Check if any exception was raised during the update
+            if not exception_queue.empty():
+                raise exception_queue.get()
 
         except TypeError as e:
             if str(e) != "'NoneType' object is not iterable":

{fivetran_connector_sdk-1.7.3 → fivetran_connector_sdk-1.7.5}/src/fivetran_connector_sdk/constants.py

@@ -39,7 +39,6 @@ LOGGING_PREFIX = "Fivetran-Connector-SDK"
 LOGGING_DELIMITER = ": "
 VIRTUAL_ENV_CONFIG = "pyvenv.cfg"
 ROOT_FILENAME = "connector.py"
-CONNECTOR_SDK_NO_YIELD_LABEL = "CONNECTOR_SDK_NO_YIELD_APPROACH"
 
 # Compile patterns used in the implementation
 WORD_DASH_DOT_PATTERN = re.compile(r'^[\w.-]*$')

{fivetran_connector_sdk-1.7.3 → fivetran_connector_sdk-1.7.5}/src/fivetran_connector_sdk/operations.py

@@ -8,7 +8,7 @@ from google.protobuf import timestamp_pb2
 
 from fivetran_connector_sdk.constants import (
     JAVA_LONG_MAX_VALUE,
-    TABLES, CONNECTOR_SDK_NO_YIELD_LABEL,
+    TABLES,
 )
 from fivetran_connector_sdk.helpers import (
     get_renamed_table_name,
@@ -85,7 +85,6 @@ _LOG_DATA_TYPE_INFERENCE = {
 
 class Operations:
     operation_stream = _OperationStream()
-    use_no_yield_approach = os.environ.get(CONNECTOR_SDK_NO_YIELD_LABEL, "false").lower() == "true"
 
     @staticmethod
     def upsert(table: str, data: dict):
@@ -117,11 +116,7 @@ class Operations:
         )
         update_response = connector_sdk_pb2.UpdateResponse(record=record)
 
-        if Operations.use_no_yield_approach:
-            Operations.operation_stream.add(update_response)
-            return None
-        else:
-            return [update_response]
+        Operations.operation_stream.add(update_response)
 
 
     @staticmethod
@@ -147,11 +142,7 @@ class Operations:
 
         update_response = connector_sdk_pb2.UpdateResponse(record=record)
 
-        if Operations.use_no_yield_approach:
-            Operations.operation_stream.add(update_response)
-            return None
-        else:
-            return update_response
+        Operations.operation_stream.add(update_response)
 
     @staticmethod
     def delete(table: str, keys: dict):
@@ -176,11 +167,7 @@ class Operations:
 
         update_response = connector_sdk_pb2.UpdateResponse(record=record)
 
-        if Operations.use_no_yield_approach:
-            Operations.operation_stream.add(update_response)
-            return None
-        else:
-            return update_response
+        Operations.operation_stream.add(update_response)
 
     @staticmethod
     def checkpoint(state: dict):
@@ -205,12 +192,7 @@ class Operations:
         """
         update_response = connector_sdk_pb2.UpdateResponse(checkpoint=connector_sdk_pb2.Checkpoint(state_json=json.dumps(state)))
 
-        if Operations.use_no_yield_approach:
-            Operations.operation_stream.add(update_response)
-            return None
-        else:
-            return update_response
-
+        Operations.operation_stream.add(update_response)
 
 def _get_columns(table: str) -> dict:
     """Retrieves the columns for the specified table.
@@ -257,12 +239,12 @@ def map_inferred_data_type(k, mapped_data, v):
             mapped_data[k] = common_pb2.ValueType(float=v)
         else:
             mapped_data[k] = common_pb2.ValueType(long=v)
+        if _LOG_DATA_TYPE_INFERENCE["boolean"] and isinstance(v, bool):
+            print_library_log("Fivetran: Boolean Datatype has been inferred", Logging.Level.INFO, True)
+            _LOG_DATA_TYPE_INFERENCE["boolean"] = False
     elif isinstance(v, float):
         mapped_data[k] = common_pb2.ValueType(float=v)
     elif isinstance(v, bool):
-        if _LOG_DATA_TYPE_INFERENCE["boolean"]:
-            print_library_log("Fivetran: Boolean Datatype has been inferred", Logging.Level.INFO, True)
-            _LOG_DATA_TYPE_INFERENCE["boolean"] = False
         mapped_data[k] = common_pb2.ValueType(bool=v)
     elif isinstance(v, bytes):
         if _LOG_DATA_TYPE_INFERENCE["binary"]:

{fivetran_connector_sdk-1.7.3 → fivetran_connector_sdk-1.7.5}/src/fivetran_connector_sdk.egg-info/PKG-INFO

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