From 2b98f3e1e8fb1a2103eb8e767ffca44c20e39812 Mon Sep 17 00:00:00 2001 From: anakin87 Date: Wed, 29 Nov 2023 15:34:07 +0100 Subject: [PATCH 1/5] move dirs --- {document_stores/chroma => chroma}/.gitignore | 0 .../unstructured_fileconverter => chroma}/LICENSE | 0 {document_stores/chroma => chroma}/README.md | 0 .../chroma => chroma}/example/data/usr_01.txt | 0 .../chroma => chroma}/example/data/usr_02.txt | 0 .../chroma => chroma}/example/data/usr_03.txt | 0 .../chroma => chroma}/example/data/usr_04.txt | 0 .../chroma => chroma}/example/data/usr_05.txt | 0 .../chroma => chroma}/example/data/usr_06.txt | 0 .../chroma => chroma}/example/data/usr_07.txt | 0 .../chroma => chroma}/example/data/usr_08.txt | 0 .../chroma => chroma}/example/data/usr_09.txt | 0 .../chroma => chroma}/example/data/usr_10.txt | 0 .../chroma => chroma}/example/data/usr_11.txt | 0 .../chroma => chroma}/example/data/usr_12.txt | 0 .../chroma => chroma}/example/data/usr_20.txt | 0 .../chroma => chroma}/example/data/usr_21.txt | 0 .../chroma => chroma}/example/data/usr_22.txt | 0 .../chroma => chroma}/example/data/usr_23.txt | 0 .../chroma => chroma}/example/data/usr_24.txt | 0 .../chroma => chroma}/example/data/usr_25.txt | 0 .../chroma => chroma}/example/data/usr_26.txt | 0 .../chroma => chroma}/example/data/usr_27.txt | 0 .../chroma => chroma}/example/data/usr_28.txt | 0 .../chroma => chroma}/example/data/usr_29.txt | 0 .../chroma => chroma}/example/data/usr_30.txt | 0 .../chroma => chroma}/example/data/usr_31.txt | 0 .../chroma => chroma}/example/data/usr_32.txt | 0 .../chroma => chroma}/example/data/usr_40.txt | 0 .../chroma => chroma}/example/data/usr_41.txt | 0 .../chroma => chroma}/example/data/usr_42.txt | 0 .../chroma => chroma}/example/data/usr_43.txt | 0 .../chroma => chroma}/example/data/usr_44.txt | 0 .../chroma => chroma}/example/data/usr_45.txt | 0 .../chroma => chroma}/example/data/usr_46.txt | 0 .../chroma => chroma}/example/data/usr_50.txt | 0 .../chroma => chroma}/example/data/usr_51.txt | 0 .../chroma => chroma}/example/data/usr_52.txt | 0 .../chroma => chroma}/example/data/usr_90.txt | 0 .../chroma => chroma}/example/example.py | 0 {document_stores/chroma => chroma}/pyproject.toml | 0 .../src/chroma_haystack/__about__.py | 0 .../src/chroma_haystack/__init__.py | 0 .../src/chroma_haystack/document_store.py | 0 .../chroma => chroma}/src/chroma_haystack/errors.py | 0 .../src/chroma_haystack/retriever.py | 0 .../chroma => chroma}/src/chroma_haystack/utils.py | 0 .../chroma => chroma}/tests/__init__.py | 0 .../chroma => chroma}/tests/test_document_store.py | 0 .../chroma => chroma}/tests/test_retriever.py | 0 components/README.md | 6 ------ components/hatch.toml | 12 ------------ document_stores/hatch.toml | 12 ------------ .../elasticsearch => elasticsearch}/.gitignore | 0 {document_stores/chroma => elasticsearch}/LICENSE | 0 .../elasticsearch => elasticsearch}/README.md | 0 .../docker-compose.yml | 0 .../elasticsearch => elasticsearch}/pyproject.toml | 0 .../src/elasticsearch_haystack/__about__.py | 0 .../src/elasticsearch_haystack/__init__.py | 0 .../src/elasticsearch_haystack/bm25_retriever.py | 0 .../src/elasticsearch_haystack/document_store.py | 0 .../elasticsearch_haystack/embedding_retriever.py | 0 .../src/elasticsearch_haystack/filters.py | 0 .../tests/__init__.py | 0 .../tests/test_bm25_retriever.py | 0 .../tests/test_document_store.py | 0 .../tests/test_embedding_retriever.py | 0 .../tests/test_filters.py | 0 .../LICENSE.txt | 0 .../README.md | 0 .../instructor_embedders/__about__.py | 0 .../instructor_embedders/__init__.py | 0 .../embedding_backend/__init__.py | 0 .../embedding_backend/instructor_backend.py | 0 .../instructor_document_embedder.py | 0 .../instructor_text_embedder.py | 0 .../pyproject.toml | 0 .../tests/__init__.py | 0 .../tests/test_instructor_backend.py | 0 .../tests/test_instructor_document_embedder.py | 0 .../tests/test_instructor_embedders.py | 0 .../tests/test_instructor_text_embedder.py | 0 .../unstructured_fileconverter}/LICENSE | 0 .../unstructured_fileconverter/README.md | 0 .../unstructured_fileconverter/pyproject.toml | 0 .../__about__.py | 0 .../unstructured_fileconverter_haystack/__init__.py | 0 .../fileconverter.py | 0 .../tests/samples/sample_pdf.pdf | Bin .../tests/test_fileconverter.py | 0 91 files changed, 30 deletions(-) rename {document_stores/chroma => chroma}/.gitignore (100%) rename {components/converters/unstructured_fileconverter => chroma}/LICENSE (100%) rename {document_stores/chroma => chroma}/README.md (100%) rename {document_stores/chroma => chroma}/example/data/usr_01.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_02.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_03.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_04.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_05.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_06.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_07.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_08.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_09.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_10.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_11.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_12.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_20.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_21.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_22.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_23.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_24.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_25.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_26.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_27.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_28.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_29.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_30.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_31.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_32.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_40.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_41.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_42.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_43.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_44.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_45.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_46.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_50.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_51.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_52.txt (100%) rename {document_stores/chroma => chroma}/example/data/usr_90.txt (100%) rename {document_stores/chroma => chroma}/example/example.py (100%) rename {document_stores/chroma => chroma}/pyproject.toml (100%) rename {document_stores/chroma => chroma}/src/chroma_haystack/__about__.py (100%) rename {document_stores/chroma => chroma}/src/chroma_haystack/__init__.py (100%) rename {document_stores/chroma => chroma}/src/chroma_haystack/document_store.py (100%) rename {document_stores/chroma => chroma}/src/chroma_haystack/errors.py (100%) rename {document_stores/chroma => chroma}/src/chroma_haystack/retriever.py (100%) rename {document_stores/chroma => chroma}/src/chroma_haystack/utils.py (100%) rename {document_stores/chroma => chroma}/tests/__init__.py (100%) rename {document_stores/chroma => chroma}/tests/test_document_store.py (100%) rename {document_stores/chroma => chroma}/tests/test_retriever.py (100%) delete mode 100644 components/README.md delete mode 100644 components/hatch.toml delete mode 100644 document_stores/hatch.toml rename {document_stores/elasticsearch => elasticsearch}/.gitignore (100%) rename {document_stores/chroma => elasticsearch}/LICENSE (100%) rename {document_stores/elasticsearch => elasticsearch}/README.md (100%) rename {document_stores/elasticsearch => elasticsearch}/docker-compose.yml (100%) rename {document_stores/elasticsearch => elasticsearch}/pyproject.toml (100%) rename {document_stores/elasticsearch => elasticsearch}/src/elasticsearch_haystack/__about__.py (100%) rename {document_stores/elasticsearch => elasticsearch}/src/elasticsearch_haystack/__init__.py (100%) rename {document_stores/elasticsearch => elasticsearch}/src/elasticsearch_haystack/bm25_retriever.py (100%) rename {document_stores/elasticsearch => elasticsearch}/src/elasticsearch_haystack/document_store.py (100%) rename {document_stores/elasticsearch => elasticsearch}/src/elasticsearch_haystack/embedding_retriever.py (100%) rename {document_stores/elasticsearch => elasticsearch}/src/elasticsearch_haystack/filters.py (100%) rename {document_stores/elasticsearch => elasticsearch}/tests/__init__.py (100%) rename {document_stores/elasticsearch => elasticsearch}/tests/test_bm25_retriever.py (100%) rename {document_stores/elasticsearch => elasticsearch}/tests/test_document_store.py (100%) rename {document_stores/elasticsearch => elasticsearch}/tests/test_embedding_retriever.py (100%) rename {document_stores/elasticsearch => elasticsearch}/tests/test_filters.py (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/LICENSE.txt (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/README.md (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/instructor_embedders/__about__.py (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/instructor_embedders/__init__.py (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/instructor_embedders/embedding_backend/__init__.py (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/instructor_embedders/embedding_backend/instructor_backend.py (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/instructor_embedders/instructor_document_embedder.py (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/instructor_embedders/instructor_text_embedder.py (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/pyproject.toml (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/tests/__init__.py (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/tests/test_instructor_backend.py (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/tests/test_instructor_document_embedder.py (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/tests/test_instructor_embedders.py (100%) rename {components/embedders/instructor-embedders => instructor-embedders}/tests/test_instructor_text_embedder.py (100%) rename {document_stores/elasticsearch => unstructured/unstructured_fileconverter}/LICENSE (100%) rename {components/converters => unstructured}/unstructured_fileconverter/README.md (100%) rename {components/converters => unstructured}/unstructured_fileconverter/pyproject.toml (100%) rename {components/converters => unstructured}/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__about__.py (100%) rename {components/converters => unstructured}/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__init__.py (100%) rename {components/converters => unstructured}/unstructured_fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py (100%) rename {components/converters => unstructured}/unstructured_fileconverter/tests/samples/sample_pdf.pdf (100%) rename {components/converters => unstructured}/unstructured_fileconverter/tests/test_fileconverter.py (100%) diff --git a/document_stores/chroma/.gitignore b/chroma/.gitignore similarity index 100% rename from document_stores/chroma/.gitignore rename to chroma/.gitignore diff --git a/components/converters/unstructured_fileconverter/LICENSE b/chroma/LICENSE similarity index 100% rename from components/converters/unstructured_fileconverter/LICENSE rename to chroma/LICENSE diff --git a/document_stores/chroma/README.md b/chroma/README.md similarity index 100% rename from document_stores/chroma/README.md rename to chroma/README.md diff --git a/document_stores/chroma/example/data/usr_01.txt b/chroma/example/data/usr_01.txt similarity index 100% rename from document_stores/chroma/example/data/usr_01.txt rename to chroma/example/data/usr_01.txt diff --git a/document_stores/chroma/example/data/usr_02.txt b/chroma/example/data/usr_02.txt similarity index 100% rename from document_stores/chroma/example/data/usr_02.txt rename to chroma/example/data/usr_02.txt diff --git a/document_stores/chroma/example/data/usr_03.txt b/chroma/example/data/usr_03.txt similarity index 100% rename from document_stores/chroma/example/data/usr_03.txt rename to chroma/example/data/usr_03.txt diff --git a/document_stores/chroma/example/data/usr_04.txt b/chroma/example/data/usr_04.txt similarity index 100% rename from document_stores/chroma/example/data/usr_04.txt rename to chroma/example/data/usr_04.txt diff --git a/document_stores/chroma/example/data/usr_05.txt b/chroma/example/data/usr_05.txt similarity index 100% rename from document_stores/chroma/example/data/usr_05.txt rename to chroma/example/data/usr_05.txt diff --git a/document_stores/chroma/example/data/usr_06.txt b/chroma/example/data/usr_06.txt similarity index 100% rename from document_stores/chroma/example/data/usr_06.txt rename to chroma/example/data/usr_06.txt diff --git a/document_stores/chroma/example/data/usr_07.txt b/chroma/example/data/usr_07.txt similarity index 100% rename from document_stores/chroma/example/data/usr_07.txt rename to chroma/example/data/usr_07.txt diff --git a/document_stores/chroma/example/data/usr_08.txt b/chroma/example/data/usr_08.txt similarity index 100% rename from document_stores/chroma/example/data/usr_08.txt rename to chroma/example/data/usr_08.txt diff --git a/document_stores/chroma/example/data/usr_09.txt b/chroma/example/data/usr_09.txt similarity index 100% rename from document_stores/chroma/example/data/usr_09.txt rename to chroma/example/data/usr_09.txt diff --git a/document_stores/chroma/example/data/usr_10.txt b/chroma/example/data/usr_10.txt similarity index 100% rename from document_stores/chroma/example/data/usr_10.txt rename to chroma/example/data/usr_10.txt diff --git a/document_stores/chroma/example/data/usr_11.txt b/chroma/example/data/usr_11.txt similarity index 100% rename from document_stores/chroma/example/data/usr_11.txt rename to chroma/example/data/usr_11.txt diff --git a/document_stores/chroma/example/data/usr_12.txt b/chroma/example/data/usr_12.txt similarity index 100% rename from document_stores/chroma/example/data/usr_12.txt rename to chroma/example/data/usr_12.txt diff --git a/document_stores/chroma/example/data/usr_20.txt b/chroma/example/data/usr_20.txt similarity index 100% rename from document_stores/chroma/example/data/usr_20.txt rename to chroma/example/data/usr_20.txt diff --git a/document_stores/chroma/example/data/usr_21.txt b/chroma/example/data/usr_21.txt similarity index 100% rename from document_stores/chroma/example/data/usr_21.txt rename to chroma/example/data/usr_21.txt diff --git a/document_stores/chroma/example/data/usr_22.txt b/chroma/example/data/usr_22.txt similarity index 100% rename from document_stores/chroma/example/data/usr_22.txt rename to chroma/example/data/usr_22.txt diff --git a/document_stores/chroma/example/data/usr_23.txt b/chroma/example/data/usr_23.txt similarity index 100% rename from document_stores/chroma/example/data/usr_23.txt rename to chroma/example/data/usr_23.txt diff --git a/document_stores/chroma/example/data/usr_24.txt b/chroma/example/data/usr_24.txt similarity index 100% rename from document_stores/chroma/example/data/usr_24.txt rename to chroma/example/data/usr_24.txt diff --git a/document_stores/chroma/example/data/usr_25.txt b/chroma/example/data/usr_25.txt similarity index 100% rename from document_stores/chroma/example/data/usr_25.txt rename to chroma/example/data/usr_25.txt diff --git a/document_stores/chroma/example/data/usr_26.txt b/chroma/example/data/usr_26.txt similarity index 100% rename from document_stores/chroma/example/data/usr_26.txt rename to chroma/example/data/usr_26.txt diff --git a/document_stores/chroma/example/data/usr_27.txt b/chroma/example/data/usr_27.txt similarity index 100% rename from document_stores/chroma/example/data/usr_27.txt rename to chroma/example/data/usr_27.txt diff --git a/document_stores/chroma/example/data/usr_28.txt b/chroma/example/data/usr_28.txt similarity index 100% rename from document_stores/chroma/example/data/usr_28.txt rename to chroma/example/data/usr_28.txt diff --git a/document_stores/chroma/example/data/usr_29.txt b/chroma/example/data/usr_29.txt similarity index 100% rename from document_stores/chroma/example/data/usr_29.txt rename to chroma/example/data/usr_29.txt diff --git a/document_stores/chroma/example/data/usr_30.txt b/chroma/example/data/usr_30.txt similarity index 100% rename from document_stores/chroma/example/data/usr_30.txt rename to chroma/example/data/usr_30.txt diff --git a/document_stores/chroma/example/data/usr_31.txt b/chroma/example/data/usr_31.txt similarity index 100% rename from document_stores/chroma/example/data/usr_31.txt rename to chroma/example/data/usr_31.txt diff --git a/document_stores/chroma/example/data/usr_32.txt b/chroma/example/data/usr_32.txt similarity index 100% rename from document_stores/chroma/example/data/usr_32.txt rename to chroma/example/data/usr_32.txt diff --git a/document_stores/chroma/example/data/usr_40.txt b/chroma/example/data/usr_40.txt similarity index 100% rename from document_stores/chroma/example/data/usr_40.txt rename to chroma/example/data/usr_40.txt diff --git a/document_stores/chroma/example/data/usr_41.txt b/chroma/example/data/usr_41.txt similarity index 100% rename from document_stores/chroma/example/data/usr_41.txt rename to chroma/example/data/usr_41.txt diff --git a/document_stores/chroma/example/data/usr_42.txt b/chroma/example/data/usr_42.txt similarity index 100% rename from document_stores/chroma/example/data/usr_42.txt rename to chroma/example/data/usr_42.txt diff --git a/document_stores/chroma/example/data/usr_43.txt b/chroma/example/data/usr_43.txt similarity index 100% rename from document_stores/chroma/example/data/usr_43.txt rename to chroma/example/data/usr_43.txt diff --git a/document_stores/chroma/example/data/usr_44.txt b/chroma/example/data/usr_44.txt similarity index 100% rename from document_stores/chroma/example/data/usr_44.txt rename to chroma/example/data/usr_44.txt diff --git a/document_stores/chroma/example/data/usr_45.txt b/chroma/example/data/usr_45.txt similarity index 100% rename from document_stores/chroma/example/data/usr_45.txt rename to chroma/example/data/usr_45.txt diff --git a/document_stores/chroma/example/data/usr_46.txt b/chroma/example/data/usr_46.txt similarity index 100% rename from document_stores/chroma/example/data/usr_46.txt rename to chroma/example/data/usr_46.txt diff --git a/document_stores/chroma/example/data/usr_50.txt b/chroma/example/data/usr_50.txt similarity index 100% rename from document_stores/chroma/example/data/usr_50.txt rename to chroma/example/data/usr_50.txt diff --git a/document_stores/chroma/example/data/usr_51.txt b/chroma/example/data/usr_51.txt similarity index 100% rename from document_stores/chroma/example/data/usr_51.txt rename to chroma/example/data/usr_51.txt diff --git a/document_stores/chroma/example/data/usr_52.txt b/chroma/example/data/usr_52.txt similarity index 100% rename from document_stores/chroma/example/data/usr_52.txt rename to chroma/example/data/usr_52.txt diff --git a/document_stores/chroma/example/data/usr_90.txt b/chroma/example/data/usr_90.txt similarity index 100% rename from document_stores/chroma/example/data/usr_90.txt rename to chroma/example/data/usr_90.txt diff --git a/document_stores/chroma/example/example.py b/chroma/example/example.py similarity index 100% rename from document_stores/chroma/example/example.py rename to chroma/example/example.py diff --git a/document_stores/chroma/pyproject.toml b/chroma/pyproject.toml similarity index 100% rename from document_stores/chroma/pyproject.toml rename to chroma/pyproject.toml diff --git a/document_stores/chroma/src/chroma_haystack/__about__.py b/chroma/src/chroma_haystack/__about__.py similarity index 100% rename from document_stores/chroma/src/chroma_haystack/__about__.py rename to chroma/src/chroma_haystack/__about__.py diff --git a/document_stores/chroma/src/chroma_haystack/__init__.py b/chroma/src/chroma_haystack/__init__.py similarity index 100% rename from document_stores/chroma/src/chroma_haystack/__init__.py rename to chroma/src/chroma_haystack/__init__.py diff --git a/document_stores/chroma/src/chroma_haystack/document_store.py b/chroma/src/chroma_haystack/document_store.py similarity index 100% rename from document_stores/chroma/src/chroma_haystack/document_store.py rename to chroma/src/chroma_haystack/document_store.py diff --git a/document_stores/chroma/src/chroma_haystack/errors.py b/chroma/src/chroma_haystack/errors.py similarity index 100% rename from document_stores/chroma/src/chroma_haystack/errors.py rename to chroma/src/chroma_haystack/errors.py diff --git a/document_stores/chroma/src/chroma_haystack/retriever.py b/chroma/src/chroma_haystack/retriever.py similarity index 100% rename from document_stores/chroma/src/chroma_haystack/retriever.py rename to chroma/src/chroma_haystack/retriever.py diff --git a/document_stores/chroma/src/chroma_haystack/utils.py b/chroma/src/chroma_haystack/utils.py similarity index 100% rename from document_stores/chroma/src/chroma_haystack/utils.py rename to chroma/src/chroma_haystack/utils.py diff --git a/document_stores/chroma/tests/__init__.py b/chroma/tests/__init__.py similarity index 100% rename from document_stores/chroma/tests/__init__.py rename to chroma/tests/__init__.py diff --git a/document_stores/chroma/tests/test_document_store.py b/chroma/tests/test_document_store.py similarity index 100% rename from document_stores/chroma/tests/test_document_store.py rename to chroma/tests/test_document_store.py diff --git a/document_stores/chroma/tests/test_retriever.py b/chroma/tests/test_retriever.py similarity index 100% rename from document_stores/chroma/tests/test_retriever.py rename to chroma/tests/test_retriever.py diff --git a/components/README.md b/components/README.md deleted file mode 100644 index 7de46eb5d..000000000 --- a/components/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# Components (for Haystack 2.x) - -To create a new package, run this command: -```sh -hatch --config hatch.toml new my_custom_component -``` diff --git a/components/hatch.toml b/components/hatch.toml deleted file mode 100644 index be4d67218..000000000 --- a/components/hatch.toml +++ /dev/null @@ -1,12 +0,0 @@ -[template] -name = "deepset GmbH" -email = "info@deepset.ai" - -[template.licenses] -headers = true -default = [ - "Apache-2.0", -] - -[template.plugins.default] -src-layout = false diff --git a/document_stores/hatch.toml b/document_stores/hatch.toml deleted file mode 100644 index be4d67218..000000000 --- a/document_stores/hatch.toml +++ /dev/null @@ -1,12 +0,0 @@ -[template] -name = "deepset GmbH" -email = "info@deepset.ai" - -[template.licenses] -headers = true -default = [ - "Apache-2.0", -] - -[template.plugins.default] -src-layout = false diff --git a/document_stores/elasticsearch/.gitignore b/elasticsearch/.gitignore similarity index 100% rename from document_stores/elasticsearch/.gitignore rename to elasticsearch/.gitignore diff --git a/document_stores/chroma/LICENSE b/elasticsearch/LICENSE similarity index 100% rename from document_stores/chroma/LICENSE rename to elasticsearch/LICENSE diff --git a/document_stores/elasticsearch/README.md b/elasticsearch/README.md similarity index 100% rename from document_stores/elasticsearch/README.md rename to elasticsearch/README.md diff --git a/document_stores/elasticsearch/docker-compose.yml b/elasticsearch/docker-compose.yml similarity index 100% rename from document_stores/elasticsearch/docker-compose.yml rename to elasticsearch/docker-compose.yml diff --git a/document_stores/elasticsearch/pyproject.toml b/elasticsearch/pyproject.toml similarity index 100% rename from document_stores/elasticsearch/pyproject.toml rename to elasticsearch/pyproject.toml diff --git a/document_stores/elasticsearch/src/elasticsearch_haystack/__about__.py b/elasticsearch/src/elasticsearch_haystack/__about__.py similarity index 100% rename from document_stores/elasticsearch/src/elasticsearch_haystack/__about__.py rename to elasticsearch/src/elasticsearch_haystack/__about__.py diff --git a/document_stores/elasticsearch/src/elasticsearch_haystack/__init__.py b/elasticsearch/src/elasticsearch_haystack/__init__.py similarity index 100% rename from document_stores/elasticsearch/src/elasticsearch_haystack/__init__.py rename to elasticsearch/src/elasticsearch_haystack/__init__.py diff --git a/document_stores/elasticsearch/src/elasticsearch_haystack/bm25_retriever.py b/elasticsearch/src/elasticsearch_haystack/bm25_retriever.py similarity index 100% rename from document_stores/elasticsearch/src/elasticsearch_haystack/bm25_retriever.py rename to elasticsearch/src/elasticsearch_haystack/bm25_retriever.py diff --git a/document_stores/elasticsearch/src/elasticsearch_haystack/document_store.py b/elasticsearch/src/elasticsearch_haystack/document_store.py similarity index 100% rename from document_stores/elasticsearch/src/elasticsearch_haystack/document_store.py rename to elasticsearch/src/elasticsearch_haystack/document_store.py diff --git a/document_stores/elasticsearch/src/elasticsearch_haystack/embedding_retriever.py b/elasticsearch/src/elasticsearch_haystack/embedding_retriever.py similarity index 100% rename from document_stores/elasticsearch/src/elasticsearch_haystack/embedding_retriever.py rename to elasticsearch/src/elasticsearch_haystack/embedding_retriever.py diff --git a/document_stores/elasticsearch/src/elasticsearch_haystack/filters.py b/elasticsearch/src/elasticsearch_haystack/filters.py similarity index 100% rename from document_stores/elasticsearch/src/elasticsearch_haystack/filters.py rename to elasticsearch/src/elasticsearch_haystack/filters.py diff --git a/document_stores/elasticsearch/tests/__init__.py b/elasticsearch/tests/__init__.py similarity index 100% rename from document_stores/elasticsearch/tests/__init__.py rename to elasticsearch/tests/__init__.py diff --git a/document_stores/elasticsearch/tests/test_bm25_retriever.py b/elasticsearch/tests/test_bm25_retriever.py similarity index 100% rename from document_stores/elasticsearch/tests/test_bm25_retriever.py rename to elasticsearch/tests/test_bm25_retriever.py diff --git a/document_stores/elasticsearch/tests/test_document_store.py b/elasticsearch/tests/test_document_store.py similarity index 100% rename from document_stores/elasticsearch/tests/test_document_store.py rename to elasticsearch/tests/test_document_store.py diff --git a/document_stores/elasticsearch/tests/test_embedding_retriever.py b/elasticsearch/tests/test_embedding_retriever.py similarity index 100% rename from document_stores/elasticsearch/tests/test_embedding_retriever.py rename to elasticsearch/tests/test_embedding_retriever.py diff --git a/document_stores/elasticsearch/tests/test_filters.py b/elasticsearch/tests/test_filters.py similarity index 100% rename from document_stores/elasticsearch/tests/test_filters.py rename to elasticsearch/tests/test_filters.py diff --git a/components/embedders/instructor-embedders/LICENSE.txt b/instructor-embedders/LICENSE.txt similarity index 100% rename from components/embedders/instructor-embedders/LICENSE.txt rename to instructor-embedders/LICENSE.txt diff --git a/components/embedders/instructor-embedders/README.md b/instructor-embedders/README.md similarity index 100% rename from components/embedders/instructor-embedders/README.md rename to instructor-embedders/README.md diff --git a/components/embedders/instructor-embedders/instructor_embedders/__about__.py b/instructor-embedders/instructor_embedders/__about__.py similarity index 100% rename from components/embedders/instructor-embedders/instructor_embedders/__about__.py rename to instructor-embedders/instructor_embedders/__about__.py diff --git a/components/embedders/instructor-embedders/instructor_embedders/__init__.py b/instructor-embedders/instructor_embedders/__init__.py similarity index 100% rename from components/embedders/instructor-embedders/instructor_embedders/__init__.py rename to instructor-embedders/instructor_embedders/__init__.py diff --git a/components/embedders/instructor-embedders/instructor_embedders/embedding_backend/__init__.py b/instructor-embedders/instructor_embedders/embedding_backend/__init__.py similarity index 100% rename from components/embedders/instructor-embedders/instructor_embedders/embedding_backend/__init__.py rename to instructor-embedders/instructor_embedders/embedding_backend/__init__.py diff --git a/components/embedders/instructor-embedders/instructor_embedders/embedding_backend/instructor_backend.py b/instructor-embedders/instructor_embedders/embedding_backend/instructor_backend.py similarity index 100% rename from components/embedders/instructor-embedders/instructor_embedders/embedding_backend/instructor_backend.py rename to instructor-embedders/instructor_embedders/embedding_backend/instructor_backend.py diff --git a/components/embedders/instructor-embedders/instructor_embedders/instructor_document_embedder.py b/instructor-embedders/instructor_embedders/instructor_document_embedder.py similarity index 100% rename from components/embedders/instructor-embedders/instructor_embedders/instructor_document_embedder.py rename to instructor-embedders/instructor_embedders/instructor_document_embedder.py diff --git a/components/embedders/instructor-embedders/instructor_embedders/instructor_text_embedder.py b/instructor-embedders/instructor_embedders/instructor_text_embedder.py similarity index 100% rename from components/embedders/instructor-embedders/instructor_embedders/instructor_text_embedder.py rename to instructor-embedders/instructor_embedders/instructor_text_embedder.py diff --git a/components/embedders/instructor-embedders/pyproject.toml b/instructor-embedders/pyproject.toml similarity index 100% rename from components/embedders/instructor-embedders/pyproject.toml rename to instructor-embedders/pyproject.toml diff --git a/components/embedders/instructor-embedders/tests/__init__.py b/instructor-embedders/tests/__init__.py similarity index 100% rename from components/embedders/instructor-embedders/tests/__init__.py rename to instructor-embedders/tests/__init__.py diff --git a/components/embedders/instructor-embedders/tests/test_instructor_backend.py b/instructor-embedders/tests/test_instructor_backend.py similarity index 100% rename from components/embedders/instructor-embedders/tests/test_instructor_backend.py rename to instructor-embedders/tests/test_instructor_backend.py diff --git a/components/embedders/instructor-embedders/tests/test_instructor_document_embedder.py b/instructor-embedders/tests/test_instructor_document_embedder.py similarity index 100% rename from components/embedders/instructor-embedders/tests/test_instructor_document_embedder.py rename to instructor-embedders/tests/test_instructor_document_embedder.py diff --git a/components/embedders/instructor-embedders/tests/test_instructor_embedders.py b/instructor-embedders/tests/test_instructor_embedders.py similarity index 100% rename from components/embedders/instructor-embedders/tests/test_instructor_embedders.py rename to instructor-embedders/tests/test_instructor_embedders.py diff --git a/components/embedders/instructor-embedders/tests/test_instructor_text_embedder.py b/instructor-embedders/tests/test_instructor_text_embedder.py similarity index 100% rename from components/embedders/instructor-embedders/tests/test_instructor_text_embedder.py rename to instructor-embedders/tests/test_instructor_text_embedder.py diff --git a/document_stores/elasticsearch/LICENSE b/unstructured/unstructured_fileconverter/LICENSE similarity index 100% rename from document_stores/elasticsearch/LICENSE rename to unstructured/unstructured_fileconverter/LICENSE diff --git a/components/converters/unstructured_fileconverter/README.md b/unstructured/unstructured_fileconverter/README.md similarity index 100% rename from components/converters/unstructured_fileconverter/README.md rename to unstructured/unstructured_fileconverter/README.md diff --git a/components/converters/unstructured_fileconverter/pyproject.toml b/unstructured/unstructured_fileconverter/pyproject.toml similarity index 100% rename from components/converters/unstructured_fileconverter/pyproject.toml rename to unstructured/unstructured_fileconverter/pyproject.toml diff --git a/components/converters/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__about__.py b/unstructured/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__about__.py similarity index 100% rename from components/converters/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__about__.py rename to unstructured/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__about__.py diff --git a/components/converters/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__init__.py b/unstructured/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__init__.py similarity index 100% rename from components/converters/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__init__.py rename to unstructured/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__init__.py diff --git a/components/converters/unstructured_fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py b/unstructured/unstructured_fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py similarity index 100% rename from components/converters/unstructured_fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py rename to unstructured/unstructured_fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py diff --git a/components/converters/unstructured_fileconverter/tests/samples/sample_pdf.pdf b/unstructured/unstructured_fileconverter/tests/samples/sample_pdf.pdf similarity index 100% rename from components/converters/unstructured_fileconverter/tests/samples/sample_pdf.pdf rename to unstructured/unstructured_fileconverter/tests/samples/sample_pdf.pdf diff --git a/components/converters/unstructured_fileconverter/tests/test_fileconverter.py b/unstructured/unstructured_fileconverter/tests/test_fileconverter.py similarity index 100% rename from components/converters/unstructured_fileconverter/tests/test_fileconverter.py rename to unstructured/unstructured_fileconverter/tests/test_fileconverter.py From 8e58f98c57f11fe0d267277d1b8e526cdb48016f Mon Sep 17 00:00:00 2001 From: anakin87 Date: Wed, 29 Nov 2023 15:42:25 +0100 Subject: [PATCH 2/5] refactor workflows --- .../{document_stores_chroma.yml => chroma.yml} | 10 +++++----- ...stores_elasticsearch.yml => elasticsearch.yml} | 14 +++++++------- ...tor_embedders.yml => instructor_embedders.yml} | 10 +++++----- ...nverter.yml => unstructured_fileconverter.yml} | 12 ++++++------ .../LICENSE | 0 .../README.md | 0 .../pyproject.toml | 0 .../__about__.py | 0 .../__init__.py | 0 .../fileconverter.py | 0 .../tests/samples/sample_pdf.pdf | Bin .../tests/test_fileconverter.py | 0 12 files changed, 23 insertions(+), 23 deletions(-) rename .github/workflows/{document_stores_chroma.yml => chroma.yml} (84%) rename .github/workflows/{document_stores_elasticsearch.yml => elasticsearch.yml} (75%) rename .github/workflows/{components_instructor_embedders.yml => instructor_embedders.yml} (67%) rename .github/workflows/{components_unstructured_fileconverter.yml => unstructured_fileconverter.yml} (78%) rename unstructured/{unstructured_fileconverter => fileconverter}/LICENSE (100%) rename unstructured/{unstructured_fileconverter => fileconverter}/README.md (100%) rename unstructured/{unstructured_fileconverter => fileconverter}/pyproject.toml (100%) rename unstructured/{unstructured_fileconverter => fileconverter}/src/unstructured_fileconverter_haystack/__about__.py (100%) rename unstructured/{unstructured_fileconverter => fileconverter}/src/unstructured_fileconverter_haystack/__init__.py (100%) rename unstructured/{unstructured_fileconverter => fileconverter}/src/unstructured_fileconverter_haystack/fileconverter.py (100%) rename unstructured/{unstructured_fileconverter => fileconverter}/tests/samples/sample_pdf.pdf (100%) rename unstructured/{unstructured_fileconverter => fileconverter}/tests/test_fileconverter.py (100%) diff --git a/.github/workflows/document_stores_chroma.yml b/.github/workflows/chroma.yml similarity index 84% rename from .github/workflows/document_stores_chroma.yml rename to .github/workflows/chroma.yml index 3068ea1fc..2f6d90c23 100644 --- a/.github/workflows/document_stores_chroma.yml +++ b/.github/workflows/chroma.yml @@ -1,21 +1,21 @@ # This workflow comes from https://github.com/ofek/hatch-mypyc # https://github.com/ofek/hatch-mypyc/blob/5a198c0ba8660494d02716cfc9d79ce4adfb1442/.github/workflows/test.yml -name: Test / Document Stores / chroma +name: Test / chroma on: schedule: - cron: "0 0 * * *" pull_request: paths: - - 'document_stores/chroma/**' - - '.github/workflows/document_stores_chroma.yml' + - 'chroma/**' + - '.github/workflows/chroma.yml' defaults: run: - working-directory: document_stores/chroma + working-directory: chroma concurrency: - group: document_stores_chroma-${{ github.head_ref }} + group: chroma-${{ github.head_ref }} cancel-in-progress: true env: diff --git a/.github/workflows/document_stores_elasticsearch.yml b/.github/workflows/elasticsearch.yml similarity index 75% rename from .github/workflows/document_stores_elasticsearch.yml rename to .github/workflows/elasticsearch.yml index 8da8d1e56..ba8629543 100644 --- a/.github/workflows/document_stores_elasticsearch.yml +++ b/.github/workflows/elasticsearch.yml @@ -1,17 +1,17 @@ # This workflow comes from https://github.com/ofek/hatch-mypyc # https://github.com/ofek/hatch-mypyc/blob/5a198c0ba8660494d02716cfc9d79ce4adfb1442/.github/workflows/test.yml -name: Test / Document Stores / elasticsearch +name: Test / elasticsearch on: schedule: - cron: "0 0 * * *" pull_request: paths: - - "document_stores/elasticsearch/**" - - ".github/workflows/document_stores_elasticsearch.yml" + - "elasticsearch/**" + - ".github/workflows/elasticsearch.yml" concurrency: - group: document_stores_elasticsearch-${{ github.head_ref }} + group: elasticsearch-${{ github.head_ref }} cancel-in-progress: true env: @@ -40,14 +40,14 @@ jobs: run: pip install --upgrade hatch - name: Lint - working-directory: document_stores/elasticsearch + working-directory: elasticsearch if: matrix.python-version == '3.9' run: hatch run lint:all - name: Run ElasticSearch container - working-directory: document_stores/elasticsearch + working-directory: elasticsearch run: docker-compose up -d - name: Run tests - working-directory: document_stores/elasticsearch + working-directory: elasticsearch run: hatch run cov diff --git a/.github/workflows/components_instructor_embedders.yml b/.github/workflows/instructor_embedders.yml similarity index 67% rename from .github/workflows/components_instructor_embedders.yml rename to .github/workflows/instructor_embedders.yml index c20363d51..03438655e 100644 --- a/.github/workflows/components_instructor_embedders.yml +++ b/.github/workflows/instructor_embedders.yml @@ -1,16 +1,16 @@ -name: Test / Components / instructor-embedders +name: Test / instructor-embedders on: schedule: - cron: "0 0 * * *" pull_request: paths: - - 'components/embedders/instructor-embedders/**' - - '.github/workflows/components_instructor_embedders.yml' + - 'instructor-embedders/**' + - '.github/workflows/instructor_embedders.yml' defaults: run: - working-directory: components/embedders/instructor-embedders + working-directory: instructor-embedders jobs: test: @@ -27,7 +27,7 @@ jobs: - name: Ruff uses: chartboost/ruff-action@v1 with: - src: components/embedders/instructor-embedders + src: instructor-embedders - name: Install instructor-embedders run: | diff --git a/.github/workflows/components_unstructured_fileconverter.yml b/.github/workflows/unstructured_fileconverter.yml similarity index 78% rename from .github/workflows/components_unstructured_fileconverter.yml rename to .github/workflows/unstructured_fileconverter.yml index f60573f79..d91ac3703 100644 --- a/.github/workflows/components_unstructured_fileconverter.yml +++ b/.github/workflows/unstructured_fileconverter.yml @@ -1,17 +1,17 @@ # This workflow comes from https://github.com/ofek/hatch-mypyc # https://github.com/ofek/hatch-mypyc/blob/5a198c0ba8660494d02716cfc9d79ce4adfb1442/.github/workflows/test.yml -name: Test / Components / unstructured-fileconverter +name: unstructured / fileconverter on: schedule: - cron: "0 0 * * *" pull_request: paths: - - "components/converters/unstructured_fileconverter/**" - - ".github/workflows/components_unstructured_fileconverter.yml" + - "unstructured/fileconverter/**" + - ".github/workflows/unstructured_fileconverter.yml" concurrency: - group: components_unstructured_fileconverter-${{ github.head_ref }} + group: unstructured_fileconverter-${{ github.head_ref }} cancel-in-progress: true env: @@ -50,10 +50,10 @@ jobs: run: pip install --upgrade hatch - name: Lint - working-directory: components/converters/unstructured_fileconverter + working-directory: unstructured/fileconverter if: matrix.python-version == '3.9' run: hatch run lint:all - name: Run tests - working-directory: components/converters/unstructured_fileconverter + working-directory: unstructured/fileconverter run: hatch run cov diff --git a/unstructured/unstructured_fileconverter/LICENSE b/unstructured/fileconverter/LICENSE similarity index 100% rename from unstructured/unstructured_fileconverter/LICENSE rename to unstructured/fileconverter/LICENSE diff --git a/unstructured/unstructured_fileconverter/README.md b/unstructured/fileconverter/README.md similarity index 100% rename from unstructured/unstructured_fileconverter/README.md rename to unstructured/fileconverter/README.md diff --git a/unstructured/unstructured_fileconverter/pyproject.toml b/unstructured/fileconverter/pyproject.toml similarity index 100% rename from unstructured/unstructured_fileconverter/pyproject.toml rename to unstructured/fileconverter/pyproject.toml diff --git a/unstructured/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__about__.py b/unstructured/fileconverter/src/unstructured_fileconverter_haystack/__about__.py similarity index 100% rename from unstructured/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__about__.py rename to unstructured/fileconverter/src/unstructured_fileconverter_haystack/__about__.py diff --git a/unstructured/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__init__.py b/unstructured/fileconverter/src/unstructured_fileconverter_haystack/__init__.py similarity index 100% rename from unstructured/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__init__.py rename to unstructured/fileconverter/src/unstructured_fileconverter_haystack/__init__.py diff --git a/unstructured/unstructured_fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py b/unstructured/fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py similarity index 100% rename from unstructured/unstructured_fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py rename to unstructured/fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py diff --git a/unstructured/unstructured_fileconverter/tests/samples/sample_pdf.pdf b/unstructured/fileconverter/tests/samples/sample_pdf.pdf similarity index 100% rename from unstructured/unstructured_fileconverter/tests/samples/sample_pdf.pdf rename to unstructured/fileconverter/tests/samples/sample_pdf.pdf diff --git a/unstructured/unstructured_fileconverter/tests/test_fileconverter.py b/unstructured/fileconverter/tests/test_fileconverter.py similarity index 100% rename from unstructured/unstructured_fileconverter/tests/test_fileconverter.py rename to unstructured/fileconverter/tests/test_fileconverter.py From 9e8415c8a2d3bc9e75b762c6b0beff732ee93365 Mon Sep 17 00:00:00 2001 From: anakin87 Date: Wed, 29 Nov 2023 15:47:29 +0100 Subject: [PATCH 3/5] fix error --- .github/workflows/unstructured_fileconverter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unstructured_fileconverter.yml b/.github/workflows/unstructured_fileconverter.yml index d91ac3703..5765a311e 100644 --- a/.github/workflows/unstructured_fileconverter.yml +++ b/.github/workflows/unstructured_fileconverter.yml @@ -1,6 +1,6 @@ # This workflow comes from https://github.com/ofek/hatch-mypyc # https://github.com/ofek/hatch-mypyc/blob/5a198c0ba8660494d02716cfc9d79ce4adfb1442/.github/workflows/test.yml -name: unstructured / fileconverter +name: Test / unstructured / fileconverter on: schedule: From eb75302ee1d2588b136ece1c5f0bf5fafc394988 Mon Sep 17 00:00:00 2001 From: anakin87 Date: Wed, 29 Nov 2023 15:57:34 +0100 Subject: [PATCH 4/5] workflows --- .github/workflows/chroma.yml | 4 ++-- .github/workflows/elasticsearch.yml | 8 ++++---- .github/workflows/instructor_embedders.yml | 4 ++-- .github/workflows/nodes_text2speech.yml | 4 ++-- {chroma => integrations/chroma}/.gitignore | 0 {chroma => integrations/chroma}/LICENSE | 0 {chroma => integrations/chroma}/README.md | 0 .../chroma}/example/data/usr_01.txt | 0 .../chroma}/example/data/usr_02.txt | 0 .../chroma}/example/data/usr_03.txt | 0 .../chroma}/example/data/usr_04.txt | 0 .../chroma}/example/data/usr_05.txt | 0 .../chroma}/example/data/usr_06.txt | 0 .../chroma}/example/data/usr_07.txt | 0 .../chroma}/example/data/usr_08.txt | 0 .../chroma}/example/data/usr_09.txt | 0 .../chroma}/example/data/usr_10.txt | 0 .../chroma}/example/data/usr_11.txt | 0 .../chroma}/example/data/usr_12.txt | 0 .../chroma}/example/data/usr_20.txt | 0 .../chroma}/example/data/usr_21.txt | 0 .../chroma}/example/data/usr_22.txt | 0 .../chroma}/example/data/usr_23.txt | 0 .../chroma}/example/data/usr_24.txt | 0 .../chroma}/example/data/usr_25.txt | 0 .../chroma}/example/data/usr_26.txt | 0 .../chroma}/example/data/usr_27.txt | 0 .../chroma}/example/data/usr_28.txt | 0 .../chroma}/example/data/usr_29.txt | 0 .../chroma}/example/data/usr_30.txt | 0 .../chroma}/example/data/usr_31.txt | 0 .../chroma}/example/data/usr_32.txt | 0 .../chroma}/example/data/usr_40.txt | 0 .../chroma}/example/data/usr_41.txt | 0 .../chroma}/example/data/usr_42.txt | 0 .../chroma}/example/data/usr_43.txt | 0 .../chroma}/example/data/usr_44.txt | 0 .../chroma}/example/data/usr_45.txt | 0 .../chroma}/example/data/usr_46.txt | 0 .../chroma}/example/data/usr_50.txt | 0 .../chroma}/example/data/usr_51.txt | 0 .../chroma}/example/data/usr_52.txt | 0 .../chroma}/example/data/usr_90.txt | 0 {chroma => integrations/chroma}/example/example.py | 0 {chroma => integrations/chroma}/pyproject.toml | 0 .../chroma}/src/chroma_haystack/__about__.py | 0 .../chroma}/src/chroma_haystack/__init__.py | 0 .../chroma}/src/chroma_haystack/document_store.py | 0 .../chroma}/src/chroma_haystack/errors.py | 0 .../chroma}/src/chroma_haystack/retriever.py | 0 .../chroma}/src/chroma_haystack/utils.py | 0 {chroma => integrations/chroma}/tests/__init__.py | 0 .../chroma}/tests/test_document_store.py | 0 .../chroma}/tests/test_retriever.py | 0 .../elasticsearch}/.gitignore | 0 .../elasticsearch}/LICENSE | 0 .../elasticsearch}/README.md | 0 .../elasticsearch}/docker-compose.yml | 0 .../elasticsearch}/pyproject.toml | 0 .../src/elasticsearch_haystack/__about__.py | 0 .../src/elasticsearch_haystack/__init__.py | 0 .../src/elasticsearch_haystack/bm25_retriever.py | 0 .../src/elasticsearch_haystack/document_store.py | 0 .../elasticsearch_haystack/embedding_retriever.py | 0 .../src/elasticsearch_haystack/filters.py | 0 .../elasticsearch}/tests/__init__.py | 0 .../elasticsearch}/tests/test_bm25_retriever.py | 0 .../elasticsearch}/tests/test_document_store.py | 0 .../tests/test_embedding_retriever.py | 0 .../elasticsearch}/tests/test_filters.py | 0 .../instructor-embedders}/LICENSE.txt | 0 .../instructor-embedders}/README.md | 0 .../instructor_embedders/__about__.py | 0 .../instructor_embedders/__init__.py | 0 .../embedding_backend/__init__.py | 0 .../embedding_backend/instructor_backend.py | 0 .../instructor_document_embedder.py | 0 .../instructor_text_embedder.py | 0 .../instructor-embedders}/pyproject.toml | 0 .../instructor-embedders}/tests/__init__.py | 0 .../tests/test_instructor_backend.py | 0 .../tests/test_instructor_document_embedder.py | 0 .../tests/test_instructor_embedders.py | 0 .../tests/test_instructor_text_embedder.py | 0 {nodes => integrations/nodes}/README.md | 0 {nodes => integrations/nodes}/hatch.toml | 0 .../nodes}/text2speech/LICENSE.txt | 0 {nodes => integrations/nodes}/text2speech/README.md | 0 .../nodes}/text2speech/pyproject.toml | 0 .../nodes}/text2speech/tests/__init__.py | 0 .../nodes}/text2speech/tests/samples/answer.wav | Bin .../samples/the context for this answer is here.wav | Bin .../samples/this is the content of the document.wav | Bin .../nodes}/text2speech/tests/test_nodes.py | 0 .../nodes}/text2speech/text2speech/__about__.py | 0 .../nodes}/text2speech/text2speech/__init__.py | 0 .../text2speech/text2speech/answer_to_speech.py | 0 .../text2speech/text2speech/document_to_speech.py | 0 .../nodes}/text2speech/text2speech/errors.py | 0 .../text2speech/text2speech/utils/__init__.py | 0 .../text2speech/text2speech/utils/text_to_speech.py | 0 .../unstructured}/fileconverter/LICENSE | 0 .../unstructured}/fileconverter/README.md | 0 .../unstructured}/fileconverter/pyproject.toml | 0 .../__about__.py | 0 .../unstructured_fileconverter_haystack/__init__.py | 0 .../fileconverter.py | 0 .../fileconverter/tests/samples/sample_pdf.pdf | Bin .../fileconverter/tests/test_fileconverter.py | 0 109 files changed, 10 insertions(+), 10 deletions(-) rename {chroma => integrations/chroma}/.gitignore (100%) rename {chroma => integrations/chroma}/LICENSE (100%) rename {chroma => integrations/chroma}/README.md (100%) rename {chroma => integrations/chroma}/example/data/usr_01.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_02.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_03.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_04.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_05.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_06.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_07.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_08.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_09.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_10.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_11.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_12.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_20.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_21.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_22.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_23.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_24.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_25.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_26.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_27.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_28.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_29.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_30.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_31.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_32.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_40.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_41.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_42.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_43.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_44.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_45.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_46.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_50.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_51.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_52.txt (100%) rename {chroma => integrations/chroma}/example/data/usr_90.txt (100%) rename {chroma => integrations/chroma}/example/example.py (100%) rename {chroma => integrations/chroma}/pyproject.toml (100%) rename {chroma => integrations/chroma}/src/chroma_haystack/__about__.py (100%) rename {chroma => integrations/chroma}/src/chroma_haystack/__init__.py (100%) rename {chroma => integrations/chroma}/src/chroma_haystack/document_store.py (100%) rename {chroma => integrations/chroma}/src/chroma_haystack/errors.py (100%) rename {chroma => integrations/chroma}/src/chroma_haystack/retriever.py (100%) rename {chroma => integrations/chroma}/src/chroma_haystack/utils.py (100%) rename {chroma => integrations/chroma}/tests/__init__.py (100%) rename {chroma => integrations/chroma}/tests/test_document_store.py (100%) rename {chroma => integrations/chroma}/tests/test_retriever.py (100%) rename {elasticsearch => integrations/elasticsearch}/.gitignore (100%) rename {elasticsearch => integrations/elasticsearch}/LICENSE (100%) rename {elasticsearch => integrations/elasticsearch}/README.md (100%) rename {elasticsearch => integrations/elasticsearch}/docker-compose.yml (100%) rename {elasticsearch => integrations/elasticsearch}/pyproject.toml (100%) rename {elasticsearch => integrations/elasticsearch}/src/elasticsearch_haystack/__about__.py (100%) rename {elasticsearch => integrations/elasticsearch}/src/elasticsearch_haystack/__init__.py (100%) rename {elasticsearch => integrations/elasticsearch}/src/elasticsearch_haystack/bm25_retriever.py (100%) rename {elasticsearch => integrations/elasticsearch}/src/elasticsearch_haystack/document_store.py (100%) rename {elasticsearch => integrations/elasticsearch}/src/elasticsearch_haystack/embedding_retriever.py (100%) rename {elasticsearch => integrations/elasticsearch}/src/elasticsearch_haystack/filters.py (100%) rename {elasticsearch => integrations/elasticsearch}/tests/__init__.py (100%) rename {elasticsearch => integrations/elasticsearch}/tests/test_bm25_retriever.py (100%) rename {elasticsearch => integrations/elasticsearch}/tests/test_document_store.py (100%) rename {elasticsearch => integrations/elasticsearch}/tests/test_embedding_retriever.py (100%) rename {elasticsearch => integrations/elasticsearch}/tests/test_filters.py (100%) rename {instructor-embedders => integrations/instructor-embedders}/LICENSE.txt (100%) rename {instructor-embedders => integrations/instructor-embedders}/README.md (100%) rename {instructor-embedders => integrations/instructor-embedders}/instructor_embedders/__about__.py (100%) rename {instructor-embedders => integrations/instructor-embedders}/instructor_embedders/__init__.py (100%) rename {instructor-embedders => integrations/instructor-embedders}/instructor_embedders/embedding_backend/__init__.py (100%) rename {instructor-embedders => integrations/instructor-embedders}/instructor_embedders/embedding_backend/instructor_backend.py (100%) rename {instructor-embedders => integrations/instructor-embedders}/instructor_embedders/instructor_document_embedder.py (100%) rename {instructor-embedders => integrations/instructor-embedders}/instructor_embedders/instructor_text_embedder.py (100%) rename {instructor-embedders => integrations/instructor-embedders}/pyproject.toml (100%) rename {instructor-embedders => integrations/instructor-embedders}/tests/__init__.py (100%) rename {instructor-embedders => integrations/instructor-embedders}/tests/test_instructor_backend.py (100%) rename {instructor-embedders => integrations/instructor-embedders}/tests/test_instructor_document_embedder.py (100%) rename {instructor-embedders => integrations/instructor-embedders}/tests/test_instructor_embedders.py (100%) rename {instructor-embedders => integrations/instructor-embedders}/tests/test_instructor_text_embedder.py (100%) rename {nodes => integrations/nodes}/README.md (100%) rename {nodes => integrations/nodes}/hatch.toml (100%) rename {nodes => integrations/nodes}/text2speech/LICENSE.txt (100%) rename {nodes => integrations/nodes}/text2speech/README.md (100%) rename {nodes => integrations/nodes}/text2speech/pyproject.toml (100%) rename {nodes => integrations/nodes}/text2speech/tests/__init__.py (100%) rename {nodes => integrations/nodes}/text2speech/tests/samples/answer.wav (100%) rename {nodes => integrations/nodes}/text2speech/tests/samples/the context for this answer is here.wav (100%) rename {nodes => integrations/nodes}/text2speech/tests/samples/this is the content of the document.wav (100%) rename {nodes => integrations/nodes}/text2speech/tests/test_nodes.py (100%) rename {nodes => integrations/nodes}/text2speech/text2speech/__about__.py (100%) rename {nodes => integrations/nodes}/text2speech/text2speech/__init__.py (100%) rename {nodes => integrations/nodes}/text2speech/text2speech/answer_to_speech.py (100%) rename {nodes => integrations/nodes}/text2speech/text2speech/document_to_speech.py (100%) rename {nodes => integrations/nodes}/text2speech/text2speech/errors.py (100%) rename {nodes => integrations/nodes}/text2speech/text2speech/utils/__init__.py (100%) rename {nodes => integrations/nodes}/text2speech/text2speech/utils/text_to_speech.py (100%) rename {unstructured => integrations/unstructured}/fileconverter/LICENSE (100%) rename {unstructured => integrations/unstructured}/fileconverter/README.md (100%) rename {unstructured => integrations/unstructured}/fileconverter/pyproject.toml (100%) rename {unstructured => integrations/unstructured}/fileconverter/src/unstructured_fileconverter_haystack/__about__.py (100%) rename {unstructured => integrations/unstructured}/fileconverter/src/unstructured_fileconverter_haystack/__init__.py (100%) rename {unstructured => integrations/unstructured}/fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py (100%) rename {unstructured => integrations/unstructured}/fileconverter/tests/samples/sample_pdf.pdf (100%) rename {unstructured => integrations/unstructured}/fileconverter/tests/test_fileconverter.py (100%) diff --git a/.github/workflows/chroma.yml b/.github/workflows/chroma.yml index 2f6d90c23..88020818e 100644 --- a/.github/workflows/chroma.yml +++ b/.github/workflows/chroma.yml @@ -7,12 +7,12 @@ on: - cron: "0 0 * * *" pull_request: paths: - - 'chroma/**' + - 'integrations/chroma/**' - '.github/workflows/chroma.yml' defaults: run: - working-directory: chroma + working-directory: integrations/chroma concurrency: group: chroma-${{ github.head_ref }} diff --git a/.github/workflows/elasticsearch.yml b/.github/workflows/elasticsearch.yml index ba8629543..08254a58b 100644 --- a/.github/workflows/elasticsearch.yml +++ b/.github/workflows/elasticsearch.yml @@ -7,7 +7,7 @@ on: - cron: "0 0 * * *" pull_request: paths: - - "elasticsearch/**" + - "integrations/elasticsearch/**" - ".github/workflows/elasticsearch.yml" concurrency: @@ -40,14 +40,14 @@ jobs: run: pip install --upgrade hatch - name: Lint - working-directory: elasticsearch + working-directory: integrations/elasticsearch if: matrix.python-version == '3.9' run: hatch run lint:all - name: Run ElasticSearch container - working-directory: elasticsearch + working-directory: integrations/elasticsearch run: docker-compose up -d - name: Run tests - working-directory: elasticsearch + working-directory: integrations/elasticsearch run: hatch run cov diff --git a/.github/workflows/instructor_embedders.yml b/.github/workflows/instructor_embedders.yml index 03438655e..293c6c142 100644 --- a/.github/workflows/instructor_embedders.yml +++ b/.github/workflows/instructor_embedders.yml @@ -5,7 +5,7 @@ on: - cron: "0 0 * * *" pull_request: paths: - - 'instructor-embedders/**' + - 'integrations/instructor-embedders/**' - '.github/workflows/instructor_embedders.yml' defaults: @@ -27,7 +27,7 @@ jobs: - name: Ruff uses: chartboost/ruff-action@v1 with: - src: instructor-embedders + src: integrations/instructor-embedders - name: Install instructor-embedders run: | diff --git a/.github/workflows/nodes_text2speech.yml b/.github/workflows/nodes_text2speech.yml index 74329d53c..315215d0d 100644 --- a/.github/workflows/nodes_text2speech.yml +++ b/.github/workflows/nodes_text2speech.yml @@ -5,12 +5,12 @@ on: - cron: "0 0 * * *" pull_request: paths: - - 'nodes/text2speech/**' + - 'integrations/nodes/text2speech/**' - '.github/workflows/nodes_text2speech.yml' defaults: run: - working-directory: nodes/text2speech + working-directory: integrations/nodes/text2speech jobs: test: diff --git a/chroma/.gitignore b/integrations/chroma/.gitignore similarity index 100% rename from chroma/.gitignore rename to integrations/chroma/.gitignore diff --git a/chroma/LICENSE b/integrations/chroma/LICENSE similarity index 100% rename from chroma/LICENSE rename to integrations/chroma/LICENSE diff --git a/chroma/README.md b/integrations/chroma/README.md similarity index 100% rename from chroma/README.md rename to integrations/chroma/README.md diff --git a/chroma/example/data/usr_01.txt b/integrations/chroma/example/data/usr_01.txt similarity index 100% rename from chroma/example/data/usr_01.txt rename to integrations/chroma/example/data/usr_01.txt diff --git a/chroma/example/data/usr_02.txt b/integrations/chroma/example/data/usr_02.txt similarity index 100% rename from chroma/example/data/usr_02.txt rename to integrations/chroma/example/data/usr_02.txt diff --git a/chroma/example/data/usr_03.txt b/integrations/chroma/example/data/usr_03.txt similarity index 100% rename from chroma/example/data/usr_03.txt rename to integrations/chroma/example/data/usr_03.txt diff --git a/chroma/example/data/usr_04.txt b/integrations/chroma/example/data/usr_04.txt similarity index 100% rename from chroma/example/data/usr_04.txt rename to integrations/chroma/example/data/usr_04.txt diff --git a/chroma/example/data/usr_05.txt b/integrations/chroma/example/data/usr_05.txt similarity index 100% rename from chroma/example/data/usr_05.txt rename to integrations/chroma/example/data/usr_05.txt diff --git a/chroma/example/data/usr_06.txt b/integrations/chroma/example/data/usr_06.txt similarity index 100% rename from chroma/example/data/usr_06.txt rename to integrations/chroma/example/data/usr_06.txt diff --git a/chroma/example/data/usr_07.txt b/integrations/chroma/example/data/usr_07.txt similarity index 100% rename from chroma/example/data/usr_07.txt rename to integrations/chroma/example/data/usr_07.txt diff --git a/chroma/example/data/usr_08.txt b/integrations/chroma/example/data/usr_08.txt similarity index 100% rename from chroma/example/data/usr_08.txt rename to integrations/chroma/example/data/usr_08.txt diff --git a/chroma/example/data/usr_09.txt b/integrations/chroma/example/data/usr_09.txt similarity index 100% rename from chroma/example/data/usr_09.txt rename to integrations/chroma/example/data/usr_09.txt diff --git a/chroma/example/data/usr_10.txt b/integrations/chroma/example/data/usr_10.txt similarity index 100% rename from chroma/example/data/usr_10.txt rename to integrations/chroma/example/data/usr_10.txt diff --git a/chroma/example/data/usr_11.txt b/integrations/chroma/example/data/usr_11.txt similarity index 100% rename from chroma/example/data/usr_11.txt rename to integrations/chroma/example/data/usr_11.txt diff --git a/chroma/example/data/usr_12.txt b/integrations/chroma/example/data/usr_12.txt similarity index 100% rename from chroma/example/data/usr_12.txt rename to integrations/chroma/example/data/usr_12.txt diff --git a/chroma/example/data/usr_20.txt b/integrations/chroma/example/data/usr_20.txt similarity index 100% rename from chroma/example/data/usr_20.txt rename to integrations/chroma/example/data/usr_20.txt diff --git a/chroma/example/data/usr_21.txt b/integrations/chroma/example/data/usr_21.txt similarity index 100% rename from chroma/example/data/usr_21.txt rename to integrations/chroma/example/data/usr_21.txt diff --git a/chroma/example/data/usr_22.txt b/integrations/chroma/example/data/usr_22.txt similarity index 100% rename from chroma/example/data/usr_22.txt rename to integrations/chroma/example/data/usr_22.txt diff --git a/chroma/example/data/usr_23.txt b/integrations/chroma/example/data/usr_23.txt similarity index 100% rename from chroma/example/data/usr_23.txt rename to integrations/chroma/example/data/usr_23.txt diff --git a/chroma/example/data/usr_24.txt b/integrations/chroma/example/data/usr_24.txt similarity index 100% rename from chroma/example/data/usr_24.txt rename to integrations/chroma/example/data/usr_24.txt diff --git a/chroma/example/data/usr_25.txt b/integrations/chroma/example/data/usr_25.txt similarity index 100% rename from chroma/example/data/usr_25.txt rename to integrations/chroma/example/data/usr_25.txt diff --git a/chroma/example/data/usr_26.txt b/integrations/chroma/example/data/usr_26.txt similarity index 100% rename from chroma/example/data/usr_26.txt rename to integrations/chroma/example/data/usr_26.txt diff --git a/chroma/example/data/usr_27.txt b/integrations/chroma/example/data/usr_27.txt similarity index 100% rename from chroma/example/data/usr_27.txt rename to integrations/chroma/example/data/usr_27.txt diff --git a/chroma/example/data/usr_28.txt b/integrations/chroma/example/data/usr_28.txt similarity index 100% rename from chroma/example/data/usr_28.txt rename to integrations/chroma/example/data/usr_28.txt diff --git a/chroma/example/data/usr_29.txt b/integrations/chroma/example/data/usr_29.txt similarity index 100% rename from chroma/example/data/usr_29.txt rename to integrations/chroma/example/data/usr_29.txt diff --git a/chroma/example/data/usr_30.txt b/integrations/chroma/example/data/usr_30.txt similarity index 100% rename from chroma/example/data/usr_30.txt rename to integrations/chroma/example/data/usr_30.txt diff --git a/chroma/example/data/usr_31.txt b/integrations/chroma/example/data/usr_31.txt similarity index 100% rename from chroma/example/data/usr_31.txt rename to integrations/chroma/example/data/usr_31.txt diff --git a/chroma/example/data/usr_32.txt b/integrations/chroma/example/data/usr_32.txt similarity index 100% rename from chroma/example/data/usr_32.txt rename to integrations/chroma/example/data/usr_32.txt diff --git a/chroma/example/data/usr_40.txt b/integrations/chroma/example/data/usr_40.txt similarity index 100% rename from chroma/example/data/usr_40.txt rename to integrations/chroma/example/data/usr_40.txt diff --git a/chroma/example/data/usr_41.txt b/integrations/chroma/example/data/usr_41.txt similarity index 100% rename from chroma/example/data/usr_41.txt rename to integrations/chroma/example/data/usr_41.txt diff --git a/chroma/example/data/usr_42.txt b/integrations/chroma/example/data/usr_42.txt similarity index 100% rename from chroma/example/data/usr_42.txt rename to integrations/chroma/example/data/usr_42.txt diff --git a/chroma/example/data/usr_43.txt b/integrations/chroma/example/data/usr_43.txt similarity index 100% rename from chroma/example/data/usr_43.txt rename to integrations/chroma/example/data/usr_43.txt diff --git a/chroma/example/data/usr_44.txt b/integrations/chroma/example/data/usr_44.txt similarity index 100% rename from chroma/example/data/usr_44.txt rename to integrations/chroma/example/data/usr_44.txt diff --git a/chroma/example/data/usr_45.txt b/integrations/chroma/example/data/usr_45.txt similarity index 100% rename from chroma/example/data/usr_45.txt rename to integrations/chroma/example/data/usr_45.txt diff --git a/chroma/example/data/usr_46.txt b/integrations/chroma/example/data/usr_46.txt similarity index 100% rename from chroma/example/data/usr_46.txt rename to integrations/chroma/example/data/usr_46.txt diff --git a/chroma/example/data/usr_50.txt b/integrations/chroma/example/data/usr_50.txt similarity index 100% rename from chroma/example/data/usr_50.txt rename to integrations/chroma/example/data/usr_50.txt diff --git a/chroma/example/data/usr_51.txt b/integrations/chroma/example/data/usr_51.txt similarity index 100% rename from chroma/example/data/usr_51.txt rename to integrations/chroma/example/data/usr_51.txt diff --git a/chroma/example/data/usr_52.txt b/integrations/chroma/example/data/usr_52.txt similarity index 100% rename from chroma/example/data/usr_52.txt rename to integrations/chroma/example/data/usr_52.txt diff --git a/chroma/example/data/usr_90.txt b/integrations/chroma/example/data/usr_90.txt similarity index 100% rename from chroma/example/data/usr_90.txt rename to integrations/chroma/example/data/usr_90.txt diff --git a/chroma/example/example.py b/integrations/chroma/example/example.py similarity index 100% rename from chroma/example/example.py rename to integrations/chroma/example/example.py diff --git a/chroma/pyproject.toml b/integrations/chroma/pyproject.toml similarity index 100% rename from chroma/pyproject.toml rename to integrations/chroma/pyproject.toml diff --git a/chroma/src/chroma_haystack/__about__.py b/integrations/chroma/src/chroma_haystack/__about__.py similarity index 100% rename from chroma/src/chroma_haystack/__about__.py rename to integrations/chroma/src/chroma_haystack/__about__.py diff --git a/chroma/src/chroma_haystack/__init__.py b/integrations/chroma/src/chroma_haystack/__init__.py similarity index 100% rename from chroma/src/chroma_haystack/__init__.py rename to integrations/chroma/src/chroma_haystack/__init__.py diff --git a/chroma/src/chroma_haystack/document_store.py b/integrations/chroma/src/chroma_haystack/document_store.py similarity index 100% rename from chroma/src/chroma_haystack/document_store.py rename to integrations/chroma/src/chroma_haystack/document_store.py diff --git a/chroma/src/chroma_haystack/errors.py b/integrations/chroma/src/chroma_haystack/errors.py similarity index 100% rename from chroma/src/chroma_haystack/errors.py rename to integrations/chroma/src/chroma_haystack/errors.py diff --git a/chroma/src/chroma_haystack/retriever.py b/integrations/chroma/src/chroma_haystack/retriever.py similarity index 100% rename from chroma/src/chroma_haystack/retriever.py rename to integrations/chroma/src/chroma_haystack/retriever.py diff --git a/chroma/src/chroma_haystack/utils.py b/integrations/chroma/src/chroma_haystack/utils.py similarity index 100% rename from chroma/src/chroma_haystack/utils.py rename to integrations/chroma/src/chroma_haystack/utils.py diff --git a/chroma/tests/__init__.py b/integrations/chroma/tests/__init__.py similarity index 100% rename from chroma/tests/__init__.py rename to integrations/chroma/tests/__init__.py diff --git a/chroma/tests/test_document_store.py b/integrations/chroma/tests/test_document_store.py similarity index 100% rename from chroma/tests/test_document_store.py rename to integrations/chroma/tests/test_document_store.py diff --git a/chroma/tests/test_retriever.py b/integrations/chroma/tests/test_retriever.py similarity index 100% rename from chroma/tests/test_retriever.py rename to integrations/chroma/tests/test_retriever.py diff --git a/elasticsearch/.gitignore b/integrations/elasticsearch/.gitignore similarity index 100% rename from elasticsearch/.gitignore rename to integrations/elasticsearch/.gitignore diff --git a/elasticsearch/LICENSE b/integrations/elasticsearch/LICENSE similarity index 100% rename from elasticsearch/LICENSE rename to integrations/elasticsearch/LICENSE diff --git a/elasticsearch/README.md b/integrations/elasticsearch/README.md similarity index 100% rename from elasticsearch/README.md rename to integrations/elasticsearch/README.md diff --git a/elasticsearch/docker-compose.yml b/integrations/elasticsearch/docker-compose.yml similarity index 100% rename from elasticsearch/docker-compose.yml rename to integrations/elasticsearch/docker-compose.yml diff --git a/elasticsearch/pyproject.toml b/integrations/elasticsearch/pyproject.toml similarity index 100% rename from elasticsearch/pyproject.toml rename to integrations/elasticsearch/pyproject.toml diff --git a/elasticsearch/src/elasticsearch_haystack/__about__.py b/integrations/elasticsearch/src/elasticsearch_haystack/__about__.py similarity index 100% rename from elasticsearch/src/elasticsearch_haystack/__about__.py rename to integrations/elasticsearch/src/elasticsearch_haystack/__about__.py diff --git a/elasticsearch/src/elasticsearch_haystack/__init__.py b/integrations/elasticsearch/src/elasticsearch_haystack/__init__.py similarity index 100% rename from elasticsearch/src/elasticsearch_haystack/__init__.py rename to integrations/elasticsearch/src/elasticsearch_haystack/__init__.py diff --git a/elasticsearch/src/elasticsearch_haystack/bm25_retriever.py b/integrations/elasticsearch/src/elasticsearch_haystack/bm25_retriever.py similarity index 100% rename from elasticsearch/src/elasticsearch_haystack/bm25_retriever.py rename to integrations/elasticsearch/src/elasticsearch_haystack/bm25_retriever.py diff --git a/elasticsearch/src/elasticsearch_haystack/document_store.py b/integrations/elasticsearch/src/elasticsearch_haystack/document_store.py similarity index 100% rename from elasticsearch/src/elasticsearch_haystack/document_store.py rename to integrations/elasticsearch/src/elasticsearch_haystack/document_store.py diff --git a/elasticsearch/src/elasticsearch_haystack/embedding_retriever.py b/integrations/elasticsearch/src/elasticsearch_haystack/embedding_retriever.py similarity index 100% rename from elasticsearch/src/elasticsearch_haystack/embedding_retriever.py rename to integrations/elasticsearch/src/elasticsearch_haystack/embedding_retriever.py diff --git a/elasticsearch/src/elasticsearch_haystack/filters.py b/integrations/elasticsearch/src/elasticsearch_haystack/filters.py similarity index 100% rename from elasticsearch/src/elasticsearch_haystack/filters.py rename to integrations/elasticsearch/src/elasticsearch_haystack/filters.py diff --git a/elasticsearch/tests/__init__.py b/integrations/elasticsearch/tests/__init__.py similarity index 100% rename from elasticsearch/tests/__init__.py rename to integrations/elasticsearch/tests/__init__.py diff --git a/elasticsearch/tests/test_bm25_retriever.py b/integrations/elasticsearch/tests/test_bm25_retriever.py similarity index 100% rename from elasticsearch/tests/test_bm25_retriever.py rename to integrations/elasticsearch/tests/test_bm25_retriever.py diff --git a/elasticsearch/tests/test_document_store.py b/integrations/elasticsearch/tests/test_document_store.py similarity index 100% rename from elasticsearch/tests/test_document_store.py rename to integrations/elasticsearch/tests/test_document_store.py diff --git a/elasticsearch/tests/test_embedding_retriever.py b/integrations/elasticsearch/tests/test_embedding_retriever.py similarity index 100% rename from elasticsearch/tests/test_embedding_retriever.py rename to integrations/elasticsearch/tests/test_embedding_retriever.py diff --git a/elasticsearch/tests/test_filters.py b/integrations/elasticsearch/tests/test_filters.py similarity index 100% rename from elasticsearch/tests/test_filters.py rename to integrations/elasticsearch/tests/test_filters.py diff --git a/instructor-embedders/LICENSE.txt b/integrations/instructor-embedders/LICENSE.txt similarity index 100% rename from instructor-embedders/LICENSE.txt rename to integrations/instructor-embedders/LICENSE.txt diff --git a/instructor-embedders/README.md b/integrations/instructor-embedders/README.md similarity index 100% rename from instructor-embedders/README.md rename to integrations/instructor-embedders/README.md diff --git a/instructor-embedders/instructor_embedders/__about__.py b/integrations/instructor-embedders/instructor_embedders/__about__.py similarity index 100% rename from instructor-embedders/instructor_embedders/__about__.py rename to integrations/instructor-embedders/instructor_embedders/__about__.py diff --git a/instructor-embedders/instructor_embedders/__init__.py b/integrations/instructor-embedders/instructor_embedders/__init__.py similarity index 100% rename from instructor-embedders/instructor_embedders/__init__.py rename to integrations/instructor-embedders/instructor_embedders/__init__.py diff --git a/instructor-embedders/instructor_embedders/embedding_backend/__init__.py b/integrations/instructor-embedders/instructor_embedders/embedding_backend/__init__.py similarity index 100% rename from instructor-embedders/instructor_embedders/embedding_backend/__init__.py rename to integrations/instructor-embedders/instructor_embedders/embedding_backend/__init__.py diff --git a/instructor-embedders/instructor_embedders/embedding_backend/instructor_backend.py b/integrations/instructor-embedders/instructor_embedders/embedding_backend/instructor_backend.py similarity index 100% rename from instructor-embedders/instructor_embedders/embedding_backend/instructor_backend.py rename to integrations/instructor-embedders/instructor_embedders/embedding_backend/instructor_backend.py diff --git a/instructor-embedders/instructor_embedders/instructor_document_embedder.py b/integrations/instructor-embedders/instructor_embedders/instructor_document_embedder.py similarity index 100% rename from instructor-embedders/instructor_embedders/instructor_document_embedder.py rename to integrations/instructor-embedders/instructor_embedders/instructor_document_embedder.py diff --git a/instructor-embedders/instructor_embedders/instructor_text_embedder.py b/integrations/instructor-embedders/instructor_embedders/instructor_text_embedder.py similarity index 100% rename from instructor-embedders/instructor_embedders/instructor_text_embedder.py rename to integrations/instructor-embedders/instructor_embedders/instructor_text_embedder.py diff --git a/instructor-embedders/pyproject.toml b/integrations/instructor-embedders/pyproject.toml similarity index 100% rename from instructor-embedders/pyproject.toml rename to integrations/instructor-embedders/pyproject.toml diff --git a/instructor-embedders/tests/__init__.py b/integrations/instructor-embedders/tests/__init__.py similarity index 100% rename from instructor-embedders/tests/__init__.py rename to integrations/instructor-embedders/tests/__init__.py diff --git a/instructor-embedders/tests/test_instructor_backend.py b/integrations/instructor-embedders/tests/test_instructor_backend.py similarity index 100% rename from instructor-embedders/tests/test_instructor_backend.py rename to integrations/instructor-embedders/tests/test_instructor_backend.py diff --git a/instructor-embedders/tests/test_instructor_document_embedder.py b/integrations/instructor-embedders/tests/test_instructor_document_embedder.py similarity index 100% rename from instructor-embedders/tests/test_instructor_document_embedder.py rename to integrations/instructor-embedders/tests/test_instructor_document_embedder.py diff --git a/instructor-embedders/tests/test_instructor_embedders.py b/integrations/instructor-embedders/tests/test_instructor_embedders.py similarity index 100% rename from instructor-embedders/tests/test_instructor_embedders.py rename to integrations/instructor-embedders/tests/test_instructor_embedders.py diff --git a/instructor-embedders/tests/test_instructor_text_embedder.py b/integrations/instructor-embedders/tests/test_instructor_text_embedder.py similarity index 100% rename from instructor-embedders/tests/test_instructor_text_embedder.py rename to integrations/instructor-embedders/tests/test_instructor_text_embedder.py diff --git a/nodes/README.md b/integrations/nodes/README.md similarity index 100% rename from nodes/README.md rename to integrations/nodes/README.md diff --git a/nodes/hatch.toml b/integrations/nodes/hatch.toml similarity index 100% rename from nodes/hatch.toml rename to integrations/nodes/hatch.toml diff --git a/nodes/text2speech/LICENSE.txt b/integrations/nodes/text2speech/LICENSE.txt similarity index 100% rename from nodes/text2speech/LICENSE.txt rename to integrations/nodes/text2speech/LICENSE.txt diff --git a/nodes/text2speech/README.md b/integrations/nodes/text2speech/README.md similarity index 100% rename from nodes/text2speech/README.md rename to integrations/nodes/text2speech/README.md diff --git a/nodes/text2speech/pyproject.toml b/integrations/nodes/text2speech/pyproject.toml similarity index 100% rename from nodes/text2speech/pyproject.toml rename to integrations/nodes/text2speech/pyproject.toml diff --git a/nodes/text2speech/tests/__init__.py b/integrations/nodes/text2speech/tests/__init__.py similarity index 100% rename from nodes/text2speech/tests/__init__.py rename to integrations/nodes/text2speech/tests/__init__.py diff --git a/nodes/text2speech/tests/samples/answer.wav b/integrations/nodes/text2speech/tests/samples/answer.wav similarity index 100% rename from nodes/text2speech/tests/samples/answer.wav rename to integrations/nodes/text2speech/tests/samples/answer.wav diff --git a/nodes/text2speech/tests/samples/the context for this answer is here.wav b/integrations/nodes/text2speech/tests/samples/the context for this answer is here.wav similarity index 100% rename from nodes/text2speech/tests/samples/the context for this answer is here.wav rename to integrations/nodes/text2speech/tests/samples/the context for this answer is here.wav diff --git a/nodes/text2speech/tests/samples/this is the content of the document.wav b/integrations/nodes/text2speech/tests/samples/this is the content of the document.wav similarity index 100% rename from nodes/text2speech/tests/samples/this is the content of the document.wav rename to integrations/nodes/text2speech/tests/samples/this is the content of the document.wav diff --git a/nodes/text2speech/tests/test_nodes.py b/integrations/nodes/text2speech/tests/test_nodes.py similarity index 100% rename from nodes/text2speech/tests/test_nodes.py rename to integrations/nodes/text2speech/tests/test_nodes.py diff --git a/nodes/text2speech/text2speech/__about__.py b/integrations/nodes/text2speech/text2speech/__about__.py similarity index 100% rename from nodes/text2speech/text2speech/__about__.py rename to integrations/nodes/text2speech/text2speech/__about__.py diff --git a/nodes/text2speech/text2speech/__init__.py b/integrations/nodes/text2speech/text2speech/__init__.py similarity index 100% rename from nodes/text2speech/text2speech/__init__.py rename to integrations/nodes/text2speech/text2speech/__init__.py diff --git a/nodes/text2speech/text2speech/answer_to_speech.py b/integrations/nodes/text2speech/text2speech/answer_to_speech.py similarity index 100% rename from nodes/text2speech/text2speech/answer_to_speech.py rename to integrations/nodes/text2speech/text2speech/answer_to_speech.py diff --git a/nodes/text2speech/text2speech/document_to_speech.py b/integrations/nodes/text2speech/text2speech/document_to_speech.py similarity index 100% rename from nodes/text2speech/text2speech/document_to_speech.py rename to integrations/nodes/text2speech/text2speech/document_to_speech.py diff --git a/nodes/text2speech/text2speech/errors.py b/integrations/nodes/text2speech/text2speech/errors.py similarity index 100% rename from nodes/text2speech/text2speech/errors.py rename to integrations/nodes/text2speech/text2speech/errors.py diff --git a/nodes/text2speech/text2speech/utils/__init__.py b/integrations/nodes/text2speech/text2speech/utils/__init__.py similarity index 100% rename from nodes/text2speech/text2speech/utils/__init__.py rename to integrations/nodes/text2speech/text2speech/utils/__init__.py diff --git a/nodes/text2speech/text2speech/utils/text_to_speech.py b/integrations/nodes/text2speech/text2speech/utils/text_to_speech.py similarity index 100% rename from nodes/text2speech/text2speech/utils/text_to_speech.py rename to integrations/nodes/text2speech/text2speech/utils/text_to_speech.py diff --git a/unstructured/fileconverter/LICENSE b/integrations/unstructured/fileconverter/LICENSE similarity index 100% rename from unstructured/fileconverter/LICENSE rename to integrations/unstructured/fileconverter/LICENSE diff --git a/unstructured/fileconverter/README.md b/integrations/unstructured/fileconverter/README.md similarity index 100% rename from unstructured/fileconverter/README.md rename to integrations/unstructured/fileconverter/README.md diff --git a/unstructured/fileconverter/pyproject.toml b/integrations/unstructured/fileconverter/pyproject.toml similarity index 100% rename from unstructured/fileconverter/pyproject.toml rename to integrations/unstructured/fileconverter/pyproject.toml diff --git a/unstructured/fileconverter/src/unstructured_fileconverter_haystack/__about__.py b/integrations/unstructured/fileconverter/src/unstructured_fileconverter_haystack/__about__.py similarity index 100% rename from unstructured/fileconverter/src/unstructured_fileconverter_haystack/__about__.py rename to integrations/unstructured/fileconverter/src/unstructured_fileconverter_haystack/__about__.py diff --git a/unstructured/fileconverter/src/unstructured_fileconverter_haystack/__init__.py b/integrations/unstructured/fileconverter/src/unstructured_fileconverter_haystack/__init__.py similarity index 100% rename from unstructured/fileconverter/src/unstructured_fileconverter_haystack/__init__.py rename to integrations/unstructured/fileconverter/src/unstructured_fileconverter_haystack/__init__.py diff --git a/unstructured/fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py b/integrations/unstructured/fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py similarity index 100% rename from unstructured/fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py rename to integrations/unstructured/fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py diff --git a/unstructured/fileconverter/tests/samples/sample_pdf.pdf b/integrations/unstructured/fileconverter/tests/samples/sample_pdf.pdf similarity index 100% rename from unstructured/fileconverter/tests/samples/sample_pdf.pdf rename to integrations/unstructured/fileconverter/tests/samples/sample_pdf.pdf diff --git a/unstructured/fileconverter/tests/test_fileconverter.py b/integrations/unstructured/fileconverter/tests/test_fileconverter.py similarity index 100% rename from unstructured/fileconverter/tests/test_fileconverter.py rename to integrations/unstructured/fileconverter/tests/test_fileconverter.py From 9dd80c3e686fa27bac838fc61f680ab3e88c9766 Mon Sep 17 00:00:00 2001 From: anakin87 Date: Wed, 29 Nov 2023 15:58:44 +0100 Subject: [PATCH 5/5] unstructured --- .github/workflows/unstructured_fileconverter.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unstructured_fileconverter.yml b/.github/workflows/unstructured_fileconverter.yml index 5765a311e..8d7ece048 100644 --- a/.github/workflows/unstructured_fileconverter.yml +++ b/.github/workflows/unstructured_fileconverter.yml @@ -7,7 +7,7 @@ on: - cron: "0 0 * * *" pull_request: paths: - - "unstructured/fileconverter/**" + - "integrations/unstructured/fileconverter/**" - ".github/workflows/unstructured_fileconverter.yml" concurrency: @@ -50,10 +50,10 @@ jobs: run: pip install --upgrade hatch - name: Lint - working-directory: unstructured/fileconverter + working-directory: integrations/unstructured/fileconverter if: matrix.python-version == '3.9' run: hatch run lint:all - name: Run tests - working-directory: unstructured/fileconverter + working-directory: integrations/unstructured/fileconverter run: hatch run cov