chore: fix typecheck error

Author: cbrzn

packages/polywrap-uri-resolvers/polywrap_uri_resolvers/builder.py

@@ -5,16 +5,16 @@
 from .package_resolver import PackageResolver
 from .wrapper_resolver import WrapperResolver
 
-from polywrap_core import IUriResolver
+from polywrap_core import IUriResolver, UriPackage, UriWrapper
 
 
 # TODO: Recheck if this should return result or not
 def build_resolver(uri_resolver_like: UriResolverLike, name: Optional[str]) -> IUriResolver:    
     if type(uri_resolver_like) == list:
         return UriResolverAggregator(map(lambda r: build_resolver(r, name), uri_resolver_like)) # type: ignore
-    elif hasattr(uri_resolver_like, "uri") and hasattr(uri_resolver_like, "package"):
-        return PackageResolver(uri=uri_resolver_like.uri, wrap_package=uri_resolver_like.package) # type: ignore
-    elif hasattr(uri_resolver_like, "uri") and hasattr(uri_resolver_like, "wrapper"):
-        return WrapperResolver(uri=uri_resolver_like.uri, wrapper=uri_resolver_like.wrapper) # type: ignore
+    elif isinstance(uri_resolver_like, UriPackage):
+        return PackageResolver(uri=uri_resolver_like.uri, wrap_package=uri_resolver_like.package)
+    elif isinstance(uri_resolver_like, UriWrapper):
+        return WrapperResolver(uri=uri_resolver_like.uri, wrapper=uri_resolver_like.wrapper)
     else:
         raise "Unknown resolver-like type" # type: ignore

packages/polywrap-uri-resolvers/polywrap_uri_resolvers/helpers/uri_resolver_like.py

@@ -1,5 +1,5 @@
 from typing import List, Union
 
-from polywrap_core import IUriResolver, UriPackage, UriWrapper
+from polywrap_core import Uri, UriPackage, UriWrapper
 
-UriResolverLike = Union[IUriResolver, UriPackage, UriWrapper, List["UriResolverLike"]]
+UriResolverLike = Union[Uri, UriPackage, UriWrapper, List["UriResolverLike"]]

packages/polywrap-uri-resolvers/polywrap_uri_resolvers/recursive_resolver.py

@@ -10,7 +10,7 @@ class RecursiveResolve(IUriResolver):
     resolver: IUriResolver
 
     def __init__(self, resolver: UriResolverLike):
-        resolver = build_resolver(resolver, None)
+        resolver = build_resolver(resolver, None) # type: ignore
 
     async def try_resolve_uri(self, uri: Uri, client: Client, resolution_context: IUriResolutionContext) -> Result[UriPackageOrWrapper]:
         if resolution_context.is_resolving(uri):

packages/polywrap-uri-resolvers/polywrap_uri_resolvers/static_resolver.py

@@ -1,5 +1,5 @@
 from typing import List, cast
-from polywrap_core import IUriResolutionStep, Wrapper, IWrapPackage, UriResolutionResult, IUriResolver, UriPackageOrWrapper, Uri, Client, IUriResolutionContext, UriPackage, UriWrapper
+from polywrap_core import IUriResolutionStep, UriResolutionResult, IUriResolver, UriPackageOrWrapper, Uri, Client, IUriResolutionContext, UriPackage, UriWrapper
 from polywrap_result import Result, Err, Ok
 
 from .helpers import UriResolverLike
@@ -46,7 +46,7 @@ async def try_resolve_uri(self, uri: Uri, client: Client, resolution_context: IU
             elif isinstance(uri_package_or_wrapper, UriWrapper):
                 result = UriResolutionResult.ok(uri, None, uri_package_or_wrapper.wrapper)
                 description = f"Static - Wrapper ({uri.uri})"
-            elif isinstance(uri_package_or_wrapper, Uri):
+            elif isinstance(uri_package_or_wrapper, Uri): #type: ignore
                 result = UriResolutionResult.ok(uri)
                 description = f"Static - Wrapper ({uri.uri})"