omnata-plugin-runtime 0.1.73__py3-none-any.whl → 0.1.80__py3-none-any.whl

omnata_plugin_runtime/api.py

@@ -5,14 +5,24 @@ Not used in plugins.
 import sys
 import json
 
-from typing import Dict, List, Literal, Optional, Union, cast # pylint: disable=ungrouped-imports
+from typing import (
+    Dict,
+    List,
+    Literal,
+    Optional,
+    Union,
+    cast,
+)  # pylint: disable=ungrouped-imports
 
 from pydantic import BaseModel, Field  # pylint: disable=no-name-in-module
 from snowflake.snowpark import Row
 
-from .configuration import (InboundSyncStreamsConfiguration,
-                            OutboundSyncStrategy, StoredConfigurationValue,
-                            StoredMappingValue)
+from .configuration import (
+    InboundSyncStreamsConfiguration,
+    OutboundSyncStrategy,
+    StoredConfigurationValue,
+    StoredMappingValue,
+)
 from .rate_limiting import ApiLimits, RateLimitState
 
 if tuple(sys.version_info[:2]) >= (3, 9):
@@ -75,7 +85,7 @@ PluginMessage = Annotated[
         PluginMessageStreamState,
         PluginMessageStreamProgressUpdate,
         PluginMessageCancelledStreams,
-        PluginMessageAbandonedStreams
+        PluginMessageAbandonedStreams,
     ],
     Field(discriminator="message_type"),
 ]
@@ -105,7 +115,7 @@ class OutboundSyncRequestPayload(BaseModel):
     sync_parameters: Dict[str, StoredConfigurationValue]
     api_limit_overrides: List[ApiLimits]
     rate_limits_state: Dict[str, RateLimitState]
-    field_mappings: StoredMappingValue
+    field_mappings: Optional[StoredMappingValue]
 
 
 class InboundSyncRequestPayload(BaseModel):
@@ -138,6 +148,7 @@ SyncRequestPayload = Annotated[
     Field(discriminator="sync_direction"),
 ]
 
+
 def handle_proc_result(query_result: List[Row]) -> Dict:
     """
     Our standard proc response is a single row with a single column, which is a JSON string
@@ -145,9 +156,11 @@ def handle_proc_result(query_result: List[Row]) -> Dict:
     Otherwise we return the data
     """
     if len(query_result) != 1:
-        raise ValueError(f"Expected a single row result from procedure (got {len(query_result)})")
+        raise ValueError(
+            f"Expected a single row result from procedure (got {len(query_result)})"
+        )
     first_row = cast(Row, query_result[0])
     result = json.loads(str(first_row[0]))
     if result["success"] is not True:
         raise ValueError(result["error"])
-    return result["data"] if "data" in result else result
+    return result["data"] if "data" in result else result

omnata_plugin_runtime/configuration.py

