Ensure that configurable fields with enums support deduplication

This commit is contained in:
Nuno Campos 2023-10-17 08:25:21 +01:00
parent 31f264169d
commit cf448a6314
3 changed files with 50 additions and 9 deletions

View File

@ -14,6 +14,7 @@ from typing import (
Union, Union,
cast, cast,
) )
from weakref import WeakValueDictionary
from langchain.pydantic_v1 import BaseModel from langchain.pydantic_v1 import BaseModel
from langchain.schema.runnable.base import Runnable, RunnableSerializable from langchain.schema.runnable.base import Runnable, RunnableSerializable
@ -262,6 +263,14 @@ class StrEnum(str, enum.Enum):
pass pass
_enums_for_spec: WeakValueDictionary[
Union[
ConfigurableFieldSingleOption, ConfigurableFieldMultiOption, ConfigurableField
],
Type[StrEnum],
] = WeakValueDictionary()
class RunnableConfigurableAlternatives(DynamicRunnable[Input, Output]): class RunnableConfigurableAlternatives(DynamicRunnable[Input, Output]):
which: ConfigurableField which: ConfigurableField
@ -271,10 +280,14 @@ class RunnableConfigurableAlternatives(DynamicRunnable[Input, Output]):
@property @property
def config_specs(self) -> Sequence[ConfigurableFieldSpec]: def config_specs(self) -> Sequence[ConfigurableFieldSpec]:
which_enum = StrEnum( # type: ignore[call-overload] if which_enum := _enums_for_spec.get(self.which):
self.which.name or self.which.id, pass
((v, v) for v in list(self.alternatives.keys()) + [self.default_key]), else:
) which_enum = StrEnum( # type: ignore[call-overload]
self.which.name or self.which.id,
((v, v) for v in list(self.alternatives.keys()) + [self.default_key]),
)
_enums_for_spec[self.which] = cast(Type[StrEnum], which_enum)
return [ return [
ConfigurableFieldSpec( ConfigurableFieldSpec(
id=self.which.id, id=self.which.id,
@ -312,10 +325,14 @@ def make_options_spec(
spec: Union[ConfigurableFieldSingleOption, ConfigurableFieldMultiOption], spec: Union[ConfigurableFieldSingleOption, ConfigurableFieldMultiOption],
description: Optional[str], description: Optional[str],
) -> ConfigurableFieldSpec: ) -> ConfigurableFieldSpec:
enum = StrEnum( # type: ignore[call-overload] if enum := _enums_for_spec.get(spec):
spec.name or spec.id, pass
((v, v) for v in list(spec.options.keys())), else:
) enum = StrEnum( # type: ignore[call-overload]
spec.name or spec.id,
((v, v) for v in list(spec.options.keys())),
)
_enums_for_spec[spec] = cast(Type[StrEnum], enum)
if isinstance(spec, ConfigurableFieldSingleOption): if isinstance(spec, ConfigurableFieldSingleOption):
return ConfigurableFieldSpec( return ConfigurableFieldSpec(
id=spec.id, id=spec.id,

View File

@ -250,6 +250,9 @@ class ConfigurableField(NamedTuple):
description: Optional[str] = None description: Optional[str] = None
annotation: Optional[Any] = None annotation: Optional[Any] = None
def __hash__(self) -> int:
return hash((self.id, self.annotation))
class ConfigurableFieldSingleOption(NamedTuple): class ConfigurableFieldSingleOption(NamedTuple):
"""A field that can be configured by the user with a default value.""" """A field that can be configured by the user with a default value."""
@ -261,6 +264,9 @@ class ConfigurableFieldSingleOption(NamedTuple):
name: Optional[str] = None name: Optional[str] = None
description: Optional[str] = None description: Optional[str] = None
def __hash__(self) -> int:
return hash((self.id, tuple(self.options.items()), self.default))
class ConfigurableFieldMultiOption(NamedTuple): class ConfigurableFieldMultiOption(NamedTuple):
"""A field that can be configured by the user with multiple default values.""" """A field that can be configured by the user with multiple default values."""
@ -272,6 +278,9 @@ class ConfigurableFieldMultiOption(NamedTuple):
name: Optional[str] = None name: Optional[str] = None
description: Optional[str] = None description: Optional[str] = None
def __hash__(self) -> int:
return hash((self.id, tuple(self.options.items()), tuple(self.default)))
AnyConfigurableField = Union[ AnyConfigurableField = Union[
ConfigurableField, ConfigurableFieldSingleOption, ConfigurableFieldMultiOption ConfigurableField, ConfigurableFieldSingleOption, ConfigurableFieldMultiOption
@ -298,6 +307,20 @@ def get_unique_config_specs(
for id, dupes in grouped: for id, dupes in grouped:
first = next(dupes) first = next(dupes)
others = list(dupes) others = list(dupes)
if len(others) > 0:
print(
first,
others,
[
(
o.id == first.id,
o.annotation == first.annotation,
o.default == first.default,
o.name == first.name,
)
for o in others
],
)
if len(others) == 0: if len(others) == 0:
unique.append(first) unique.append(first)
elif all(o == first for o in others): elif all(o == first for o in others):

View File

@ -941,7 +941,8 @@ def test_configurable_fields_example() -> None:
) )
) )
chain_configurable = prompt | fake_llm # deduplication of configurable fields
chain_configurable = prompt | fake_llm | (lambda x: {"name": x}) | prompt | fake_llm
assert chain_configurable.invoke({"name": "John"}) == "a" assert chain_configurable.invoke({"name": "John"}) == "a"