Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Format imports with ruff #533

Merged
merged 1 commit into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/examples/basic/app.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os

from flask import Flask
import openai
from flask import Flask
from langchain.llms import OpenAI
from langchain.prompts import PromptTemplate

Expand Down
2 changes: 1 addition & 1 deletion docker/examples/multistage/app.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os

from flask import Flask
import openai
from flask import Flask
from langchain.llms import OpenAI
from langchain.prompts import PromptTemplate

Expand Down
2 changes: 1 addition & 1 deletion examples/evaluation/tru_download.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import tru_shared
import pandas as pd
import tru_shared

tru = tru_shared.init_tru()

Expand Down
6 changes: 3 additions & 3 deletions examples/evaluation/tru_evaluate.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

import tru_shared

import time
import logging
import sys
import time

import tru_shared

root = logging.getLogger()
root.setLevel(logging.INFO)
Expand Down
3 changes: 1 addition & 2 deletions examples/evaluation/tru_langchain.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import tru_shared

from langchain_core.runnables import RunnablePassthrough
from langchain.prompts import ChatPromptTemplate
from langchain.schema import StrOutputParser
from langchain_core.runnables import RunnablePassthrough

framework = tru_shared.Framework.LANG_CHAIN

Expand Down
10 changes: 7 additions & 3 deletions examples/evaluation/tru_llamaindex.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import tru_shared

from llama_index import get_response_synthesizer, VectorStoreIndex, StorageContext, ServiceContext
from llama_index.retrievers import VectorIndexRetriever
from llama_index import (
ServiceContext,
StorageContext,
VectorStoreIndex,
get_response_synthesizer,
)
from llama_index.query_engine import RetrieverQueryEngine
from llama_index.retrievers import VectorIndexRetriever

framework = tru_shared.Framework.LLAMA_INDEX

Expand Down
21 changes: 9 additions & 12 deletions examples/evaluation/tru_shared.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
import json
import os
import uuid
import numpy as np

from dotenv import load_dotenv
from enum import Enum

from trulens_eval import Tru, Feedback, TruChain, TruLlama
from trulens_eval.app import App
from trulens_eval.feedback.provider import AzureOpenAI
from trulens_eval.feedback import Groundedness, GroundTruthAgreement

import numpy as np
from dotenv import load_dotenv
from langchain_astradb import AstraDBVectorStore as LangChainAstraDBVectorStore
from langchain_community.chat_models import AzureChatOpenAI
from langchain_community.embeddings import AzureOpenAIEmbeddings
from llama_index.embeddings import AzureOpenAIEmbedding
from llama_index.llms import AzureOpenAI as LlamaAzureChatOpenAI
from llama_index.vector_stores import AstraDBVectorStore

from langchain_community.chat_models import AzureChatOpenAI
from langchain_community.embeddings import AzureOpenAIEmbeddings
from langchain_astradb import AstraDBVectorStore as LangChainAstraDBVectorStore
from trulens_eval import Feedback, Tru, TruChain, TruLlama
from trulens_eval.app import App
from trulens_eval.feedback import Groundedness, GroundTruthAgreement
from trulens_eval.feedback.provider import AzureOpenAI

# this code assumes the following env vars exist in a .env file:
#
Expand Down
1 change: 1 addition & 0 deletions libs/colbert/tests/integration_tests/test_database.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import pytest
from ragstack_colbert import CassandraDatabase, Chunk
from ragstack_tests_utils import TestData

from tests.integration_tests.conftest import (
get_astradb_test_store,
get_local_cassandra_test_store,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
ColbertVectorStore,
)
from ragstack_tests_utils import TestData

