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

omnata_plugin_runtime/api.py

@@ -115,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):

omnata_plugin_runtime/configuration.py

@@ -205,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):

omnata_plugin_runtime/forms.py

@@ -388,14 +388,28 @@ 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
         of the plugin's documentation.
@@ -403,5 +417,5 @@ class ConnectionMethod(SubscriptableBaseModel):
 
     name: str
     fields: List[FormFieldBase]
-    oauth: bool = False
+    oauth_template: Optional[SecurityIntegrationTemplate] = None
     description: str = ""

omnata_plugin_runtime/omnata_plugin.py

@@ -1038,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
@@ -1085,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')]
@@ -1193,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,

omnata_plugin_runtime/plugin_entrypoints.py

@@ -317,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)
@@ -341,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(
@@ -361,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]:
@@ -410,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-0.1.74.dist-info → omnata_plugin_runtime-0.1.80.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.1.74
+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
@@ -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.74.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.74.dist-info/RECORD

@@ -1,12 +0,0 @@
-omnata_plugin_runtime/__init__.py,sha256=w63LVME5nY-hQ4BBzfacy9kvTunwqHGs8iiSPGAX2ns,1214
-omnata_plugin_runtime/api.py,sha256=Zv6L1-NNtlF7L5rkiU2L__RPwKDDxMVeYPm03dCzKCo,5581
-omnata_plugin_runtime/configuration.py,sha256=4wdKiIDvNzvUZLyv5dn6tNT_JhqI1xVg4p8GYo46680,29473
-omnata_plugin_runtime/forms.py,sha256=AIKMcMxsh42nVYb2Jg51bh_AekMkZPvlChsAqZyLdg4,14302
-omnata_plugin_runtime/logging.py,sha256=ne1sLh5cBkjdRS54B30PGc5frABgjy0sF1_2RMcJ_Tk,3012
-omnata_plugin_runtime/omnata_plugin.py,sha256=UkA06vpUClw1xMnMWDYpxrqerD406Ih8bmatX4HKYPA,75493
-omnata_plugin_runtime/plugin_entrypoints.py,sha256=U4Yitsp0aAiByz0D7ITF5RH_ntJYV0Qkgy5Dlg3dSsc,21192
-omnata_plugin_runtime/rate_limiting.py,sha256=OnFnCdMenpMpAZYumpe6mypRnMmDl1Q02vzlgmQgiw0,10733
-omnata_plugin_runtime-0.1.74.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-omnata_plugin_runtime-0.1.74.dist-info/METADATA,sha256=TYeCn4OHoS1SgbpaQoAivIxKVBzf0049tFScNjN5vUo,995
-omnata_plugin_runtime-0.1.74.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-omnata_plugin_runtime-0.1.74.dist-info/RECORD,,