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