Skip to content

Commit

Permalink
Feature/merge dev minor main (#1457)
Browse files Browse the repository at this point in the history
* add run without orchestration (#1448)

* add run without orchestration

* bump versions

* bump versions

* bump versions

* fix

* up

* add end points
  • Loading branch information
emrgnt-cmplxty authored Oct 23, 2024
1 parent 08b07d7 commit 816a860
Show file tree
Hide file tree
Showing 15 changed files with 1,692 additions and 3,053 deletions.
11 changes: 6 additions & 5 deletions .github/actions/setup-python-light/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ runs:
- name: Install Poetry and dependencies on Windows
if: inputs.os == 'windows-latest'
shell: cmd
shell: pwsh
run: |
python -c "import urllib.request; print(urllib.request.urlopen('https://install.python-poetry.org').read().decode())" > install-poetry.py
python install-poetry.py
echo %USERPROFILE%\AppData\Roaming\Python\Scripts >> %GITHUB_PATH%
cd py && poetry install -E core -E ingestion-bundle
(Invoke-WebRequest -Uri https://install.python-poetry.org -UseBasicParsing).Content | python -
$env:PATH += ";$env:APPDATA\Python\Scripts"
poetry --version
cd py
poetry install -E core -E ingestion-bundle
8 changes: 0 additions & 8 deletions .github/workflows/r2r-full-py-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ jobs:
if: matrix.test_category == 'cli-retrieval'
uses: ./.github/actions/run-cli-retrieval-tests

- name: Run CLI GraphRAG Tests
if: matrix.test_category == 'cli-graphrag'
uses: ./.github/actions/run-cli-graphrag-tests

- name: Run SDK Ingestion Tests
if: matrix.test_category == 'sdk-ingestion'
uses: ./.github/actions/run-sdk-ingestion-tests
Expand All @@ -78,7 +74,3 @@ jobs:
- name: Run SDK Collections Tests
if: matrix.test_category == 'sdk-collections'
uses: ./.github/actions/run-sdk-collections-tests

- name: Run SDK GraphRAG Tests
if: matrix.test_category == 'sdk-graphrag'
uses: ./.github/actions/run-sdk-graphrag-tests
8 changes: 0 additions & 8 deletions .github/workflows/r2r-light-py-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ jobs:
if: matrix.test_category == 'cli-retrieval'
uses: ./.github/actions/run-cli-retrieval-tests

- name: Run CLI GraphRAG Tests
if: matrix.test_category == 'cli-graphrag'
uses: ./.github/actions/run-cli-graphrag-tests

- name: Run SDK Ingestion Tests
if: matrix.test_category == 'sdk-ingestion'
uses: ./.github/actions/run-sdk-ingestion-tests
Expand All @@ -81,7 +77,3 @@ jobs:
- name: Run SDK Collections Tests
if: matrix.test_category == 'sdk-collections'
uses: ./.github/actions/run-sdk-collections-tests

- name: Run SDK GraphRAG Tests
if: matrix.test_category == 'sdk-graphrag'
uses: ./.github/actions/run-sdk-graphrag-tests
4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/delete_vector_indices.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: List Vector Indices
openapi: 'GET /v2/list_vector_indices'
---
4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/list_vector_index.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: Delete Vector Index
openapi: 'DELETE /v2/delete_vector_index'
---
14 changes: 14 additions & 0 deletions docs/documentation/js-sdk/ingestion.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,11 @@ const ingestResponse = await client.ingestFiles(files, {
</Expandable>
</ParamField>

<ParamField path="run_with_orchestration" type="Optional[bool]">
Whether or not ingestion runs with orchestration, default is `True`. When set to `False`, the ingestion process will run synchronous and directly return the result.
</ParamField>


### Ingest Chunks

Ingest pre-parsed text chunks into your R2R system:
Expand Down Expand Up @@ -248,6 +253,10 @@ const ingestResponse = await client.ingestChunks(chunks, undefined, {
An optional metadata object for the document.
</ParamField>

<ParamField path="run_with_orchestration" type="Optional[bool]">
Whether or not ingestion runs with orchestration, default is `True`. When set to `False`, the ingestion process will run synchronous and directly return the result.
</ParamField>


### Update Files

Expand Down Expand Up @@ -315,6 +324,11 @@ const updateResponse = await client.updateFiles(files, {
</ParamField>


<ParamField path="run_with_orchestration" type="Optional[bool]">
Whether or not ingestion runs with orchestration, default is `True`. When set to `False`, the ingestion process will run synchronous and directly return the result.
</ParamField>


### Documents Overview

Retrieve high-level document information, restricted to user files, except when called by a superuser where it will then return results from over all users:
Expand Down
13 changes: 13 additions & 0 deletions docs/documentation/python-sdk/ingestion.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ Refer to the [ingestion configuration](/documentation/configuration/ingestion/pa
Whether to keep XML tags in the output.
</ParamField>
</Expandable>

<ParamField path="run_with_orchestration" type="Optional[bool]">
Whether or not ingestion runs with orchestration, default is `True`. When set to `False`, the ingestion process will run synchronous and directly return the result.
</ParamField>


</ParamField>

### Ingest Chunks
Expand Down Expand Up @@ -262,6 +268,9 @@ ingest_response = client.ingest_chunks(
An optional metadata dictionary for the document.
</ParamField>

<ParamField path="run_with_orchestration" type="Optional[bool]">
Whether or not ingestion runs with orchestration, default is `True`. When set to `False`, the ingestion process will run synchronous and directly return the result.
</ParamField>


### Update Files
Expand Down Expand Up @@ -436,6 +445,10 @@ The ingestion configuration can be customized analogously to the ingest files en
Whether to keep XML tags in the output.
</ParamField>
</Expandable>

<ParamField path="run_with_orchestration" type="Optional[bool]">
Whether or not ingestion runs with orchestration, default is `True`. When set to `False`, the ingestion process will run synchronous and directly return the result.
</ParamField>
</ParamField>


Expand Down
4 changes: 3 additions & 1 deletion docs/mint.json
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,9 @@
"api-reference/endpoint/ingest_files",
"api-reference/endpoint/ingest_chunks",
"api-reference/endpoint/update_files",
"api-reference/endpoint/create_vector_index"
"api-reference/endpoint/create_vector_index",
"api-reference/endpoint/delete_vector_index",
"api-reference/endpoint/list_vector_index"
]
},
{
Expand Down
Loading

0 comments on commit 816a860

Please sign in to comment.