langchain 0.3.25__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 +7 -7
- 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 +18 -9
- 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 +47 -38
- langchain/agents/openai_functions_multi_agent/base.py +40 -27
- langchain/agents/openai_tools/base.py +8 -8
- langchain/agents/output_parsers/__init__.py +3 -3
- langchain/agents/output_parsers/json.py +7 -7
- 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 +6 -6
- 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/base.py +2 -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 +89 -55
- langchain/chains/chat_vector_db/prompts.py +2 -3
- langchain/chains/combine_documents/__init__.py +1 -1
- langchain/chains/combine_documents/base.py +24 -11
- langchain/chains/combine_documents/map_reduce.py +39 -31
- langchain/chains/combine_documents/map_rerank.py +34 -21
- 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 +6 -7
- 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 +170 -153
- 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 +117 -26
- 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 +24 -24
- langchain/evaluation/agents/trajectory_eval_prompt.py +6 -9
- langchain/evaluation/comparison/__init__.py +1 -1
- langchain/evaluation/comparison/eval_chain.py +21 -14
- langchain/evaluation/comparison/prompt.py +1 -2
- langchain/evaluation/criteria/__init__.py +1 -1
- langchain/evaluation/criteria/eval_chain.py +21 -12
- langchain/evaluation/criteria/prompt.py +2 -3
- langchain/evaluation/embedding_distance/base.py +24 -21
- 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 +13 -6
- 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 +23 -16
- langchain/evaluation/scoring/prompt.py +0 -1
- langchain/evaluation/string_distance/base.py +15 -10
- 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 +11 -8
- 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 +13 -6
- 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 +10 -9
- 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 +15 -13
- langchain/retrievers/docarray.py +1 -1
- langchain/retrievers/document_compressors/__init__.py +7 -5
- langchain/retrievers/document_compressors/base.py +13 -7
- langchain/retrievers/document_compressors/chain_extract.py +4 -5
- langchain/retrievers/document_compressors/chain_extract_prompt.py +2 -3
- langchain/retrievers/document_compressors/chain_filter.py +11 -12
- langchain/retrievers/document_compressors/chain_filter_prompt.py +1 -2
- langchain/retrievers/document_compressors/cohere_rerank.py +17 -19
- langchain/retrievers/document_compressors/embeddings_filter.py +23 -23
- langchain/retrievers/document_compressors/flashrank_rerank.py +1 -1
- langchain/retrievers/document_compressors/listwise_rerank.py +11 -6
- 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 -119
- langchain/retrievers/time_weighted_retriever.py +18 -7
- langchain/retrievers/zilliz.py +1 -1
- langchain/runnables/hub.py +2 -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 +3 -2
- 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 +181 -129
- 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.25.dist-info → langchain-0.3.27.dist-info}/METADATA +5 -5
- {langchain-0.3.25.dist-info → langchain-0.3.27.dist-info}/RECORD +582 -582
- {langchain-0.3.25.dist-info → langchain-0.3.27.dist-info}/WHEEL +1 -1
- {langchain-0.3.25.dist-info → langchain-0.3.27.dist-info}/entry_points.txt +0 -0
- {langchain-0.3.25.dist-info → langchain-0.3.27.dist-info}/licenses/LICENSE +0 -0
langchain/globals.py
CHANGED
|
@@ -16,7 +16,9 @@ _debug: bool = False
|
|
|
16
16
|
_llm_cache: Optional["BaseCache"] = None
|
|
17
17
|
|
|
18
18
|
|
|
19
|
-
def set_verbose(
|
|
19
|
+
def set_verbose(
|
|
20
|
+
value: bool, # noqa: FBT001
|
|
21
|
+
) -> None:
|
|
20
22
|
"""Set a new value for the `verbose` global setting."""
|
|
21
23
|
import langchain
|
|
22
24
|
|
|
@@ -37,7 +39,7 @@ def set_verbose(value: bool) -> None:
|
|
|
37
39
|
# have migrated to using `set_verbose()` here.
|
|
38
40
|
langchain.verbose = value
|
|
39
41
|
|
|
40
|
-
global _verbose
|
|
42
|
+
global _verbose # noqa: PLW0603
|
|
41
43
|
_verbose = value
|
|
42
44
|
|
|
43
45
|
|
|
@@ -64,14 +66,15 @@ def get_verbose() -> bool:
|
|
|
64
66
|
# In the meantime, the `verbose` setting is considered True if either the old
|
|
65
67
|
# or the new value are True. This accommodates users who haven't migrated
|
|
66
68
|
# to using `set_verbose()` yet. Those users are getting deprecation warnings
|
|
67
|
-
# directing them to use `set_verbose()` when they import `
|
|
69
|
+
# directing them to use `set_verbose()` when they import `langchain.verbose`.
|
|
68
70
|
old_verbose = langchain.verbose
|
|
69
71
|
|
|
70
|
-
global _verbose
|
|
71
72
|
return _verbose or old_verbose
|
|
72
73
|
|
|
73
74
|
|
|
74
|
-
def set_debug(
|
|
75
|
+
def set_debug(
|
|
76
|
+
value: bool, # noqa: FBT001
|
|
77
|
+
) -> None:
|
|
75
78
|
"""Set a new value for the `debug` global setting."""
|
|
76
79
|
import langchain
|
|
77
80
|
|
|
@@ -90,7 +93,7 @@ def set_debug(value: bool) -> None:
|
|
|
90
93
|
# have migrated to using `set_debug()` here.
|
|
91
94
|
langchain.debug = value
|
|
92
95
|
|
|
93
|
-
global _debug
|
|
96
|
+
global _debug # noqa: PLW0603
|
|
94
97
|
_debug = value
|
|
95
98
|
|
|
96
99
|
|
|
@@ -115,10 +118,9 @@ def get_debug() -> bool:
|
|
|
115
118
|
# In the meantime, the `debug` setting is considered True if either the old
|
|
116
119
|
# or the new value are True. This accommodates users who haven't migrated
|
|
117
120
|
# to using `set_debug()` yet. Those users are getting deprecation warnings
|
|
118
|
-
# directing them to use `set_debug()` when they import `
|
|
121
|
+
# directing them to use `set_debug()` when they import `langchain.debug`.
|
|
119
122
|
old_debug = langchain.debug
|
|
120
123
|
|
|
121
|
-
global _debug
|
|
122
124
|
return _debug or old_debug
|
|
123
125
|
|
|
124
126
|
|
|
@@ -143,7 +145,7 @@ def set_llm_cache(value: Optional["BaseCache"]) -> None:
|
|
|
143
145
|
# once all users have migrated to using `set_llm_cache()` here.
|
|
144
146
|
langchain.llm_cache = value
|
|
145
147
|
|
|
146
|
-
global _llm_cache
|
|
148
|
+
global _llm_cache # noqa: PLW0603
|
|
147
149
|
_llm_cache = value
|
|
148
150
|
|
|
149
151
|
|
|
@@ -172,8 +174,7 @@ def get_llm_cache() -> "BaseCache":
|
|
|
172
174
|
# or the old value if both are falsy. This accommodates users
|
|
173
175
|
# who haven't migrated to using `set_llm_cache()` yet.
|
|
174
176
|
# Those users are getting deprecation warnings directing them
|
|
175
|
-
# to use `set_llm_cache()` when they import `
|
|
177
|
+
# to use `set_llm_cache()` when they import `langchain.llm_cache`.
|
|
176
178
|
old_llm_cache = langchain.llm_cache
|
|
177
179
|
|
|
178
|
-
global _llm_cache
|
|
179
180
|
return _llm_cache or old_llm_cache
|
langchain/graphs/__init__.py
CHANGED
|
@@ -44,14 +44,14 @@ def __getattr__(name: str) -> Any:
|
|
|
44
44
|
|
|
45
45
|
|
|
46
46
|
__all__ = [
|
|
47
|
+
"ArangoGraph",
|
|
48
|
+
"FalkorDBGraph",
|
|
49
|
+
"HugeGraph",
|
|
50
|
+
"KuzuGraph",
|
|
47
51
|
"MemgraphGraph",
|
|
48
|
-
"NetworkxEntityGraph",
|
|
49
|
-
"Neo4jGraph",
|
|
50
52
|
"NebulaGraph",
|
|
53
|
+
"Neo4jGraph",
|
|
51
54
|
"NeptuneGraph",
|
|
52
|
-
"
|
|
53
|
-
"HugeGraph",
|
|
55
|
+
"NetworkxEntityGraph",
|
|
54
56
|
"RdfGraph",
|
|
55
|
-
"ArangoGraph",
|
|
56
|
-
"FalkorDBGraph",
|
|
57
57
|
]
|
langchain/hub.py
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
"""Interface with the LangChain Hub."""
|
|
1
|
+
"""Interface with the `LangChain Hub <https://smith.langchain.com/hub>`__."""
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
@@ -21,25 +21,25 @@ def _get_client(
|
|
|
21
21
|
ls_client = LangSmithClient(api_url, api_key=api_key)
|
|
22
22
|
if hasattr(ls_client, "push_prompt") and hasattr(ls_client, "pull_prompt"):
|
|
23
23
|
return ls_client
|
|
24
|
-
|
|
25
|
-
from langchainhub import Client as LangChainHubClient
|
|
24
|
+
from langchainhub import Client as LangChainHubClient
|
|
26
25
|
|
|
27
|
-
|
|
26
|
+
return LangChainHubClient(api_url, api_key=api_key)
|
|
28
27
|
except ImportError:
|
|
29
28
|
try:
|
|
30
29
|
from langchainhub import Client as LangChainHubClient
|
|
31
30
|
|
|
32
31
|
return LangChainHubClient(api_url, api_key=api_key)
|
|
33
32
|
except ImportError as e:
|
|
34
|
-
|
|
33
|
+
msg = (
|
|
35
34
|
"Could not import langsmith or langchainhub (deprecated),"
|
|
36
35
|
"please install with `pip install langsmith`."
|
|
37
|
-
)
|
|
36
|
+
)
|
|
37
|
+
raise ImportError(msg) from e
|
|
38
38
|
|
|
39
39
|
|
|
40
40
|
def push(
|
|
41
41
|
repo_full_name: str,
|
|
42
|
-
object: Any,
|
|
42
|
+
object: Any, # noqa: A002
|
|
43
43
|
*,
|
|
44
44
|
api_url: Optional[str] = None,
|
|
45
45
|
api_key: Optional[str] = None,
|
|
@@ -81,14 +81,13 @@ def push(
|
|
|
81
81
|
|
|
82
82
|
# Then it's langchainhub
|
|
83
83
|
manifest_json = dumps(object)
|
|
84
|
-
|
|
84
|
+
return client.push(
|
|
85
85
|
repo_full_name,
|
|
86
86
|
manifest_json,
|
|
87
87
|
parent_commit_hash=parent_commit_hash,
|
|
88
88
|
new_repo_is_public=new_repo_is_public,
|
|
89
89
|
new_repo_description=new_repo_description,
|
|
90
90
|
)
|
|
91
|
-
return message
|
|
92
91
|
|
|
93
92
|
|
|
94
93
|
def pull(
|
|
@@ -112,8 +111,7 @@ def pull(
|
|
|
112
111
|
|
|
113
112
|
# Then it's langsmith
|
|
114
113
|
if hasattr(client, "pull_prompt"):
|
|
115
|
-
|
|
116
|
-
return response
|
|
114
|
+
return client.pull_prompt(owner_repo_commit, include_model=include_model)
|
|
117
115
|
|
|
118
116
|
# Then it's langchainhub
|
|
119
117
|
if hasattr(client, "pull_repo"):
|
langchain/indexes/__init__.py
CHANGED
|
@@ -119,10 +119,12 @@ class SQLRecordManager(RecordManager):
|
|
|
119
119
|
"""
|
|
120
120
|
super().__init__(namespace=namespace)
|
|
121
121
|
if db_url is None and engine is None:
|
|
122
|
-
|
|
122
|
+
msg = "Must specify either db_url or engine"
|
|
123
|
+
raise ValueError(msg)
|
|
123
124
|
|
|
124
125
|
if db_url is not None and engine is not None:
|
|
125
|
-
|
|
126
|
+
msg = "Must specify either db_url or engine, not both"
|
|
127
|
+
raise ValueError(msg)
|
|
126
128
|
|
|
127
129
|
_engine: Union[Engine, AsyncEngine]
|
|
128
130
|
if db_url:
|
|
@@ -134,7 +136,8 @@ class SQLRecordManager(RecordManager):
|
|
|
134
136
|
_engine = engine
|
|
135
137
|
|
|
136
138
|
else:
|
|
137
|
-
|
|
139
|
+
msg = "Something went wrong with configuration of engine."
|
|
140
|
+
raise AssertionError(msg)
|
|
138
141
|
|
|
139
142
|
_session_factory: Union[sessionmaker[Session], async_sessionmaker[AsyncSession]]
|
|
140
143
|
if isinstance(_engine, AsyncEngine):
|
|
@@ -149,7 +152,8 @@ class SQLRecordManager(RecordManager):
|
|
|
149
152
|
def create_schema(self) -> None:
|
|
150
153
|
"""Create the database schema."""
|
|
151
154
|
if isinstance(self.engine, AsyncEngine):
|
|
152
|
-
|
|
155
|
+
msg = "This method is not supported for async engines."
|
|
156
|
+
raise AssertionError(msg) # noqa: TRY004
|
|
153
157
|
|
|
154
158
|
Base.metadata.create_all(self.engine)
|
|
155
159
|
|
|
@@ -157,7 +161,8 @@ class SQLRecordManager(RecordManager):
|
|
|
157
161
|
"""Create the database schema."""
|
|
158
162
|
|
|
159
163
|
if not isinstance(self.engine, AsyncEngine):
|
|
160
|
-
|
|
164
|
+
msg = "This method is not supported for sync engines."
|
|
165
|
+
raise AssertionError(msg) # noqa: TRY004
|
|
161
166
|
|
|
162
167
|
async with self.engine.begin() as session:
|
|
163
168
|
await session.run_sync(Base.metadata.create_all)
|
|
@@ -167,7 +172,8 @@ class SQLRecordManager(RecordManager):
|
|
|
167
172
|
"""Create a session and close it after use."""
|
|
168
173
|
|
|
169
174
|
if isinstance(self.session_factory, async_sessionmaker):
|
|
170
|
-
|
|
175
|
+
msg = "This method is not supported for async engines."
|
|
176
|
+
raise AssertionError(msg) # noqa: TRY004
|
|
171
177
|
|
|
172
178
|
session = self.session_factory()
|
|
173
179
|
try:
|
|
@@ -180,7 +186,8 @@ class SQLRecordManager(RecordManager):
|
|
|
180
186
|
"""Create a session and close it after use."""
|
|
181
187
|
|
|
182
188
|
if not isinstance(self.session_factory, async_sessionmaker):
|
|
183
|
-
|
|
189
|
+
msg = "This method is not supported for sync engines."
|
|
190
|
+
raise AssertionError(msg) # noqa: TRY004
|
|
184
191
|
|
|
185
192
|
async with self.session_factory() as session:
|
|
186
193
|
yield session
|
|
@@ -206,13 +213,15 @@ class SQLRecordManager(RecordManager):
|
|
|
206
213
|
elif self.dialect == "postgresql":
|
|
207
214
|
query = text("SELECT EXTRACT (EPOCH FROM CURRENT_TIMESTAMP);")
|
|
208
215
|
else:
|
|
209
|
-
|
|
216
|
+
msg = f"Not implemented for dialect {self.dialect}"
|
|
217
|
+
raise NotImplementedError(msg)
|
|
210
218
|
|
|
211
219
|
dt = session.execute(query).scalar()
|
|
212
220
|
if isinstance(dt, decimal.Decimal):
|
|
213
221
|
dt = float(dt)
|
|
214
222
|
if not isinstance(dt, float):
|
|
215
|
-
|
|
223
|
+
msg = f"Unexpected type for datetime: {type(dt)}"
|
|
224
|
+
raise AssertionError(msg) # noqa: TRY004
|
|
216
225
|
return dt
|
|
217
226
|
|
|
218
227
|
async def aget_time(self) -> float:
|
|
@@ -236,14 +245,16 @@ class SQLRecordManager(RecordManager):
|
|
|
236
245
|
elif self.dialect == "postgresql":
|
|
237
246
|
query = text("SELECT EXTRACT (EPOCH FROM CURRENT_TIMESTAMP);")
|
|
238
247
|
else:
|
|
239
|
-
|
|
248
|
+
msg = f"Not implemented for dialect {self.dialect}"
|
|
249
|
+
raise NotImplementedError(msg)
|
|
240
250
|
|
|
241
251
|
dt = (await session.execute(query)).scalar_one_or_none()
|
|
242
252
|
|
|
243
253
|
if isinstance(dt, decimal.Decimal):
|
|
244
254
|
dt = float(dt)
|
|
245
255
|
if not isinstance(dt, float):
|
|
246
|
-
|
|
256
|
+
msg = f"Unexpected type for datetime: {type(dt)}"
|
|
257
|
+
raise AssertionError(msg) # noqa: TRY004
|
|
247
258
|
return dt
|
|
248
259
|
|
|
249
260
|
def update(
|
|
@@ -258,10 +269,11 @@ class SQLRecordManager(RecordManager):
|
|
|
258
269
|
group_ids = [None] * len(keys)
|
|
259
270
|
|
|
260
271
|
if len(keys) != len(group_ids):
|
|
261
|
-
|
|
272
|
+
msg = (
|
|
262
273
|
f"Number of keys ({len(keys)}) does not match number of "
|
|
263
274
|
f"group_ids ({len(group_ids)})"
|
|
264
275
|
)
|
|
276
|
+
raise ValueError(msg)
|
|
265
277
|
|
|
266
278
|
# Get the current time from the server.
|
|
267
279
|
# This makes an extra round trip to the server, should not be a big deal
|
|
@@ -274,7 +286,8 @@ class SQLRecordManager(RecordManager):
|
|
|
274
286
|
|
|
275
287
|
if time_at_least and update_time < time_at_least:
|
|
276
288
|
# Safeguard against time sync issues
|
|
277
|
-
|
|
289
|
+
msg = f"Time sync issue: {update_time} < {time_at_least}"
|
|
290
|
+
raise AssertionError(msg)
|
|
278
291
|
|
|
279
292
|
records_to_upsert = [
|
|
280
293
|
{
|
|
@@ -294,14 +307,14 @@ class SQLRecordManager(RecordManager):
|
|
|
294
307
|
# Note: uses SQLite insert to make on_conflict_do_update work.
|
|
295
308
|
# This code needs to be generalized a bit to work with more dialects.
|
|
296
309
|
sqlite_insert_stmt: SqliteInsertType = sqlite_insert(
|
|
297
|
-
UpsertionRecord
|
|
310
|
+
UpsertionRecord,
|
|
298
311
|
).values(records_to_upsert)
|
|
299
312
|
stmt = sqlite_insert_stmt.on_conflict_do_update(
|
|
300
313
|
[UpsertionRecord.key, UpsertionRecord.namespace],
|
|
301
|
-
set_=
|
|
302
|
-
updated_at
|
|
303
|
-
group_id
|
|
304
|
-
|
|
314
|
+
set_={
|
|
315
|
+
"updated_at": sqlite_insert_stmt.excluded.updated_at,
|
|
316
|
+
"group_id": sqlite_insert_stmt.excluded.group_id,
|
|
317
|
+
},
|
|
305
318
|
)
|
|
306
319
|
elif self.dialect == "postgresql":
|
|
307
320
|
from sqlalchemy.dialects.postgresql import Insert as PgInsertType
|
|
@@ -310,17 +323,18 @@ class SQLRecordManager(RecordManager):
|
|
|
310
323
|
# Note: uses postgresql insert to make on_conflict_do_update work.
|
|
311
324
|
# This code needs to be generalized a bit to work with more dialects.
|
|
312
325
|
pg_insert_stmt: PgInsertType = pg_insert(UpsertionRecord).values(
|
|
313
|
-
records_to_upsert
|
|
326
|
+
records_to_upsert,
|
|
314
327
|
)
|
|
315
328
|
stmt = pg_insert_stmt.on_conflict_do_update( # type: ignore[assignment]
|
|
316
329
|
"uix_key_namespace", # Name of constraint
|
|
317
|
-
set_=
|
|
318
|
-
updated_at
|
|
319
|
-
group_id
|
|
320
|
-
|
|
330
|
+
set_={
|
|
331
|
+
"updated_at": pg_insert_stmt.excluded.updated_at,
|
|
332
|
+
"group_id": pg_insert_stmt.excluded.group_id,
|
|
333
|
+
},
|
|
321
334
|
)
|
|
322
335
|
else:
|
|
323
|
-
|
|
336
|
+
msg = f"Unsupported dialect {self.dialect}"
|
|
337
|
+
raise NotImplementedError(msg)
|
|
324
338
|
|
|
325
339
|
session.execute(stmt)
|
|
326
340
|
session.commit()
|
|
@@ -337,10 +351,11 @@ class SQLRecordManager(RecordManager):
|
|
|
337
351
|
group_ids = [None] * len(keys)
|
|
338
352
|
|
|
339
353
|
if len(keys) != len(group_ids):
|
|
340
|
-
|
|
354
|
+
msg = (
|
|
341
355
|
f"Number of keys ({len(keys)}) does not match number of "
|
|
342
356
|
f"group_ids ({len(group_ids)})"
|
|
343
357
|
)
|
|
358
|
+
raise ValueError(msg)
|
|
344
359
|
|
|
345
360
|
# Get the current time from the server.
|
|
346
361
|
# This makes an extra round trip to the server, should not be a big deal
|
|
@@ -353,7 +368,8 @@ class SQLRecordManager(RecordManager):
|
|
|
353
368
|
|
|
354
369
|
if time_at_least and update_time < time_at_least:
|
|
355
370
|
# Safeguard against time sync issues
|
|
356
|
-
|
|
371
|
+
msg = f"Time sync issue: {update_time} < {time_at_least}"
|
|
372
|
+
raise AssertionError(msg)
|
|
357
373
|
|
|
358
374
|
records_to_upsert = [
|
|
359
375
|
{
|
|
@@ -373,14 +389,14 @@ class SQLRecordManager(RecordManager):
|
|
|
373
389
|
# Note: uses SQLite insert to make on_conflict_do_update work.
|
|
374
390
|
# This code needs to be generalized a bit to work with more dialects.
|
|
375
391
|
sqlite_insert_stmt: SqliteInsertType = sqlite_insert(
|
|
376
|
-
UpsertionRecord
|
|
392
|
+
UpsertionRecord,
|
|
377
393
|
).values(records_to_upsert)
|
|
378
394
|
stmt = sqlite_insert_stmt.on_conflict_do_update(
|
|
379
395
|
[UpsertionRecord.key, UpsertionRecord.namespace],
|
|
380
|
-
set_=
|
|
381
|
-
updated_at
|
|
382
|
-
group_id
|
|
383
|
-
|
|
396
|
+
set_={
|
|
397
|
+
"updated_at": sqlite_insert_stmt.excluded.updated_at,
|
|
398
|
+
"group_id": sqlite_insert_stmt.excluded.group_id,
|
|
399
|
+
},
|
|
384
400
|
)
|
|
385
401
|
elif self.dialect == "postgresql":
|
|
386
402
|
from sqlalchemy.dialects.postgresql import Insert as PgInsertType
|
|
@@ -389,17 +405,18 @@ class SQLRecordManager(RecordManager):
|
|
|
389
405
|
# Note: uses SQLite insert to make on_conflict_do_update work.
|
|
390
406
|
# This code needs to be generalized a bit to work with more dialects.
|
|
391
407
|
pg_insert_stmt: PgInsertType = pg_insert(UpsertionRecord).values(
|
|
392
|
-
records_to_upsert
|
|
408
|
+
records_to_upsert,
|
|
393
409
|
)
|
|
394
410
|
stmt = pg_insert_stmt.on_conflict_do_update( # type: ignore[assignment]
|
|
395
411
|
"uix_key_namespace", # Name of constraint
|
|
396
|
-
set_=
|
|
397
|
-
updated_at
|
|
398
|
-
group_id
|
|
399
|
-
|
|
412
|
+
set_={
|
|
413
|
+
"updated_at": pg_insert_stmt.excluded.updated_at,
|
|
414
|
+
"group_id": pg_insert_stmt.excluded.group_id,
|
|
415
|
+
},
|
|
400
416
|
)
|
|
401
417
|
else:
|
|
402
|
-
|
|
418
|
+
msg = f"Unsupported dialect {self.dialect}"
|
|
419
|
+
raise NotImplementedError(msg)
|
|
403
420
|
|
|
404
421
|
await session.execute(stmt)
|
|
405
422
|
await session.commit()
|
|
@@ -412,10 +429,10 @@ class SQLRecordManager(RecordManager):
|
|
|
412
429
|
and_(
|
|
413
430
|
UpsertionRecord.key.in_(keys),
|
|
414
431
|
UpsertionRecord.namespace == self.namespace,
|
|
415
|
-
)
|
|
432
|
+
),
|
|
416
433
|
)
|
|
417
434
|
records = filtered_query.all()
|
|
418
|
-
found_keys =
|
|
435
|
+
found_keys = {r.key for r in records}
|
|
419
436
|
return [k in found_keys for k in keys]
|
|
420
437
|
|
|
421
438
|
async def aexists(self, keys: Sequence[str]) -> list[bool]:
|
|
@@ -428,8 +445,8 @@ class SQLRecordManager(RecordManager):
|
|
|
428
445
|
and_(
|
|
429
446
|
UpsertionRecord.key.in_(keys),
|
|
430
447
|
UpsertionRecord.namespace == self.namespace,
|
|
431
|
-
)
|
|
432
|
-
)
|
|
448
|
+
),
|
|
449
|
+
),
|
|
433
450
|
)
|
|
434
451
|
)
|
|
435
452
|
.scalars()
|
|
@@ -450,7 +467,7 @@ class SQLRecordManager(RecordManager):
|
|
|
450
467
|
session: Session
|
|
451
468
|
with self._make_session() as session:
|
|
452
469
|
query: Query = session.query(UpsertionRecord).filter(
|
|
453
|
-
UpsertionRecord.namespace == self.namespace
|
|
470
|
+
UpsertionRecord.namespace == self.namespace,
|
|
454
471
|
)
|
|
455
472
|
|
|
456
473
|
if after:
|
|
@@ -477,7 +494,7 @@ class SQLRecordManager(RecordManager):
|
|
|
477
494
|
session: AsyncSession
|
|
478
495
|
async with self._amake_session() as session:
|
|
479
496
|
query: Query = select(UpsertionRecord.key).filter( # type: ignore[assignment]
|
|
480
|
-
UpsertionRecord.namespace == self.namespace
|
|
497
|
+
UpsertionRecord.namespace == self.namespace,
|
|
481
498
|
)
|
|
482
499
|
|
|
483
500
|
# mypy does not recognize .all() or .filter()
|
|
@@ -501,7 +518,7 @@ class SQLRecordManager(RecordManager):
|
|
|
501
518
|
and_(
|
|
502
519
|
UpsertionRecord.key.in_(keys),
|
|
503
520
|
UpsertionRecord.namespace == self.namespace,
|
|
504
|
-
)
|
|
521
|
+
),
|
|
505
522
|
)
|
|
506
523
|
|
|
507
524
|
filtered_query.delete()
|
|
@@ -515,8 +532,8 @@ class SQLRecordManager(RecordManager):
|
|
|
515
532
|
and_(
|
|
516
533
|
UpsertionRecord.key.in_(keys),
|
|
517
534
|
UpsertionRecord.namespace == self.namespace,
|
|
518
|
-
)
|
|
519
|
-
)
|
|
535
|
+
),
|
|
536
|
+
),
|
|
520
537
|
)
|
|
521
538
|
|
|
522
539
|
await session.commit()
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
# flake8: noqa
|
|
2
1
|
from langchain_core.prompts.prompt import PromptTemplate
|
|
3
2
|
|
|
4
3
|
_DEFAULT_ENTITY_EXTRACTION_TEMPLATE = """You are an AI assistant reading the transcript of a conversation between an AI and a human. Extract all of the proper nouns from the last line of conversation. As a guideline, a proper noun is generally capitalized. You should definitely extract all names and places.
|
|
@@ -34,7 +33,7 @@ Conversation history (for reference only):
|
|
|
34
33
|
Last line of conversation (for extraction):
|
|
35
34
|
Human: {input}
|
|
36
35
|
|
|
37
|
-
Output:"""
|
|
36
|
+
Output:""" # noqa: E501
|
|
38
37
|
ENTITY_EXTRACTION_PROMPT = PromptTemplate(
|
|
39
38
|
input_variables=["history", "input"], template=_DEFAULT_ENTITY_EXTRACTION_TEMPLATE
|
|
40
39
|
)
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
# flake8: noqa
|
|
2
1
|
from langchain_core.prompts.prompt import PromptTemplate
|
|
3
2
|
|
|
4
3
|
_DEFAULT_ENTITY_SUMMARIZATION_TEMPLATE = """You are an AI assistant helping a human keep track of facts about relevant people, places, and concepts in their life. Update the summary of the provided entity in the "Entity" section based on the last line of your conversation with the human. If you are writing the summary for the first time, return a single sentence.
|
|
@@ -17,7 +16,7 @@ Existing summary of {entity}:
|
|
|
17
16
|
|
|
18
17
|
Last line of conversation:
|
|
19
18
|
Human: {input}
|
|
20
|
-
Updated summary:"""
|
|
19
|
+
Updated summary:""" # noqa: E501
|
|
21
20
|
|
|
22
21
|
ENTITY_SUMMARIZATION_PROMPT = PromptTemplate(
|
|
23
22
|
input_variables=["entity", "summary", "history", "input"],
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
# flake8: noqa
|
|
2
|
-
|
|
3
1
|
from langchain_core.prompts.prompt import PromptTemplate
|
|
4
2
|
|
|
5
3
|
KG_TRIPLE_DELIMITER = "<|>"
|
|
@@ -25,7 +23,7 @@ _DEFAULT_KNOWLEDGE_TRIPLE_EXTRACTION_TEMPLATE = (
|
|
|
25
23
|
"END OF EXAMPLE\n\n"
|
|
26
24
|
"EXAMPLE\n"
|
|
27
25
|
"Oh huh. I know Descartes likes to drive antique scooters and play the mandolin.\n"
|
|
28
|
-
f"Output: (Descartes, likes to drive, antique scooters){KG_TRIPLE_DELIMITER}(Descartes, plays, mandolin)\n"
|
|
26
|
+
f"Output: (Descartes, likes to drive, antique scooters){KG_TRIPLE_DELIMITER}(Descartes, plays, mandolin)\n" # noqa: E501
|
|
29
27
|
"END OF EXAMPLE\n\n"
|
|
30
28
|
"EXAMPLE\n"
|
|
31
29
|
"{text}"
|