omnata-plugin-runtime 0.5.7a136__tar.gz → 0.5.7a138__tar.gz

{omnata_plugin_runtime-0.5.7a136 → omnata_plugin_runtime-0.5.7a138}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.5.7a136
+Version: 0.5.7a138
 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.5.7a136 → omnata_plugin_runtime-0.5.7a138}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.5.7-a136"
+version = "0.5.7-a138"
 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.5.7a136 → omnata_plugin_runtime-0.5.7a138}/src/omnata_plugin_runtime/omnata_plugin.py

@@ -2250,21 +2250,25 @@ def consumer_udtf(
         result_columns: List[SnowflakeUDTFResultColumn]):
     def class_decorator(cls):
         # Get the original 'process' method from the class
-        cls._is_omnata_consumer_udtf = True
         original_process = getattr(cls, 'process')
         sig = signature(original_process)
-        params = sig.parameters
-        if len(params) < 2:
+        function_params = sig.parameters
+        if len(function_params) < 2:
             raise ValueError("The function must have the self parameter, plus at least the mandatory 'connection_parameters' parameter.")
         # Ensure the first argument is mandatory and positional
-        if list(params.keys())[0] != 'self':
-            raise ValueError("The first argument should be 'self' for class methods.")
+        first_param_name = list(function_params.keys())[0]
 
-        if list(params.keys())[1] != 'connection_parameters':
-            raise ValueError("The second argument should be 'connection_parameters'.")
-        
-        if params[list(params.keys())[1]].annotation != ConnectionConfigurationParameters:
-            raise ValueError("The second argument must be a ConnectionConfigurationParameters.")
+        if first_param_name != 'self':
+            raise ValueError(f"The first argument should be 'self', instead it was '{first_param_name}'.")
+
+        second_param_name = list(function_params.keys())[1]
+
+        if second_param_name != 'connection_parameters':
+            raise ValueError(f"The second argument should be 'connection_parameters', instead it was {second_param_name}.")
+
+
+        if function_params[second_param_name].annotation != ConnectionConfigurationParameters:
+            raise ValueError(f"The second argument must be a ConnectionConfigurationParameters, instead it was a {function_params[second_param_name].annotation}.")
 
         @wraps(original_process)
         def wrapped_process(self, connection_parameters, *args, **kwargs):
@@ -2290,7 +2294,10 @@ def consumer_udtf(
             return original_process(self, parameters, *args, **kwargs)
         # Replace the original 'process' method with the wrapped version
         setattr(cls, 'process', wrapped_process)
-        
+        cls._is_omnata_consumer_udtf = True
+        cls._omnata_consumer_udtf_description = description
+        cls._omnata_consumer_udtf_params = params
+        cls._omnata_consumer_udtf_result_columns = result_columns
         return cls
     
     return class_decorator
@@ -2321,14 +2328,15 @@ def consumer_udf(
         result_data_type: str):
     def decorator(func):
         sig = signature(func)
-        params = sig.parameters
-        if len(params) == 0:
+        function_params = sig.parameters
+        if len(function_params) == 0:
             raise ValueError("The function must have at least one parameter.")
         # Ensure the first argument is mandatory and positional
-        if list(params.keys())[0] != 'connection_parameters':
-            raise ValueError("The first argument should be 'connection_parameters'.")
-        if params[list(params.keys())[0]].annotation != ConnectionConfigurationParameters:
-            raise ValueError("The first argument must be a ConnectionConfigurationParameters.")
+        first_param_name = list(function_params.keys())[0]
+        if first_param_name != 'connection_parameters':
+            raise ValueError(f"The first argument should be 'connection_parameters', instead it was '{first_param_name}'.")
+        if function_params[first_param_name].annotation != ConnectionConfigurationParameters:
+            raise ValueError(f"The first argument must be a ConnectionConfigurationParameters, instead it was a {function_params[first_param_name].annotation}.")
 
         @wraps(func)
         def wrapper(self, connection_parameters, *args, **kwargs):
@@ -2355,6 +2363,9 @@ def consumer_udf(
             return func(parameters, *args, **kwargs)
         
         wrapper._is_omnata_consumer_udf = True
+        wrapper._omnata_consumer_udf_description = description
+        wrapper._omnata_consumer_udf_params = params
+        wrapper._omnata_consumer_udf_result_data_type = result_data_type
         return wrapper
     
     return decorator