polywrap · Niraj-Kamdar · Aug 30, 2023 · Aug 30, 2023 · Aug 30, 2023 · Aug 30, 2023
diff --git a/packages/config-bundles/polywrap-sys-config-bundle/poetry.lock b/packages/config-bundles/polywrap-sys-config-bundle/poetry.lock
diff --git a/packages/config-bundles/polywrap-web3-config-bundle/poetry.lock b/packages/config-bundles/polywrap-web3-config-bundle/poetry.lock
diff --git a/packages/plugins/polywrap-ethereum-wallet/poetry.lock b/packages/plugins/polywrap-ethereum-wallet/poetry.lock
diff --git a/packages/plugins/polywrap-fs-plugin/poetry.lock b/packages/plugins/polywrap-fs-plugin/poetry.lock
diff --git a/packages/plugins/polywrap-http-plugin/poetry.lock b/packages/plugins/polywrap-http-plugin/poetry.lock
diff --git a/packages/polywrap-client-config-builder/poetry.lock b/packages/polywrap-client-config-builder/poetry.lock
diff --git a/packages/polywrap-client/poetry.lock b/packages/polywrap-client/poetry.lock
diff --git a/packages/polywrap-client/polywrap_client/client.py b/packages/polywrap-client/polywrap_client/client.py
@@ -20,7 +20,7 @@
 from polywrap_manifest import AnyWrapManifest, DeserializeManifestOptions
 from polywrap_msgpack import msgpack_decode, msgpack_encode
 
-from polywrap_client.errors import WrapNotFoundError
+from .errors import WrapNotFoundError
 
 
 class PolywrapClient(Client):
@@ -222,7 +222,20 @@ def invoke(
         """
         resolution_context = resolution_context or UriResolutionContext()
         load_wrapper_context = resolution_context.create_sub_history_context()
-        wrapper = self.load_wrapper(uri, resolution_context=load_wrapper_context)
+
+        try:
+            wrapper = self.load_wrapper(uri, resolution_context=load_wrapper_context)
+        except Exception as err:
+            resolution_context.track_step(
+                UriResolutionStep(
+                    source_uri=uri,
+                    result=uri,
+                    description=f"Client.load_wrapper - Error: {err.__class__.__name__}",
+                    sub_history=load_wrapper_context.get_history(),
+                )
+            )
+            raise err
+
         wrapper_resolution_path = load_wrapper_context.get_resolution_path()
         wrapper_resolved_uri = wrapper_resolution_path[-1]
 
@@ -241,14 +254,25 @@ def invoke(
 
         wrapper_invoke_context = resolution_context.create_sub_history_context()
 
-        invocable_result = wrapper.invoke(
-            uri=wrapper_resolved_uri,
-            method=method,
-            args=args,
-            env=env,
-            resolution_context=wrapper_invoke_context,
-            client=self,
-        )
+        try:
+            invocable_result = wrapper.invoke(
+                uri=wrapper_resolved_uri,
+                method=method,
+                args=args,
+                env=env,
+                resolution_context=wrapper_invoke_context,
+                client=self,
+            )
+        except Exception as err:
+            resolution_context.track_step(
+                UriResolutionStep(
+                    source_uri=wrapper_resolved_uri,
+                    result=wrapper_resolved_uri,
+                    description=f"Wrapper.invoke - Error: {err.__class__.__name__}",
+                    sub_history=wrapper_invoke_context.get_history(),
+                )
+            )
+            raise err
 
         resolution_context.track_step(
             UriResolutionStep(

diff --git a/packages/polywrap-client/pyproject.toml b/packages/polywrap-client/pyproject.toml
@@ -53,6 +53,7 @@ testpaths = [
 [tool.pylint]
 disable = [
     "too-many-arguments",
+    "too-many-locals",
 ]
 ignore = [
     "tests/"

diff --git a/packages/polywrap-core/poetry.lock b/packages/polywrap-core/poetry.lock
diff --git a/packages/polywrap-manifest/poetry.lock b/packages/polywrap-manifest/poetry.lock
diff --git a/packages/polywrap-msgpack/poetry.lock b/packages/polywrap-msgpack/poetry.lock
diff --git a/packages/polywrap-plugin/poetry.lock b/packages/polywrap-plugin/poetry.lock