@@ -1,5 +1,3 @@
-# it's not the 1980s anymore
-# pylint: disable=line-too-long,multiple-imports,logging-fstring-interpolation
 """
 Omnata Plugin Runtime configuration objects.
 Includes data container classes related to plugin configuration.
@@ -14,7 +12,7 @@ from pydantic import BaseModel, Field  # pylint: disable=no-name-in-module
 
 if tuple(sys.version_info[:2]) >= (3, 9):
     # Python 3.9 and above
-    from typing import Annotated # pylint: disable=ungrouped-imports
+    from typing import Annotated  # pylint: disable=ungrouped-imports
 else:
     # Python 3.8 and below
     from typing_extensions import Annotated
@@ -207,10 +205,10 @@ class OutboundSyncStrategy(SubscriptableBaseModel, ABC):
     name: str
     description: str
     icon_source: str = ICON_URL_CODE
-    action_on_record_create: OutboundSyncAction = None
-    action_on_record_update: OutboundSyncAction = None
-    action_on_record_delete: OutboundSyncAction = None
-    action_on_record_unchanged: OutboundSyncAction = None
+    action_on_record_create: Optional[OutboundSyncAction] = None
+    action_on_record_update: Optional[OutboundSyncAction] = None
+    action_on_record_delete: Optional[OutboundSyncAction] = None
+    action_on_record_unchanged: Optional[OutboundSyncAction] = None
     custom_strategy: bool = True
 
     def __eq__(self, other):
@@ -498,7 +496,7 @@ class ConnectionConfigurationParameters(SubscriptableBaseModel):
             raise ValueError("Connection parameters were not provided")
         if parameter_name not in self.connection_parameters.keys():
             raise ValueError(f"Connection parameter '{parameter_name}' not available")
-        return self.connection_parameters[ # pylint: disable=unsubscriptable-object
+        return self.connection_parameters[  # pylint: disable=unsubscriptable-object
             parameter_name
         ]
 
@@ -516,7 +514,7 @@ class ConnectionConfigurationParameters(SubscriptableBaseModel):
             raise ValueError("Connection secrets were not provided")
         if parameter_name not in self.connection_secrets.keys():
             raise ValueError(f"Connection secret '{parameter_name}' not available")
-        return self.connection_secrets[ # pylint: disable=unsubscriptable-object
+        return self.connection_secrets[  # pylint: disable=unsubscriptable-object
             parameter_name
         ]
 
@@ -559,7 +557,7 @@ class SyncConfigurationParameters(ConnectionConfigurationParameters):
             if default_value is not None:
                 return {"value": default_value, "metadata": {}}
             raise ValueError(f"Sync parameter '{parameter_name}' not available")
-        return self.sync_parameters[ # pylint: disable=unsubscriptable-object
+        return self.sync_parameters[  # pylint: disable=unsubscriptable-object
             parameter_name
         ]
 
@@ -580,7 +578,7 @@ class SyncConfigurationParameters(ConnectionConfigurationParameters):
             if default_value is not None:
                 return StoredConfigurationValue(value=default_value)
             raise ValueError(f"Form parameter '{parameter_name}' not available")
-        return self.current_form_parameters[ # pylint: disable=unsubscriptable-object
+        return self.current_form_parameters[  # pylint: disable=unsubscriptable-object
             parameter_name
         ]
 
@@ -591,7 +589,9 @@ class SyncConfigurationParameters(ConnectionConfigurationParameters):
         return_dict = {}
         for dict_key in self.current_form_parameters.keys():
             if dict_key not in exclude_fields:
-                return_dict[dict_key] = self.current_form_parameters[ # pylint: disable=unsubscriptable-object
+                return_dict[
+                    dict_key
+                ] = self.current_form_parameters[  # pylint: disable=unsubscriptable-object
                     dict_key
                 ].value
         return return_dict

omnata_plugin_runtime/forms.py

@@ -1,5 +1,3 @@
-# it's not the 1980s anymore
-# pylint: disable=line-too-long,multiple-imports,logging-fstring-interpolation,too-many-arguments,no-self-argument
 """
 Contains form elements for Omnata plugin configuration
 """
@@ -207,7 +205,7 @@ class FormJinjaTemplate(SubscriptableBaseModel):
 # Everything above here has no dependencies on other BaseModels in this module
 # ----------------------------------------------------------------------------
 
-NewOptionCreator = ForwardRef("NewOptionCreator") # type: ignore
+NewOptionCreator = ForwardRef("NewOptionCreator")  # type: ignore
 
 
 class StaticFormOptionsDataSource(SubscriptableBaseModel):
@@ -390,20 +388,34 @@ class InboundSyncConfigurationForm(ConfigurationFormBase):
     fields: List[FormFieldBase] = Field(default_factory=list)
     stream_lister: StreamLister
 
+class SecurityIntegrationTemplate(BaseModel):
+    """
+    Provides values used to populate a security integration instructions template, which
+    in turn allows the customer to create an OAuth based secret object
+    """
+    oauth_docs_url: Optional[str] = None
+    oauth_type: Literal["code_grant"] = "code_grant"
+    oauth_client_id: str = '<client id>'
+    oauth_client_secret: str = '<client secret>'
+    oauth_token_endpoint: str = '<token endpoint>'
+    oauth_authorization_endpoint: str = '<authorization endpoint>'
+    oauth_allowed_scopes: List[str] = []
+
 
 class ConnectionMethod(SubscriptableBaseModel):
     """
     Defines a method of connecting to an application.
     :param str data_source: The name of the connection method, e.g. "OAuth", "API Key", "Credentials"
     :param List[FormFieldBase] fields: A list of fields that are used to collect the connection information from the user.
