omnata-plugin-devkit 0.10.15a105__tar.gz → 0.10.24__tar.gz

{omnata_plugin_devkit-0.10.15a105 → omnata_plugin_devkit-0.10.24}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: omnata-plugin-devkit
-Version: 0.10.15a105
+Version: 0.10.24
 Summary: 
+License-File: LICENSE
 Author: James Weakley
 Author-email: james.weakley@omnata.com
 Requires-Python: >=3.10,<3.11
@@ -12,7 +13,7 @@ Requires-Dist: behave_pandas (>=0.5.0,<0.6.0)
 Requires-Dist: jinja2 (>=3,<=3.1.4)
 Requires-Dist: numpy (<=1.27.0)
 Requires-Dist: omnata-plugin-runtime (>=0.10.20)
-Requires-Dist: omnata_cli (>=0.2.1,<0.3.0)
+Requires-Dist: omnata_cli (>=0.2.3,<0.3.0)
 Requires-Dist: pandas (>=2,<=2.1.4)
 Requires-Dist: pyparsing (>=3.0)
 Requires-Dist: python-slugify (>=8,<9)

{omnata_plugin_devkit-0.10.15a105 → omnata_plugin_devkit-0.10.24}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-devkit"
-version = "0.10.15-a105"
+version = "0.10.24"
 description = ""
 authors = ["James Weakley <james.weakley@omnata.com>"]
 readme = "README.md"
@@ -8,7 +8,7 @@ packages = [{ include = "omnata_plugin_devkit", from = "src" }]
 
 [tool.poetry.dependencies]
 python = "~3.10"
-omnata_cli = "^0.2.1"
+omnata_cli = "^0.2.3"
 omnata-plugin-runtime = ">=0.10.20"
 pandas = "^2,<=2.1.4"
 numpy = "<=1.27.0"

omnata_plugin_devkit-0.10.24/src/omnata_plugin_devkit/jinja_templates/FETCH_CONNECTIONS.sql.jinja

@@ -0,0 +1,26 @@
+CREATE or replace PROCEDURE PLUGIN.FETCH_CONNECTIONS()
+RETURNS TABLE()
+LANGUAGE SQL
+as
+DECLARE
+
+CONNECTIONS resultset;
+SYNC_ENGINE_DATABASE_NAME varchar;
+PROC_NAME varchar;
+PLUGIN_REGISTRATION_EXCEPTION EXCEPTION (-20001, 'Plugin is not registered to a sync engine instance');
+c1 CURSOR FOR select min(APPLICATION_NAME) from DATA.OMNATA_REGISTRATION;
+BEGIN
+
+OPEN c1;
+FETCH c1 INTO SYNC_ENGINE_DATABASE_NAME;
+IF (:SYNC_ENGINE_DATABASE_NAME = null) THEN
+   RAISE PLUGIN_REGISTRATION_EXCEPTION;
+END IF;
+
+select CONCAT(:SYNC_ENGINE_DATABASE_NAME,'.API.PLUGIN_FETCH_CONNECTIONS') into :PROC_NAME;
+
+CONNECTIONS:= (call IDENTIFIER(:PROC_NAME)(current_database(),PLUGIN.TOKEN()));
+
+RETURN TABLE(CONNECTIONS);
+
+END;

omnata_plugin_devkit-0.10.24/src/omnata_plugin_devkit/jinja_templates/FETCH_SYNCS.sql.jinja

@@ -0,0 +1,26 @@
+CREATE or replace PROCEDURE PLUGIN.FETCH_SYNCS(CONNECTION_ID NUMERIC(38,0) DEFAULT NULL)
+RETURNS TABLE()
+LANGUAGE SQL
+as
+DECLARE
+
+SYNCS resultset;
+SYNC_ENGINE_DATABASE_NAME varchar;
+PROC_NAME varchar;
+PLUGIN_REGISTRATION_EXCEPTION EXCEPTION (-20001, 'Plugin is not registered to a sync engine instance');
+c1 CURSOR FOR select min(APPLICATION_NAME) from DATA.OMNATA_REGISTRATION;
+BEGIN
+
+OPEN c1;
+FETCH c1 INTO SYNC_ENGINE_DATABASE_NAME;
+IF (:SYNC_ENGINE_DATABASE_NAME = null) THEN
+   RAISE PLUGIN_REGISTRATION_EXCEPTION;
+END IF;
+
+select CONCAT(:SYNC_ENGINE_DATABASE_NAME,'.API.PLUGIN_FETCH_SYNCS') into :PROC_NAME;
+
+SYNCS:= (call IDENTIFIER(:PROC_NAME)(current_database(),PLUGIN.TOKEN(),:CONNECTION_ID));
+
+RETURN TABLE(SYNCS);
+
+END;

