omnata-plugin-runtime 0.6.1a164__tar.gz → 0.6.2a166__tar.gz

{omnata_plugin_runtime-0.6.1a164 → omnata_plugin_runtime-0.6.2a166}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.6.1a164
+Version: 0.6.2a166
 Summary: Classes and common runtime components for building and running Omnata Plugins
 Author: James Weakley
 Author-email: james.weakley@omnata.com

{omnata_plugin_runtime-0.6.1a164 → omnata_plugin_runtime-0.6.2a166}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.6.1-a164"
+version = "0.6.2-a166"
 description = "Classes and common runtime components for building and running Omnata Plugins"
 authors = ["James Weakley <james.weakley@omnata.com>"]
 readme = "README.md"

{omnata_plugin_runtime-0.6.1a164 → omnata_plugin_runtime-0.6.2a166}/src/omnata_plugin_runtime/omnata_plugin.py

@@ -2397,39 +2397,43 @@ def find_udtf_classes(path:str = '.') -> List[UDTFDefinition]:
     matching_classes = []
 
     # Iterate over all modules in the current directory
-    for _, module_name, _ in pkgutil.iter_modules([current_dir]):
-        # Import the module
-        module = importlib.import_module(module_name)
-
-        # Iterate over all members of the module
-        for name, obj in inspect.getmembers(module, inspect.isclass):
-            # Check if the class has the specified attribute
-            if hasattr(obj, '_is_omnata_udtf'):
-                matching_classes.append(UDTFDefinition(
-                    name=obj._omnata_udtf_name,
-                    language='python',
-                    runtime_version='3.10',
-                    imports=['/app.zip'],
-                    description=obj._omnata_udtf_description,
-                    params=obj._omnata_udtf_params,
-                    result_columns=obj._omnata_udtf_result_columns,
-                    expose_to_consumer=obj._omnata_udtf_expose_to_consumer,
-                    handler=obj.__module__+'.'+obj.__name__
-                ))
-        # java doesn't use the python decorator, so we need to check for the class directly
-        for name, obj in inspect.getmembers(module):
-            # Check if the class has the specified attribute
-            if isinstance(obj, UDTFDefinition) and cast(UDTFDefinition,obj).language == 'java':
-                udtf_obj = cast(UDTFDefinition,obj)
-                if udtf_obj.language == 'java':
-                    # because the decorator wasn't used, we need to check if we need to add the connection_parameters parameter
-                    if udtf_obj.expose_to_consumer:
-                        if len(udtf_obj.params) == 0 or udtf_obj.params[0].name.upper() != 'CONNECTION_PARAMETERS':
-                            udtf_obj.params = [SnowflakeFunctionParameter(
-                                                name='CONNECTION_PARAMETERS',
-                                                data_type='OBJECT',
-                                                description='The connection object, obtained from calling PLUGIN.PLUGIN_CONNECTION.')] + udtf_obj.params
-                    matching_classes.append(udtf_obj)
+    for root, _, _ in os.walk(current_dir):
+        # exclude the '.packages' directory
+        if '.packages' in root:
+            continue
+        for _, module_name, _ in pkgutil.iter_modules([root]):
+            # Import the module
+            module = importlib.import_module(module_name)
+
+            # Iterate over all members of the module
+            for name, obj in inspect.getmembers(module, inspect.isclass):
+                # Check if the class has the specified attribute
+                if hasattr(obj, '_is_omnata_udtf'):
+                    matching_classes.append(UDTFDefinition(
+                        name=obj._omnata_udtf_name,
+                        language='python',
+                        runtime_version='3.10',
+                        imports=['/app.zip'],
+                        description=obj._omnata_udtf_description,
+                        params=obj._omnata_udtf_params,
+                        result_columns=obj._omnata_udtf_result_columns,
+                        expose_to_consumer=obj._omnata_udtf_expose_to_consumer,
+                        handler=obj.__module__+'.'+obj.__name__
+                    ))
+            # java doesn't use the python decorator, so we need to check for the class directly
+            for name, obj in inspect.getmembers(module):
+                # Check if the class has the specified attribute
+                if isinstance(obj, UDTFDefinition) and cast(UDTFDefinition,obj).language == 'java':
+                    udtf_obj = cast(UDTFDefinition,obj)
+                    if udtf_obj.language == 'java':
+                        # because the decorator wasn't used, we need to check if we need to add the connection_parameters parameter
+                        if udtf_obj.expose_to_consumer:
+                            if len(udtf_obj.params) == 0 or udtf_obj.params[0].name.upper() != 'CONNECTION_PARAMETERS':
+                                udtf_obj.params = [SnowflakeFunctionParameter(
+                                                    name='CONNECTION_PARAMETERS',
+                                                    data_type='OBJECT',
+                                                    description='The connection object, obtained from calling PLUGIN.PLUGIN_CONNECTION.')] + udtf_obj.params
+                        matching_classes.append(udtf_obj)
             
     return matching_classes
 
