omnata-plugin-runtime 0.5.7a131__tar.gz → 0.5.7a133__tar.gz

{omnata_plugin_runtime-0.5.7a131 → omnata_plugin_runtime-0.5.7a133}/PKG-INFO

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

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

@@ -2242,38 +2242,15 @@ def consumer_udtf(param_docs: Dict[str, Dict[str, Any]]):
 
         if list(params.keys())[1] != 'connection_parameters':
             raise ValueError("The second argument should be 'connection_parameters'.")
-
-        # Create a Pydantic model based on the function signature and the provided documentation
-        fields = {
-            name: (param.annotation, param_docs.get(name, {}).get("default", param.default))
-            for name, param in params.items()
-            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"
+        
+        if params[list(params.keys())[1]].annotation != Dict:
+            raise ValueError("The second argument must be a dict.")
 
         @wraps(original_process)
         def wrapped_process(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.")
 
-            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
@@ -2290,7 +2267,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)
         
@@ -2325,37 +2302,15 @@ def consumer_udf(param_docs: Dict[str, Dict[str, Any]]):
         # Ensure the first argument is mandatory and positional
         if list(params.keys())[0] != 'connection_parameters':
             raise ValueError("The first argument should be 'connection_parameters'.")
-
-        # Create a Pydantic model based on the function signature and the provided documentation
-        fields = {
-            name: (param.annotation, param_docs.get(name, {}).get("default", param.default))
-            for name, param in params.items()
-            if name != 'connection_parameters'
-        }
-
-        DynamicModel = create_model('DynamicModel', **fields)
-
-        # Attach the documentation to the function
-        func.__doc__ = func.__doc__ or ""
-        func.__doc__ += "\n\nArgs:\n"
-        for name, param in params.items():
-            doc = param_docs.get(name, {})
-            func.__doc__ += f"    {name} ({param.annotation.__name__}): {doc.get('description', 'No description provided.')}\n"
+        if params[list(params.keys())[0]].annotation != Dict:
+            raise ValueError("The first argument must be a dict.")
 
         @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.")
 
-            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
@@ -2372,7 +2327,7 @@ def consumer_udf(param_docs: Dict[str, Dict[str, Any]]):
                 parameters = ConnectionConfigurationParameters.model_validate(connection_parameters)
 
             # Pass the validated arguments to the function
-            return func(parameters, *args, **validated_args.dict())
+            return func(parameters, *args, **kwargs)
         
         wrapper._is_omnata_consumer_udf = True
         return wrapper