Skip to content

Commit 88eb118

Browse files
committed
chore: fix typecheck error
1 parent 646d90d commit 88eb118

4 files changed

Lines changed: 14 additions & 13 deletions

File tree

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
from typing import Optional
1+
from typing import Optional, List, cast
22

33
from .helpers import UriResolverLike
44
from .aggregator import UriResolverAggregator
55
from .package_resolver import PackageResolver
66
from .wrapper_resolver import WrapperResolver
77

8-
from polywrap_core import IUriResolver
8+
from polywrap_core import IUriResolver, UriPackage, UriWrapper
99

1010

1111
# TODO: Recheck if this should return result or not
1212
def build_resolver(uri_resolver_like: UriResolverLike, name: Optional[str]) -> IUriResolver:
1313
if type(uri_resolver_like) == list:
14-
return UriResolverAggregator(map(lambda r: build_resolver(r, name), uri_resolver_like)) # type: ignore
15-
elif hasattr(uri_resolver_like, "uri") and hasattr(uri_resolver_like, "package"):
16-
return PackageResolver(uri=uri_resolver_like.uri, wrap_package=uri_resolver_like.package) # type: ignore
17-
elif hasattr(uri_resolver_like, "uri") and hasattr(uri_resolver_like, "wrapper"):
18-
return WrapperResolver(uri=uri_resolver_like.uri, wrapper=uri_resolver_like.wrapper) # type: ignore
14+
resolvers: List[IUriResolver] = list(map(lambda r: build_resolver(cast(UriResolverLike, r), name), uri_resolver_like)) # type: ignore
15+
return UriResolverAggregator(resolvers) # type: ignore
16+
elif isinstance(uri_resolver_like, UriPackage):
17+
return PackageResolver(uri=uri_resolver_like.uri, wrap_package=uri_resolver_like.package) # type: ignore
18+
elif isinstance(uri_resolver_like, UriWrapper):
19+
return WrapperResolver(uri=uri_resolver_like.uri, wrapper=uri_resolver_like.wrapper) # type: ignore
1920
else:
2021
raise "Unknown resolver-like type" # type: ignore
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from typing import List, Union
22

3-
from polywrap_core import IUriResolver, UriPackage, UriWrapper
3+
from polywrap_core import Uri, UriPackage, UriWrapper
44

5-
UriResolverLike = Union[IUriResolver, UriPackage, UriWrapper, List["UriResolverLike"]]
5+
UriResolverLike = Union[Uri, UriPackage, UriWrapper, List["UriResolverLike"]]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class RecursiveResolve(IUriResolver):
1010
resolver: IUriResolver
1111

1212
def __init__(self, resolver: UriResolverLike):
13-
resolver = build_resolver(resolver, None)
13+
resolver = build_resolver(resolver, None) # type: ignore
1414

1515
async def try_resolve_uri(self, uri: Uri, client: Client, resolution_context: IUriResolutionContext) -> Result[UriPackageOrWrapper]:
1616
if resolution_context.is_resolving(uri):

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from typing import List, cast
2-
from polywrap_core import IUriResolutionStep, Wrapper, IWrapPackage, UriResolutionResult, IUriResolver, UriPackageOrWrapper, Uri, Client, IUriResolutionContext, UriPackage, UriWrapper
2+
from polywrap_core import IUriResolutionStep, UriResolutionResult, IUriResolver, UriPackageOrWrapper, Uri, Client, IUriResolutionContext, UriPackage, UriWrapper
33
from polywrap_result import Result, Err, Ok
44

55
from .helpers import UriResolverLike
@@ -27,7 +27,7 @@ def from_list(static_resolver_likes: List[UriResolverLike]) -> Result["StaticRes
2727
uri_wrapper = UriWrapper(uri=static_resolver_like.uri, wrapper=static_resolver_like.wrapper) # type: ignore
2828
uri_map[uri_wrapper.uri.uri] = uri_wrapper
2929
elif isinstance(static_resolver_like, Uri):
30-
uri_map[static_resolver_like.uri] = static_resolver_like
30+
uri_map[static_resolver_like.uri] = static_resolver_like # type: ignore
3131
else:
3232
return Err(Exception("Unknown static-resolver-like type provided."))
3333

@@ -46,7 +46,7 @@ async def try_resolve_uri(self, uri: Uri, client: Client, resolution_context: IU
4646
elif isinstance(uri_package_or_wrapper, UriWrapper):
4747
result = UriResolutionResult.ok(uri, None, uri_package_or_wrapper.wrapper)
4848
description = f"Static - Wrapper ({uri.uri})"
49-
elif isinstance(uri_package_or_wrapper, Uri):
49+
elif isinstance(uri_package_or_wrapper, Uri): #type: ignore
5050
result = UriResolutionResult.ok(uri)
5151
description = f"Static - Wrapper ({uri.uri})"
5252

0 commit comments

Comments
 (0)