feat: add tests for client-config-builder (#190)

Author: Niraj-Kamdar

packages/polywrap-client-config-builder/poetry.lock

@@ -1,6 +1,6 @@
 """This module contains the env configure class for the client config builder."""
 from abc import ABC
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Union, cast
 
 from polywrap_core import Uri
 
@@ -35,9 +35,9 @@ def add_env(self, uri: Uri, env: Any) -> ClientConfigBuilder:
 
         If an Any is already associated with the uri, it is modified.
         """
-        if self.config.envs.get(uri):
-            for key in self.config.envs[uri]:
-                self.config.envs[uri][key] = env[key]
+        if old_env := self.config.envs.get(uri):
+            new_env = self._merge_envs(old_env, env)
+            self.config.envs[uri] = new_env
         else:
             self.config.envs[uri] = env
         return self
@@ -58,3 +58,19 @@ def remove_envs(self, uris: List[Uri]) -> ClientConfigBuilder:
         for uri in uris:
             self.remove_env(uri)
         return self
+
+    @staticmethod
+    def _merge_envs(env1: Dict[str, Any], env2: Dict[str, Any]) -> Dict[str, Any]:
+        for key, val in env2.items():
+            if key not in env1:
+                env1[key] = val
+                continue
+
+            if isinstance(val, dict):
+                old_val = cast(Dict[str, Any], env1[key])
+                new_val = cast(Dict[str, Any], val)
+
+                EnvConfigure._merge_envs(old_val, new_val)
+            else:
+                env1[key] = val
+        return env1

packages/polywrap-client-config-builder/polywrap_client_config_builder/configures/env_configure.py

@@ -26,7 +26,10 @@ def add_interface_implementations(
     ) -> ClientConfigBuilder:
         """Add a list of implementation URIs for the given interface URI to the builder's config."""
         if interface_uri in self.config.interfaces.keys():
-            self.config.interfaces[interface_uri].extend(implementations_uris)
+            existing_implementations = set(self.config.interfaces[interface_uri])
+            for implementation_uri in implementations_uris:
+                if implementation_uri not in existing_implementations:
+                    self.config.interfaces[interface_uri].append(implementation_uri)
         else:
             self.config.interfaces[interface_uri] = implementations_uris
         return self

packages/polywrap-client-config-builder/polywrap_client_config_builder/configures/interface_configure.py

@@ -54,13 +54,7 @@ def __init__(self):
 
     def build(self, options: Optional[BuildOptions] = None) -> ClientConfig:
         """Build the ClientConfig object from the builder's config."""
-        static_resolver_like = cast(StaticResolverLike, self.config.redirects)
-
-        for uri, wrapper in self.config.wrappers.items():
-            static_resolver_like[uri] = UriWrapper(uri=uri, wrapper=wrapper)
-
-        for uri, package in self.config.packages.items():
-            static_resolver_like[uri] = UriPackage(uri=uri, package=package)
+        static_resolver_like = self._build_static_resolver_like()
 
         resolver = (
             options.resolver
@@ -87,5 +81,16 @@ def build(self, options: Optional[BuildOptions] = None) -> ClientConfig:
             resolver=resolver,
         )
 
+    def _build_static_resolver_like(self) -> StaticResolverLike:
+        static_resolver_like = cast(StaticResolverLike, self.config.redirects)
+
+        for uri, wrapper in self.config.wrappers.items():
+            static_resolver_like[uri] = UriWrapper(uri=uri, wrapper=wrapper)
+
+        for uri, package in self.config.packages.items():
+            static_resolver_like[uri] = UriPackage(uri=uri, package=package)
+
+        return static_resolver_like
+
 
 __all__ = ["PolywrapClientConfigBuilder"]

packages/polywrap-client-config-builder/polywrap_client_config_builder/polywrap_client_config_builder.py

@@ -1,5 +1,5 @@
 """This module contains the BuilderConfig class."""
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Any, Dict, List
 
 from polywrap_core import Uri, UriResolver, WrapPackage, Wrapper
@@ -18,12 +18,12 @@ class BuilderConfig:
         redirects (Dict[Uri, Uri]): The URI redirects.
     """
 
-    envs: Dict[Uri, Any]
-    interfaces: Dict[Uri, List[Uri]]
-    wrappers: Dict[Uri, Wrapper]
-    packages: Dict[Uri, WrapPackage]
-    resolvers: List[UriResolver]
-    redirects: Dict[Uri, Uri]
+    envs: Dict[Uri, Any] = field(default_factory=dict)
+    interfaces: Dict[Uri, List[Uri]] = field(default_factory=dict)
+    wrappers: Dict[Uri, Wrapper] = field(default_factory=dict)
+    packages: Dict[Uri, WrapPackage] = field(default_factory=dict)
+    resolvers: List[UriResolver] = field(default_factory=list)
+    redirects: Dict[Uri, Uri] = field(default_factory=dict)
 
 
 __all__ = ["BuilderConfig"]

packages/polywrap-client-config-builder/polywrap_client_config_builder/types/builder_config.py

@@ -25,6 +25,9 @@ isort = "^5.10.1"
 pyright = "^1.1.275"
 pydocstyle = "^6.1.1"
 
+[tool.poetry.group.dev.dependencies]
+hypothesis = "^6.76.0"
+
 [tool.bandit]
 exclude_dirs = ["tests"]
 

packages/polywrap-client-config-builder/pyproject.toml

@@ -0,0 +1 @@
+!env/

packages/polywrap-client-config-builder/tests/.gitignore

@@ -0,0 +1,2 @@
+C_LONG_MIN = -9223372036854775808
+C_LONG_MAX = 9223372036854775807