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..88020818e 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' + - 'integrations/chroma/**' + - '.github/workflows/chroma.yml' defaults: run: - working-directory: document_stores/chroma + working-directory: integrations/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..08254a58b 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" + - "integrations/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: integrations/elasticsearch if: matrix.python-version == '3.9' run: hatch run lint:all - name: Run ElasticSearch container - working-directory: document_stores/elasticsearch + working-directory: integrations/elasticsearch run: docker-compose up -d - name: Run tests - working-directory: document_stores/elasticsearch + working-directory: integrations/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..293c6c142 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' + - 'integrations/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: 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/.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..8d7ece048 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: Test / unstructured / fileconverter on: schedule: - cron: "0 0 * * *" pull_request: paths: - - "components/converters/unstructured_fileconverter/**" - - ".github/workflows/components_unstructured_fileconverter.yml" + - "integrations/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: integrations/unstructured/fileconverter if: matrix.python-version == '3.9' run: hatch run lint:all - name: Run tests - working-directory: components/converters/unstructured_fileconverter + working-directory: integrations/unstructured/fileconverter run: hatch run cov 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/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/chroma/.gitignore b/integrations/chroma/.gitignore similarity index 100% rename from document_stores/chroma/.gitignore rename to integrations/chroma/.gitignore diff --git a/components/converters/unstructured_fileconverter/LICENSE b/integrations/chroma/LICENSE similarity index 100% rename from components/converters/unstructured_fileconverter/LICENSE rename to integrations/chroma/LICENSE diff --git a/document_stores/chroma/README.md b/integrations/chroma/README.md similarity index 100% rename from document_stores/chroma/README.md rename to integrations/chroma/README.md diff --git a/document_stores/chroma/example/data/usr_01.txt b/integrations/chroma/example/data/usr_01.txt similarity index 100% rename from document_stores/chroma/example/data/usr_01.txt rename to integrations/chroma/example/data/usr_01.txt diff --git a/document_stores/chroma/example/data/usr_02.txt b/integrations/chroma/example/data/usr_02.txt similarity index 100% rename from document_stores/chroma/example/data/usr_02.txt rename to integrations/chroma/example/data/usr_02.txt diff --git a/document_stores/chroma/example/data/usr_03.txt b/integrations/chroma/example/data/usr_03.txt similarity index 100% rename from document_stores/chroma/example/data/usr_03.txt rename to integrations/chroma/example/data/usr_03.txt diff --git a/document_stores/chroma/example/data/usr_04.txt b/integrations/chroma/example/data/usr_04.txt similarity index 100% rename from document_stores/chroma/example/data/usr_04.txt rename to integrations/chroma/example/data/usr_04.txt diff --git a/document_stores/chroma/example/data/usr_05.txt b/integrations/chroma/example/data/usr_05.txt similarity index 100% rename from document_stores/chroma/example/data/usr_05.txt rename to integrations/chroma/example/data/usr_05.txt diff --git a/document_stores/chroma/example/data/usr_06.txt b/integrations/chroma/example/data/usr_06.txt similarity index 100% rename from document_stores/chroma/example/data/usr_06.txt rename to integrations/chroma/example/data/usr_06.txt diff --git a/document_stores/chroma/example/data/usr_07.txt b/integrations/chroma/example/data/usr_07.txt similarity index 100% rename from document_stores/chroma/example/data/usr_07.txt rename to integrations/chroma/example/data/usr_07.txt diff --git a/document_stores/chroma/example/data/usr_08.txt b/integrations/chroma/example/data/usr_08.txt similarity index 100% rename from document_stores/chroma/example/data/usr_08.txt rename to integrations/chroma/example/data/usr_08.txt diff --git a/document_stores/chroma/example/data/usr_09.txt b/integrations/chroma/example/data/usr_09.txt similarity index 100% rename from document_stores/chroma/example/data/usr_09.txt rename to integrations/chroma/example/data/usr_09.txt diff --git a/document_stores/chroma/example/data/usr_10.txt b/integrations/chroma/example/data/usr_10.txt similarity index 100% rename from document_stores/chroma/example/data/usr_10.txt rename to integrations/chroma/example/data/usr_10.txt diff --git a/document_stores/chroma/example/data/usr_11.txt b/integrations/chroma/example/data/usr_11.txt similarity index 100% rename from document_stores/chroma/example/data/usr_11.txt rename to integrations/chroma/example/data/usr_11.txt diff --git a/document_stores/chroma/example/data/usr_12.txt b/integrations/chroma/example/data/usr_12.txt similarity index 100% rename from document_stores/chroma/example/data/usr_12.txt rename to integrations/chroma/example/data/usr_12.txt diff --git a/document_stores/chroma/example/data/usr_20.txt b/integrations/chroma/example/data/usr_20.txt similarity index 100% rename from document_stores/chroma/example/data/usr_20.txt rename to integrations/chroma/example/data/usr_20.txt diff --git a/document_stores/chroma/example/data/usr_21.txt b/integrations/chroma/example/data/usr_21.txt similarity index 100% rename from document_stores/chroma/example/data/usr_21.txt rename to integrations/chroma/example/data/usr_21.txt diff --git a/document_stores/chroma/example/data/usr_22.txt b/integrations/chroma/example/data/usr_22.txt similarity index 100% rename from document_stores/chroma/example/data/usr_22.txt rename to integrations/chroma/example/data/usr_22.txt diff --git a/document_stores/chroma/example/data/usr_23.txt b/integrations/chroma/example/data/usr_23.txt similarity index 100% rename from document_stores/chroma/example/data/usr_23.txt rename to integrations/chroma/example/data/usr_23.txt diff --git a/document_stores/chroma/example/data/usr_24.txt b/integrations/chroma/example/data/usr_24.txt similarity index 100% rename from document_stores/chroma/example/data/usr_24.txt rename to integrations/chroma/example/data/usr_24.txt diff --git a/document_stores/chroma/example/data/usr_25.txt b/integrations/chroma/example/data/usr_25.txt similarity index 100% rename from document_stores/chroma/example/data/usr_25.txt rename to integrations/chroma/example/data/usr_25.txt diff --git a/document_stores/chroma/example/data/usr_26.txt b/integrations/chroma/example/data/usr_26.txt similarity index 100% rename from document_stores/chroma/example/data/usr_26.txt rename to integrations/chroma/example/data/usr_26.txt diff --git a/document_stores/chroma/example/data/usr_27.txt b/integrations/chroma/example/data/usr_27.txt similarity index 100% rename from document_stores/chroma/example/data/usr_27.txt rename to integrations/chroma/example/data/usr_27.txt diff --git a/document_stores/chroma/example/data/usr_28.txt b/integrations/chroma/example/data/usr_28.txt similarity index 100% rename from document_stores/chroma/example/data/usr_28.txt rename to integrations/chroma/example/data/usr_28.txt diff --git a/document_stores/chroma/example/data/usr_29.txt b/integrations/chroma/example/data/usr_29.txt similarity index 100% rename from document_stores/chroma/example/data/usr_29.txt rename to integrations/chroma/example/data/usr_29.txt diff --git a/document_stores/chroma/example/data/usr_30.txt b/integrations/chroma/example/data/usr_30.txt similarity index 100% rename from document_stores/chroma/example/data/usr_30.txt rename to integrations/chroma/example/data/usr_30.txt diff --git a/document_stores/chroma/example/data/usr_31.txt b/integrations/chroma/example/data/usr_31.txt similarity index 100% rename from document_stores/chroma/example/data/usr_31.txt rename to integrations/chroma/example/data/usr_31.txt diff --git a/document_stores/chroma/example/data/usr_32.txt b/integrations/chroma/example/data/usr_32.txt similarity index 100% rename from document_stores/chroma/example/data/usr_32.txt rename to integrations/chroma/example/data/usr_32.txt diff --git a/document_stores/chroma/example/data/usr_40.txt b/integrations/chroma/example/data/usr_40.txt similarity index 100% rename from document_stores/chroma/example/data/usr_40.txt rename to integrations/chroma/example/data/usr_40.txt diff --git a/document_stores/chroma/example/data/usr_41.txt b/integrations/chroma/example/data/usr_41.txt similarity index 100% rename from document_stores/chroma/example/data/usr_41.txt rename to integrations/chroma/example/data/usr_41.txt diff --git a/document_stores/chroma/example/data/usr_42.txt b/integrations/chroma/example/data/usr_42.txt similarity index 100% rename from document_stores/chroma/example/data/usr_42.txt rename to integrations/chroma/example/data/usr_42.txt diff --git a/document_stores/chroma/example/data/usr_43.txt b/integrations/chroma/example/data/usr_43.txt similarity index 100% rename from document_stores/chroma/example/data/usr_43.txt rename to integrations/chroma/example/data/usr_43.txt diff --git a/document_stores/chroma/example/data/usr_44.txt b/integrations/chroma/example/data/usr_44.txt similarity index 100% rename from document_stores/chroma/example/data/usr_44.txt rename to integrations/chroma/example/data/usr_44.txt diff --git a/document_stores/chroma/example/data/usr_45.txt b/integrations/chroma/example/data/usr_45.txt similarity index 100% rename from document_stores/chroma/example/data/usr_45.txt rename to integrations/chroma/example/data/usr_45.txt diff --git a/document_stores/chroma/example/data/usr_46.txt b/integrations/chroma/example/data/usr_46.txt similarity index 100% rename from document_stores/chroma/example/data/usr_46.txt rename to integrations/chroma/example/data/usr_46.txt diff --git a/document_stores/chroma/example/data/usr_50.txt b/integrations/chroma/example/data/usr_50.txt similarity index 100% rename from document_stores/chroma/example/data/usr_50.txt rename to integrations/chroma/example/data/usr_50.txt diff --git a/document_stores/chroma/example/data/usr_51.txt b/integrations/chroma/example/data/usr_51.txt similarity index 100% rename from document_stores/chroma/example/data/usr_51.txt rename to integrations/chroma/example/data/usr_51.txt diff --git a/document_stores/chroma/example/data/usr_52.txt b/integrations/chroma/example/data/usr_52.txt similarity index 100% rename from document_stores/chroma/example/data/usr_52.txt rename to integrations/chroma/example/data/usr_52.txt diff --git a/document_stores/chroma/example/data/usr_90.txt b/integrations/chroma/example/data/usr_90.txt similarity index 100% rename from document_stores/chroma/example/data/usr_90.txt rename to integrations/chroma/example/data/usr_90.txt diff --git a/document_stores/chroma/example/example.py b/integrations/chroma/example/example.py similarity index 100% rename from document_stores/chroma/example/example.py rename to integrations/chroma/example/example.py diff --git a/document_stores/chroma/pyproject.toml b/integrations/chroma/pyproject.toml similarity index 100% rename from document_stores/chroma/pyproject.toml rename to integrations/chroma/pyproject.toml diff --git a/document_stores/chroma/src/chroma_haystack/__about__.py b/integrations/chroma/src/chroma_haystack/__about__.py similarity index 100% rename from document_stores/chroma/src/chroma_haystack/__about__.py rename to integrations/chroma/src/chroma_haystack/__about__.py diff --git a/document_stores/chroma/src/chroma_haystack/__init__.py b/integrations/chroma/src/chroma_haystack/__init__.py similarity index 100% rename from document_stores/chroma/src/chroma_haystack/__init__.py rename to integrations/chroma/src/chroma_haystack/__init__.py diff --git a/document_stores/chroma/src/chroma_haystack/document_store.py b/integrations/chroma/src/chroma_haystack/document_store.py similarity index 100% rename from document_stores/chroma/src/chroma_haystack/document_store.py rename to integrations/chroma/src/chroma_haystack/document_store.py diff --git a/document_stores/chroma/src/chroma_haystack/errors.py b/integrations/chroma/src/chroma_haystack/errors.py similarity index 100% rename from document_stores/chroma/src/chroma_haystack/errors.py rename to integrations/chroma/src/chroma_haystack/errors.py diff --git a/document_stores/chroma/src/chroma_haystack/retriever.py b/integrations/chroma/src/chroma_haystack/retriever.py similarity index 100% rename from document_stores/chroma/src/chroma_haystack/retriever.py rename to integrations/chroma/src/chroma_haystack/retriever.py diff --git a/document_stores/chroma/src/chroma_haystack/utils.py b/integrations/chroma/src/chroma_haystack/utils.py similarity index 100% rename from document_stores/chroma/src/chroma_haystack/utils.py rename to integrations/chroma/src/chroma_haystack/utils.py diff --git a/document_stores/chroma/tests/__init__.py b/integrations/chroma/tests/__init__.py similarity index 100% rename from document_stores/chroma/tests/__init__.py rename to integrations/chroma/tests/__init__.py diff --git a/document_stores/chroma/tests/test_document_store.py b/integrations/chroma/tests/test_document_store.py similarity index 100% rename from document_stores/chroma/tests/test_document_store.py rename to integrations/chroma/tests/test_document_store.py diff --git a/document_stores/chroma/tests/test_retriever.py b/integrations/chroma/tests/test_retriever.py similarity index 100% rename from document_stores/chroma/tests/test_retriever.py rename to integrations/chroma/tests/test_retriever.py diff --git a/document_stores/elasticsearch/.gitignore b/integrations/elasticsearch/.gitignore similarity index 100% rename from document_stores/elasticsearch/.gitignore rename to integrations/elasticsearch/.gitignore diff --git a/document_stores/chroma/LICENSE b/integrations/elasticsearch/LICENSE similarity index 100% rename from document_stores/chroma/LICENSE rename to integrations/elasticsearch/LICENSE diff --git a/document_stores/elasticsearch/README.md b/integrations/elasticsearch/README.md similarity index 100% rename from document_stores/elasticsearch/README.md rename to integrations/elasticsearch/README.md diff --git a/document_stores/elasticsearch/docker-compose.yml b/integrations/elasticsearch/docker-compose.yml similarity index 100% rename from document_stores/elasticsearch/docker-compose.yml rename to integrations/elasticsearch/docker-compose.yml diff --git a/document_stores/elasticsearch/pyproject.toml b/integrations/elasticsearch/pyproject.toml similarity index 100% rename from document_stores/elasticsearch/pyproject.toml rename to integrations/elasticsearch/pyproject.toml diff --git a/document_stores/elasticsearch/src/elasticsearch_haystack/__about__.py b/integrations/elasticsearch/src/elasticsearch_haystack/__about__.py similarity index 100% rename from document_stores/elasticsearch/src/elasticsearch_haystack/__about__.py rename to integrations/elasticsearch/src/elasticsearch_haystack/__about__.py diff --git a/document_stores/elasticsearch/src/elasticsearch_haystack/__init__.py b/integrations/elasticsearch/src/elasticsearch_haystack/__init__.py similarity index 100% rename from document_stores/elasticsearch/src/elasticsearch_haystack/__init__.py rename to integrations/elasticsearch/src/elasticsearch_haystack/__init__.py diff --git a/document_stores/elasticsearch/src/elasticsearch_haystack/bm25_retriever.py b/integrations/elasticsearch/src/elasticsearch_haystack/bm25_retriever.py similarity index 100% rename from document_stores/elasticsearch/src/elasticsearch_haystack/bm25_retriever.py rename to integrations/elasticsearch/src/elasticsearch_haystack/bm25_retriever.py diff --git a/document_stores/elasticsearch/src/elasticsearch_haystack/document_store.py b/integrations/elasticsearch/src/elasticsearch_haystack/document_store.py similarity index 100% rename from document_stores/elasticsearch/src/elasticsearch_haystack/document_store.py rename to integrations/elasticsearch/src/elasticsearch_haystack/document_store.py diff --git a/document_stores/elasticsearch/src/elasticsearch_haystack/embedding_retriever.py b/integrations/elasticsearch/src/elasticsearch_haystack/embedding_retriever.py similarity index 100% rename from document_stores/elasticsearch/src/elasticsearch_haystack/embedding_retriever.py rename to integrations/elasticsearch/src/elasticsearch_haystack/embedding_retriever.py diff --git a/document_stores/elasticsearch/src/elasticsearch_haystack/filters.py b/integrations/elasticsearch/src/elasticsearch_haystack/filters.py similarity index 100% rename from document_stores/elasticsearch/src/elasticsearch_haystack/filters.py rename to integrations/elasticsearch/src/elasticsearch_haystack/filters.py diff --git a/document_stores/elasticsearch/tests/__init__.py b/integrations/elasticsearch/tests/__init__.py similarity index 100% rename from document_stores/elasticsearch/tests/__init__.py rename to integrations/elasticsearch/tests/__init__.py diff --git a/document_stores/elasticsearch/tests/test_bm25_retriever.py b/integrations/elasticsearch/tests/test_bm25_retriever.py similarity index 100% rename from document_stores/elasticsearch/tests/test_bm25_retriever.py rename to integrations/elasticsearch/tests/test_bm25_retriever.py diff --git a/document_stores/elasticsearch/tests/test_document_store.py b/integrations/elasticsearch/tests/test_document_store.py similarity index 100% rename from document_stores/elasticsearch/tests/test_document_store.py rename to integrations/elasticsearch/tests/test_document_store.py diff --git a/document_stores/elasticsearch/tests/test_embedding_retriever.py b/integrations/elasticsearch/tests/test_embedding_retriever.py similarity index 100% rename from document_stores/elasticsearch/tests/test_embedding_retriever.py rename to integrations/elasticsearch/tests/test_embedding_retriever.py diff --git a/document_stores/elasticsearch/tests/test_filters.py b/integrations/elasticsearch/tests/test_filters.py similarity index 100% rename from document_stores/elasticsearch/tests/test_filters.py rename to integrations/elasticsearch/tests/test_filters.py diff --git a/components/embedders/instructor-embedders/LICENSE.txt b/integrations/instructor-embedders/LICENSE.txt similarity index 100% rename from components/embedders/instructor-embedders/LICENSE.txt rename to integrations/instructor-embedders/LICENSE.txt diff --git a/components/embedders/instructor-embedders/README.md b/integrations/instructor-embedders/README.md similarity index 100% rename from components/embedders/instructor-embedders/README.md rename to integrations/instructor-embedders/README.md diff --git a/components/embedders/instructor-embedders/instructor_embedders/__about__.py b/integrations/instructor-embedders/instructor_embedders/__about__.py similarity index 100% rename from components/embedders/instructor-embedders/instructor_embedders/__about__.py rename to integrations/instructor-embedders/instructor_embedders/__about__.py diff --git a/components/embedders/instructor-embedders/instructor_embedders/__init__.py b/integrations/instructor-embedders/instructor_embedders/__init__.py similarity index 100% rename from components/embedders/instructor-embedders/instructor_embedders/__init__.py rename to integrations/instructor-embedders/instructor_embedders/__init__.py diff --git a/components/embedders/instructor-embedders/instructor_embedders/embedding_backend/__init__.py b/integrations/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 integrations/instructor-embedders/instructor_embedders/embedding_backend/__init__.py diff --git a/components/embedders/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 components/embedders/instructor-embedders/instructor_embedders/embedding_backend/instructor_backend.py rename to integrations/instructor-embedders/instructor_embedders/embedding_backend/instructor_backend.py diff --git a/components/embedders/instructor-embedders/instructor_embedders/instructor_document_embedder.py b/integrations/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 integrations/instructor-embedders/instructor_embedders/instructor_document_embedder.py diff --git a/components/embedders/instructor-embedders/instructor_embedders/instructor_text_embedder.py b/integrations/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 integrations/instructor-embedders/instructor_embedders/instructor_text_embedder.py diff --git a/components/embedders/instructor-embedders/pyproject.toml b/integrations/instructor-embedders/pyproject.toml similarity index 100% rename from components/embedders/instructor-embedders/pyproject.toml rename to integrations/instructor-embedders/pyproject.toml diff --git a/components/embedders/instructor-embedders/tests/__init__.py b/integrations/instructor-embedders/tests/__init__.py similarity index 100% rename from components/embedders/instructor-embedders/tests/__init__.py rename to integrations/instructor-embedders/tests/__init__.py diff --git a/components/embedders/instructor-embedders/tests/test_instructor_backend.py b/integrations/instructor-embedders/tests/test_instructor_backend.py similarity index 100% rename from components/embedders/instructor-embedders/tests/test_instructor_backend.py rename to integrations/instructor-embedders/tests/test_instructor_backend.py diff --git a/components/embedders/instructor-embedders/tests/test_instructor_document_embedder.py b/integrations/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 integrations/instructor-embedders/tests/test_instructor_document_embedder.py diff --git a/components/embedders/instructor-embedders/tests/test_instructor_embedders.py b/integrations/instructor-embedders/tests/test_instructor_embedders.py similarity index 100% rename from components/embedders/instructor-embedders/tests/test_instructor_embedders.py rename to integrations/instructor-embedders/tests/test_instructor_embedders.py diff --git a/components/embedders/instructor-embedders/tests/test_instructor_text_embedder.py b/integrations/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 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/components/hatch.toml b/integrations/nodes/hatch.toml similarity index 100% rename from components/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/document_stores/elasticsearch/LICENSE b/integrations/unstructured/fileconverter/LICENSE similarity index 100% rename from document_stores/elasticsearch/LICENSE rename to integrations/unstructured/fileconverter/LICENSE diff --git a/components/converters/unstructured_fileconverter/README.md b/integrations/unstructured/fileconverter/README.md similarity index 100% rename from components/converters/unstructured_fileconverter/README.md rename to integrations/unstructured/fileconverter/README.md diff --git a/components/converters/unstructured_fileconverter/pyproject.toml b/integrations/unstructured/fileconverter/pyproject.toml similarity index 100% rename from components/converters/unstructured_fileconverter/pyproject.toml rename to integrations/unstructured/fileconverter/pyproject.toml diff --git a/components/converters/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__about__.py b/integrations/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 integrations/unstructured/fileconverter/src/unstructured_fileconverter_haystack/__about__.py diff --git a/components/converters/unstructured_fileconverter/src/unstructured_fileconverter_haystack/__init__.py b/integrations/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 integrations/unstructured/fileconverter/src/unstructured_fileconverter_haystack/__init__.py diff --git a/components/converters/unstructured_fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py b/integrations/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 integrations/unstructured/fileconverter/src/unstructured_fileconverter_haystack/fileconverter.py diff --git a/components/converters/unstructured_fileconverter/tests/samples/sample_pdf.pdf b/integrations/unstructured/fileconverter/tests/samples/sample_pdf.pdf similarity index 100% rename from components/converters/unstructured_fileconverter/tests/samples/sample_pdf.pdf rename to integrations/unstructured/fileconverter/tests/samples/sample_pdf.pdf diff --git a/components/converters/unstructured_fileconverter/tests/test_fileconverter.py b/integrations/unstructured/fileconverter/tests/test_fileconverter.py similarity index 100% rename from components/converters/unstructured_fileconverter/tests/test_fileconverter.py rename to integrations/unstructured/fileconverter/tests/test_fileconverter.py diff --git a/nodes/hatch.toml b/nodes/hatch.toml deleted file mode 100644 index be4d67218..000000000 --- a/nodes/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