-    :param bool oauth: If True, the resulting form will indicate to the user that OAuth will be used.
-        In this scenario, the oauth_parameters function will be called before the connect function.
+    :param Optional[SecurityIntegrationTemplate] oauth_template: If provided, the user will be guided through the process
+    of creating a security integration, followed by a secret and performing the OAuth flow. Once this secret is completed,
+    the rest of the values from the form will be captured and then the connection will be tested.
     :param str description: A markdown description of the connection method, which will be displayed to the user.
-        This should be concise as it will be displayed in a sidebar, but you can include a link to the connection section 
+        This should be concise as it will be displayed in a sidebar, but you can include a link to the connection section
         of the plugin's documentation.
     """
 
     name: str
     fields: List[FormFieldBase]
-    oauth: bool = False
+    oauth_template: Optional[SecurityIntegrationTemplate] = None
     description: str = ""

omnata_plugin_runtime/logging.py

@@ -37,7 +37,7 @@ class CustomLogger(logging.getLoggerClass()):
             if isinstance(exc_value, ValidationError):
                 record.msg = exc_value.errors()
                 record.exc_info = (exc_type, None, tb)
-        super().handleError(record) # type: ignore
+        super().handleError(record)  # type: ignore
 
 
 class OmnataPluginLogHandler(logging.Handler):
@@ -66,11 +66,13 @@ class OmnataPluginLogHandler(logging.Handler):
 
     def emit(self, record: logging.LogRecord):
         if hasattr(record, "stream_name"):
-            stream_name: str = record.stream_name # type: ignore
+            stream_name: str = record.stream_name  # type: ignore
             if record.levelno >= logging.ERROR:
                 self.stream_has_errors[stream_name] = True
 
-    def register(self, logging_level: str, additional_loggers: Optional[List[str]] = None):
+    def register(
+        self, logging_level: str, additional_loggers: Optional[List[str]] = None
+    ):
         """
         Register the handler with the omnata_plugin namespace
         """

omnata_plugin_runtime/omnata_plugin.py

@@ -1,5 +1,4 @@
-# it's not the 1980s anymore
-# pylint: disable=line-too-long,multiple-imports,logging-fstring-interpolation
+# pylint: disable=protected-access
 """
 Omnata Plugin Runtime.
 Includes data container classes and defines the contract for a plugin.
@@ -28,23 +27,40 @@ from snowflake.connector.pandas_tools import write_pandas
 from snowflake.snowpark import Session
 from snowflake.snowpark.functions import col
 
-from .api import (PluginMessage, PluginMessageAbandonedStreams,
-                  PluginMessageCancelledStreams, PluginMessageCurrentActivity,
-                  PluginMessageStreamProgressUpdate, PluginMessageStreamState,
-                  handle_proc_result)
-from .configuration import (STANDARD_OUTBOUND_SYNC_ACTIONS,
-                            ConnectionConfigurationParameters,
-                            InboundSyncConfigurationParameters,
-                            OutboundSyncAction,
-                            OutboundSyncConfigurationParameters,
-                            OutboundSyncStrategy, StoredConfigurationValue,
-                            StoredMappingValue, StoredStreamConfiguration,
-                            StreamConfiguration, SubscriptableBaseModel,
-                            SyncConfigurationParameters)
-from .forms import (ConnectionMethod, InboundSyncConfigurationForm,
-                    OutboundSyncConfigurationForm)
-from .rate_limiting import (ApiLimits, HttpMethodType,
-                            InterruptedWhileWaitingException, RateLimitState)
+from .api import (
+    PluginMessage,
+    PluginMessageAbandonedStreams,
+    PluginMessageCancelledStreams,
+    PluginMessageCurrentActivity,
+    PluginMessageStreamProgressUpdate,
+    PluginMessageStreamState,
+    handle_proc_result,
+)
+from .configuration import (
+    STANDARD_OUTBOUND_SYNC_ACTIONS,
+    ConnectionConfigurationParameters,
+    InboundSyncConfigurationParameters,
+    OutboundSyncAction,
+    OutboundSyncConfigurationParameters,
+    OutboundSyncStrategy,
+    StoredConfigurationValue,
+    StoredMappingValue,
+    StoredStreamConfiguration,
+    StreamConfiguration,
+    SubscriptableBaseModel,
+    SyncConfigurationParameters,
+)
+from .forms import (
+    ConnectionMethod,
+    InboundSyncConfigurationForm,
+    OutboundSyncConfigurationForm,
+)
+from .rate_limiting import (
+    ApiLimits,
+    HttpMethodType,
+    InterruptedWhileWaitingException,
+    RateLimitState,
+)
 
 logger = getLogger(__name__)
 SortDirectionType = Literal["asc", "desc"]
