Merge pull request #27 from polywrap/nk/add-manifest-support

feat: add support for wrap manifest in client

Author: Niraj-Kamdar

packages/polywrap-client/poetry.lock

@@ -8,6 +8,7 @@
     ClientConfig,
     Env,
     GetEnvsOptions,
+    GetManifestOptions,
     GetFileOptions,
     GetUriResolversOptions,
     InvokeResult,
@@ -23,6 +24,7 @@
 )
 from polywrap_msgpack import msgpack_decode, msgpack_encode
 from polywrap_uri_resolvers import FsUriResolver, SimpleFileReader
+from polywrap_manifest import AnyWrapManifest
 from result import Err, Ok, Result
 
 
@@ -58,7 +60,11 @@ def get_env_by_uri(
 
     async def get_file(self, uri: Uri, options: GetFileOptions) -> Union[bytes, str]:
         loaded_wrapper = (await self.load_wrapper(uri)).unwrap()
-        return await loaded_wrapper.get_file(options=options, client=self)
+        return await loaded_wrapper.get_file(options)
+
+    async def get_manifest(self, uri: Uri, options: Optional[GetManifestOptions] = None) -> AnyWrapManifest:
+        loaded_wrapper = (await self.load_wrapper(uri)).unwrap()
+        return loaded_wrapper.get_manifest()
 
     async def try_resolve_uri(
         self, options: TryResolveUriOptions
@@ -90,7 +96,7 @@ async def load_wrapper(
             return Err(Exception(f'Error resolving URI "{uri.uri}"\nURI not found'))
 
         if isinstance(uri_package_or_wrapper, UriPackage):
-            return Ok(uri_package_or_wrapper.package.create_wrapper())
+            return Ok(await uri_package_or_wrapper.package.create_wrapper())
 
         return Ok(uri_package_or_wrapper.wrapper)
 

packages/polywrap-client/polywrap_client/client.py

@@ -14,6 +14,8 @@ python = "^3.10"
 wasmtime = "^1.0.1"
 unsync = "^1.4.0"
 polywrap-core = { path = "../polywrap-core", develop = true }
+polywrap-msgpack = { path = "../polywrap-msgpack", develop = true }
+polywrap-manifest = { path = "../polywrap-manifest", develop = true }
 polywrap-uri-resolvers = { path = "../polywrap-uri-resolvers", develop = true }
 result = "^0.8.0"
 

packages/polywrap-client/pyproject.toml

@@ -0,0 +1 @@
+��version�0.1�name�Simple�type�wasm�abi��version�0.1�moduleType��type�Module�kind̀�methods���name�simpleMethod�return��type�String�name�simpleMethod�requiredäkind"�scalar��name�simpleMethod�type�String�requiredäkind�type�Method�kind@�requiredéarguments���type�String�name�arg�requiredäkind"�scalar��name�arg�type�String�requiredäkind

packages/polywrap-client/tests/cases/simple-invoke/wrap.info

@@ -0,0 +1 @@
+��version�0.1�name�Simple�type�wasm�abi��version�0.1�moduleType��type�Module�kind̀�methods���name�add�return��type�Int�name�add�requiredäkind"�scalar��name�add�type�Int�requiredäkind�type�Method�kind@�requiredéarguments���type�Int�name�a�requiredäkind"�scalar��name�a�type�Int�requiredäkind��type�Int�name�b�requiredäkind"�scalar��name�b�type�Int�requiredäkind

packages/polywrap-client/tests/cases/simple-subinvoke/invoke/wrap.info

@@ -10,7 +10,7 @@
 async def test_invoke():
     client = PolywrapClient()
     uri = Uri(
-        f'fs/{Path(__file__).parent.joinpath("cases", "simple-invoke", "wrap.wasm").absolute()}'
+        f'fs/{Path(__file__).parent.joinpath("cases", "simple-invoke").absolute()}'
     )
     args = {"arg": "hello polywrap"}
     options = InvokerOptions(
@@ -26,7 +26,7 @@ async def test_subinvoke():
         file_reader=SimpleFileReader(),
         redirects={
             Uri("ens/add.eth"): Uri(
-                f'fs/{Path(__file__).parent.joinpath("cases", "subinvoke", "wrap-subinvoke.wasm").absolute()}'
+                f'fs/{Path(__file__).parent.joinpath("cases", "simple-subinvoke", "subinvoke").absolute()}'
             ),
         },
     )
@@ -35,7 +35,7 @@ async def test_subinvoke():
         envs=[], resolver=uri_resolver
     ))
     uri = Uri(
-        f'fs/{Path(__file__).parent.joinpath("cases", "subinvoke", "wrap-invoke.wasm").absolute()}'
+        f'fs/{Path(__file__).parent.joinpath("cases", "simple-subinvoke", "invoke").absolute()}'
     )
     args = b'\x82\xa1a\x01\xa1b\x02'
     options = InvokerOptions(