The agent engineering platform.
Python agentsaiai-agentsanthropicchatgptdeepagentsenterpriseframeworkgeminigenerative-ailangchainlanggraphllmmultiagentopen-sourceopenaipydanticpythonragtypescript
community: fix ChatEdenAI + EdenAI Tools (#23715)
KyrianC0fdbaf4a8dd0
diff --git a/libs/community/langchain_community/chat_models/__init__.py b/libs/community/langchain_community/chat_models/__init__.pyindex af25b60184..3d0d47878f 100644--- a/libs/community/langchain_community/chat_models/__init__.py+++ b/libs/community/langchain_community/chat_models/__init__.py@@ -51,6 +51,7 @@ if TYPE_CHECKING:from langchain_community.chat_models.deepinfra import (ChatDeepInfra,)+ from langchain_community.chat_models.edenai import ChatEdenAIfrom langchain_community.chat_models.ernie import (ErnieBotChat,)@@ -182,6 +183,7 @@ __all__ = ["ChatOctoAI","ChatDatabricks","ChatDeepInfra",+ "ChatEdenAI","ChatEverlyAI","ChatFireworks","ChatFriendli",@@ -237,6 +239,7 @@ _module_lookup = {"ChatDatabricks": "langchain_community.chat_models.databricks","ChatDeepInfra": "langchain_community.chat_models.deepinfra","ChatEverlyAI": "langchain_community.chat_models.everlyai",+ "ChatEdenAI": "langchain_community.chat_models.edenai","ChatFireworks": "langchain_community.chat_models.fireworks","ChatFriendli": "langchain_community.chat_models.friendli","ChatGooglePalm": "langchain_community.chat_models.google_palm",diff --git a/libs/community/langchain_community/chat_models/edenai.py b/libs/community/langchain_community/chat_models/edenai.pyindex 3cf1f16eea..384e80d72d 100644--- a/libs/community/langchain_community/chat_models/edenai.py+++ b/libs/community/langchain_community/chat_models/edenai.py@@ -122,8 +122,8 @@ def _format_edenai_messages(messages: List[BaseMessage]) -> Dict[str, Any]:system = Noneformatted_messages = []- human_messages = filter(lambda msg: isinstance(msg, HumanMessage), messages)- last_human_message = list(human_messages)[-1] if human_messages else ""+ human_messages = list(filter(lambda msg: isinstance(msg, HumanMessage), messages))+ last_human_message = human_messages[-1] if human_messages else ""tool_results, other_messages = _extract_edenai_tool_results_from_messages(messages)for i, message in enumerate(other_messages):diff --git a/libs/community/langchain_community/tools/edenai/audio_speech_to_text.py b/libs/community/langchain_community/tools/edenai/audio_speech_to_text.pyindex ba2978399a..dc772ece59 100644--- a/libs/community/langchain_community/tools/edenai/audio_speech_to_text.py+++ b/libs/community/langchain_community/tools/edenai/audio_speech_to_text.py@@ -3,17 +3,21 @@ from __future__ import annotationsimport jsonimport loggingimport time-from typing import List, Optional+from typing import List, Optional, Typeimport requestsfrom langchain_core.callbacks import CallbackManagerForToolRun-from langchain_core.pydantic_v1 import validator+from langchain_core.pydantic_v1 import BaseModel, Field, HttpUrl, validatorfrom langchain_community.tools.edenai.edenai_base_tool import EdenaiToollogger = logging.getLogger(__name__)+class SpeechToTextInput(BaseModel):+ query: HttpUrl = Field(description="url of the audio to analyze")++class EdenAiSpeechToTextTool(EdenaiTool):"""Tool that queries the Eden AI Speech To Text API.@@ -23,7 +27,6 @@ class EdenAiSpeechToTextTool(EdenaiTool):To use, you should havethe environment variable ``EDENAI_API_KEY`` set with your API token.You can find your token here: https://app.edenai.run/admin/account/settings-"""edenai_api_key: Optional[str] = None@@ -34,6 +37,7 @@ class EdenAiSpeechToTextTool(EdenaiTool):"Useful for when you have to convert audio to text.""Input should be a url to an audio file.")+ args_schema: Type[BaseModel] = SpeechToTextInputis_async: bool = Truelanguage: Optional[str] = "en"diff --git a/libs/community/langchain_community/tools/edenai/audio_text_to_speech.py b/libs/community/langchain_community/tools/edenai/audio_text_to_speech.pyindex 421d06f5b0..e78cf35419 100644--- a/libs/community/langchain_community/tools/edenai/audio_text_to_speech.py+++ b/libs/community/langchain_community/tools/edenai/audio_text_to_speech.py@@ -1,17 +1,21 @@from __future__ import annotationsimport logging-from typing import Dict, List, Literal, Optional+from typing import Dict, List, Literal, Optional, Typeimport requestsfrom langchain_core.callbacks import CallbackManagerForToolRun-from langchain_core.pydantic_v1 import Field, root_validator, validator+from langchain_core.pydantic_v1 import BaseModel, Field, root_validator, validatorfrom langchain_community.tools.edenai.edenai_base_tool import EdenaiToollogger = logging.getLogger(__name__)+class TextToSpeechInput(BaseModel):+ query: str = Field(description="text to generate audio from")++class EdenAiTextToSpeechTool(EdenaiTool):"""Tool that queries the Eden AI Text to speech API.for api reference check edenai documentation:@@ -30,6 +34,7 @@ class EdenAiTextToSpeechTool(EdenaiTool):"""the output is a string representing the URL of the audio file,or the path to the downloaded wav file """)+ args_schema: Type[BaseModel] = TextToSpeechInputlanguage: Optional[str] = "en""""diff --git a/libs/community/langchain_community/tools/edenai/image_explicitcontent.py b/libs/community/langchain_community/tools/edenai/image_explicitcontent.pyindex 3dac6622aa..8ca1d7739c 100644--- a/libs/community/langchain_community/tools/edenai/image_explicitcontent.py+++ b/libs/community/langchain_community/tools/edenai/image_explicitcontent.py@@ -1,15 +1,20 @@from __future__ import annotationsimport logging-from typing import Optional+from typing import Optional, Typefrom langchain_core.callbacks import CallbackManagerForToolRun+from langchain_core.pydantic_v1 import BaseModel, Field, HttpUrlfrom langchain_community.tools.edenai.edenai_base_tool import EdenaiToollogger = logging.getLogger(__name__)+class ExplicitImageInput(BaseModel):+ query: HttpUrl = Field(description="url of the image to analyze")++class EdenAiExplicitImageTool(EdenaiTool):"""Tool that queries the Eden AI Explicit image detection.@@ -33,6 +38,7 @@ class EdenAiExplicitImageTool(EdenaiTool):pornography, violence, gore content, etc.""""Input should be the string url of the image .")+ args_schema: Type[BaseModel] = ExplicitImageInputcombine_available: bool = Truefeature: str = "image"diff --git a/libs/community/langchain_community/tools/edenai/image_objectdetection.py b/libs/community/langchain_community/tools/edenai/image_objectdetection.pyindex 03b9fc36e5..1098e8e37f 100644--- a/libs/community/langchain_community/tools/edenai/image_objectdetection.py+++ b/libs/community/langchain_community/tools/edenai/image_objectdetection.py@@ -1,15 +1,20 @@from __future__ import annotationsimport logging-from typing import Optional+from typing import Optional, Typefrom langchain_core.callbacks import CallbackManagerForToolRun+from langchain_core.pydantic_v1 import BaseModel, Field, HttpUrlfrom langchain_community.tools.edenai.edenai_base_tool import EdenaiToollogger = logging.getLogger(__name__)+class ObjectDetectionInput(BaseModel):+ query: HttpUrl = Field(description="url of the image to analyze")++class EdenAiObjectDetectionTool(EdenaiTool):"""Tool that queries the Eden AI Object detection API.@@ -30,6 +35,7 @@ class EdenAiObjectDetectionTool(EdenaiTool):(with bounding boxes) objects in an image """"Input should be the string url of the image to identify.")+ args_schema: Type[BaseModel] = ObjectDetectionInputshow_positions: bool = Falsediff --git a/libs/community/langchain_community/tools/edenai/ocr_identityparser.py b/libs/community/langchain_community/tools/edenai/ocr_identityparser.pyindex 75352312e5..2e208dbb54 100644--- a/libs/community/langchain_community/tools/edenai/ocr_identityparser.py+++ b/libs/community/langchain_community/tools/edenai/ocr_identityparser.py@@ -1,15 +1,20 @@from __future__ import annotationsimport logging-from typing import Optional+from typing import Optional, Typefrom langchain_core.callbacks import CallbackManagerForToolRun+from langchain_core.pydantic_v1 import BaseModel, Field, HttpUrlfrom langchain_community.tools.edenai.edenai_base_tool import EdenaiToollogger = logging.getLogger(__name__)+class IDParsingInput(BaseModel):+ query: HttpUrl = Field(description="url of the document to parse")++class EdenAiParsingIDTool(EdenaiTool):"""Tool that queries the Eden AI Identity parsing API.@@ -29,6 +34,7 @@ class EdenAiParsingIDTool(EdenaiTool):"Useful for when you have to extract information from an ID Document ""Input should be the string url of the document to parse.")+ args_schema: Type[BaseModel] = IDParsingInputfeature: str = "ocr"subfeature: str = "identity_parser"diff --git a/libs/community/langchain_community/tools/edenai/ocr_invoiceparser.py b/libs/community/langchain_community/tools/edenai/ocr_invoiceparser.pyindex 4413beedf7..75c8425154 100644--- a/libs/community/langchain_community/tools/edenai/ocr_invoiceparser.py+++ b/libs/community/langchain_community/tools/edenai/ocr_invoiceparser.py@@ -1,15 +1,20 @@from __future__ import annotationsimport logging-from typing import Optional+from typing import Optional, Typefrom langchain_core.callbacks import CallbackManagerForToolRun+from langchain_core.pydantic_v1 import BaseModel, Field, HttpUrlfrom langchain_community.tools.edenai.edenai_base_tool import EdenaiToollogger = logging.getLogger(__name__)+class InvoiceParsingInput(BaseModel):+ query: HttpUrl = Field(description="url of the document to parse")++class EdenAiParsingInvoiceTool(EdenaiTool):"""Tool that queries the Eden AI Invoice parsing API.@@ -23,7 +28,6 @@ class EdenAiParsingInvoiceTool(EdenaiTool):"""name: str = "edenai_invoice_parsing"-description: str = ("A wrapper around edenai Services invoice parsing. """"Useful for when you have to extract information from@@ -33,6 +37,7 @@ class EdenAiParsingInvoiceTool(EdenaiTool):in a structured format to automate the invoice processing """"Input should be the string url of the document to parse.")+ args_schema: Type[BaseModel] = InvoiceParsingInputlanguage: Optional[str] = None"""diff --git a/libs/community/langchain_community/tools/edenai/text_moderation.py b/libs/community/langchain_community/tools/edenai/text_moderation.pyindex 2486287fba..9aed36f0b7 100644--- a/libs/community/langchain_community/tools/edenai/text_moderation.py+++ b/libs/community/langchain_community/tools/edenai/text_moderation.py@@ -1,15 +1,20 @@from __future__ import annotationsimport logging-from typing import Optional+from typing import Optional, Typefrom langchain_core.callbacks import CallbackManagerForToolRun+from langchain_core.pydantic_v1 import BaseModel, Fieldfrom langchain_community.tools.edenai.edenai_base_tool import EdenaiToollogger = logging.getLogger(__name__)+class TextModerationInput(BaseModel):+ query: str = Field(description="Text to moderate")++class EdenAiTextModerationTool(EdenaiTool):"""Tool that queries the Eden AI Explicit text detection.@@ -23,7 +28,6 @@ class EdenAiTextModerationTool(EdenaiTool):"""name: str = "edenai_explicit_content_detection_text"-description: str = ("A wrapper around edenai Services explicit content detection for text. """"Useful for when you have to scan text for offensive,@@ -44,6 +48,7 @@ class EdenAiTextModerationTool(EdenaiTool):""""Input should be a string.")+ args_schema: Type[BaseModel] = TextModerationInputlanguage: strdiff --git a/libs/community/tests/unit_tests/chat_models/test_imports.py b/libs/community/tests/unit_tests/chat_models/test_imports.pyindex 3c9b5e2254..4c46c7203f 100644--- a/libs/community/tests/unit_tests/chat_models/test_imports.py+++ b/libs/community/tests/unit_tests/chat_models/test_imports.py@@ -11,6 +11,7 @@ EXPECTED_ALL = ["ChatDatabricks","ChatDeepInfra","ChatEverlyAI",+ "ChatEdenAI","ChatFireworks","ChatFriendli","ChatGooglePalm",