refactor: plugin package

Author: Niraj-Kamdar

packages/polywrap-plugin/polywrap_plugin/module.py

@@ -17,15 +17,11 @@ def __init__(self, config: TConfig):
     def set_env(self, env: Dict[str, Any]) -> None:
         self.env = env
 
-    async def _wrap_invoke(self, method: str, args: Dict[str, Any], client: Invoker) -> Result[TResult]:
+    async def __wrap_invoke__(self, method: str, args: Dict[str, Any], client: Invoker) -> Result[TResult]:
         methods: List[str] = [name for name in dir(self) if name == method]
 
-        if len(methods) == 0:
+        if not methods:
             return Err(Exception(f"{method} is not defined in plugin"))
 
         callable_method = getattr(self, method)
-
-        if not callable(callable_method):
-            return Err(Exception(f"{method} is an attribute, not a method"))
-
-        return Ok(callable_method(args, client))
+        return Ok(callable_method(args, client)) if callable(callable_method) else Err(Exception(f"{method} is an attribute, not a method"))

packages/polywrap-plugin/polywrap_plugin/wrapper.py

@@ -23,15 +23,13 @@ def __init__(self, module: PluginModule[TConfig, TResult], manifest: AnyWrapMani
     async def invoke(
         self, options: InvokeOptions, invoker: Invoker
     ) -> Result[InvocableResult]:
-        env = options.env if options.env else {}
+        env = options.env or {}
         self.module.set_env(env)
 
-        decoded_args: Union[Dict[str, Any], bytes] = options.args if options.args else {}
+        args: Union[Dict[str, Any], bytes] = options.args or {}
+        decoded_args: Dict[str, Any] = msgpack_decode(args) if isinstance(args, bytes) else args
 
-        if isinstance(decoded_args, bytes):
-            decoded_args = msgpack_decode(decoded_args)
-
-        result: Result[TResult] = await self.module._wrap_invoke(options.method, decoded_args, invoker) # type: ignore
+        result: Result[TResult] = await self.module.__wrap_invoke__(options.method, decoded_args, invoker)
 
         if result.is_err():
             return cast(Err, result.err)

packages/polywrap-plugin/tests/conftest.py

@@ -13,5 +13,4 @@ def __init__(self, config: None):
         def greeting(self, args: Dict[str, Any], client: Invoker):
             return f"Greetings from: {args['name']}"
 
-    instance = GreetingModule(None)
-    return instance
+    return GreetingModule(None)

packages/polywrap-plugin/tests/test_plugin_module.py

@@ -11,5 +11,5 @@ async def test_plugin_module(get_greeting_module: PluginModule[None, str]):
     module = get_greeting_module
 
     client = PolywrapClient()
-    result = await module._wrap_invoke("greeting", { "name": "Joe" }, client) # type: ignore
+    result = await module.__wrap_invoke__("greeting", { "name": "Joe" }, client)
     assert result, Ok("Greetings from: Joe")

packages/polywrap-plugin/tests/test_plugin_package.py

@@ -1,4 +1,4 @@
-from typing import Any, cast
+from typing import cast
 
 import pytest
 from polywrap_core import InvokeOptions, Uri, AnyWrapManifest

packages/polywrap-plugin/tests/test_plugin_wrapper.py

@@ -1,4 +1,4 @@
-from typing import cast, Callable, Any
+from typing import cast
 
 import pytest
 from polywrap_core import InvokeOptions, Uri