langchain 0.3.26__py3-none-any.whl → 0.3.27__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of langchain might be problematic. Click here for more details.
- langchain/__init__.py +110 -96
- langchain/_api/__init__.py +2 -2
- langchain/_api/deprecation.py +3 -3
- langchain/_api/module_import.py +51 -46
- langchain/_api/path.py +1 -1
- langchain/adapters/openai.py +8 -8
- langchain/agents/__init__.py +15 -12
- langchain/agents/agent.py +160 -133
- langchain/agents/agent_iterator.py +31 -14
- langchain/agents/agent_toolkits/__init__.py +7 -6
- langchain/agents/agent_toolkits/ainetwork/toolkit.py +1 -1
- langchain/agents/agent_toolkits/amadeus/toolkit.py +1 -1
- langchain/agents/agent_toolkits/azure_cognitive_services.py +1 -1
- langchain/agents/agent_toolkits/clickup/toolkit.py +1 -1
- langchain/agents/agent_toolkits/conversational_retrieval/openai_functions.py +6 -4
- langchain/agents/agent_toolkits/csv/__init__.py +4 -2
- langchain/agents/agent_toolkits/file_management/__init__.py +1 -1
- langchain/agents/agent_toolkits/file_management/toolkit.py +1 -1
- langchain/agents/agent_toolkits/github/toolkit.py +9 -9
- langchain/agents/agent_toolkits/gitlab/toolkit.py +1 -1
- langchain/agents/agent_toolkits/json/base.py +1 -1
- langchain/agents/agent_toolkits/multion/toolkit.py +1 -1
- langchain/agents/agent_toolkits/office365/toolkit.py +1 -1
- langchain/agents/agent_toolkits/openapi/base.py +1 -1
- langchain/agents/agent_toolkits/openapi/planner.py +2 -2
- langchain/agents/agent_toolkits/openapi/planner_prompt.py +10 -10
- langchain/agents/agent_toolkits/openapi/prompt.py +1 -1
- langchain/agents/agent_toolkits/openapi/toolkit.py +1 -1
- langchain/agents/agent_toolkits/pandas/__init__.py +4 -2
- langchain/agents/agent_toolkits/playwright/__init__.py +1 -1
- langchain/agents/agent_toolkits/playwright/toolkit.py +1 -1
- langchain/agents/agent_toolkits/powerbi/base.py +1 -1
- langchain/agents/agent_toolkits/powerbi/chat_base.py +1 -1
- langchain/agents/agent_toolkits/powerbi/prompt.py +2 -2
- langchain/agents/agent_toolkits/powerbi/toolkit.py +1 -1
- langchain/agents/agent_toolkits/python/__init__.py +4 -2
- langchain/agents/agent_toolkits/spark/__init__.py +4 -2
- langchain/agents/agent_toolkits/spark_sql/base.py +1 -1
- langchain/agents/agent_toolkits/spark_sql/toolkit.py +1 -1
- langchain/agents/agent_toolkits/sql/prompt.py +1 -1
- langchain/agents/agent_toolkits/sql/toolkit.py +1 -1
- langchain/agents/agent_toolkits/vectorstore/base.py +2 -2
- langchain/agents/agent_toolkits/vectorstore/prompt.py +2 -4
- langchain/agents/agent_toolkits/vectorstore/toolkit.py +12 -11
- langchain/agents/agent_toolkits/xorbits/__init__.py +4 -2
- langchain/agents/agent_toolkits/zapier/toolkit.py +1 -1
- langchain/agents/agent_types.py +6 -6
- langchain/agents/chat/base.py +6 -12
- langchain/agents/chat/output_parser.py +9 -6
- langchain/agents/chat/prompt.py +3 -4
- langchain/agents/conversational/base.py +9 -5
- langchain/agents/conversational/output_parser.py +4 -2
- langchain/agents/conversational/prompt.py +2 -3
- langchain/agents/conversational_chat/base.py +7 -5
- langchain/agents/conversational_chat/output_parser.py +9 -11
- langchain/agents/conversational_chat/prompt.py +5 -6
- langchain/agents/format_scratchpad/__init__.py +3 -3
- langchain/agents/format_scratchpad/log_to_messages.py +1 -1
- langchain/agents/format_scratchpad/openai_functions.py +8 -6
- langchain/agents/format_scratchpad/tools.py +5 -3
- langchain/agents/format_scratchpad/xml.py +33 -2
- langchain/agents/initialize.py +16 -8
- langchain/agents/json_chat/base.py +18 -18
- langchain/agents/json_chat/prompt.py +2 -3
- langchain/agents/load_tools.py +2 -1
- langchain/agents/loading.py +28 -18
- langchain/agents/mrkl/base.py +9 -4
- langchain/agents/mrkl/output_parser.py +17 -13
- langchain/agents/mrkl/prompt.py +1 -2
- langchain/agents/openai_assistant/base.py +80 -70
- langchain/agents/openai_functions_agent/base.py +46 -37
- langchain/agents/openai_functions_multi_agent/base.py +39 -26
- langchain/agents/openai_tools/base.py +8 -8
- langchain/agents/output_parsers/__init__.py +3 -3
- langchain/agents/output_parsers/json.py +6 -6
- langchain/agents/output_parsers/openai_functions.py +15 -7
- langchain/agents/output_parsers/openai_tools.py +9 -4
- langchain/agents/output_parsers/react_json_single_input.py +10 -5
- langchain/agents/output_parsers/react_single_input.py +15 -11
- langchain/agents/output_parsers/self_ask.py +3 -2
- langchain/agents/output_parsers/tools.py +18 -13
- langchain/agents/output_parsers/xml.py +99 -28
- langchain/agents/react/agent.py +4 -4
- langchain/agents/react/base.py +22 -17
- langchain/agents/react/output_parser.py +5 -6
- langchain/agents/react/textworld_prompt.py +0 -1
- langchain/agents/react/wiki_prompt.py +14 -15
- langchain/agents/schema.py +3 -2
- langchain/agents/self_ask_with_search/base.py +19 -15
- langchain/agents/self_ask_with_search/prompt.py +0 -1
- langchain/agents/structured_chat/base.py +14 -11
- langchain/agents/structured_chat/output_parser.py +16 -18
- langchain/agents/structured_chat/prompt.py +3 -4
- langchain/agents/tool_calling_agent/base.py +7 -6
- langchain/agents/tools.py +2 -2
- langchain/agents/utils.py +2 -3
- langchain/agents/xml/base.py +5 -5
- langchain/agents/xml/prompt.py +1 -2
- langchain/cache.py +12 -12
- langchain/callbacks/__init__.py +11 -11
- langchain/callbacks/aim_callback.py +2 -2
- langchain/callbacks/argilla_callback.py +1 -1
- langchain/callbacks/arize_callback.py +1 -1
- langchain/callbacks/arthur_callback.py +1 -1
- langchain/callbacks/base.py +7 -7
- langchain/callbacks/clearml_callback.py +1 -1
- langchain/callbacks/comet_ml_callback.py +1 -1
- langchain/callbacks/confident_callback.py +1 -1
- langchain/callbacks/context_callback.py +1 -1
- langchain/callbacks/flyte_callback.py +1 -1
- langchain/callbacks/human.py +2 -2
- langchain/callbacks/infino_callback.py +1 -1
- langchain/callbacks/labelstudio_callback.py +1 -1
- langchain/callbacks/llmonitor_callback.py +1 -1
- langchain/callbacks/manager.py +5 -5
- langchain/callbacks/mlflow_callback.py +2 -2
- langchain/callbacks/openai_info.py +1 -1
- langchain/callbacks/promptlayer_callback.py +1 -1
- langchain/callbacks/sagemaker_callback.py +1 -1
- langchain/callbacks/streaming_aiter.py +4 -1
- langchain/callbacks/streaming_aiter_final_only.py +5 -3
- langchain/callbacks/streaming_stdout_final_only.py +5 -3
- langchain/callbacks/streamlit/__init__.py +3 -2
- langchain/callbacks/streamlit/mutable_expander.py +1 -1
- langchain/callbacks/streamlit/streamlit_callback_handler.py +3 -3
- langchain/callbacks/tracers/__init__.py +1 -1
- langchain/callbacks/tracers/comet.py +1 -1
- langchain/callbacks/tracers/evaluation.py +1 -1
- langchain/callbacks/tracers/log_stream.py +1 -1
- langchain/callbacks/tracers/logging.py +1 -1
- langchain/callbacks/tracers/stdout.py +1 -1
- langchain/callbacks/trubrics_callback.py +1 -1
- langchain/callbacks/utils.py +4 -4
- langchain/callbacks/wandb_callback.py +1 -1
- langchain/callbacks/whylabs_callback.py +1 -1
- langchain/chains/api/base.py +36 -22
- langchain/chains/api/news_docs.py +1 -2
- langchain/chains/api/open_meteo_docs.py +1 -2
- langchain/chains/api/openapi/requests_chain.py +1 -1
- langchain/chains/api/openapi/response_chain.py +1 -1
- langchain/chains/api/podcast_docs.py +1 -2
- langchain/chains/api/prompt.py +1 -2
- langchain/chains/api/tmdb_docs.py +1 -2
- langchain/chains/base.py +88 -54
- langchain/chains/chat_vector_db/prompts.py +2 -3
- langchain/chains/combine_documents/__init__.py +1 -1
- langchain/chains/combine_documents/base.py +23 -10
- langchain/chains/combine_documents/map_reduce.py +38 -30
- langchain/chains/combine_documents/map_rerank.py +33 -20
- langchain/chains/combine_documents/reduce.py +47 -26
- langchain/chains/combine_documents/refine.py +26 -17
- langchain/chains/combine_documents/stuff.py +19 -12
- langchain/chains/constitutional_ai/base.py +4 -4
- langchain/chains/constitutional_ai/principles.py +22 -25
- langchain/chains/constitutional_ai/prompts.py +25 -28
- langchain/chains/conversation/base.py +5 -3
- langchain/chains/conversation/memory.py +5 -5
- langchain/chains/conversation/prompt.py +5 -5
- langchain/chains/conversational_retrieval/base.py +41 -20
- langchain/chains/conversational_retrieval/prompts.py +2 -3
- langchain/chains/elasticsearch_database/base.py +8 -9
- langchain/chains/elasticsearch_database/prompts.py +2 -3
- langchain/chains/ernie_functions/__init__.py +2 -2
- langchain/chains/example_generator.py +3 -1
- langchain/chains/flare/base.py +26 -12
- langchain/chains/graph_qa/cypher.py +2 -2
- langchain/chains/graph_qa/falkordb.py +1 -1
- langchain/chains/graph_qa/gremlin.py +1 -1
- langchain/chains/graph_qa/neptune_sparql.py +1 -1
- langchain/chains/graph_qa/prompts.py +2 -2
- langchain/chains/history_aware_retriever.py +2 -1
- langchain/chains/hyde/base.py +6 -5
- langchain/chains/hyde/prompts.py +5 -6
- langchain/chains/llm.py +77 -61
- langchain/chains/llm_bash/__init__.py +2 -1
- langchain/chains/llm_checker/base.py +7 -5
- langchain/chains/llm_checker/prompt.py +3 -4
- langchain/chains/llm_math/base.py +16 -9
- langchain/chains/llm_math/prompt.py +1 -2
- langchain/chains/llm_summarization_checker/base.py +9 -6
- langchain/chains/llm_symbolic_math/__init__.py +2 -1
- langchain/chains/loading.py +151 -95
- langchain/chains/mapreduce.py +4 -3
- langchain/chains/moderation.py +8 -9
- langchain/chains/natbot/base.py +8 -8
- langchain/chains/natbot/crawler.py +73 -76
- langchain/chains/natbot/prompt.py +2 -3
- langchain/chains/openai_functions/__init__.py +7 -7
- langchain/chains/openai_functions/base.py +13 -10
- langchain/chains/openai_functions/citation_fuzzy_match.py +12 -11
- langchain/chains/openai_functions/extraction.py +19 -19
- langchain/chains/openai_functions/openapi.py +35 -35
- langchain/chains/openai_functions/qa_with_structure.py +19 -12
- langchain/chains/openai_functions/tagging.py +2 -4
- langchain/chains/openai_tools/extraction.py +7 -8
- langchain/chains/qa_generation/base.py +4 -3
- langchain/chains/qa_generation/prompt.py +5 -5
- langchain/chains/qa_with_sources/base.py +14 -6
- langchain/chains/qa_with_sources/loading.py +16 -8
- langchain/chains/qa_with_sources/map_reduce_prompt.py +8 -9
- langchain/chains/qa_with_sources/refine_prompts.py +0 -1
- langchain/chains/qa_with_sources/retrieval.py +14 -5
- langchain/chains/qa_with_sources/stuff_prompt.py +6 -7
- langchain/chains/qa_with_sources/vector_db.py +17 -6
- langchain/chains/query_constructor/base.py +34 -33
- langchain/chains/query_constructor/ir.py +4 -4
- langchain/chains/query_constructor/parser.py +37 -32
- langchain/chains/query_constructor/prompt.py +5 -6
- langchain/chains/question_answering/chain.py +21 -10
- langchain/chains/question_answering/map_reduce_prompt.py +14 -14
- langchain/chains/question_answering/map_rerank_prompt.py +3 -3
- langchain/chains/question_answering/refine_prompts.py +2 -5
- langchain/chains/question_answering/stuff_prompt.py +5 -5
- langchain/chains/retrieval.py +1 -3
- langchain/chains/retrieval_qa/base.py +34 -27
- langchain/chains/retrieval_qa/prompt.py +1 -2
- langchain/chains/router/__init__.py +3 -3
- langchain/chains/router/base.py +24 -20
- langchain/chains/router/embedding_router.py +12 -8
- langchain/chains/router/llm_router.py +17 -16
- langchain/chains/router/multi_prompt.py +2 -2
- langchain/chains/router/multi_retrieval_qa.py +10 -5
- langchain/chains/sequential.py +30 -18
- langchain/chains/sql_database/prompt.py +14 -16
- langchain/chains/sql_database/query.py +6 -5
- langchain/chains/structured_output/__init__.py +1 -1
- langchain/chains/structured_output/base.py +75 -67
- langchain/chains/summarize/chain.py +11 -5
- langchain/chains/summarize/map_reduce_prompt.py +0 -1
- langchain/chains/summarize/stuff_prompt.py +0 -1
- langchain/chains/transform.py +5 -6
- langchain/chat_loaders/facebook_messenger.py +1 -1
- langchain/chat_loaders/langsmith.py +1 -1
- langchain/chat_loaders/utils.py +3 -3
- langchain/chat_models/__init__.py +20 -19
- langchain/chat_models/anthropic.py +1 -1
- langchain/chat_models/azureml_endpoint.py +1 -1
- langchain/chat_models/baidu_qianfan_endpoint.py +1 -1
- langchain/chat_models/base.py +160 -123
- langchain/chat_models/bedrock.py +1 -1
- langchain/chat_models/fake.py +1 -1
- langchain/chat_models/meta.py +1 -1
- langchain/chat_models/pai_eas_endpoint.py +1 -1
- langchain/chat_models/promptlayer_openai.py +1 -1
- langchain/chat_models/volcengine_maas.py +1 -1
- langchain/docstore/base.py +1 -1
- langchain/document_loaders/__init__.py +9 -9
- langchain/document_loaders/airbyte.py +3 -3
- langchain/document_loaders/assemblyai.py +1 -1
- langchain/document_loaders/azure_blob_storage_container.py +1 -1
- langchain/document_loaders/azure_blob_storage_file.py +1 -1
- langchain/document_loaders/baiducloud_bos_file.py +1 -1
- langchain/document_loaders/base.py +1 -1
- langchain/document_loaders/blob_loaders/__init__.py +1 -1
- langchain/document_loaders/blockchain.py +1 -1
- langchain/document_loaders/chatgpt.py +1 -1
- langchain/document_loaders/college_confidential.py +1 -1
- langchain/document_loaders/confluence.py +1 -1
- langchain/document_loaders/email.py +1 -1
- langchain/document_loaders/facebook_chat.py +1 -1
- langchain/document_loaders/markdown.py +1 -1
- langchain/document_loaders/notebook.py +1 -1
- langchain/document_loaders/org_mode.py +1 -1
- langchain/document_loaders/parsers/__init__.py +1 -1
- langchain/document_loaders/parsers/docai.py +1 -1
- langchain/document_loaders/parsers/generic.py +1 -1
- langchain/document_loaders/parsers/html/__init__.py +1 -1
- langchain/document_loaders/parsers/html/bs4.py +1 -1
- langchain/document_loaders/parsers/language/cobol.py +1 -1
- langchain/document_loaders/parsers/language/python.py +1 -1
- langchain/document_loaders/parsers/msword.py +1 -1
- langchain/document_loaders/parsers/pdf.py +5 -5
- langchain/document_loaders/parsers/registry.py +1 -1
- langchain/document_loaders/pdf.py +8 -8
- langchain/document_loaders/powerpoint.py +1 -1
- langchain/document_loaders/pyspark_dataframe.py +1 -1
- langchain/document_loaders/telegram.py +2 -2
- langchain/document_loaders/tencent_cos_directory.py +1 -1
- langchain/document_loaders/unstructured.py +5 -5
- langchain/document_loaders/url_playwright.py +1 -1
- langchain/document_loaders/whatsapp_chat.py +1 -1
- langchain/document_loaders/youtube.py +2 -2
- langchain/document_transformers/__init__.py +3 -3
- langchain/document_transformers/beautiful_soup_transformer.py +1 -1
- langchain/document_transformers/doctran_text_extract.py +1 -1
- langchain/document_transformers/doctran_text_qa.py +1 -1
- langchain/document_transformers/doctran_text_translate.py +1 -1
- langchain/document_transformers/embeddings_redundant_filter.py +3 -3
- langchain/document_transformers/google_translate.py +1 -1
- langchain/document_transformers/html2text.py +1 -1
- langchain/document_transformers/nuclia_text_transform.py +1 -1
- langchain/embeddings/__init__.py +5 -5
- langchain/embeddings/base.py +33 -24
- langchain/embeddings/cache.py +36 -31
- langchain/embeddings/fake.py +1 -1
- langchain/embeddings/huggingface.py +2 -2
- langchain/evaluation/__init__.py +22 -22
- langchain/evaluation/agents/trajectory_eval_chain.py +23 -23
- langchain/evaluation/agents/trajectory_eval_prompt.py +6 -9
- langchain/evaluation/comparison/__init__.py +1 -1
- langchain/evaluation/comparison/eval_chain.py +20 -13
- langchain/evaluation/comparison/prompt.py +1 -2
- langchain/evaluation/criteria/__init__.py +1 -1
- langchain/evaluation/criteria/eval_chain.py +20 -11
- langchain/evaluation/criteria/prompt.py +2 -3
- langchain/evaluation/embedding_distance/base.py +23 -20
- langchain/evaluation/loading.py +15 -11
- langchain/evaluation/parsing/base.py +4 -1
- langchain/evaluation/parsing/json_distance.py +5 -2
- langchain/evaluation/parsing/json_schema.py +12 -8
- langchain/evaluation/qa/__init__.py +1 -1
- langchain/evaluation/qa/eval_chain.py +12 -5
- langchain/evaluation/qa/eval_prompt.py +7 -8
- langchain/evaluation/qa/generate_chain.py +2 -1
- langchain/evaluation/qa/generate_prompt.py +2 -4
- langchain/evaluation/schema.py +38 -30
- langchain/evaluation/scoring/__init__.py +1 -1
- langchain/evaluation/scoring/eval_chain.py +22 -15
- langchain/evaluation/scoring/prompt.py +0 -1
- langchain/evaluation/string_distance/base.py +14 -9
- langchain/globals.py +12 -11
- langchain/graphs/__init__.py +6 -6
- langchain/graphs/graph_document.py +1 -1
- langchain/graphs/networkx_graph.py +2 -2
- langchain/hub.py +9 -11
- langchain/indexes/__init__.py +3 -3
- langchain/indexes/_sql_record_manager.py +63 -46
- langchain/indexes/prompts/entity_extraction.py +1 -2
- langchain/indexes/prompts/entity_summarization.py +1 -2
- langchain/indexes/prompts/knowledge_triplet_extraction.py +1 -3
- langchain/indexes/vectorstore.py +35 -19
- langchain/llms/__init__.py +13 -13
- langchain/llms/ai21.py +1 -1
- langchain/llms/azureml_endpoint.py +4 -4
- langchain/llms/base.py +15 -7
- langchain/llms/bedrock.py +1 -1
- langchain/llms/cloudflare_workersai.py +1 -1
- langchain/llms/gradient_ai.py +1 -1
- langchain/llms/loading.py +1 -1
- langchain/llms/openai.py +1 -1
- langchain/llms/sagemaker_endpoint.py +1 -1
- langchain/load/dump.py +1 -1
- langchain/load/load.py +1 -1
- langchain/load/serializable.py +3 -3
- langchain/memory/__init__.py +3 -3
- langchain/memory/buffer.py +9 -7
- langchain/memory/chat_memory.py +14 -8
- langchain/memory/chat_message_histories/__init__.py +1 -1
- langchain/memory/chat_message_histories/astradb.py +1 -1
- langchain/memory/chat_message_histories/cassandra.py +1 -1
- langchain/memory/chat_message_histories/cosmos_db.py +1 -1
- langchain/memory/chat_message_histories/dynamodb.py +1 -1
- langchain/memory/chat_message_histories/elasticsearch.py +1 -1
- langchain/memory/chat_message_histories/file.py +1 -1
- langchain/memory/chat_message_histories/firestore.py +1 -1
- langchain/memory/chat_message_histories/momento.py +1 -1
- langchain/memory/chat_message_histories/mongodb.py +1 -1
- langchain/memory/chat_message_histories/neo4j.py +1 -1
- langchain/memory/chat_message_histories/postgres.py +1 -1
- langchain/memory/chat_message_histories/redis.py +1 -1
- langchain/memory/chat_message_histories/rocksetdb.py +1 -1
- langchain/memory/chat_message_histories/singlestoredb.py +1 -1
- langchain/memory/chat_message_histories/streamlit.py +1 -1
- langchain/memory/chat_message_histories/upstash_redis.py +1 -1
- langchain/memory/chat_message_histories/xata.py +1 -1
- langchain/memory/chat_message_histories/zep.py +1 -1
- langchain/memory/combined.py +13 -12
- langchain/memory/entity.py +84 -61
- langchain/memory/prompt.py +10 -11
- langchain/memory/readonly.py +0 -2
- langchain/memory/simple.py +1 -3
- langchain/memory/summary.py +13 -11
- langchain/memory/summary_buffer.py +17 -8
- langchain/memory/utils.py +3 -2
- langchain/memory/vectorstore.py +12 -5
- langchain/memory/vectorstore_token_buffer_memory.py +5 -5
- langchain/model_laboratory.py +12 -11
- langchain/output_parsers/__init__.py +4 -4
- langchain/output_parsers/boolean.py +7 -4
- langchain/output_parsers/combining.py +10 -5
- langchain/output_parsers/datetime.py +32 -31
- langchain/output_parsers/enum.py +5 -3
- langchain/output_parsers/fix.py +52 -52
- langchain/output_parsers/format_instructions.py +6 -8
- langchain/output_parsers/json.py +2 -2
- langchain/output_parsers/list.py +2 -2
- langchain/output_parsers/loading.py +9 -9
- langchain/output_parsers/openai_functions.py +3 -3
- langchain/output_parsers/openai_tools.py +1 -1
- langchain/output_parsers/pandas_dataframe.py +43 -47
- langchain/output_parsers/prompts.py +1 -2
- langchain/output_parsers/rail_parser.py +1 -1
- langchain/output_parsers/regex.py +7 -8
- langchain/output_parsers/regex_dict.py +7 -10
- langchain/output_parsers/retry.py +77 -78
- langchain/output_parsers/structured.py +11 -6
- langchain/output_parsers/yaml.py +15 -11
- langchain/prompts/__init__.py +5 -3
- langchain/prompts/base.py +5 -5
- langchain/prompts/chat.py +8 -8
- langchain/prompts/example_selector/__init__.py +3 -1
- langchain/prompts/example_selector/semantic_similarity.py +2 -2
- langchain/prompts/few_shot.py +1 -1
- langchain/prompts/loading.py +3 -3
- langchain/prompts/prompt.py +1 -1
- langchain/retrievers/__init__.py +5 -5
- langchain/retrievers/bedrock.py +2 -2
- langchain/retrievers/bm25.py +1 -1
- langchain/retrievers/contextual_compression.py +14 -8
- langchain/retrievers/docarray.py +1 -1
- langchain/retrievers/document_compressors/__init__.py +5 -4
- langchain/retrievers/document_compressors/base.py +12 -6
- langchain/retrievers/document_compressors/chain_extract.py +2 -2
- langchain/retrievers/document_compressors/chain_extract_prompt.py +2 -3
- langchain/retrievers/document_compressors/chain_filter.py +9 -9
- langchain/retrievers/document_compressors/chain_filter_prompt.py +1 -2
- langchain/retrievers/document_compressors/cohere_rerank.py +15 -15
- langchain/retrievers/document_compressors/embeddings_filter.py +21 -17
- langchain/retrievers/document_compressors/flashrank_rerank.py +1 -1
- langchain/retrievers/document_compressors/listwise_rerank.py +7 -5
- langchain/retrievers/ensemble.py +28 -25
- langchain/retrievers/google_cloud_documentai_warehouse.py +1 -1
- langchain/retrievers/google_vertex_ai_search.py +2 -2
- langchain/retrievers/kendra.py +10 -10
- langchain/retrievers/llama_index.py +1 -1
- langchain/retrievers/merger_retriever.py +11 -11
- langchain/retrievers/milvus.py +1 -1
- langchain/retrievers/multi_query.py +32 -26
- langchain/retrievers/multi_vector.py +20 -8
- langchain/retrievers/parent_document_retriever.py +18 -9
- langchain/retrievers/re_phraser.py +6 -5
- langchain/retrievers/self_query/base.py +138 -127
- langchain/retrievers/time_weighted_retriever.py +18 -7
- langchain/retrievers/zilliz.py +1 -1
- langchain/runnables/openai_functions.py +6 -2
- langchain/schema/__init__.py +23 -23
- langchain/schema/cache.py +1 -1
- langchain/schema/callbacks/base.py +7 -7
- langchain/schema/callbacks/manager.py +19 -19
- langchain/schema/callbacks/tracers/base.py +1 -1
- langchain/schema/callbacks/tracers/evaluation.py +1 -1
- langchain/schema/callbacks/tracers/langchain.py +1 -1
- langchain/schema/callbacks/tracers/langchain_v1.py +1 -1
- langchain/schema/callbacks/tracers/log_stream.py +1 -1
- langchain/schema/callbacks/tracers/schemas.py +8 -8
- langchain/schema/callbacks/tracers/stdout.py +3 -3
- langchain/schema/document.py +1 -1
- langchain/schema/language_model.py +2 -2
- langchain/schema/messages.py +12 -12
- langchain/schema/output.py +3 -3
- langchain/schema/output_parser.py +3 -3
- langchain/schema/runnable/__init__.py +3 -3
- langchain/schema/runnable/base.py +9 -9
- langchain/schema/runnable/config.py +5 -5
- langchain/schema/runnable/configurable.py +1 -1
- langchain/schema/runnable/history.py +1 -1
- langchain/schema/runnable/passthrough.py +1 -1
- langchain/schema/runnable/utils.py +16 -16
- langchain/schema/vectorstore.py +1 -1
- langchain/smith/__init__.py +1 -1
- langchain/smith/evaluation/__init__.py +2 -2
- langchain/smith/evaluation/config.py +10 -7
- langchain/smith/evaluation/name_generation.py +3 -3
- langchain/smith/evaluation/progress.py +11 -2
- langchain/smith/evaluation/runner_utils.py +179 -127
- langchain/smith/evaluation/string_run_evaluator.py +75 -68
- langchain/storage/__init__.py +2 -2
- langchain/storage/_lc_store.py +4 -2
- langchain/storage/encoder_backed.py +6 -2
- langchain/storage/file_system.py +19 -16
- langchain/storage/in_memory.py +1 -1
- langchain/storage/upstash_redis.py +1 -1
- langchain/text_splitter.py +15 -15
- langchain/tools/__init__.py +28 -26
- langchain/tools/ainetwork/app.py +1 -1
- langchain/tools/ainetwork/base.py +1 -1
- langchain/tools/ainetwork/owner.py +1 -1
- langchain/tools/ainetwork/rule.py +1 -1
- langchain/tools/ainetwork/transfer.py +1 -1
- langchain/tools/ainetwork/value.py +1 -1
- langchain/tools/amadeus/closest_airport.py +1 -1
- langchain/tools/amadeus/flight_search.py +1 -1
- langchain/tools/azure_cognitive_services/__init__.py +1 -1
- langchain/tools/base.py +4 -4
- langchain/tools/bearly/tool.py +1 -1
- langchain/tools/bing_search/__init__.py +1 -1
- langchain/tools/bing_search/tool.py +1 -1
- langchain/tools/dataforseo_api_search/__init__.py +1 -1
- langchain/tools/dataforseo_api_search/tool.py +1 -1
- langchain/tools/ddg_search/tool.py +1 -1
- langchain/tools/e2b_data_analysis/tool.py +2 -2
- langchain/tools/edenai/__init__.py +1 -1
- langchain/tools/file_management/__init__.py +1 -1
- langchain/tools/file_management/copy.py +1 -1
- langchain/tools/file_management/delete.py +1 -1
- langchain/tools/gmail/__init__.py +2 -2
- langchain/tools/gmail/get_message.py +1 -1
- langchain/tools/gmail/search.py +1 -1
- langchain/tools/gmail/send_message.py +1 -1
- langchain/tools/google_finance/__init__.py +1 -1
- langchain/tools/google_finance/tool.py +1 -1
- langchain/tools/google_scholar/__init__.py +1 -1
- langchain/tools/google_scholar/tool.py +1 -1
- langchain/tools/google_search/__init__.py +1 -1
- langchain/tools/google_search/tool.py +1 -1
- langchain/tools/google_serper/__init__.py +1 -1
- langchain/tools/google_serper/tool.py +1 -1
- langchain/tools/google_trends/__init__.py +1 -1
- langchain/tools/google_trends/tool.py +1 -1
- langchain/tools/jira/tool.py +20 -1
- langchain/tools/json/tool.py +25 -3
- langchain/tools/memorize/tool.py +1 -1
- langchain/tools/multion/__init__.py +1 -1
- langchain/tools/multion/update_session.py +1 -1
- langchain/tools/office365/__init__.py +2 -2
- langchain/tools/office365/events_search.py +1 -1
- langchain/tools/office365/messages_search.py +1 -1
- langchain/tools/office365/send_event.py +1 -1
- langchain/tools/office365/send_message.py +1 -1
- langchain/tools/openapi/utils/api_models.py +6 -6
- langchain/tools/playwright/__init__.py +5 -5
- langchain/tools/playwright/click.py +1 -1
- langchain/tools/playwright/extract_hyperlinks.py +1 -1
- langchain/tools/playwright/get_elements.py +1 -1
- langchain/tools/playwright/navigate.py +1 -1
- langchain/tools/plugin.py +2 -2
- langchain/tools/powerbi/tool.py +1 -1
- langchain/tools/python/__init__.py +2 -1
- langchain/tools/reddit_search/tool.py +1 -1
- langchain/tools/render.py +2 -2
- langchain/tools/requests/tool.py +2 -2
- langchain/tools/searchapi/tool.py +1 -1
- langchain/tools/searx_search/tool.py +1 -1
- langchain/tools/slack/get_message.py +1 -1
- langchain/tools/spark_sql/tool.py +1 -1
- langchain/tools/sql_database/tool.py +1 -1
- langchain/tools/tavily_search/__init__.py +1 -1
- langchain/tools/tavily_search/tool.py +1 -1
- langchain/tools/zapier/__init__.py +1 -1
- langchain/tools/zapier/tool.py +24 -2
- langchain/utilities/__init__.py +4 -4
- langchain/utilities/arcee.py +4 -4
- langchain/utilities/clickup.py +4 -4
- langchain/utilities/dalle_image_generator.py +1 -1
- langchain/utilities/dataforseo_api_search.py +1 -1
- langchain/utilities/opaqueprompts.py +1 -1
- langchain/utilities/reddit_search.py +1 -1
- langchain/utilities/sql_database.py +1 -1
- langchain/utilities/tavily_search.py +1 -1
- langchain/utilities/vertexai.py +2 -2
- langchain/utils/__init__.py +1 -1
- langchain/utils/aiter.py +1 -1
- langchain/utils/html.py +3 -3
- langchain/utils/input.py +1 -1
- langchain/utils/iter.py +1 -1
- langchain/utils/json_schema.py +1 -3
- langchain/utils/strings.py +1 -1
- langchain/utils/utils.py +6 -6
- langchain/vectorstores/__init__.py +5 -5
- langchain/vectorstores/alibabacloud_opensearch.py +1 -1
- langchain/vectorstores/azure_cosmos_db.py +1 -1
- langchain/vectorstores/clickhouse.py +1 -1
- langchain/vectorstores/elastic_vector_search.py +1 -1
- langchain/vectorstores/elasticsearch.py +2 -2
- langchain/vectorstores/myscale.py +1 -1
- langchain/vectorstores/neo4j_vector.py +1 -1
- langchain/vectorstores/pgembedding.py +1 -1
- langchain/vectorstores/qdrant.py +1 -1
- langchain/vectorstores/redis/__init__.py +1 -1
- langchain/vectorstores/redis/base.py +1 -1
- langchain/vectorstores/redis/filters.py +4 -4
- langchain/vectorstores/redis/schema.py +6 -6
- langchain/vectorstores/sklearn.py +2 -2
- langchain/vectorstores/starrocks.py +1 -1
- langchain/vectorstores/utils.py +1 -1
- {langchain-0.3.26.dist-info → langchain-0.3.27.dist-info}/METADATA +4 -4
- {langchain-0.3.26.dist-info → langchain-0.3.27.dist-info}/RECORD +580 -580
- {langchain-0.3.26.dist-info → langchain-0.3.27.dist-info}/WHEEL +1 -1
- {langchain-0.3.26.dist-info → langchain-0.3.27.dist-info}/entry_points.txt +0 -0
- {langchain-0.3.26.dist-info → langchain-0.3.27.dist-info}/licenses/LICENSE +0 -0
langchain/agents/react/agent.py
CHANGED
|
@@ -118,10 +118,11 @@ def create_react_agent(
|
|
|
118
118
|
prompt = PromptTemplate.from_template(template)
|
|
119
119
|
""" # noqa: E501
|
|
120
120
|
missing_vars = {"tools", "tool_names", "agent_scratchpad"}.difference(
|
|
121
|
-
prompt.input_variables + list(prompt.partial_variables)
|
|
121
|
+
prompt.input_variables + list(prompt.partial_variables),
|
|
122
122
|
)
|
|
123
123
|
if missing_vars:
|
|
124
|
-
|
|
124
|
+
msg = f"Prompt missing required variables: {missing_vars}"
|
|
125
|
+
raise ValueError(msg)
|
|
125
126
|
|
|
126
127
|
prompt = prompt.partial(
|
|
127
128
|
tools=tools_renderer(list(tools)),
|
|
@@ -133,7 +134,7 @@ def create_react_agent(
|
|
|
133
134
|
else:
|
|
134
135
|
llm_with_stop = llm
|
|
135
136
|
output_parser = output_parser or ReActSingleInputOutputParser()
|
|
136
|
-
|
|
137
|
+
return (
|
|
137
138
|
RunnablePassthrough.assign(
|
|
138
139
|
agent_scratchpad=lambda x: format_log_to_str(x["intermediate_steps"]),
|
|
139
140
|
)
|
|
@@ -141,4 +142,3 @@ def create_react_agent(
|
|
|
141
142
|
| llm_with_stop
|
|
142
143
|
| output_parser
|
|
143
144
|
)
|
|
144
|
-
return agent
|
langchain/agents/react/base.py
CHANGED
|
@@ -24,6 +24,9 @@ if TYPE_CHECKING:
|
|
|
24
24
|
from langchain_community.docstore.base import Docstore
|
|
25
25
|
|
|
26
26
|
|
|
27
|
+
_LOOKUP_AND_SEARCH_TOOLS = {"Lookup", "Search"}
|
|
28
|
+
|
|
29
|
+
|
|
27
30
|
@deprecated(
|
|
28
31
|
"0.1.0",
|
|
29
32
|
message=AGENT_DEPRECATION_WARNING,
|
|
@@ -52,13 +55,13 @@ class ReActDocstoreAgent(Agent):
|
|
|
52
55
|
def _validate_tools(cls, tools: Sequence[BaseTool]) -> None:
|
|
53
56
|
validate_tools_single_input(cls.__name__, tools)
|
|
54
57
|
super()._validate_tools(tools)
|
|
55
|
-
if len(tools) !=
|
|
56
|
-
|
|
58
|
+
if len(tools) != len(_LOOKUP_AND_SEARCH_TOOLS):
|
|
59
|
+
msg = f"Exactly two tools must be specified, but got {tools}"
|
|
60
|
+
raise ValueError(msg)
|
|
57
61
|
tool_names = {tool.name for tool in tools}
|
|
58
|
-
if tool_names !=
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
)
|
|
62
|
+
if tool_names != _LOOKUP_AND_SEARCH_TOOLS:
|
|
63
|
+
msg = f"Tool names should be Lookup and Search, got {tool_names}"
|
|
64
|
+
raise ValueError(msg)
|
|
62
65
|
|
|
63
66
|
@property
|
|
64
67
|
def observation_prefix(self) -> str:
|
|
@@ -96,14 +99,14 @@ class DocstoreExplorer:
|
|
|
96
99
|
if isinstance(result, Document):
|
|
97
100
|
self.document = result
|
|
98
101
|
return self._summary
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
return result
|
|
102
|
+
self.document = None
|
|
103
|
+
return result
|
|
102
104
|
|
|
103
105
|
def lookup(self, term: str) -> str:
|
|
104
106
|
"""Lookup a term in document (if saved)."""
|
|
105
107
|
if self.document is None:
|
|
106
|
-
|
|
108
|
+
msg = "Cannot lookup without a successful search first"
|
|
109
|
+
raise ValueError(msg)
|
|
107
110
|
if term.lower() != self.lookup_str:
|
|
108
111
|
self.lookup_str = term.lower()
|
|
109
112
|
self.lookup_index = 0
|
|
@@ -112,11 +115,10 @@ class DocstoreExplorer:
|
|
|
112
115
|
lookups = [p for p in self._paragraphs if self.lookup_str in p.lower()]
|
|
113
116
|
if len(lookups) == 0:
|
|
114
117
|
return "No Results"
|
|
115
|
-
|
|
118
|
+
if self.lookup_index >= len(lookups):
|
|
116
119
|
return "No More Results"
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
return f"{result_prefix} {lookups[self.lookup_index]}"
|
|
120
|
+
result_prefix = f"(Result {self.lookup_index + 1}/{len(lookups)})"
|
|
121
|
+
return f"{result_prefix} {lookups[self.lookup_index]}"
|
|
120
122
|
|
|
121
123
|
@property
|
|
122
124
|
def _summary(self) -> str:
|
|
@@ -125,7 +127,8 @@ class DocstoreExplorer:
|
|
|
125
127
|
@property
|
|
126
128
|
def _paragraphs(self) -> list[str]:
|
|
127
129
|
if self.document is None:
|
|
128
|
-
|
|
130
|
+
msg = "Cannot get paragraphs without a document"
|
|
131
|
+
raise ValueError(msg)
|
|
129
132
|
return self.document.page_content.split("\n\n")
|
|
130
133
|
|
|
131
134
|
|
|
@@ -147,10 +150,12 @@ class ReActTextWorldAgent(ReActDocstoreAgent):
|
|
|
147
150
|
validate_tools_single_input(cls.__name__, tools)
|
|
148
151
|
super()._validate_tools(tools)
|
|
149
152
|
if len(tools) != 1:
|
|
150
|
-
|
|
153
|
+
msg = f"Exactly one tool must be specified, but got {tools}"
|
|
154
|
+
raise ValueError(msg)
|
|
151
155
|
tool_names = {tool.name for tool in tools}
|
|
152
156
|
if tool_names != {"Play"}:
|
|
153
|
-
|
|
157
|
+
msg = f"Tool name should be Play, got {tool_names}"
|
|
158
|
+
raise ValueError(msg)
|
|
154
159
|
|
|
155
160
|
|
|
156
161
|
@deprecated(
|
|
@@ -13,21 +13,20 @@ class ReActOutputParser(AgentOutputParser):
|
|
|
13
13
|
def parse(self, text: str) -> Union[AgentAction, AgentFinish]:
|
|
14
14
|
action_prefix = "Action: "
|
|
15
15
|
if not text.strip().split("\n")[-1].startswith(action_prefix):
|
|
16
|
-
|
|
16
|
+
msg = f"Could not parse LLM Output: {text}"
|
|
17
|
+
raise OutputParserException(msg)
|
|
17
18
|
action_block = text.strip().split("\n")[-1]
|
|
18
19
|
|
|
19
20
|
action_str = action_block[len(action_prefix) :]
|
|
20
21
|
# Parse out the action and the directive.
|
|
21
22
|
re_matches = re.search(r"(.*?)\[(.*?)\]", action_str)
|
|
22
23
|
if re_matches is None:
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
)
|
|
24
|
+
msg = f"Could not parse action directive: {action_str}"
|
|
25
|
+
raise OutputParserException(msg)
|
|
26
26
|
action, action_input = re_matches.group(1), re_matches.group(2)
|
|
27
27
|
if action == "Finish":
|
|
28
28
|
return AgentFinish({"output": action_input}, text)
|
|
29
|
-
|
|
30
|
-
return AgentAction(action, action_input, text)
|
|
29
|
+
return AgentAction(action, action_input, text)
|
|
31
30
|
|
|
32
31
|
@property
|
|
33
32
|
def _type(self) -> str:
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
# flake8: noqa
|
|
2
1
|
from langchain_core.prompts.prompt import PromptTemplate
|
|
3
2
|
|
|
4
3
|
EXAMPLES = [
|
|
@@ -16,7 +15,7 @@ Thought: I need to instead search High Plains (United States).
|
|
|
16
15
|
Action: Search[High Plains (United States)]
|
|
17
16
|
Observation: The High Plains are a subregion of the Great Plains. From east to west, the High Plains rise in elevation from around 1,800 to 7,000 ft (550 to 2,130 m).[3]
|
|
18
17
|
Thought: High Plains rise in elevation from around 1,800 to 7,000 ft, so the answer is 1,800 to 7,000 ft.
|
|
19
|
-
Action: Finish[1,800 to 7,000 ft]""",
|
|
18
|
+
Action: Finish[1,800 to 7,000 ft]""", # noqa: E501
|
|
20
19
|
"""Question: Musician and satirist Allie Goertz wrote a song about the "The Simpsons" character Milhouse, who Matt Groening named after who?
|
|
21
20
|
Thought: The question simplifies to "The Simpsons" character Milhouse is named after who. I only need to search Milhouse and find who it is named after.
|
|
22
21
|
Action: Search[Milhouse]
|
|
@@ -25,16 +24,16 @@ Thought: The paragraph does not tell who Milhouse is named after, maybe I can lo
|
|
|
25
24
|
Action: Lookup[named after]
|
|
26
25
|
Observation: (Result 1 / 1) Milhouse was named after U.S. president Richard Nixon, whose middle name was Milhous.
|
|
27
26
|
Thought: Milhouse was named after U.S. president Richard Nixon, so the answer is Richard Nixon.
|
|
28
|
-
Action: Finish[Richard Nixon]""",
|
|
27
|
+
Action: Finish[Richard Nixon]""", # noqa: E501
|
|
29
28
|
"""Question: Which documentary is about Finnish rock groups, Adam Clayton Powell or The Saimaa Gesture?
|
|
30
29
|
Thought: I need to search Adam Clayton Powell and The Saimaa Gesture, and find which documentary is about Finnish rock groups.
|
|
31
30
|
Action: Search[Adam Clayton Powell]
|
|
32
|
-
Observation: Could not find [Adam Clayton Powell]. Similar: [
|
|
31
|
+
Observation: Could not find [Adam Clayton Powell]. Similar: ['Adam Clayton Powell III', 'Seventh Avenue (Manhattan)', 'Adam Clayton Powell Jr. State Office Building', 'Isabel Washington Powell', 'Adam Powell', 'Adam Clayton Powell (film)', 'Giancarlo Esposito'].
|
|
33
32
|
Thought: To find the documentary, I can search Adam Clayton Powell (film).
|
|
34
33
|
Action: Search[Adam Clayton Powell (film)]
|
|
35
34
|
Observation: Adam Clayton Powell is a 1989 American documentary film directed by Richard Kilberg. The film is about the rise and fall of influential African-American politician Adam Clayton Powell Jr.[3][4] It was later aired as part of the PBS series The American Experience.
|
|
36
35
|
Thought: Adam Clayton Powell (film) is a documentary about an African-American politician, not Finnish rock groups. So the documentary about Finnish rock groups must instead be The Saimaa Gesture.
|
|
37
|
-
Action: Finish[The Saimaa Gesture]""",
|
|
36
|
+
Action: Finish[The Saimaa Gesture]""", # noqa: E501
|
|
38
37
|
"""Question: What profession does Nicholas Ray and Elia Kazan have in common?
|
|
39
38
|
Thought: I need to search Nicholas Ray and Elia Kazan, find their professions, then find the profession they have in common.
|
|
40
39
|
Action: Search[Nicholas Ray]
|
|
@@ -43,16 +42,16 @@ Thought: Professions of Nicholas Ray are director, screenwriter, and actor. I ne
|
|
|
43
42
|
Action: Search[Elia Kazan]
|
|
44
43
|
Observation: Elia Kazan was an American film and theatre director, producer, screenwriter and actor.
|
|
45
44
|
Thought: Professions of Elia Kazan are director, producer, screenwriter, and actor. So profession Nicholas Ray and Elia Kazan have in common is director, screenwriter, and actor.
|
|
46
|
-
Action: Finish[director, screenwriter, actor]""",
|
|
47
|
-
"""Question: Which magazine was started first Arthur
|
|
48
|
-
Thought: I need to search Arthur
|
|
49
|
-
Action: Search[Arthur
|
|
50
|
-
Observation: Arthur
|
|
51
|
-
Thought: Arthur
|
|
45
|
+
Action: Finish[director, screenwriter, actor]""", # noqa: E501
|
|
46
|
+
"""Question: Which magazine was started first Arthur's Magazine or First for Women?
|
|
47
|
+
Thought: I need to search Arthur's Magazine and First for Women, and find which was started first.
|
|
48
|
+
Action: Search[Arthur's Magazine]
|
|
49
|
+
Observation: Arthur's Magazine (1844-1846) was an American literary periodical published in Philadelphia in the 19th century.
|
|
50
|
+
Thought: Arthur's Magazine was started in 1844. I need to search First for Women next.
|
|
52
51
|
Action: Search[First for Women]
|
|
53
|
-
Observation: First for Women is a woman
|
|
54
|
-
Thought: First for Women was started in 1989. 1844 (Arthur
|
|
55
|
-
Action: Finish[Arthur
|
|
52
|
+
Observation: First for Women is a woman's magazine published by Bauer Media Group in the USA.[1] The magazine was started in 1989.
|
|
53
|
+
Thought: First for Women was started in 1989. 1844 (Arthur's Magazine) < 1989 (First for Women), so Arthur's Magazine was started first.
|
|
54
|
+
Action: Finish[Arthur's Magazine]""", # noqa: E501
|
|
56
55
|
"""Question: Were Pavel Urysohn and Leonid Levin known for the same type of work?
|
|
57
56
|
Thought: I need to search Pavel Urysohn and Leonid Levin, find their types of work, then find if they are the same.
|
|
58
57
|
Action: Search[Pavel Urysohn]
|
|
@@ -61,7 +60,7 @@ Thought: Pavel Urysohn is a mathematician. I need to search Leonid Levin next an
|
|
|
61
60
|
Action: Search[Leonid Levin]
|
|
62
61
|
Observation: Leonid Anatolievich Levin is a Soviet-American mathematician and computer scientist.
|
|
63
62
|
Thought: Leonid Levin is a mathematician and computer scientist. So Pavel Urysohn and Leonid Levin have the same type of work.
|
|
64
|
-
Action: Finish[yes]""",
|
|
63
|
+
Action: Finish[yes]""", # noqa: E501
|
|
65
64
|
]
|
|
66
65
|
SUFFIX = """\nQuestion: {input}
|
|
67
66
|
{agent_scratchpad}"""
|
langchain/agents/schema.py
CHANGED
|
@@ -12,7 +12,8 @@ class AgentScratchPadChatPromptTemplate(ChatPromptTemplate):
|
|
|
12
12
|
return False
|
|
13
13
|
|
|
14
14
|
def _construct_agent_scratchpad(
|
|
15
|
-
self,
|
|
15
|
+
self,
|
|
16
|
+
intermediate_steps: list[tuple[AgentAction, str]],
|
|
16
17
|
) -> str:
|
|
17
18
|
if len(intermediate_steps) == 0:
|
|
18
19
|
return ""
|
|
@@ -29,6 +30,6 @@ class AgentScratchPadChatPromptTemplate(ChatPromptTemplate):
|
|
|
29
30
|
def _merge_partial_and_user_variables(self, **kwargs: Any) -> dict[str, Any]:
|
|
30
31
|
intermediate_steps = kwargs.pop("intermediate_steps")
|
|
31
32
|
kwargs["agent_scratchpad"] = self._construct_agent_scratchpad(
|
|
32
|
-
intermediate_steps
|
|
33
|
+
intermediate_steps,
|
|
33
34
|
)
|
|
34
35
|
return kwargs
|
|
@@ -50,12 +50,12 @@ class SelfAskWithSearchAgent(Agent):
|
|
|
50
50
|
validate_tools_single_input(cls.__name__, tools)
|
|
51
51
|
super()._validate_tools(tools)
|
|
52
52
|
if len(tools) != 1:
|
|
53
|
-
|
|
53
|
+
msg = f"Exactly one tool must be specified, but got {tools}"
|
|
54
|
+
raise ValueError(msg)
|
|
54
55
|
tool_names = {tool.name for tool in tools}
|
|
55
56
|
if tool_names != {"Intermediate Answer"}:
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
)
|
|
57
|
+
msg = f"Tool name should be Intermediate Answer, got {tool_names}"
|
|
58
|
+
raise ValueError(msg)
|
|
59
59
|
|
|
60
60
|
@property
|
|
61
61
|
def observation_prefix(self) -> str:
|
|
@@ -76,7 +76,9 @@ class SelfAskWithSearchChain(AgentExecutor):
|
|
|
76
76
|
self,
|
|
77
77
|
llm: BaseLanguageModel,
|
|
78
78
|
search_chain: Union[
|
|
79
|
-
GoogleSerperAPIWrapper,
|
|
79
|
+
GoogleSerperAPIWrapper,
|
|
80
|
+
SearchApiAPIWrapper,
|
|
81
|
+
SerpAPIWrapper,
|
|
80
82
|
],
|
|
81
83
|
**kwargs: Any,
|
|
82
84
|
):
|
|
@@ -92,7 +94,9 @@ class SelfAskWithSearchChain(AgentExecutor):
|
|
|
92
94
|
|
|
93
95
|
|
|
94
96
|
def create_self_ask_with_search_agent(
|
|
95
|
-
llm: BaseLanguageModel,
|
|
97
|
+
llm: BaseLanguageModel,
|
|
98
|
+
tools: Sequence[BaseTool],
|
|
99
|
+
prompt: BasePromptTemplate,
|
|
96
100
|
) -> Runnable:
|
|
97
101
|
"""Create an agent that uses self-ask with search prompting.
|
|
98
102
|
|
|
@@ -180,21 +184,22 @@ def create_self_ask_with_search_agent(
|
|
|
180
184
|
prompt = PromptTemplate.from_template(template)
|
|
181
185
|
""" # noqa: E501
|
|
182
186
|
missing_vars = {"agent_scratchpad"}.difference(
|
|
183
|
-
prompt.input_variables + list(prompt.partial_variables)
|
|
187
|
+
prompt.input_variables + list(prompt.partial_variables),
|
|
184
188
|
)
|
|
185
189
|
if missing_vars:
|
|
186
|
-
|
|
190
|
+
msg = f"Prompt missing required variables: {missing_vars}"
|
|
191
|
+
raise ValueError(msg)
|
|
187
192
|
|
|
188
193
|
if len(tools) != 1:
|
|
189
|
-
|
|
190
|
-
|
|
194
|
+
msg = "This agent expects exactly one tool"
|
|
195
|
+
raise ValueError(msg)
|
|
196
|
+
tool = next(iter(tools))
|
|
191
197
|
if tool.name != "Intermediate Answer":
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
)
|
|
198
|
+
msg = "This agent expects the tool to be named `Intermediate Answer`"
|
|
199
|
+
raise ValueError(msg)
|
|
195
200
|
|
|
196
201
|
llm_with_stop = llm.bind(stop=["\nIntermediate answer:"])
|
|
197
|
-
|
|
202
|
+
return (
|
|
198
203
|
RunnablePassthrough.assign(
|
|
199
204
|
agent_scratchpad=lambda x: format_log_to_str(
|
|
200
205
|
x["intermediate_steps"],
|
|
@@ -208,4 +213,3 @@ def create_self_ask_with_search_agent(
|
|
|
208
213
|
| llm_with_stop
|
|
209
214
|
| SelfAskOutputParser()
|
|
210
215
|
)
|
|
211
|
-
return agent
|
|
@@ -35,7 +35,7 @@ class StructuredChatAgent(Agent):
|
|
|
35
35
|
"""Structured Chat Agent."""
|
|
36
36
|
|
|
37
37
|
output_parser: AgentOutputParser = Field(
|
|
38
|
-
default_factory=StructuredChatOutputParserWithRetries
|
|
38
|
+
default_factory=StructuredChatOutputParserWithRetries,
|
|
39
39
|
)
|
|
40
40
|
"""Output parser for the agent."""
|
|
41
41
|
|
|
@@ -50,19 +50,20 @@ class StructuredChatAgent(Agent):
|
|
|
50
50
|
return "Thought:"
|
|
51
51
|
|
|
52
52
|
def _construct_scratchpad(
|
|
53
|
-
self,
|
|
53
|
+
self,
|
|
54
|
+
intermediate_steps: list[tuple[AgentAction, str]],
|
|
54
55
|
) -> str:
|
|
55
56
|
agent_scratchpad = super()._construct_scratchpad(intermediate_steps)
|
|
56
57
|
if not isinstance(agent_scratchpad, str):
|
|
57
|
-
|
|
58
|
+
msg = "agent_scratchpad should be of type string."
|
|
59
|
+
raise ValueError(msg) # noqa: TRY004
|
|
58
60
|
if agent_scratchpad:
|
|
59
61
|
return (
|
|
60
62
|
f"This was your previous work "
|
|
61
63
|
f"(but I haven't seen any of it! I only see what "
|
|
62
64
|
f"you return as final answer):\n{agent_scratchpad}"
|
|
63
65
|
)
|
|
64
|
-
|
|
65
|
-
return agent_scratchpad
|
|
66
|
+
return agent_scratchpad
|
|
66
67
|
|
|
67
68
|
@classmethod
|
|
68
69
|
def _validate_tools(cls, tools: Sequence[BaseTool]) -> None:
|
|
@@ -70,7 +71,9 @@ class StructuredChatAgent(Agent):
|
|
|
70
71
|
|
|
71
72
|
@classmethod
|
|
72
73
|
def _get_default_output_parser(
|
|
73
|
-
cls,
|
|
74
|
+
cls,
|
|
75
|
+
llm: Optional[BaseLanguageModel] = None,
|
|
76
|
+
**kwargs: Any,
|
|
74
77
|
) -> AgentOutputParser:
|
|
75
78
|
return StructuredChatOutputParserWithRetries.from_llm(llm=llm)
|
|
76
79
|
|
|
@@ -96,7 +99,7 @@ class StructuredChatAgent(Agent):
|
|
|
96
99
|
formatted_tools = "\n".join(tool_strings)
|
|
97
100
|
tool_names = ", ".join([tool.name for tool in tools])
|
|
98
101
|
format_instructions = format_instructions.format(tool_names=tool_names)
|
|
99
|
-
template = "\n\n
|
|
102
|
+
template = f"{prefix}\n\n{formatted_tools}\n\n{format_instructions}\n\n{suffix}"
|
|
100
103
|
if input_variables is None:
|
|
101
104
|
input_variables = ["input", "agent_scratchpad"]
|
|
102
105
|
_memory_prompts = memory_prompts or []
|
|
@@ -275,10 +278,11 @@ def create_structured_chat_agent(
|
|
|
275
278
|
)
|
|
276
279
|
""" # noqa: E501
|
|
277
280
|
missing_vars = {"tools", "tool_names", "agent_scratchpad"}.difference(
|
|
278
|
-
prompt.input_variables + list(prompt.partial_variables)
|
|
281
|
+
prompt.input_variables + list(prompt.partial_variables),
|
|
279
282
|
)
|
|
280
283
|
if missing_vars:
|
|
281
|
-
|
|
284
|
+
msg = f"Prompt missing required variables: {missing_vars}"
|
|
285
|
+
raise ValueError(msg)
|
|
282
286
|
|
|
283
287
|
prompt = prompt.partial(
|
|
284
288
|
tools=tools_renderer(list(tools)),
|
|
@@ -290,7 +294,7 @@ def create_structured_chat_agent(
|
|
|
290
294
|
else:
|
|
291
295
|
llm_with_stop = llm
|
|
292
296
|
|
|
293
|
-
|
|
297
|
+
return (
|
|
294
298
|
RunnablePassthrough.assign(
|
|
295
299
|
agent_scratchpad=lambda x: format_log_to_str(x["intermediate_steps"]),
|
|
296
300
|
)
|
|
@@ -298,4 +302,3 @@ def create_structured_chat_agent(
|
|
|
298
302
|
| llm_with_stop
|
|
299
303
|
| JSONAgentOutputParser()
|
|
300
304
|
)
|
|
301
|
-
return agent
|
|
@@ -42,14 +42,15 @@ class StructuredChatOutputParser(AgentOutputParser):
|
|
|
42
42
|
response = response[0]
|
|
43
43
|
if response["action"] == "Final Answer":
|
|
44
44
|
return AgentFinish({"output": response["action_input"]}, text)
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
45
|
+
return AgentAction(
|
|
46
|
+
response["action"],
|
|
47
|
+
response.get("action_input", {}),
|
|
48
|
+
text,
|
|
49
|
+
)
|
|
50
|
+
return AgentFinish({"output": text}, text)
|
|
51
51
|
except Exception as e:
|
|
52
|
-
|
|
52
|
+
msg = f"Could not parse LLM output: {text}"
|
|
53
|
+
raise OutputParserException(msg) from e
|
|
53
54
|
|
|
54
55
|
@property
|
|
55
56
|
def _type(self) -> str:
|
|
@@ -70,14 +71,11 @@ class StructuredChatOutputParserWithRetries(AgentOutputParser):
|
|
|
70
71
|
def parse(self, text: str) -> Union[AgentAction, AgentFinish]:
|
|
71
72
|
try:
|
|
72
73
|
if self.output_fixing_parser is not None:
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
)
|
|
76
|
-
else:
|
|
77
|
-
parsed_obj = self.base_parser.parse(text)
|
|
78
|
-
return parsed_obj
|
|
74
|
+
return self.output_fixing_parser.parse(text)
|
|
75
|
+
return self.base_parser.parse(text)
|
|
79
76
|
except Exception as e:
|
|
80
|
-
|
|
77
|
+
msg = f"Could not parse LLM output: {text}"
|
|
78
|
+
raise OutputParserException(msg) from e
|
|
81
79
|
|
|
82
80
|
@classmethod
|
|
83
81
|
def from_llm(
|
|
@@ -88,13 +86,13 @@ class StructuredChatOutputParserWithRetries(AgentOutputParser):
|
|
|
88
86
|
if llm is not None:
|
|
89
87
|
base_parser = base_parser or StructuredChatOutputParser()
|
|
90
88
|
output_fixing_parser: OutputFixingParser = OutputFixingParser.from_llm(
|
|
91
|
-
llm=llm,
|
|
89
|
+
llm=llm,
|
|
90
|
+
parser=base_parser,
|
|
92
91
|
)
|
|
93
92
|
return cls(output_fixing_parser=output_fixing_parser)
|
|
94
|
-
|
|
93
|
+
if base_parser is not None:
|
|
95
94
|
return cls(base_parser=base_parser)
|
|
96
|
-
|
|
97
|
-
return cls()
|
|
95
|
+
return cls()
|
|
98
96
|
|
|
99
97
|
@property
|
|
100
98
|
def _type(self) -> str:
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
#
|
|
2
|
-
PREFIX = """Respond to the human as helpfully and accurately as possible. You have access to the following tools:"""
|
|
1
|
+
PREFIX = """Respond to the human as helpfully and accurately as possible. You have access to the following tools:""" # noqa: E501
|
|
3
2
|
FORMAT_INSTRUCTIONS = """Use a json blob to specify a tool by providing an action key (tool name) and an action_input key (tool input).
|
|
4
3
|
|
|
5
4
|
Valid "action" values: "Final Answer" or {tool_names}
|
|
@@ -30,6 +29,6 @@ Action:
|
|
|
30
29
|
"action": "Final Answer",
|
|
31
30
|
"action_input": "Final response to human"
|
|
32
31
|
}}}}
|
|
33
|
-
```"""
|
|
32
|
+
```""" # noqa: E501
|
|
34
33
|
SUFFIX = """Begin! Reminder to ALWAYS respond with a valid json blob of a single action. Use tools if necessary. Respond directly if appropriate. Format is Action:```$JSON_BLOB```then Observation:.
|
|
35
|
-
Thought:"""
|
|
34
|
+
Thought:""" # noqa: E501
|
|
@@ -87,23 +87,24 @@ def create_tool_calling_agent(
|
|
|
87
87
|
messages will be passed in here.
|
|
88
88
|
"""
|
|
89
89
|
missing_vars = {"agent_scratchpad"}.difference(
|
|
90
|
-
prompt.input_variables + list(prompt.partial_variables)
|
|
90
|
+
prompt.input_variables + list(prompt.partial_variables),
|
|
91
91
|
)
|
|
92
92
|
if missing_vars:
|
|
93
|
-
|
|
93
|
+
msg = f"Prompt missing required variables: {missing_vars}"
|
|
94
|
+
raise ValueError(msg)
|
|
94
95
|
|
|
95
96
|
if not hasattr(llm, "bind_tools"):
|
|
97
|
+
msg = "This function requires a bind_tools() method be implemented on the LLM."
|
|
96
98
|
raise ValueError(
|
|
97
|
-
|
|
99
|
+
msg,
|
|
98
100
|
)
|
|
99
101
|
llm_with_tools = llm.bind_tools(tools)
|
|
100
102
|
|
|
101
|
-
|
|
103
|
+
return (
|
|
102
104
|
RunnablePassthrough.assign(
|
|
103
|
-
agent_scratchpad=lambda x: message_formatter(x["intermediate_steps"])
|
|
105
|
+
agent_scratchpad=lambda x: message_formatter(x["intermediate_steps"]),
|
|
104
106
|
)
|
|
105
107
|
| prompt
|
|
106
108
|
| llm_with_tools
|
|
107
109
|
| ToolsAgentOutputParser()
|
|
108
110
|
)
|
|
109
|
-
return agent
|
langchain/agents/tools.py
CHANGED
|
@@ -24,7 +24,7 @@ class InvalidTool(BaseTool):
|
|
|
24
24
|
run_manager: Optional[CallbackManagerForToolRun] = None,
|
|
25
25
|
) -> str:
|
|
26
26
|
"""Use the tool."""
|
|
27
|
-
available_tool_names_str = ", ".join(
|
|
27
|
+
available_tool_names_str = ", ".join(list(available_tool_names))
|
|
28
28
|
return (
|
|
29
29
|
f"{requested_tool_name} is not a valid tool, "
|
|
30
30
|
f"try one of [{available_tool_names_str}]."
|
|
@@ -37,7 +37,7 @@ class InvalidTool(BaseTool):
|
|
|
37
37
|
run_manager: Optional[AsyncCallbackManagerForToolRun] = None,
|
|
38
38
|
) -> str:
|
|
39
39
|
"""Use the tool asynchronously."""
|
|
40
|
-
available_tool_names_str = ", ".join(
|
|
40
|
+
available_tool_names_str = ", ".join(list(available_tool_names))
|
|
41
41
|
return (
|
|
42
42
|
f"{requested_tool_name} is not a valid tool, "
|
|
43
43
|
f"try one of [{available_tool_names_str}]."
|
langchain/agents/utils.py
CHANGED
|
@@ -15,6 +15,5 @@ def validate_tools_single_input(class_name: str, tools: Sequence[BaseTool]) -> N
|
|
|
15
15
|
"""
|
|
16
16
|
for tool in tools:
|
|
17
17
|
if not tool.is_single_input:
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
)
|
|
18
|
+
msg = f"{class_name} does not support multi-input tool {tool.name}."
|
|
19
|
+
raise ValueError(msg)
|
langchain/agents/xml/base.py
CHANGED
|
@@ -52,7 +52,7 @@ class XMLAgent(BaseSingleActionAgent):
|
|
|
52
52
|
def get_default_prompt() -> ChatPromptTemplate:
|
|
53
53
|
base_prompt = ChatPromptTemplate.from_template(agent_instructions)
|
|
54
54
|
return base_prompt + AIMessagePromptTemplate.from_template(
|
|
55
|
-
"{intermediate_steps}"
|
|
55
|
+
"{intermediate_steps}",
|
|
56
56
|
)
|
|
57
57
|
|
|
58
58
|
@staticmethod
|
|
@@ -205,10 +205,11 @@ def create_xml_agent(
|
|
|
205
205
|
prompt = PromptTemplate.from_template(template)
|
|
206
206
|
""" # noqa: E501
|
|
207
207
|
missing_vars = {"tools", "agent_scratchpad"}.difference(
|
|
208
|
-
prompt.input_variables + list(prompt.partial_variables)
|
|
208
|
+
prompt.input_variables + list(prompt.partial_variables),
|
|
209
209
|
)
|
|
210
210
|
if missing_vars:
|
|
211
|
-
|
|
211
|
+
msg = f"Prompt missing required variables: {missing_vars}"
|
|
212
|
+
raise ValueError(msg)
|
|
212
213
|
|
|
213
214
|
prompt = prompt.partial(
|
|
214
215
|
tools=tools_renderer(list(tools)),
|
|
@@ -220,7 +221,7 @@ def create_xml_agent(
|
|
|
220
221
|
else:
|
|
221
222
|
llm_with_stop = llm
|
|
222
223
|
|
|
223
|
-
|
|
224
|
+
return (
|
|
224
225
|
RunnablePassthrough.assign(
|
|
225
226
|
agent_scratchpad=lambda x: format_xml(x["intermediate_steps"]),
|
|
226
227
|
)
|
|
@@ -228,4 +229,3 @@ def create_xml_agent(
|
|
|
228
229
|
| llm_with_stop
|
|
229
230
|
| XMLAgentOutputParser()
|
|
230
231
|
)
|
|
231
|
-
return agent
|
langchain/agents/xml/prompt.py
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
# flake8: noqa
|
|
2
1
|
# TODO: deprecate
|
|
3
2
|
agent_instructions = """You are a helpful assistant. Help the user answer any questions.
|
|
4
3
|
|
|
@@ -19,4 +18,4 @@ When you are done, respond with a final answer between <final_answer></final_ans
|
|
|
19
18
|
|
|
20
19
|
Begin!
|
|
21
20
|
|
|
22
|
-
Question: {question}"""
|
|
21
|
+
Question: {question}""" # noqa: E501
|
langchain/cache.py
CHANGED
|
@@ -53,20 +53,20 @@ def __getattr__(name: str) -> Any:
|
|
|
53
53
|
|
|
54
54
|
|
|
55
55
|
__all__ = [
|
|
56
|
-
"
|
|
57
|
-
"
|
|
58
|
-
"
|
|
59
|
-
"UpstashRedisCache",
|
|
60
|
-
"RedisCache",
|
|
61
|
-
"RedisSemanticCache",
|
|
62
|
-
"GPTCache",
|
|
63
|
-
"MomentoCache",
|
|
64
|
-
"InMemoryCache",
|
|
56
|
+
"AstraDBCache",
|
|
57
|
+
"AstraDBSemanticCache",
|
|
58
|
+
"AzureCosmosDBSemanticCache",
|
|
65
59
|
"CassandraCache",
|
|
66
60
|
"CassandraSemanticCache",
|
|
61
|
+
"FullLLMCache",
|
|
67
62
|
"FullMd5LLMCache",
|
|
63
|
+
"GPTCache",
|
|
64
|
+
"InMemoryCache",
|
|
65
|
+
"MomentoCache",
|
|
66
|
+
"RedisCache",
|
|
67
|
+
"RedisSemanticCache",
|
|
68
|
+
"SQLAlchemyCache",
|
|
68
69
|
"SQLAlchemyMd5Cache",
|
|
69
|
-
"
|
|
70
|
-
"
|
|
71
|
-
"AzureCosmosDBSemanticCache",
|
|
70
|
+
"SQLiteCache",
|
|
71
|
+
"UpstashRedisCache",
|
|
72
72
|
]
|