@@ -142,7 +158,7 @@ class SyncRequest(ABC):
         self._run_id = run_id
         self.api_limits = api_limits
         self.rate_limit_state = rate_limit_state
-        self._apply_results = None # this will be re-initialised by subclasses
+        self._apply_results = None  # this will be re-initialised by subclasses
         # these deal with applying the results, not sure they belong here
         self._apply_results_lock = threading.Lock()
         # Snowflake connector appears to not be thread safe
@@ -204,7 +220,7 @@ class SyncRequest(ABC):
         Designed to be run in a thread, this method checks to see if the sync run has been cancelled.
         """
         while not cancellation_token.is_set():
-            logger.info("cancel checking worked checking for results")
+            logger.info("cancel checking worker checking for results")
 
             with self._snowflake_query_lock:
                 try:
@@ -344,7 +360,7 @@ class HttpRateLimiting:
         It does this by patching http.client.HTTPConnection.putrequest
         """
         self_outer = self
-        self.original_putrequest = http.client.HTTPConnection.putrequest # type: ignore
+        self.original_putrequest = http.client.HTTPConnection.putrequest  # type: ignore
 
         def new_putrequest(
             self,
@@ -372,10 +388,10 @@ class HttpRateLimiting:
                 self, method, url, skip_host, skip_accept_encoding
             )
 
-        http.client.HTTPConnection.putrequest = new_putrequest # type: ignore
+        http.client.HTTPConnection.putrequest = new_putrequest  # type: ignore
 
     def __exit__(self, exc_type, exc_value, traceback):
-        http.client.HTTPConnection.putrequest = self.original_putrequest # type: ignore
+        http.client.HTTPConnection.putrequest = self.original_putrequest  # type: ignore
 
 
 class OutboundSyncRequest(SyncRequest):
@@ -554,23 +570,29 @@ class OutboundSyncRequest(SyncRequest):
         # use a random table name with a random string to avoid collisions
         with self._snowflake_query_lock:
             success, nchunks, nrows, _ = write_pandas(
-                conn=self._session._conn._cursor.connection,       # pylint: disable=protected-access
+                conn=self._session._conn._cursor.connection,  # pylint: disable=protected-access
                 df=self._preprocess_results_dataframe(results_df),
                 quote_identifiers=False,
                 table_name=self._full_results_table_name,
                 auto_create_table=False,
             )
             if not success:
-                raise ValueError(f"Failed to write results to table {self._full_results_table_name}")
-            logger.info(f"Wrote {nrows} rows and {nchunks} chunks to table {self._full_results_table_name}")
+                raise ValueError(
+                    f"Failed to write results to table {self._full_results_table_name}"
+                )
+            logger.info(
+                f"Wrote {nrows} rows and {nchunks} chunks to table {self._full_results_table_name}"
+            )
 
-    def __dataframe_wrapper(self, data_frame:pandas.DataFrame, render_jinja: bool = True) -> pandas.DataFrame:
+    def __dataframe_wrapper(
+        self, data_frame: pandas.DataFrame, render_jinja: bool = True
+    ) -> pandas.DataFrame:
         """
         Takes care of some common stuff we need to do for each dataframe for outbound syncs.
         Parses the JSON in the transformed record column (Snowflake passes it as a string).
         Also when the mapper is a jinja template, renders it.
         """