from tests.integration_tests.conftest import (
get_astradb_test_store,
get_local_cassandra_test_store,
Expand Down
11 changes: 6 additions & 5 deletions libs/e2e-tests/e2e_tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@

import pytest


from e2e_tests.test_utils import (
get_required_env as root_get_required_env,
)
from e2e_tests.test_utils import (
is_skipped_due_to_implementation_not_supported,
)
from e2e_tests.test_utils.astradb_vector_store_handler import AstraDBVectorStoreHandler
from e2e_tests.test_utils.cassandra_vector_store_handler import (
CassandraVectorStoreHandler,
Expand All @@ -14,10 +19,6 @@
VectorStoreHandler,
VectorStoreImplementation,
)
from e2e_tests.test_utils import (
get_required_env as root_get_required_env,
is_skipped_due_to_implementation_not_supported,
)

LOGGER = logging.getLogger(__name__)

Expand Down
1 change: 0 additions & 1 deletion libs/e2e-tests/e2e_tests/langchain/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from e2e_tests.conftest import (
get_vector_store_handler,
)

from e2e_tests.test_utils.vector_store_handler import (
VectorStoreImplementation,
)
Expand Down
18 changes: 8 additions & 10 deletions libs/e2e-tests/e2e_tests/langchain/nemo_guardrails.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
from langchain.llms.base import BaseLLM
from langchain.prompts import PromptTemplate
from langchain.schema.output_parser import StrOutputParser
from langchain.schema.retriever import BaseRetriever
from langchain.schema.vectorstore import VectorStore
from nemoguardrails import LLMRails, RailsConfig
from nemoguardrails.actions.actions import ActionResult

from e2e_tests.langchain.rag_application import (
BASIC_QA_PROMPT,
SAMPLE_DATA,
)

from langchain.schema.vectorstore import VectorStore
from langchain.schema.output_parser import StrOutputParser
from langchain.schema.retriever import BaseRetriever
from langchain.prompts import PromptTemplate
from langchain.llms.base import BaseLLM


from nemoguardrails import RailsConfig, LLMRails
from nemoguardrails.actions.actions import ActionResult


def _config(engine, model) -> str:
return f"""
Expand Down
19 changes: 8 additions & 11 deletions libs/e2e-tests/e2e_tests/langchain/rag_application.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import logging
import time
from operator import itemgetter
from typing import Dict, List, Optional, Sequence, Callable
from typing import Callable, Dict, List, Optional, Sequence

from langchain.schema.vectorstore import VectorStore
from langchain.prompts import ChatPromptTemplate, MessagesPlaceholder
from langchain import callbacks
from langchain.chains import ConversationalRetrievalChain
from langchain.memory import (
ConversationSummaryMemory,
)
from langchain.prompts import ChatPromptTemplate, MessagesPlaceholder, PromptTemplate
from langchain.schema import Document
from langchain.schema.language_model import BaseLanguageModel
from langchain.schema.messages import AIMessage, HumanMessage
Expand All @@ -16,20 +20,13 @@
RunnableLambda,
RunnableMap,
)
from langchain.schema.vectorstore import VectorStore
from langchain_core.chat_history import BaseChatMessageHistory
from langchain_core.tracers import ConsoleCallbackHandler
from langchain import callbacks
from pydantic import BaseModel

from langchain.prompts import PromptTemplate
from langchain.chains import ConversationalRetrievalChain
from langchain.memory import (
ConversationSummaryMemory,
)

from e2e_tests.test_utils.tracing import record_langsmith_sharelink


BASIC_QA_PROMPT = """
Answer the question based only on the supplied context. If you don't know the answer, say the following: "I don't know the answer".
Context: {context}
Expand Down
9 changes: 4 additions & 5 deletions libs/e2e-tests/e2e_tests/langchain/test_astra.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,18 @@
import logging
from typing import List

from astrapy.api import APIRequestError
import pytest
from astrapy.api import APIRequestError
from httpx import ConnectError, HTTPStatusError

from langchain.schema.embeddings import Embeddings
from langchain_astradb import AstraDBVectorStore
from e2e_tests.conftest import (
is_astra,
)
from langchain_core.documents import Document
from langchain_core.runnables import RunnableConfig
from langchain_core.vectorstores import VectorStore

from e2e_tests.conftest import (
is_astra,
)
from e2e_tests.test_utils import skip_test_due_to_implementation_not_supported
from e2e_tests.test_utils.astradb_vector_store_handler import AstraDBVectorStoreHandler
from e2e_tests.test_utils.vector_store_handler import VectorStoreImplementation
Expand Down
3 changes: 1 addition & 2 deletions libs/e2e-tests/e2e_tests/langchain/test_cassandra_tool.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import uuid

import cassio

from langchain.agents import AgentExecutor, create_openai_tools_agent
from langchain import hub
from langchain.agents import AgentExecutor, create_openai_tools_agent
from langchain_community.tools.cassandra_database.tool import (
GetSchemaCassandraDatabaseTool,
GetTableDataCassandraDatabaseTool,
Expand Down
22 changes: 10 additions & 12 deletions libs/e2e-tests/e2e_tests/langchain/test_compatibility_rag.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,34 @@
HuggingFaceInferenceAPIEmbeddings,
)
from langchain_community.llms.huggingface_hub import HuggingFaceHub
from langchain_core.embeddings import Embeddings
from langchain_core.messages import HumanMessage
from langchain_core.prompts import ChatPromptTemplate
from langchain_google_genai import ChatGoogleGenerativeAI
from langchain_google_vertexai import ChatVertexAI, VertexAIEmbeddings
from langchain_openai import (
OpenAIEmbeddings,
ChatOpenAI,
AzureChatOpenAI,
AzureOpenAIEmbeddings,
ChatOpenAI,
OpenAIEmbeddings,
)
from vertexai.vision_models import Image, MultiModalEmbeddingModel

from e2e_tests.conftest import (
set_current_test_info,
get_required_env,
get_vector_store_handler,
set_current_test_info,
)
from e2e_tests.langchain.nemo_guardrails import run_nemo_guardrails
from e2e_tests.langchain.rag_application import (
run_rag_custom_chain,
run_conversational_rag,
run_rag_custom_chain,
)
from e2e_tests.langchain.trulens import run_trulens_evaluation
from e2e_tests.test_utils import (
get_local_resource_path,
skip_test_due_to_implementation_not_supported,
)
from e2e_tests.langchain.nemo_guardrails import run_nemo_guardrails

from langchain_core.embeddings import Embeddings
from langchain_core.messages import HumanMessage
from langchain_core.prompts import ChatPromptTemplate
from langchain_google_genai import ChatGoogleGenerativeAI
from vertexai.vision_models import MultiModalEmbeddingModel, Image

from e2e_tests.test_utils.tracing import record_langsmith_sharelink
from e2e_tests.test_utils.vector_store_handler import VectorStoreImplementation

Expand Down
6 changes: 2 additions & 4 deletions libs/e2e-tests/e2e_tests/langchain/test_document_loaders.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@
import boto3
import pytest
from azure.storage.blob import ContainerClient
from langchain.document_loaders import CSVLoader, S3DirectoryLoader, WebBaseLoader
from langchain_astradb import AstraDBLoader

from e2e_tests.conftest import set_current_test_info, get_required_env, is_astra

from langchain.document_loaders import CSVLoader, WebBaseLoader, S3DirectoryLoader
from langchain_community.document_loaders import AzureBlobStorageContainerLoader

from e2e_tests.conftest import get_required_env, is_astra, set_current_test_info
from e2e_tests.test_utils.astradb_vector_store_handler import AstraDBVectorStoreHandler
from e2e_tests.test_utils.vector_store_handler import VectorStoreImplementation

Expand Down
10 changes: 3 additions & 7 deletions libs/e2e-tests/e2e_tests/langchain/test_unstructured.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
import pytest

from langchain.text_splitter import TokenTextSplitter
from langchain_community.document_loaders import UnstructuredAPIFileLoader
from langchain_core.output_parsers import StrOutputParser
from langchain_core.prompts import PromptTemplate
from langchain_core.runnables import RunnablePassthrough

from langchain_openai import (
ChatOpenAI,
OpenAIEmbeddings,
)

from e2e_tests.langchain.rag_application import BASIC_QA_PROMPT
from e2e_tests.test_utils import get_local_resource_path

from e2e_tests.conftest import (
set_current_test_info,
get_required_env,
set_current_test_info,
)

from e2e_tests.langchain.rag_application import BASIC_QA_PROMPT
from e2e_tests.test_utils import get_local_resource_path
from e2e_tests.test_utils.vector_store_handler import (
VectorStoreTestContext,
)
Expand Down
14 changes: 6 additions & 8 deletions libs/e2e-tests/e2e_tests/langchain/trulens.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
from trulens_eval import TruChain, Feedback, Tru
from trulens_eval.feedback.provider import Langchain
from trulens_eval.app import App

from langchain.schema.vectorstore import VectorStore
import numpy as np
from langchain.prompts import PromptTemplate
from langchain.schema.language_model import BaseLanguageModel
from langchain.schema.output_parser import StrOutputParser
from langchain.schema.runnable import Runnable
from langchain.prompts import PromptTemplate
from langchain.schema.vectorstore import VectorStore
from langchain_core.runnables import RunnablePassthrough
from langchain_core.vectorstores import VectorStoreRetriever
from trulens_eval import Feedback, Tru, TruChain
from trulens_eval.app import App
from trulens_eval.feedback.provider import Langchain

from e2e_tests.langchain.rag_application import (
BASIC_QA_PROMPT,
SAMPLE_DATA,
format_docs,
)

import numpy as np


def _feedback_functions(chain: Runnable, llm: BaseLanguageModel) -> list[Feedback]:
provider = Langchain(chain=llm)
Expand Down
11 changes: 4 additions & 7 deletions libs/e2e-tests/e2e_tests/langchain_llamaindex/test_astra.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,20 @@

import langchain_core.documents
import pytest
from langchain_openai import OpenAIEmbeddings, ChatOpenAI

from e2e_tests.conftest import get_required_env, is_astra
from langchain.chains import ConversationalRetrievalChain
from langchain_astradb import AstraDBVectorStore as LangChainAstraDBVectorStore

from langchain_openai import ChatOpenAI, OpenAIEmbeddings
from llama_index.core import ServiceContext, StorageContext, VectorStoreIndex
from llama_index.core.schema import Document
from llama_index.core.vector_stores import (
MetadataFilters,
ExactMatchFilter,
MetadataFilters,
)
from llama_index.vector_stores.astra_db import AstraDBVectorStore
from llama_index.embeddings.openai import OpenAIEmbedding
from llama_index.llms.openai import OpenAI
from llama_index.vector_stores.astra_db import AstraDBVectorStore


from e2e_tests.conftest import get_required_env, is_astra
from e2e_tests.test_utils import skip_test_due_to_implementation_not_supported
from e2e_tests.test_utils.astradb_vector_store_handler import (
AstraDBVectorStoreHandler,
Expand Down
Loading
Loading