omnata_plugin_devkit-0.10.24/src/omnata_plugin_devkit/jinja_templates/FETCH_SYNC_BRANCHES.sql.jinja

@@ -0,0 +1,26 @@
+CREATE or replace PROCEDURE PLUGIN.FETCH_SYNC_BRANCHES(SYNC_ID numeric)
+RETURNS TABLE()
+LANGUAGE SQL
+as
+DECLARE
+
+SYNC_BRANCHES resultset;
+SYNC_ENGINE_DATABASE_NAME varchar;
+PROC_NAME varchar;
+PLUGIN_REGISTRATION_EXCEPTION EXCEPTION (-20001, 'Plugin is not registered to a sync engine instance');
+c1 CURSOR FOR select min(APPLICATION_NAME) from DATA.OMNATA_REGISTRATION;
+BEGIN
+
+OPEN c1;
+FETCH c1 INTO SYNC_ENGINE_DATABASE_NAME;
+IF (:SYNC_ENGINE_DATABASE_NAME = null) THEN
+   RAISE PLUGIN_REGISTRATION_EXCEPTION;
+END IF;
+
+select CONCAT(:SYNC_ENGINE_DATABASE_NAME,'.API.PLUGIN_FETCH_SYNC_BRANCHES') into :PROC_NAME;
+
+SYNC_BRANCHES:= (call IDENTIFIER(:PROC_NAME)(current_database(),PLUGIN.TOKEN(),:SYNC_ID));
+
+RETURN TABLE(SYNC_BRANCHES);
+
+END;

{omnata_plugin_devkit-0.10.15a105 → omnata_plugin_devkit-0.10.24}/src/omnata_plugin_devkit/jinja_templates/TUNNEL_TEST.sql.jinja

@@ -48,6 +48,7 @@ def run(session,tunnel_type:str,other_secrets_name:str):
       url = f'https://{ngrok_endpoint_host}/'
       try:
          response=http.request('GET',url)
+         return_data['mtls_success'] = True
       except urllib3.exceptions.MaxRetryError as max_retry_error:
          if isinstance(max_retry_error.reason, urllib3.exceptions.SSLError):
             ssl_error:urllib3.exceptions.SSLError = max_retry_error.reason

{omnata_plugin_devkit-0.10.15a105 → omnata_plugin_devkit-0.10.24}/src/omnata_plugin_devkit/jinja_templates/manifest.yml.jinja

@@ -1,4 +1,4 @@
-manifest_version: 1
+manifest_version: 2
 
 version:
   comment: |
@@ -14,7 +14,8 @@ artifacts:
 #runtime configuration for this version
 configuration:
   log_level: {{log_level}}
-  trace_level: ALWAYS
+  trace_level: ON_EVENT
+  metric_level: ALL
   telemetry_event_definitions:
     - type: ERRORS_AND_WARNINGS
       sharing: MANDATORY
@@ -24,9 +25,6 @@ configuration:
       sharing: OPTIONAL
     - type: DEBUG_LOGS
       sharing: OPTIONAL
+    - type: METRICS
+      sharing: OPTIONAL
 
-privileges:
-  - CREATE EXTERNAL ACCESS INTEGRATION:
-      description: "To connect to external application endpoints, as configured by the user (required)"
-  - CREATE SECURITY INTEGRATION:
-      description: "To create OAuth integration, as configured by the user (optional, only required if OAuth connectivity is needed)"

{omnata_plugin_devkit-0.10.15a105 → omnata_plugin_devkit-0.10.24}/src/omnata_plugin_devkit/native_app_packaging.py