-        #if data_frame is None:
+        # if data_frame is None:
         #    logger.info(
         #        "Dataframe wrapper skipping pre-processing as dataframe is None"
         #    )
@@ -672,9 +694,7 @@ class OutboundSyncRequest(SyncRequest):
         with self._snowflake_query_lock:
             dataframe = (
                 self._session.table(self._full_records_table_name)
-                .filter(
-                    (col("SYNC_ACTION").in_(sync_action_names)) # type: ignore
-                )
+                .filter((col("SYNC_ACTION").in_(sync_action_names)))  # type: ignore
                 .select(
                     col("IDENTIFIER"), col("SYNC_ACTION"), col("TRANSFORMED_RECORD")
                 )
@@ -828,9 +848,7 @@ class InboundSyncRequest(SyncRequest):
             if stream.stream_name not in self._completed_streams
         ]
         self._plugin_message(
-            message=PluginMessageAbandonedStreams(
-                abandoned_streams = abandoned_streams
-            )
+            message=PluginMessageAbandonedStreams(abandoned_streams=abandoned_streams)
         )
 
     def enqueue_results(self, stream_name: str, results: List[Dict], new_state: Any):
@@ -932,7 +950,7 @@ class InboundSyncRequest(SyncRequest):
                 [
                     {
                         "RECORD_DATA": self._convert_by_json_schema(
-                            stream_name, data, stream_obj.json_schema # type: ignore
+                            stream_name, data, stream_obj.json_schema  # type: ignore
                         )
                     }
                     for data in results
@@ -987,7 +1005,7 @@ class InboundSyncRequest(SyncRequest):
                     f"Applying {len(results_df)} results to {self._full_results_table_name}"
                 )
                 success, nchunks, nrows, _ = write_pandas(
-                    conn=self._session._conn._cursor.connection, # pylint: disable=protected-access
+                    conn=self._session._conn._cursor.connection,  # pylint: disable=protected-access
                     df=results_df,
                     table_name=self._full_results_table_name,
                     quote_identifiers=False,  # already done in get_temp_table_name
@@ -995,8 +1013,12 @@ class InboundSyncRequest(SyncRequest):
                     table_type="transient",
                 )
                 if not success:
-                    raise ValueError(f"Failed to write results to table {self._full_results_table_name}")
-                logger.info(f"Wrote {nrows} rows and {nchunks} chunks to table {self._full_results_table_name}")
+                    raise ValueError(
+                        f"Failed to write results to table {self._full_results_table_name}"
+                    )
+                logger.info(
+                    f"Wrote {nrows} rows and {nchunks} chunks to table {self._full_results_table_name}"
+                )
                 # temp tables aren't allowed
                 # snowflake_df = self._session.create_dataframe(results_df)
                 # snowflake_df.write.save_as_table(table_name=temp_table,
@@ -1016,23 +1038,6 @@ class InboundSyncRequest(SyncRequest):
         self._plugin_message(PluginMessageStreamState(stream_state=self._latest_states))
 
 
-class OAuthParameters(SubscriptableBaseModel):
-    """
-    Encapsulates a set of OAuth Parameters
-    """
-
-    scope: str
-    authorization_url: str
-    access_token_url: str
-    client_id: str
-    state: Optional[str] = None
-    response_type: str = "code"
-    access_type: str = "offline"
-
-    class Config:
-        extra = "allow"  # OAuth can contain extra fields
-
-
 class ConnectResponse(SubscriptableBaseModel):
     """
     Encapsulates the response to a connection request. This is used to pass back any additional
@@ -1063,14 +1068,11 @@ class BillingEvent(BaseModel):
 class BillingEventRequest(BaseModel):
     """
     Represents a request to provide billing events for that day.
