chore: leftovers from removing knowledge graph support (#4974)

* leftovers from removing knowledge graph support

* more leftovers
This commit is contained in:
Massimiliano Pippi 2023-05-22 10:03:51 +02:00 committed by GitHub
parent 5c576df335
commit 8228081e7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 4 additions and 26 deletions

3
.github/labeler.yml vendored
View File

@ -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

1
.github/release.yml vendored
View File

@ -33,7 +33,6 @@ changelog:
- topic:pinecone
- topic:sql
- topic:knowledge_graph
- topic:graphdb
- title: REST API
labels:
- topic:api

View File

@ -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"

View File

@ -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 .

View File

@ -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
```

View File

@ -10,7 +10,6 @@ loaders:
"sql",
"faiss",
"weaviate",
"graphdb",
"deepsetcloud",
"pinecone",
"search_engine",

View File

@ -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

View File

@ -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",

View File

@ -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():