@@ -27,6 +27,7 @@ class NativeAppPackaging:
         self,
         developer_role: Optional[str] = None,
         distribution: Literal["INTERNAL", "EXTERNAL"] = "INTERNAL",
+        enable_release_channels: bool = False,
     ) -> bool:
         """
         Creates a native application package in Snowflake.
@@ -39,7 +40,8 @@ class NativeAppPackaging:
         if len(app_packages) == 0:
             self.session.sql(
                 f"""CREATE APPLICATION PACKAGE {self.package_name} 
-                                        DISTRIBUTION={distribution}"""
+                                        DISTRIBUTION={distribution}
+                                        ENABLE_RELEASE_CHANNELS={str(enable_release_channels).upper()}"""
             ).collect()
         if developer_role is not None:
             self.session.sql(
@@ -79,7 +81,6 @@ class NativeAppPackaging:
         application_name: str,
         version_name: str,
         patch_number: Optional[int] = None,
-        debug_mode: bool = True,
         authorize_telemetry_event_sharing: bool = True,
     ) -> bool:
         """
@@ -107,7 +108,6 @@ class NativeAppPackaging:
                 f"""CREATE APPLICATION {application_name} 
                                         FROM APPLICATION PACKAGE {self.package_name}
                                         USING VERSION {version_name} patch {patch_number}
-                                        DEBUG_MODE={str(debug_mode).upper()}
                                         AUTHORIZE_TELEMETRY_EVENT_SHARING={str(authorize_telemetry_event_sharing).upper()}"""
             ).collect()
             return True

{omnata_plugin_devkit-0.10.15a105 → omnata_plugin_devkit-0.10.24}/src/omnata_plugin_devkit/plugin_uploader.py

@@ -20,6 +20,7 @@ import sys
 import typing
 import zipfile
 import copy
+import uuid
 from pathlib import Path
 from typing import Any, Dict, List, Literal, Optional
 
@@ -260,6 +261,7 @@ class PluginUploader:
                 # some packages are named inconsistently which makes them hard to remove from the artifact
                 for item in zip_read.infolist():
                     if not item.filename.startswith('.packages') and \
+                        not item.filename.startswith('udf_direct_imports') and \
                         not item.filename.startswith('pydantic_core'):
                         if item.filename.endswith('.so'):
                             raise ValueError(f"Native library found in package: {item.filename}")
@@ -468,9 +470,11 @@ class PluginUploader:
                 "CONFIGURE_APIS",
                 "UPDATE_API_CONFIGURATION",
                 "PENDING_API_CONFIGURATION",
+                "FETCH_CONNECTIONS",
+                "FETCH_SYNCS",
+                "FETCH_SYNC_BRANCHES",
                 "TEST_CALLBACK",
                 "LIST_STAGES",
-                "CREATE_EXTERNAL_ACCESS_INTEGRATION",
                 "CREATE_GENERIC_SECRET_OBJECT",
                 "CREATE_GENERIC_SECRET_OBJECT_FROM_EXISTING",
                 "UPDATE_GENERIC_SECRET_OBJECT_OLD",
@@ -574,9 +578,14 @@ $${}$$;
                 os.chdir(direct_imports_path)
                 # upload all files in the directory to the stage
                 for path in sorted(Path(".").rglob("*")):
-                    print(f"Uploading {path} to stage")
+                    # don't try to upload directories, only files
+                    if path.is_dir():
+                        continue
+                    # figure out the path
+                    relative_path = str(f"/{path.parent}") if path.parent != Path(".") else ""
+                    print(f"Uploading {path} to stage under {relative_path}")
                     self.session.sql(
-                        f"put file://{path} @{database_name}.{schema_name}.{stage_name} AUTO_COMPRESS=FALSE OVERWRITE=TRUE"
+                        f"put file://{path} @{database_name}.{schema_name}.{stage_name}{relative_path} AUTO_COMPRESS=FALSE OVERWRITE=TRUE"
                     ).collect()
                 os.chdir(cwd)
 
@@ -618,6 +627,28 @@ $${}$$;
 FROM '/streamlit'
 MAIN_FILE = '/plugin_configuration.py';"""
             )