-    The Omnata engine provides the number of runs for the most frequent inbound and outbound syncs, and the sync ids
     """
 
     billing_schedule: Literal["DAILY"]
-    inbound_most_frequent_run_count: int
-    inbound_most_frequent_sync_id: int
-    outbound_most_frequent_run_count: int
-    outbound_most_frequent_sync_id: int
+    has_active_inbound: bool
+    has_active_outbound: bool
 
 
 # BillingEventRequest = Annotated[Union[DailyBillingEventRequest,...],Field(discriminator='billing_schedule')]
@@ -1171,21 +1173,6 @@ class OmnataPlugin(ABC):
         """
         raise NotImplementedError("Your plugin class must implement the connect method")
 
-    def oauth_parameters(
-        self, parameters: ConnectionConfigurationParameters
-    ) -> OAuthParameters:
-        """
-        This function is called for any connection method where the "oauth" flag is set to true.
-        Connection Parameters are provided in case they are needed to construct the OAuth parameters.
-
-        :param PluginConfigurationParameters parameters the parameters of the sync, as configured by the user
-        :return A OAuthParameters, which contains information to commence an OAuth flow
-        :rtype OAuthParameters
-        """
-        raise NotImplementedError(
-            "Your plugin class must implement the oauth_parameters method"
-        )
-
     def sync_outbound(
         self,
         parameters: OutboundSyncConfigurationParameters,
@@ -1222,7 +1209,6 @@ class OmnataPlugin(ABC):
             source_types: a dictionary of field names to the original SQL type of the source column/literal/expression (before conversion to variant), as returned by SYSTEM$TYPEOF.
                 Leveraging this information may be simpler than trying to parse the transformed values to determine if the original type is compatible
         """
-        pass
 
     def sync_inbound(
         self,
@@ -1366,10 +1352,14 @@ def __managed_outbound_processing_worker(
         logger.info(
             f"worker {worker_index} processing. Cancelled: {cancellation_token.is_set()}"
         )
-        assert plugin_class_obj._sync_request is not None # pylint: disable=protected-access
-        if datetime.datetime.now() > plugin_class_obj._sync_request._run_deadline: # pylint: disable=protected-access
+        assert (
+            plugin_class_obj._sync_request is not None
+        )  # pylint: disable=protected-access
+        if (
+            datetime.datetime.now() > plugin_class_obj._sync_request._run_deadline
+        ):  # pylint: disable=protected-access
             # if we've reached the deadline for the run, end it
-            plugin_class_obj._sync_request.apply_deadline_reached() # pylint: disable=protected-access
+            plugin_class_obj._sync_request.apply_deadline_reached()  # pylint: disable=protected-access
             return
         records_df = next(dataframe_generator)
         logger.info(f"records returned from dataframe generator: {records_df}")
@@ -1406,8 +1396,12 @@ def __managed_outbound_processing_worker(
 
         # we want to write the results of the batch back to Snowflake, so we
         # enqueue them and they'll be picked up by the apply_results worker
-        outbound_sync_request = cast(OutboundSyncRequest, plugin_class_obj._sync_request) # pylint: disable=protected-access
-        outbound_sync_request.enqueue_results(results_df) # pylint: disable=protected-access
+        outbound_sync_request = cast(
+            OutboundSyncRequest, plugin_class_obj._sync_request
+        )  # pylint: disable=protected-access
+        outbound_sync_request.enqueue_results(
+            results_df
+        )  # pylint: disable=protected-access
         logger.info(
             f"worker {worker_index} applied results, marking queue task as done"
         )
@@ -1430,10 +1424,10 @@ def managed_outbound_processing(concurrency: int, batch_size: int):
 
     def actual_decorator(method):
         @wraps(method)
-        def _impl(self:OmnataPlugin, *method_args, **method_kwargs):
+        def _impl(self: OmnataPlugin, *method_args, **method_kwargs):
             logger.info(f"method_args: {method_args}")
             logger.info(f"method_kwargs: {method_kwargs}")
-            if self._sync_request is None: # pylint: disable=protected-access
+            if self._sync_request is None:  # pylint: disable=protected-access
                 raise ValueError(
                     "To use the managed_outbound_processing decorator, you must attach a sync request to the plugin instance (via the _sync_request property)"
                 )

omnata_plugin_runtime/plugin_entrypoints.py

@@ -1,4 +1,3 @@
-# pylint: disable=logging-fstring-interpolation
 import datetime
 import importlib
 import json
@@ -101,9 +100,9 @@ class PluginEntrypoint:
         # if any endpoint categories have no state, give them an empty state
         for api_limit in api_limits:
             if api_limit.endpoint_category not in request.rate_limits_state:
-                request.rate_limits_state[
-                    api_limit.endpoint_category
-                ] = RateLimitState(wait_until=None,previous_request_timestamps=None)
+                request.rate_limits_state[api_limit.endpoint_category] = RateLimitState(
+                    wait_until=None, previous_request_timestamps=None
+                )
         logger.info(
             f"Rate limits state: {json.dumps(request.rate_limits_state, default=pydantic.json.pydantic_encoder)}"
         )
@@ -318,11 +317,11 @@ class PluginEntrypoint:
         events: List[BillingEvent] = self._plugin_instance.create_billing_events(
             request
         )
-        # create each billing event, waiting a minute between each one
+        # create each billing event, waiting a second between each one
         first_time = True
         for billing_event in events:
             if not first_time:
-                time.sleep(60)
+                time.sleep(1)
             else:
                 first_time = False
             current_time = int(time.time() * 1000)
@@ -342,8 +341,8 @@ class PluginEntrypoint:
                     $${json.dumps(billing_event.additional_info)}$$)
                     """
             logger.info(f"Executing billing event query: {event_query}")
-            handle_proc_result(session.sql(event_query).collect())
-
+            result = session.sql(event_query).collect()
+            logger.info(f"Billing event result: {result}")
         return [e.dict() for e in events]
 
     def get_secrets(
@@ -362,14 +361,15 @@ class PluginEntrypoint:
                 secret_string_content = _snowflake.get_generic_secret_string(
                     other_secrets_name
                 )
-                other_secrets = json.loads(secret_string_content)
+                if len(secret_string_content) > 2:
+                    other_secrets = json.loads(secret_string_content)
+                    connection_secrets = {
+                        **connection_secrets,
+                        **parse_obj_as(Dict[str, StoredConfigurationValue], other_secrets),
+                    }
             except Exception as exception:
-                logger.error(f"Error parsing secrets content: {str(exception)}")
+                logger.error(f"Error parsing secrets content for secret {other_secrets_name}: {str(exception)}")
                 raise ValueError("Error parsing secrets content:") from exception
-            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]:
@@ -411,9 +411,7 @@ class PluginEntrypoint:
                 connection_parameters=parse_obj_as(
                     Dict[str, StoredConfigurationValue], connection_parameters
                 ),
-                connection_secrets=parse_obj_as(
-                    Dict[str, StoredConfigurationValue], connection_secrets
-                ),
+                connection_secrets=connection_secrets
             )
         )
         # the connect method can also return more network addresses. If so, we need to update the

