omnata-plugin-runtime 0.1.46__py3-none-any.whl → 0.1.48__py3-none-any.whl

omnata_plugin_runtime/omnata_plugin.py

@@ -492,20 +492,18 @@ class OutboundSyncRequest(SyncRequest):
         if sync_actions is None:
             sync_actions = [action() for action in list(STANDARD_OUTBOUND_SYNC_ACTIONS.values())]
         # ignore null sync actions
-        sync_actions = [s for s in sync_actions if s]
+        sync_action_names:List[str] = [s.action_name for s in sync_actions if s]
         # only used by testing framework when running a behave test
         if self._prebaked_record_state is not None:
             logger.info('returning prebaked record state')
-            dataframe = self._prebaked_record_state[self._prebaked_record_state['SYNC_ACTION'].isin(sync_actions)] # pylint: disable=unsubscriptable-object
+            dataframe = self._prebaked_record_state[self._prebaked_record_state['SYNC_ACTION'].isin(sync_action_names)] # pylint: disable=unsubscriptable-object
             if len(dataframe)==0:
                 # no need to do the whole FixedSizeGenerator thing for 0 records
                 return self.__dataframe_wrapper(dataframe,render_jinja)
-            # these were recorded earlier, we should preserve batch size and concurrency from the original
-            #wrapped_df = FixedSizeGenerator(dataframe,self.api_limits.batch_size)
+            # we use map to create an iterable wrapper around the pandas batches which are also iterable
+            # we use an intermediate partial to allow us to pass the extra parameter
             mapfunc = partial(self.__dataframe_wrapper, render_jinja=render_jinja)
             return map(mapfunc, [dataframe])
-            #return self.__dataframe_wrapper(wrapped_df,render_jinja)
-        sync_action_names:List[str] = [action.action_name for action in sync_actions]
         with self._snowflake_query_lock:
             dataframe = self._session.table(self._full_records_table_name) \
                     .filter((col("SYNC_ACTION").in_(sync_action_names)) &
@@ -1065,7 +1063,7 @@ def managed_outbound_processing(concurrency:int, batch_size:int):
             #    raise ValueError('To use the managed_outbound_processing decorator, API constraints must be defined. These can be provided in the response to the connect method')
             logger.info(f"Batch size: {batch_size}. Concurrency: {concurrency}")
             if len(method_args)==0:
-                raise ValueError('You must provide at least one method argument, and the first argument must be a DataFrame or DataFrame generator (from outbound_sync_request.get_records_to_*)')
+                raise ValueError('You must provide at least one method argument, and the first argument must be a DataFrame or DataFrame generator (from outbound_sync_request.get_records)')
             first_arg = method_args[0]
             logger.info(first_arg.__class__.__name__)
             if first_arg.__class__.__name__ == 'DataFrame':
@@ -1073,7 +1071,7 @@ def managed_outbound_processing(concurrency:int, batch_size:int):
             elif hasattr(first_arg,'__next__'):
                 logger.info('managed_outbound_processing received an iterator function')
             else:
-                raise ValueError(f'The first argument to a @managed_outbound_processing method must be a DataFrame or DataFrame generator (from outbound_sync_request.get_records_to_*). Instead, a {first_arg.__class__.__name__} was provided.')
+                raise ValueError(f'The first argument to a @managed_outbound_processing method must be a DataFrame or DataFrame generator (from outbound_sync_request.get_records). Instead, a {first_arg.__class__.__name__} was provided.')
 
             # put the record iterator on the queue, ready for the first task to read it
             fixed_size_generator = FixedSizeGenerator(first_arg,batch_size = batch_size)

omnata_plugin_runtime/plugin_entrypoints.py

@@ -268,7 +268,7 @@ class PluginEntrypoint():
             except Exception as exception:
                 logger.error(f'Error parsing secrets content: {str(exception)}')
                 raise ValueError(f'Error parsing secrets content: {str(exception)}')
-            connection_secrets = parse_obj_as(Dict[str,StoredConfigurationValue],other_secrets)
+            connection_secrets = {**connection_secrets,**parse_obj_as(Dict[str,StoredConfigurationValue],other_secrets)}
         return connection_secrets
     
     def network_addresses(self,method:str,connection_parameters:Dict) -> List[str]:

{omnata_plugin_runtime-0.1.46.dist-info → omnata_plugin_runtime-0.1.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.1.46
+Version: 0.1.48
 Summary: A development kit to assist with building, testing and publishing Omnata Plugins
 Author: James Weakley
 Author-email: james.weakley@omnata.com

{omnata_plugin_runtime-0.1.46.dist-info → omnata_plugin_runtime-0.1.48.dist-info}/RECORD

@@ -3,11 +3,11 @@ omnata_plugin_runtime/api.py,sha256=z0yyaLq51gzP7OCJJyerCyfOXV2fY9Hhu8Qk64Q_jms,
 omnata_plugin_runtime/configuration.py,sha256=ApmDhTG7TqURiQ5VCkfP8QY8rT5K9pQIdKi6qJurDnQ,29524
 omnata_plugin_runtime/forms.py,sha256=n_OTuWL8zldCQtxqP4ZORn4Jq3mKObLEZ9bZqOrWoSE,13518
 omnata_plugin_runtime/logging.py,sha256=qwJolvjKpOC0RcbP7kUQsqaS4OeMYTzdw7yacWVXKrQ,4629
-omnata_plugin_runtime/omnata_plugin.py,sha256=PKX3m_prUp7YSDkvoL-zYBigUzcwoRN0lG3tS2LhEl4,67598
-omnata_plugin_runtime/plugin_entrypoints.py,sha256=cdg9mmon5UoGiusBPsmBHOpcIfQYNUhdMRQSeIwIZ0A,20091
+omnata_plugin_runtime/omnata_plugin.py,sha256=qqir2ngJheY2ooC5WyrIbUyT8DKYxcaRjHGvURBB-e4,67464
+omnata_plugin_runtime/plugin_entrypoints.py,sha256=OV2h6my2sY6B14lYJIH9Os8DAqNdxP4PV50IANdgT-c,20116
 omnata_plugin_runtime/rate_limiting.py,sha256=wxjKF26cMyCRdkCdTytC-mXwJFgsMze-PJttiND9c8g,10078
 omnata_plugin_runtime/record_transformer.py,sha256=oDUHurMQl6ixsltBaZf6ngPxtoizcaS21LuxKMxlaxY,2611
-omnata_plugin_runtime-0.1.46.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-omnata_plugin_runtime-0.1.46.dist-info/METADATA,sha256=ioLLvEMyj1_AgBXYzBoytSGIxUHznRkU-QpPwtTWI2c,853
-omnata_plugin_runtime-0.1.46.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-omnata_plugin_runtime-0.1.46.dist-info/RECORD,,
+omnata_plugin_runtime-0.1.48.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+omnata_plugin_runtime-0.1.48.dist-info/METADATA,sha256=gPGr1HF0TiHNA06x3B2lylBcivDafgY6uBpaRNYbO_w,853
+omnata_plugin_runtime-0.1.48.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+omnata_plugin_runtime-0.1.48.dist-info/RECORD,,