+            
+            setup_script.write("""
+WITH CREATE_TOKEN_FUNCTION AS PROCEDURE()
+RETURNS BOOLEAN
+LANGUAGE JAVASCRIPT
+AS
+$$
+    var uuidStatement = snowflake.createStatement({ sqlText: 
+        `select UUID_STRING();`
+    });
+    var uuidResult = uuidStatement.execute();
+    uuidResult.next();
+    var uuid = uuidResult.getColumnValue(1);
+    var twoDollars='$' + '$';
+    snowflake.createStatement({ sqlText: 
+        `create or replace function PLUGIN.TOKEN() returns string as ${twoDollars}'${uuid}'${twoDollars} `
+    }).execute();
+    return true;
+$$
+CALL CREATE_TOKEN_FUNCTION();
+GRANT USAGE ON FUNCTION PLUGIN.TOKEN() TO application role OMNATA_MANAGEMENT;
+""")
 
             setup_script.write(
                 """GRANT USAGE ON STREAMLIT UI."Plugin Configuration" TO application role OMNATA_MANAGEMENT;\n"""
@@ -652,6 +683,15 @@ MAIN_FILE = '/plugin_configuration.py';"""
                 }
             )
             manifest_file.write(content)
+            custom_manifest_privileges = os.path.join(plugin_directory, "custom_manifest_section.yml")
+            if os.path.exists(custom_manifest_privileges):
+                print("Adding manifest privileges from custom_manifest_section.yml")
+                with open(
+                    custom_manifest_privileges, "r", encoding="utf-8"
+                ) as custom_manifest_privileges_stream:
+                    manifest_file.write(custom_manifest_privileges_stream.read() + "\n")
+
+        
         print("Uploading app manifest to stage")
         self.session.sql(
             (

omnata_plugin_devkit-0.10.15a105/src/omnata_plugin_devkit/jinja_templates/CREATE_EXTERNAL_ACCESS_INTEGRATION.sql.jinja

@@ -1,49 +0,0 @@
-create or replace procedure PLUGIN.CREATE_EXTERNAL_ACCESS_INTEGRATION(
-      EAI_NAME varchar,
-      SECRET_NAMES ARRAY,
-      NETWORK_RULE_NAMES ARRAY)
-   returns object
-   language javascript
-   COMMENT = $$
-   This procedure is deprecated, as the user must create the OAuth secrets themselves in order to be able to bind them correctly.
-   $$
-   execute as owner
-as
-$$
-try{
-   if (SECRET_NAMES === null || SECRET_NAMES === undefined || SECRET_NAMES.length==0){
-      throw new Error('Secret names parameter must contain at least one secret');
-   }
-   if (NETWORK_RULE_NAMES === null || NETWORK_RULE_NAMES === undefined || NETWORK_RULE_NAMES.length==0){
-      throw new Error('Network rule names parameter must contain at least one secret');
-   }
-   var bindings = [EAI_NAME];
-   const secretNamesClauses = SECRET_NAMES.map((s)=>{return `'${s}'`}).join(',');
-   const networkRuleNamesClauses = NETWORK_RULE_NAMES.map((n)=>{return `'${n}'`}).join(',');
-   snowflake.createStatement( {
-      sqlText: `CREATE OR REPLACE EXTERNAL ACCESS INTEGRATION IDENTIFIER(?)
-                           ALLOWED_NETWORK_RULES = (${networkRuleNamesClauses})
-                           ALLOWED_AUTHENTICATION_SECRETS = (${secretNamesClauses})
-                           ENABLED = true`,
-      binds:bindings
-   } ).execute();
-   snowflake.createStatement( {
-      sqlText: `GRANT USAGE ON INTEGRATION IDENTIFIER(?) TO APPLICATION ROLE OMNATA_MANAGEMENT`,
-      binds:[EAI_NAME]
-   } ).execute();
-    return {
-        "success": true,
-        "data": null
-    }
-}
-catch(e){
-   return {
-      "success": false,
-      "error": `CREATE_EXTERNAL_ACCESS_INTEGRATION: ${String(e)}`
-   }
-}
-$$
-;
-
-grant usage on procedure PLUGIN.CREATE_EXTERNAL_ACCESS_INTEGRATION(VARCHAR,ARRAY,ARRAY)
-to application role OMNATA_MANAGEMENT;