omnata_plugin_runtime/rate_limiting.py

@@ -1,5 +1,3 @@
-# it's not the 1980s anymore
-# pylint: disable=line-too-long,multiple-imports,logging-fstring-interpolation
 """
 Contains functionality for limiting http requests made by Omnata plugins
 """
@@ -25,6 +23,7 @@ HttpMethodType = Literal[
     "GET", "HEAD", "POST", "PUT", "DELETE", "CONNECT", "OPTIONS", "TRACE", "PATCH"
 ]
 
+
 class HttpRequestMatcher(SubscriptableBaseModel):
     """
     A class used to match an HTTP request

{omnata_plugin_runtime-0.1.73.dist-info → omnata_plugin_runtime-0.1.80.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.1.73
-Summary: A development kit to assist with building, testing and publishing Omnata Plugins
+Version: 0.1.80
+Summary: Classes and common runtime components for building and running Omnata Plugins
 Author: James Weakley
 Author-email: james.weakley@omnata.com
 Requires-Python: >=3.10,<3.11
@@ -11,7 +11,7 @@ Requires-Dist: jinja2 (>=3,<4)
 Requires-Dist: pandas
 Requires-Dist: pydantic (>=1,<2)
 Requires-Dist: requests (>=2,<3)
-Requires-Dist: snowflake-snowpark-python (>=1.5.1,<2.0.0)
+Requires-Dist: snowflake-snowpark-python (>=1,<2)
 Description-Content-Type: text/markdown
 
 # omnata-plugin-runtime

omnata_plugin_runtime-0.1.80.dist-info/RECORD

@@ -0,0 +1,12 @@
+omnata_plugin_runtime/__init__.py,sha256=w63LVME5nY-hQ4BBzfacy9kvTunwqHGs8iiSPGAX2ns,1214
+omnata_plugin_runtime/api.py,sha256=vCDTCxPZ5rIhi8aSM6Z0TXWHtGpbCoNvCnM3mKa-47Q,5591
+omnata_plugin_runtime/configuration.py,sha256=7P1g8ryOqiXULhKnosAp_uS-h4bZP7i0VZOQ3Izmsac,29513
+omnata_plugin_runtime/forms.py,sha256=AEj74Wko89zBSgucVfPRctU-MI-AuYsIOEBDPhDi6Hc,15050
+omnata_plugin_runtime/logging.py,sha256=ne1sLh5cBkjdRS54B30PGc5frABgjy0sF1_2RMcJ_Tk,3012
+omnata_plugin_runtime/omnata_plugin.py,sha256=LLn4o8xZHXFpdfhIgUiC-eIbvhZOGfhNeqZVsjRQxB8,74217
+omnata_plugin_runtime/plugin_entrypoints.py,sha256=RyOtV2OZ1gRmlXJKpg7EwyWaUK_5oNAGDymXgInMnck,21267
+omnata_plugin_runtime/rate_limiting.py,sha256=OnFnCdMenpMpAZYumpe6mypRnMmDl1Q02vzlgmQgiw0,10733
+omnata_plugin_runtime-0.1.80.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+omnata_plugin_runtime-0.1.80.dist-info/METADATA,sha256=eIByiBLYOznPEF_zymN5f7q7UQpNRQAqSRzld1zyIsI,987
+omnata_plugin_runtime-0.1.80.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+omnata_plugin_runtime-0.1.80.dist-info/RECORD,,

{omnata_plugin_runtime-0.1.73.dist-info → omnata_plugin_runtime-0.1.80.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.6.1
+Generator: poetry-core 1.7.0
 Root-Is-Purelib: true
 Tag: py3-none-any

omnata_plugin_runtime-0.1.73.dist-info/RECORD

@@ -1,12 +0,0 @@
-omnata_plugin_runtime/__init__.py,sha256=w63LVME5nY-hQ4BBzfacy9kvTunwqHGs8iiSPGAX2ns,1214
-omnata_plugin_runtime/api.py,sha256=hxEOcT_CWb0jbQ1ahcHCBPhXAa0N8fLSg4fcADopRfQ,5563
-omnata_plugin_runtime/configuration.py,sha256=HjXeuJEKvYXPCXLmlSwntvRq67sOewxDmoMDQ3T0yB4,29537
-omnata_plugin_runtime/forms.py,sha256=8n6z7dVm4YnVHGeHMyg5ccLW6ZAWxB9UUgVZDuaXrXo,14446
-omnata_plugin_runtime/logging.py,sha256=QjM4x6Hpix7UN_9qVRx24HwtICCfOIS6w0cptgH-DFE,2996
-omnata_plugin_runtime/omnata_plugin.py,sha256=sJhTegSehM-reszYzzWQ1zQNLP1yiEYDFMEod95SSKA,75590
-omnata_plugin_runtime/plugin_entrypoints.py,sha256=jpohxu9vUhKzaukkHhat0xGDu5O-GZ2UfFgqm48iJco,21239
-omnata_plugin_runtime/rate_limiting.py,sha256=8DBz-OxzBGUCoZqWe8fJvT4TGIs4b3WFZgO--9_UbF0,10840
-omnata_plugin_runtime-0.1.73.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-omnata_plugin_runtime-0.1.73.dist-info/METADATA,sha256=Wk66C8wHMAED06sEhH-5txz9_ZdR8igtxt2oymfVWZk,998
-omnata_plugin_runtime-0.1.73.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-omnata_plugin_runtime-0.1.73.dist-info/RECORD,,