@@ -2512,39 +2516,44 @@ def find_udf_functions(path:str = '.') -> List[UDFDefinition]:
     matching_classes = []
 
     # Iterate over all modules in the current directory
-    for _, module_name, _ in pkgutil.iter_modules([current_dir]):
-        # Import the module
-        module = importlib.import_module(module_name)
-
-        # Iterate over all members of the module
-        for name, obj in inspect.getmembers(module, inspect.isfunction):
-            # Check if the class has the specified attribute
-            if hasattr(obj, '_is_omnata_udf'):
-                matching_classes.append(UDFDefinition(
-                    name=obj._omnata_udf_name,
-                    language='python',
-                    runtime_version='3.10',
-                    imports=['/app.zip'],
-                    description=obj._omnata_udf_description,
-                    params=obj._omnata_udf_params,
-                    result_data_type=obj._omnata_udf_result_data_type,
-                    expose_to_consumer=obj._omnata_udf_expose_to_consumer,
-                    packages=[],
-                    handler=obj.__module__+'.'+obj.__name__
-                ))
-        # java doesn't use the python decorator, so we need to check for the class directly
-        for name, obj in inspect.getmembers(module):
-            # Check if the class has the specified attribute
-            if isinstance(obj, UDFDefinition):
-                udf_obj = cast(UDFDefinition,obj)
-                if udf_obj.language == 'java':
-                    # because the decorator wasn't used, we need to check if we need to add the connection_parameters parameter
-                    if udf_obj.expose_to_consumer:
-                        if len(udf_obj.params) == 0 or udf_obj.params[0].name.upper() != 'CONNECTION_PARAMETERS':
-                            udf_obj.params = [SnowflakeFunctionParameter(
-                                                name='CONNECTION_PARAMETERS',
-                                                data_type='OBJECT',
-                                                description='The connection object, obtained from calling PLUGIN.PLUGIN_CONNECTION.')] + udf_obj.params
-                    matching_classes.append(udf_obj)
+    # Walk through the directory tree
+    for root, _, _ in os.walk(current_dir):
+        # exclude the '.packages' directory
+        if '.packages' in root:
+            continue
+        for _, module_name, _ in pkgutil.iter_modules([root]):
+            # Import the module
+            module = importlib.import_module(module_name)
+
+            # Iterate over all members of the module
+            for name, obj in inspect.getmembers(module, inspect.isfunction):
+                # Check if the class has the specified attribute
+                if hasattr(obj, '_is_omnata_udf'):
+                    matching_classes.append(UDFDefinition(
+                        name=obj._omnata_udf_name,
+                        language='python',
+                        runtime_version='3.10',
+                        imports=['/app.zip'],
+                        description=obj._omnata_udf_description,
+                        params=obj._omnata_udf_params,
+                        result_data_type=obj._omnata_udf_result_data_type,
+                        expose_to_consumer=obj._omnata_udf_expose_to_consumer,
+                        packages=[],
+                        handler=obj.__module__+'.'+obj.__name__
+                    ))
+            # java doesn't use the python decorator, so we need to check for the class directly
+            for name, obj in inspect.getmembers(module):
+                # Check if the class has the specified attribute
+                if isinstance(obj, UDFDefinition):
+                    udf_obj = cast(UDFDefinition,obj)
+                    if udf_obj.language == 'java':
+                        # because the decorator wasn't used, we need to check if we need to add the connection_parameters parameter
+                        if udf_obj.expose_to_consumer:
+                            if len(udf_obj.params) == 0 or udf_obj.params[0].name.upper() != 'CONNECTION_PARAMETERS':
+                                udf_obj.params = [SnowflakeFunctionParameter(
+                                                    name='CONNECTION_PARAMETERS',
+                                                    data_type='OBJECT',
+                                                    description='The connection object, obtained from calling PLUGIN.PLUGIN_CONNECTION.')] + udf_obj.params
+                        matching_classes.append(udf_obj)
 
     return matching_classes