omnata-plugin-runtime 0.5.7a130__py3-none-any.whl → 0.5.7a132__py3-none-any.whl

omnata_plugin_runtime/omnata_plugin.py

@@ -23,6 +23,11 @@ import threading
 import time
 import hashlib
 import requests
+import pkgutil
+import inspect
+import importlib
+import sys
+import os
 from abc import ABC, abstractmethod
 from decimal import Decimal
 from functools import partial, wraps, reduce
@@ -2242,19 +2247,9 @@ def consumer_udtf(param_docs: Dict[str, Dict[str, Any]]):
         fields = {
             name: (param.annotation, param_docs.get(name, {}).get("default", param.default))
             for name, param in params.items()
-            if name != 'self' and name != 'mandatory_arg'
+            if name != 'cls' and name != 'connection_parameters'
         }
 
-        DynamicModel = create_model('DynamicModel', **fields)
-
-        # Attach the documentation to the function
-        original_process.__doc__ = original_process.__doc__ or ""
-        original_process.__doc__ += "\n\nArgs:\n"
-        for name, param in params.items():
-            if name != 'self':
-                doc = param_docs.get(name, {})
-                original_process.__doc__ += f"    {name} ({param.annotation.__name__}): {doc.get('description', 'No description provided.')}\n"
-
         @wraps(original_process)
         def wrapped_process(self, connection_parameters, *args, **kwargs):
             if connection_parameters is None:
@@ -2263,12 +2258,6 @@ def consumer_udtf(param_docs: Dict[str, Dict[str, Any]]):
             if not isinstance(connection_parameters, Dict):
                 raise ValueError("The first argument must be an object, the result of calling PLUGIN_CONNECTION.")
 
-            try:
-                # Validate the arguments using the dynamic Pydantic model
-                validated_args = DynamicModel(**kwargs)
-            except ValidationError as e:
-                raise ValueError(f"Argument validation error: {e}")
-            
             # convert the connection parameters dictionary to a ConnectionConfigurationParameters object which includes the real secrets
             if 'other_secrets_name' in connection_parameters:
                 # this is the new way, where the sync engine only passes the name of the secret
@@ -2285,7 +2274,7 @@ def consumer_udtf(param_docs: Dict[str, Dict[str, Any]]):
                 parameters = ConnectionConfigurationParameters.model_validate(connection_parameters)
 
             # Pass the validated arguments to the function
-            return original_process(self, parameters, *args, **validated_args.dict())
+            return original_process(self, parameters, *args, **kwargs)
         # Replace the original 'process' method with the wrapped version
         setattr(cls, 'process', wrapped_process)
         
@@ -2293,3 +2282,61 @@ def consumer_udtf(param_docs: Dict[str, Dict[str, Any]]):
     
     return class_decorator
 
+def find_classes_with_attribute(attribute_name: str,path:str = '.'):
+    # Get the directory's absolute path
+    current_dir = os.path.abspath(path)
+
+    # List to hold the classes that match the attribute
+    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, attribute_name):
+                matching_classes.append(obj)
+
+
+def consumer_udf(param_docs: Dict[str, Dict[str, Any]]):
+    def decorator(func):
+        sig = signature(func)
+        params = sig.parameters
+
+        # Ensure the first argument is mandatory and positional
+        if list(params.keys())[0] != 'connection_parameters':
+            raise ValueError("The first argument should be 'connection_parameters'.")
+
+        @wraps(func)
+        def wrapper(self, connection_parameters, *args, **kwargs):
+            if connection_parameters is None:
+                raise ValueError("Connection not found")
+            
+            if not isinstance(connection_parameters, Dict):
+                raise ValueError("The first argument must be an object, the result of calling PLUGIN_CONNECTION.")
+
+            # convert the connection parameters dictionary to a ConnectionConfigurationParameters object which includes the real secrets
+            if 'other_secrets_name' in connection_parameters:
+                # this is the new way, where the sync engine only passes the name of the secret
+                oauth_secrets_name = None
+                if 'oauth_secret_name' in connection_parameters:
+                    oauth_secrets_name = connection_parameters['oauth_secret_name']
+                    del connection_parameters['oauth_secret_name']
+                result = get_secrets(oauth_secrets_name,connection_parameters['other_secrets_name'])
+                connection_parameters['connection_secrets'] = result
+                del connection_parameters['other_secrets_name']
+                parameters = ConnectionConfigurationParameters.model_validate(connection_parameters)
+            else:
+                # deprecated way, where the sync engine passes the secrets directly
+                parameters = ConnectionConfigurationParameters.model_validate(connection_parameters)
+
+            # Pass the validated arguments to the function
+            return func(parameters, *args, **kwargs)
+        
+        wrapper._is_omnata_consumer_udf = True
+        return wrapper
+    
+    return decorator

{omnata_plugin_runtime-0.5.7a130.dist-info → omnata_plugin_runtime-0.5.7a132.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.5.7a130
+Version: 0.5.7a132
 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.7a130.dist-info → omnata_plugin_runtime-0.5.7a132.dist-info}/RECORD

@@ -3,10 +3,10 @@ omnata_plugin_runtime/api.py,sha256=FxzTqri4no8ClkOm7vZADG8aD47jcGBCTTQDEORmOJM,
 omnata_plugin_runtime/configuration.py,sha256=TI6GaVFhewVawBCaYN34GujY57qEP6q2nik4YpSEk5s,38100
 omnata_plugin_runtime/forms.py,sha256=GzSPEwcijsoPCXEO1mHiE8ylvX_KSE5TkhwqkymA2Ss,19755
 omnata_plugin_runtime/logging.py,sha256=bn7eKoNWvtuyTk7RTwBS9UARMtqkiICtgMtzq3KA2V0,3272
-omnata_plugin_runtime/omnata_plugin.py,sha256=jznVOLsrJbeta_50c21Ab2SNfwP79-WkXcBJ4BNHNkY,115179
+omnata_plugin_runtime/omnata_plugin.py,sha256=eV1QKOqdxktkVB3ZEQPS7A9a9q7UOsyEhfyZ-JwV5iw,117231
 omnata_plugin_runtime/plugin_entrypoints.py,sha256=PFSLsYEVnWHVvSoOYTtTK2JY6pp6_8_eYP53WqLRiPE,27975
 omnata_plugin_runtime/rate_limiting.py,sha256=DVQ_bc-mVLBkrU1PTns1MWXhHiLpSB5HkWCcdePtJ2A,25611
-omnata_plugin_runtime-0.5.7a130.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-omnata_plugin_runtime-0.5.7a130.dist-info/METADATA,sha256=bfYMu8hzQFu5-LW4ObOCXVy9KODwjxSOhPC3Zzbl87U,1985
-omnata_plugin_runtime-0.5.7a130.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-omnata_plugin_runtime-0.5.7a130.dist-info/RECORD,,
+omnata_plugin_runtime-0.5.7a132.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+omnata_plugin_runtime-0.5.7a132.dist-info/METADATA,sha256=YHhi631jWmg1ZBJuNsry--DCdhMxWVNynL2ZreqnS7w,1985
+omnata_plugin_runtime-0.5.7a132.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+omnata_plugin_runtime-0.5.7a132.dist-info/RECORD,,