Skip to content

Commit

Permalink
fix actions (#1528)
Browse files Browse the repository at this point in the history
  • Loading branch information
emrgnt-cmplxty authored Oct 30, 2024
1 parent f23d87e commit ed6b07d
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ on:
jobs:
test:
runs-on: ${{ matrix.os }}
continue-on-error: true

strategy:
matrix:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
jobs:
test:
runs-on: ${{ matrix.os }}
continue-on-error: true

strategy:
matrix:
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/r2r-full-py-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ on:
jobs:
test:
runs-on: ${{ matrix.os }}
continue-on-error: true

strategy:
matrix:
Expand Down Expand Up @@ -57,34 +58,27 @@ jobs:
- name: Run CLI Ingestion Tests
if: matrix.test_category == 'cli-ingestion'
uses: ./.github/actions/run-cli-ingestion-tests
continue-on-error: true

- name: Run CLI Retrieval Tests
if: matrix.test_category == 'cli-retrieval'
uses: ./.github/actions/run-cli-retrieval-tests
continue-on-error: true

- name: Run SDK Ingestion Tests
if: matrix.test_category == 'sdk-ingestion'
uses: ./.github/actions/run-sdk-ingestion-tests
continue-on-error: true

- name: Run SDK Retrieval Tests
if: matrix.test_category == 'sdk-retrieval'
uses: ./.github/actions/run-sdk-retrieval-tests
continue-on-error: true

- name: Run SDK Auth Tests
if: matrix.test_category == 'sdk-auth'
uses: ./.github/actions/run-sdk-auth-tests
continue-on-error: true

- name: Run SDK Collections Tests
if: matrix.test_category == 'sdk-collections'
uses: ./.github/actions/run-sdk-collections-tests
continue-on-error: true


- name: Run SDK Prompt Tests
if: matrix.test_category == 'sdk-prompts'
uses: ./.github/actions/run-sdk-prompt-management-tests
continue-on-error: true
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
jobs:
test:
runs-on: ${{ matrix.os }}
continue-on-error: true

strategy:
matrix:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
jobs:
test:
runs-on: ${{ matrix.os }}
continue-on-error: true

strategy:
matrix:
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/r2r-light-py-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
jobs:
test:
runs-on: ${{ matrix.os }}
continue-on-error: true

strategy:
matrix:
Expand Down Expand Up @@ -60,34 +61,27 @@ jobs:
- name: Run CLI Ingestion Tests
if: matrix.test_category == 'cli-ingestion'
uses: ./.github/actions/run-cli-ingestion-tests
continue-on-error: true

- name: Run CLI Retrieval Tests
if: matrix.test_category == 'cli-retrieval'
uses: ./.github/actions/run-cli-retrieval-tests
continue-on-error: true

- name: Run SDK Ingestion Tests
if: matrix.test_category == 'sdk-ingestion'
uses: ./.github/actions/run-sdk-ingestion-tests
continue-on-error: true

- name: Run SDK Retrieval Tests
if: matrix.test_category == 'sdk-retrieval'
uses: ./.github/actions/run-sdk-retrieval-tests
continue-on-error: true

- name: Run SDK Auth Tests
if: matrix.test_category == 'sdk-auth'
uses: ./.github/actions/run-sdk-auth-tests
continue-on-error: true

- name: Run SDK Collections Tests
if: matrix.test_category == 'sdk-collections'
uses: ./.github/actions/run-sdk-collections-tests
continue-on-error: true

- name: Run SDK Prompt Tests
if: matrix.test_category == 'sdk-prompts'
uses: ./.github/actions/run-sdk-prompt-management-tests
continue-on-error: true
22 changes: 13 additions & 9 deletions py/core/main/api/ingestion_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,11 @@ async def ingest_files_app(
auth_user=Depends(self.service.providers.auth.auth_wrapper),
) -> WrappedIngestionResponse: # type: ignore
"""
Ingest files into the system.
Ingests files into R2R, resulting in stored `Document` objects. Each document has corresponding `Chunk` objects which are used in vector indexing and search.
This endpoint supports multipart/form-data requests, enabling you to ingest files and their associated metadatas into R2R.
This endpoint supports multipart/form-data requests.
A valid user authentication token is required to access this endpoint, as regular users can only ingest files for their own access. More expansive collection permissioning is under development.
A valid user authentication token is required to access this endpoint, as regular users can only ingest files for their own access.
"""
# Check if the user is a superuser
if not auth_user.is_superuser:
Expand Down Expand Up @@ -257,11 +257,11 @@ async def update_files_app(
auth_user=Depends(self.service.providers.auth.auth_wrapper),
) -> WrappedUpdateResponse:
"""
Update existing files in the system.
Ingests updated files into R2R, updating the corresponding `Document` and `Chunk` objects from previous ingestion.
This endpoint supports multipart/form-data requests, enabling you to update files and their associated metadatas into R2R.
A valid user authentication token is required to access this endpoint, as regular users can only update their own files. More expansive collection permissioning is under development.
A valid user authentication token is required to access this endpoint, as regular users can only update their own files.
"""
if not auth_user.is_superuser:
for metadata in metadatas or []:
Expand Down Expand Up @@ -366,11 +366,9 @@ async def ingest_chunks_app(
auth_user=Depends(self.service.providers.auth.auth_wrapper),
) -> WrappedIngestionResponse:
"""
Ingest text chunks into the system.
Ingests `Chunk` objects into the system as raw text and associated metadata.
This endpoint supports multipart/form-data requests, enabling you to ingest pre-parsed text chunks into R2R.
A valid user authentication token is required to access this endpoint, as regular users can only ingest chunks for their own access. More expansive collection permissioning is under development.
A valid user authentication token is required to access this endpoint, as regular users can only ingest chunks for their own access.
"""
if document_id:
try:
Expand Down Expand Up @@ -437,6 +435,12 @@ async def update_chunk_app(
run_with_orchestration: Optional[bool] = Body(True),
auth_user=Depends(self.service.providers.auth.auth_wrapper),
) -> WrappedUpdateResponse:
"""
Updates a previously ingested `Chunk` object into the system as raw text and associated metadata.
A valid user authentication token is required to access this endpoint, as regular users can only ingest chunks for their own access.
"""

try:
workflow_input = {
"document_id": str(document_id),
Expand Down

0 comments on commit ed6b07d

Please sign in to comment.