From 287911adbc27c640e1d550ef09a9cf6bdb5e541b Mon Sep 17 00:00:00 2001 From: Eugene Yurtsev Date: Tue, 10 Sep 2024 17:32:10 -0400 Subject: [PATCH] community[patch]: Add protected_namespace=() to models that use model namespace (#26284) Add protected_namespaces=() for existing implementations that use the pydantic reserved model namespace. --- .../langchain_community/cross_encoders/huggingface.py | 4 +--- .../langchain_community/cross_encoders/sagemaker_endpoint.py | 3 +-- .../document_compressors/llmlingua_filter.py | 1 + libs/community/langchain_community/llms/moonshot.py | 4 +--- libs/community/langchain_community/llms/oci_generative_ai.py | 3 +-- libs/community/langchain_community/llms/solar.py | 1 + .../langchain_community/utilities/dalle_image_generator.py | 4 +--- 7 files changed, 7 insertions(+), 13 deletions(-) diff --git a/libs/community/langchain_community/cross_encoders/huggingface.py b/libs/community/langchain_community/cross_encoders/huggingface.py index fa10f228d4c..5c10553e17e 100644 --- a/libs/community/langchain_community/cross_encoders/huggingface.py +++ b/libs/community/langchain_community/cross_encoders/huggingface.py @@ -45,9 +45,7 @@ class HuggingFaceCrossEncoder(BaseModel, BaseCrossEncoder): self.model_name, **self.model_kwargs ) - model_config = ConfigDict( - extra="forbid", - ) + model_config = ConfigDict(extra="forbid", protected_namespaces=()) def score(self, text_pairs: List[Tuple[str, str]]) -> List[float]: """Compute similarity scores using a HuggingFace transformer model. diff --git a/libs/community/langchain_community/cross_encoders/sagemaker_endpoint.py b/libs/community/langchain_community/cross_encoders/sagemaker_endpoint.py index b809095532d..aed3de5354f 100644 --- a/libs/community/langchain_community/cross_encoders/sagemaker_endpoint.py +++ b/libs/community/langchain_community/cross_encoders/sagemaker_endpoint.py @@ -90,8 +90,7 @@ class SagemakerEndpointCrossEncoder(BaseModel, BaseCrossEncoder): """ model_config = ConfigDict( - arbitrary_types_allowed=True, - extra="forbid", + arbitrary_types_allowed=True, extra="forbid", protected_namespaces=() ) @model_validator(mode="before") diff --git a/libs/community/langchain_community/document_compressors/llmlingua_filter.py b/libs/community/langchain_community/document_compressors/llmlingua_filter.py index 0c88a045180..be1a1ee5d87 100644 --- a/libs/community/langchain_community/document_compressors/llmlingua_filter.py +++ b/libs/community/langchain_community/document_compressors/llmlingua_filter.py @@ -76,6 +76,7 @@ class LLMLinguaCompressor(BaseDocumentCompressor): arbitrary_types_allowed=True, extra="forbid", populate_by_name=True, + protected_namespaces=(), ) @staticmethod diff --git a/libs/community/langchain_community/llms/moonshot.py b/libs/community/langchain_community/llms/moonshot.py index eedc482053f..473f35fdf06 100644 --- a/libs/community/langchain_community/llms/moonshot.py +++ b/libs/community/langchain_community/llms/moonshot.py @@ -50,9 +50,7 @@ class MoonshotCommon(BaseModel): temperature: float = 0.3 """Temperature parameter (higher values make the model more creative).""" - model_config = ConfigDict( - populate_by_name=True, - ) + model_config = ConfigDict(populate_by_name=True, protected_namespaces=()) @property def lc_secrets(self) -> dict: diff --git a/libs/community/langchain_community/llms/oci_generative_ai.py b/libs/community/langchain_community/llms/oci_generative_ai.py index 74a37c05972..a9f48a97528 100644 --- a/libs/community/langchain_community/llms/oci_generative_ai.py +++ b/libs/community/langchain_community/llms/oci_generative_ai.py @@ -101,8 +101,7 @@ class OCIGenAIBase(BaseModel, ABC): """Whether to stream back partial progress""" model_config = ConfigDict( - extra="forbid", - arbitrary_types_allowed=True, + extra="forbid", arbitrary_types_allowed=True, protected_namespaces=() ) @pre_init diff --git a/libs/community/langchain_community/llms/solar.py b/libs/community/langchain_community/llms/solar.py index 32dc00b98b2..b5ea74bd632 100644 --- a/libs/community/langchain_community/llms/solar.py +++ b/libs/community/langchain_community/llms/solar.py @@ -53,6 +53,7 @@ class SolarCommon(BaseModel): populate_by_name=True, arbitrary_types_allowed=True, extra="ignore", + protected_namespaces=(), ) @property diff --git a/libs/community/langchain_community/utilities/dalle_image_generator.py b/libs/community/langchain_community/utilities/dalle_image_generator.py index c0cbf00a437..e5608e6b064 100644 --- a/libs/community/langchain_community/utilities/dalle_image_generator.py +++ b/libs/community/langchain_community/utilities/dalle_image_generator.py @@ -73,9 +73,7 @@ class DallEAPIWrapper(BaseModel): http_client: Union[Any, None] = None """Optional httpx.Client.""" - model_config = ConfigDict( - extra="forbid", - ) + model_config = ConfigDict(extra="forbid", protected_namespaces=()) @model_validator(mode="before") @classmethod