utils.env, utils.strings

libs/core/langchain_core/utils/__init__.py

@@ -4,15 +4,13 @@
 These functions do not depend on any other LangChain module.
 """
 
-from langchain_core.utils.env import get_from_dict_or_env, get_from_env
 from langchain_core.utils.formatting import StrictFormatter, formatter
 from langchain_core.utils.input import (
     get_bolded_text,
     get_color_mapping,
     get_colored_text,
     print_text,
 )
-from langchain_core.utils.strings import comma_list, stringify_dict, stringify_value
 from langchain_core.utils.utils import (
     check_package_version,
     convert_to_secret_str,
@@ -26,20 +24,15 @@
 __all__ = [
     "StrictFormatter",
     "check_package_version",
-    "comma_list",
     "convert_to_secret_str",
     "formatter",
     "get_bolded_text",
     "get_color_mapping",
     "get_colored_text",
-    "get_from_dict_or_env",
-    "get_from_env",
     "get_pydantic_field_names",
     "guard_import",
     "mock_now",
     "print_text",
     "raise_for_status_with_text",
-    "stringify_dict",
-    "stringify_value",
     "xor_args",
 ]

libs/core/tests/unit_tests/utils/test_imports.py

@@ -3,21 +3,16 @@
 EXPECTED_ALL = [
     "StrictFormatter",
     "check_package_version",
-    "comma_list",
     "convert_to_secret_str",
     "formatter",
     "get_bolded_text",
     "get_color_mapping",
     "get_colored_text",
-    "get_from_dict_or_env",
-    "get_from_env",
     "get_pydantic_field_names",
     "guard_import",
     "mock_now",
     "print_text",
     "raise_for_status_with_text",
-    "stringify_dict",
-    "stringify_value",
     "xor_args",
 ]
 

libs/langchain/langchain/cache.py

@@ -56,9 +56,9 @@
 from langchain_core.schema import ChatGeneration, Generation
 from langchain_core.schema.cache import RETURN_VAL_TYPE, BaseCache
 from langchain_core.schema.embeddings import Embeddings
-from langchain_core.utils import get_from_env
 
 from langchain.llms.base import LLM, get_prompts
+from langchain.utils import get_from_env
 from langchain.vectorstores.redis import Redis as RedisVectorstore
 
 logger = logging.getLogger(__file__)

libs/langchain/langchain/callbacks/mlflow_callback.py

@@ -8,7 +8,6 @@
 from typing import Any, Dict, List, Optional, Union
 
 from langchain_core.schema import AgentAction, AgentFinish, LLMResult
-from langchain_core.utils import get_from_dict_or_env
 
 from langchain.callbacks.base import BaseCallbackHandler
 from langchain.callbacks.utils import (
@@ -19,6 +18,7 @@
     import_spacy,
     import_textstat,
 )
+from langchain.utils import get_from_dict_or_env
 
 
 def import_mlflow() -> Any:

libs/langchain/langchain/callbacks/whylabs_callback.py

@@ -3,9 +3,8 @@
 import logging
 from typing import TYPE_CHECKING, Any, Optional
 
-from langchain_core.utils import get_from_env
-
 from langchain.callbacks.base import BaseCallbackHandler
+from langchain.utils import get_from_env
 
 if TYPE_CHECKING:
     from whylogs.api.logger.logger import Logger

libs/langchain/langchain/chains/moderation.py

@@ -2,10 +2,10 @@
 from typing import Any, Dict, List, Optional
 
 from langchain_core.pydantic_v1 import root_validator
-from langchain_core.utils import get_from_dict_or_env
 
 from langchain.callbacks.manager import CallbackManagerForChainRun
 from langchain.chains.base import Chain
+from langchain.utils import get_from_dict_or_env
 
 
 class OpenAIModerationChain(Chain):

libs/langchain/langchain/chat_models/anyscale.py

@@ -9,14 +9,15 @@
 import requests
 from langchain_core.pydantic_v1 import Field, SecretStr, root_validator
 from langchain_core.schema.messages import BaseMessage
-from langchain_core.utils import convert_to_secret_str, get_from_dict_or_env
+from langchain_core.utils import convert_to_secret_str
 from langchain_core.utils.openai import is_openai_v1
 
 from langchain.adapters.openai import convert_message_to_dict
 from langchain.chat_models.openai import (
     ChatOpenAI,
     _import_tiktoken,
 )
+from langchain.utils import get_from_dict_or_env
 
 if TYPE_CHECKING:
     import tiktoken

libs/langchain/langchain/chat_models/azure_openai.py

@@ -8,10 +8,10 @@
 
 from langchain_core.pydantic_v1 import BaseModel, Field, root_validator
 from langchain_core.schema import ChatResult
-from langchain_core.utils import get_from_dict_or_env
 from langchain_core.utils.openai import is_openai_v1
 
 from langchain.chat_models.openai import ChatOpenAI
+from langchain.utils import get_from_dict_or_env
 
 logger = logging.getLogger(__name__)
 

libs/langchain/langchain/chat_models/azureml_endpoint.py

@@ -9,11 +9,12 @@
     HumanMessage,
     SystemMessage,
 )
-from langchain_core.utils import convert_to_secret_str, get_from_dict_or_env
+from langchain_core.utils import convert_to_secret_str
 
 from langchain.callbacks.manager import CallbackManagerForLLMRun
 from langchain.chat_models.base import SimpleChatModel
 from langchain.llms.azureml_endpoint import AzureMLEndpointClient, ContentFormatterBase
+from langchain.utils import get_from_dict_or_env
 
 
 class LlamaContentFormatter(ContentFormatterBase):

libs/langchain/langchain/chat_models/baichuan.py

@@ -23,12 +23,12 @@
 from langchain_core.schema.output import ChatGenerationChunk
 from langchain_core.utils import (
     convert_to_secret_str,
-    get_from_dict_or_env,
     get_pydantic_field_names,
 )
 
 from langchain.callbacks.manager import CallbackManagerForLLMRun
 from langchain.chat_models.base import BaseChatModel, _generate_from_stream
+from langchain.utils import get_from_dict_or_env
 
 logger = logging.getLogger(__name__)
 

libs/langchain/langchain/chat_models/baidu_qianfan_endpoint.py

@@ -15,13 +15,13 @@
     SystemMessage,
 )
 from langchain_core.schema.output import ChatGenerationChunk
-from langchain_core.utils import get_from_dict_or_env
 
 from langchain.callbacks.manager import (
     AsyncCallbackManagerForLLMRun,
     CallbackManagerForLLMRun,
 )
 from langchain.chat_models.base import BaseChatModel
+from langchain.utils import get_from_dict_or_env
 
 logger = logging.getLogger(__name__)
 

libs/langchain/langchain/chat_models/ernie.py

@@ -13,10 +13,10 @@
     ChatResult,
     HumanMessage,
 )
-from langchain_core.utils import get_from_dict_or_env
 
 from langchain.callbacks.manager import CallbackManagerForLLMRun
 from langchain.chat_models.base import BaseChatModel
+from langchain.utils import get_from_dict_or_env
 
 logger = logging.getLogger(__name__)
 

libs/langchain/langchain/chat_models/everlyai.py

@@ -7,13 +7,13 @@
 
 from langchain_core.pydantic_v1 import Field, root_validator
 from langchain_core.schema.messages import BaseMessage
-from langchain_core.utils import get_from_dict_or_env
 
 from langchain.adapters.openai import convert_message_to_dict
 from langchain.chat_models.openai import (
     ChatOpenAI,
     _import_tiktoken,
 )
+from langchain.utils import get_from_dict_or_env
 
 if TYPE_CHECKING:
     import tiktoken

libs/langchain/langchain/chat_models/google_palm.py

@@ -16,7 +16,6 @@
     HumanMessage,
     SystemMessage,
 )
-from langchain_core.utils import get_from_dict_or_env
 from tenacity import (
     before_sleep_log,
     retry,
@@ -30,6 +29,7 @@
     CallbackManagerForLLMRun,
 )
 from langchain.chat_models.base import BaseChatModel
+from langchain.utils import get_from_dict_or_env
 
 if TYPE_CHECKING:
     import google.generativeai as genai

libs/langchain/langchain/chat_models/jinachat.py

@@ -35,7 +35,7 @@
     SystemMessageChunk,
 )
 from langchain_core.schema.output import ChatGenerationChunk
-from langchain_core.utils import get_from_dict_or_env, get_pydantic_field_names
+from langchain_core.utils import get_pydantic_field_names
 from tenacity import (
     before_sleep_log,
     retry,
@@ -53,6 +53,7 @@
     _agenerate_from_stream,
     _generate_from_stream,
 )
+from langchain.utils import get_from_dict_or_env
 
 logger = logging.getLogger(__name__)
 

libs/langchain/langchain/chat_models/konko.py

@@ -20,14 +20,14 @@
 from langchain_core.schema import ChatGeneration, ChatResult
 from langchain_core.schema.messages import AIMessageChunk, BaseMessage
 from langchain_core.schema.output import ChatGenerationChunk
-from langchain_core.utils import get_from_dict_or_env
 
 from langchain.adapters.openai import convert_dict_to_message, convert_message_to_dict
 from langchain.callbacks.manager import (
     CallbackManagerForLLMRun,
 )
 from langchain.chat_models.base import BaseChatModel, _generate_from_stream
 from langchain.chat_models.openai import _convert_delta_to_message_chunk
+from langchain.utils import get_from_dict_or_env
 
 DEFAULT_API_BASE = "https://api.konko.ai/v1"
 DEFAULT_MODEL = "meta-llama/Llama-2-13b-chat-hf"

libs/langchain/langchain/chat_models/litellm.py

@@ -36,7 +36,6 @@
     SystemMessageChunk,
 )
 from langchain_core.schema.output import ChatGenerationChunk
-from langchain_core.utils import get_from_dict_or_env
 
 from langchain.callbacks.manager import (
     AsyncCallbackManagerForLLMRun,
@@ -48,6 +47,7 @@
     _generate_from_stream,
 )
 from langchain.llms.base import create_base_retry_decorator
+from langchain.utils import get_from_dict_or_env
 
 logger = logging.getLogger(__name__)
 

libs/langchain/langchain/chat_models/openai.py

@@ -36,7 +36,6 @@
 )
 from langchain_core.schema.output import ChatGenerationChunk
 from langchain_core.utils import (
-    get_from_dict_or_env,
     get_pydantic_field_names,
 )
 from langchain_core.utils.openai import is_openai_v1
@@ -52,6 +51,7 @@
     _generate_from_stream,
 )
 from langchain.llms.base import create_base_retry_decorator
+from langchain.utils import get_from_dict_or_env
 
 if TYPE_CHECKING:
     import tiktoken

libs/langchain/langchain/chat_models/pai_eas_endpoint.py

@@ -16,14 +16,14 @@
     SystemMessage,
 )
 from langchain_core.schema.output import ChatGenerationChunk
-from langchain_core.utils import get_from_dict_or_env
 
 from langchain.callbacks.manager import (
     AsyncCallbackManagerForLLMRun,
     CallbackManagerForLLMRun,
 )
 from langchain.chat_models.base import BaseChatModel
 from langchain.llms.utils import enforce_stop_tokens
+from langchain.utils import get_from_dict_or_env
 
 logger = logging.getLogger(__name__)
 

libs/langchain/langchain/chat_models/tongyi.py

@@ -30,7 +30,6 @@
     SystemMessageChunk,
 )
 from langchain_core.schema.output import ChatGenerationChunk, GenerationChunk
-from langchain_core.utils import get_from_dict_or_env
 from requests.exceptions import HTTPError
 from tenacity import (
     RetryCallState,
@@ -45,6 +44,7 @@
     BaseChatModel,
     _generate_from_stream,
 )
+from langchain.utils import get_from_dict_or_env
 
 logger = logging.getLogger(__name__)