diff --git a/.github/labeler.yml b/.github/labeler.yml index 2766040f7..b23898541 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -98,6 +98,3 @@ topic:knowledge_graph: topic:dc_document_store: - haystack/document_stores/deepsetcloud.py - test/document_stores/test_deepsetcloud.py -topic:graphdb: -- haystack/document_stores/graphdb.py -- test/document_stores/test_knowledge_graph.py diff --git a/.github/release.yml b/.github/release.yml index 2ae75e2c5..14070bf39 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -33,7 +33,6 @@ changelog: - topic:pinecone - topic:sql - topic:knowledge_graph - - topic:graphdb - title: REST API labels: - topic:api diff --git a/.github/workflows/cml.yml b/.github/workflows/cml.yml index fe83c9d9b..545034427 100644 --- a/.github/workflows/cml.yml +++ b/.github/workflows/cml.yml @@ -76,7 +76,7 @@ jobs: run: | apt-get update -y apt-get install python3-dev -y - pip install .[elasticsearch,faiss,weaviate,graphdb,ray,rest,ui,dev] + pip install .[elasticsearch,faiss,weaviate,ray,rest,ui,dev] cd test/benchmarks && python run.py --retriever_index --retriever_query --reader --ci --save_markdown { echo -en "## Benchmarks: Retriever Indexing\n" diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 61e11b1cc..a82be363f 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -50,9 +50,6 @@ jobs: - name: Run Weaviate run: docker run -d -p 8080:8080 --name haystack_test_weaviate --env AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED='true' --env PERSISTENCE_DATA_PATH='/var/lib/weaviate' --env ENABLE_EXPERIMENTAL_BM25='true' --env DISK_USE_READONLY_PERCENTAGE='95' semitechnologies/weaviate:1.17.2 - - name: Run GraphDB - run: docker run -d -p 7200:7200 --name haystack_test_graphdb deepset/graphdb-free:9.4.1-adoptopenjdk11 - - name: Install Haystack run: pip install . diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f21f90ee8..beab19215 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -204,9 +204,6 @@ docker run -d -p 9200:9200 -e "discovery.type=single-node" -e "ES_JAVA_OPTS=-Xms # Weaviate docker run -d -p 8080:8080 --name haystack_test_weaviate --env AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED='true' --env PERSISTENCE_DATA_PATH='/var/lib/weaviate' --env ENABLE_EXPERIMENTAL_BM25='true' semitechnologies/weaviate:1.14.1 -# GraphDB -docker run -d -p 7200:7200 --name haystack_test_graphdb deepset/graphdb-free:9.4.1-adoptopenjdk11 - # Tika docker run -d -p 9998:9998 -e "TIKA_CHILD_JAVA_OPTS=-JXms128m" -e "TIKA_CHILD_JAVA_OPTS=-JXmx128m" apache/tika:1.28.4 ``` diff --git a/docs/pydoc/config/document-store.yml b/docs/pydoc/config/document-store.yml index fbc2ba003..ee6f1c902 100644 --- a/docs/pydoc/config/document-store.yml +++ b/docs/pydoc/config/document-store.yml @@ -10,7 +10,6 @@ loaders: "sql", "faiss", "weaviate", - "graphdb", "deepsetcloud", "pinecone", "search_engine", diff --git a/docs/pydoc/config/retriever.yml b/docs/pydoc/config/retriever.yml index 7819ce3ba..4c17d6f93 100644 --- a/docs/pydoc/config/retriever.yml +++ b/docs/pydoc/config/retriever.yml @@ -1,7 +1,7 @@ loaders: - type: python search_path: [../../../haystack/nodes/retriever] - modules: ["base", "sparse", "dense", "text2sparql", "multimodal/retriever", "web"] + modules: ["base", "sparse", "dense", "multimodal/retriever", "web"] ignore_when_discovered: ["__init__"] processors: - type: filter diff --git a/pyproject.toml b/pyproject.toml index 5273037df..5e40c6f60 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -119,22 +119,14 @@ only-pinecone = [ pinecone = [ "farm-haystack[sql,only-pinecone]", ] -graphdb = [ - "SPARQLWrapper", - "rdflib!=6.3.2", # GPL-2.0-only license issue -] -inmemorygraph = [ - "SPARQLWrapper", - "rdflib!=6.3.2", # GPL-2.0-only license issue -] opensearch = [ "opensearch-py>=2", ] docstores = [ - "farm-haystack[elasticsearch,faiss,weaviate,graphdb,inmemorygraph,pinecone,opensearch]", + "farm-haystack[elasticsearch,faiss,weaviate,pinecone,opensearch]", ] docstores-gpu = [ - "farm-haystack[elasticsearch,faiss-gpu,weaviate,graphdb,inmemorygraph,pinecone,opensearch]", + "farm-haystack[elasticsearch,faiss-gpu,weaviate,pinecone,opensearch]", ] audio = [ "openai-whisper" @@ -340,7 +332,6 @@ markers = [ "ocr: requires Tesseract", "elasticsearch: requires Elasticsearch container", - "graphdb: requires GraphDB container", "weaviate: requires Weaviate container", "pinecone: requires Pinecone credentials", "faiss: uses FAISS", diff --git a/test/conftest.py b/test/conftest.py index 17f47bb72..d6d93e4e5 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -139,8 +139,6 @@ def pytest_collection_modifyitems(config, items): "faiss": [pytest.mark.faiss], "weaviate": [pytest.mark.weaviate], "pinecone": [pytest.mark.pinecone], - # FIXME GraphDB can't be treated as a regular docstore, it fails most of their tests - "graphdb": [pytest.mark.integration], } for item in items: for name, markers in name_to_markers.items():