Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/api v3 #1540

Closed
wants to merge 88 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
fff21c6
improve ci/cd runtime
emrgnt-cmplxty Oct 30, 2024
954c59b
update prompt tests
emrgnt-cmplxty Oct 30, 2024
fd4ca5b
improve ci/cd runtime (#1535)
emrgnt-cmplxty Oct 30, 2024
db28363
Support Python ^3.10 (#1534)
NolanTrem Oct 30, 2024
7b070da
add azure
emrgnt-cmplxty Oct 30, 2024
905227c
up
emrgnt-cmplxty Oct 30, 2024
7dac6f4
up
emrgnt-cmplxty Oct 30, 2024
d75dd97
merge
emrgnt-cmplxty Oct 30, 2024
7635180
spec out v3 api
emrgnt-cmplxty Oct 30, 2024
1a71b1b
checkin document router
emrgnt-cmplxty Oct 31, 2024
e348dde
adding chunk abstr
emrgnt-cmplxty Oct 31, 2024
cda23bc
add list chunks
emrgnt-cmplxty Nov 1, 2024
70af883
add chunk search
emrgnt-cmplxty Nov 1, 2024
a2a3222
up
emrgnt-cmplxty Nov 1, 2024
8690ddc
add users routes
emrgnt-cmplxty Nov 1, 2024
33f6b55
up
emrgnt-cmplxty Nov 3, 2024
c4255ad
checkin progress
emrgnt-cmplxty Nov 4, 2024
bf96b0b
add collections annotations
emrgnt-cmplxty Nov 5, 2024
dfeaf47
add indices
emrgnt-cmplxty Nov 5, 2024
01d8f36
add user
emrgnt-cmplxty Nov 5, 2024
a5e7264
checkin work
emrgnt-cmplxty Nov 5, 2024
f82a2ce
up
emrgnt-cmplxty Nov 6, 2024
1258d7a
complete conversations CRUD
emrgnt-cmplxty Nov 6, 2024
5db221c
fix type errors
emrgnt-cmplxty Nov 6, 2024
242894f
add graph router
emrgnt-cmplxty Nov 6, 2024
01ca3e4
add graphs
emrgnt-cmplxty Nov 6, 2024
47c0b7e
Update JS (#1563)
NolanTrem Nov 7, 2024
c58257c
Feature/add graph to v3 (#1565)
emrgnt-cmplxty Nov 7, 2024
625cf2b
Harmonize Pagination across endpoints (#1564)
NolanTrem Nov 7, 2024
2eff0da
Fix nested deletion filter bug (#1567)
NolanTrem Nov 7, 2024
dfabb2e
Remove Mintlify docs (#1569)
NolanTrem Nov 7, 2024
adc2d68
Nolan/list collection (#1568)
NolanTrem Nov 8, 2024
668ac9a
JS V3 (#1571)
NolanTrem Nov 12, 2024
da2514a
Merge branch 'main' of github.com:SciPhi-AI/R2R into feature/api-v3
NolanTrem Nov 12, 2024
571a6fc
Fix lock
NolanTrem Nov 12, 2024
c21f27c
Nolan/v3 tests (#1578)
NolanTrem Nov 12, 2024
92b0de2
Fix GraphRAG tests (#1579)
NolanTrem Nov 12, 2024
3473279
More cleanup (#1580)
NolanTrem Nov 13, 2024
208f732
Fix test
NolanTrem Nov 13, 2024
3d6ebe9
More cleanups
NolanTrem Nov 13, 2024
ec59bd3
More cleanups
NolanTrem Nov 13, 2024
e6f87a2
More
NolanTrem Nov 13, 2024
f47af4c
Merge branch 'main' into feature/api-v3
NolanTrem Nov 13, 2024
1858873
Merge main
NolanTrem Nov 13, 2024
c6a02bb
Python SDK V3 (#1585)
NolanTrem Nov 13, 2024
72dffa2
First pass (#1586)
NolanTrem Nov 13, 2024
73ed794
More V3 (#1587)
NolanTrem Nov 13, 2024
b3b5770
Fix sync methods on v2 sdk, add check for download files (#1588)
NolanTrem Nov 14, 2024
2481051
More CLI (#1589)
NolanTrem Nov 14, 2024
b68421f
Print logs on failing tests (#1590)
NolanTrem Nov 14, 2024
ae47d79
More JS testing (#1591)
NolanTrem Nov 14, 2024
547bacc
More refactors for tests (#1592)
NolanTrem Nov 14, 2024
0b1f6c5
System Routes (#1594)
NolanTrem Nov 15, 2024
731f861
Fix type errors, pass collection id (#1595)
NolanTrem Nov 15, 2024
f0e6636
Hotfix: dict
NolanTrem Nov 15, 2024
e819d2e
V3 graph implmentations (#1593)
shreyaspimpalgaonkar Nov 15, 2024
e2eeda3
Allow passing of collection id at document ingestion (#1596)
NolanTrem Nov 15, 2024
22efa39
KG Response sync (#1597)
NolanTrem Nov 15, 2024
78656bf
fix
NolanTrem Nov 15, 2024
8f29ed4
Fix Prompt Override (#1599)
NolanTrem Nov 17, 2024
62e6d54
Updated Graph Models, Drop SID (#1598)
NolanTrem Nov 18, 2024
56abcdb
minor tweaks
emrgnt-cmplxty Nov 18, 2024
f6c5a30
fix summary model (#1604)
emrgnt-cmplxty Nov 18, 2024
5450ae1
incr progress
emrgnt-cmplxty Nov 18, 2024
9b05de8
Add /users/me (#1605)
NolanTrem Nov 18, 2024
c5a7541
Resolve Merge Conflicts (#1607)
NolanTrem Nov 18, 2024
0f6ea07
Nolan/conflicts (#1608)
NolanTrem Nov 18, 2024
aaf21da
github sucks
NolanTrem Nov 18, 2024
909bd88
Merge branch 'feature/api-v3' of github.com:SciPhi-AI/R2R into featur…
NolanTrem Nov 18, 2024
13efb2e
wrapup walkthrough
emrgnt-cmplxty Nov 19, 2024
4fcd550
Merge branch 'feature/api-v3' of github.com:SciPhi-AI/R2R into featur…
emrgnt-cmplxty Nov 19, 2024
1085576
Add delete user method, sync JS to camel case (#1609)
NolanTrem Nov 19, 2024
1f28eea
V3 graph testing (#1606)
shreyaspimpalgaonkar Nov 19, 2024
44bfc4d
Fix Broken V2 Graphs, Better Response Models (#1612)
NolanTrem Nov 20, 2024
7a9b81c
Add types to package export (#1613)
NolanTrem Nov 20, 2024
934a66a
Graph refactor (#1611)
shreyaspimpalgaonkar Nov 20, 2024
1e514db
Create branch update (#1617)
NolanTrem Nov 20, 2024
e41eb26
Graph refactor (#1616)
shreyaspimpalgaonkar Nov 20, 2024
0bf2f04
List collections (#1619)
NolanTrem Nov 21, 2024
0081852
Graph refactor (#1620)
shreyaspimpalgaonkar Nov 21, 2024
42f9e3a
Nolan/update graph (#1621)
NolanTrem Nov 21, 2024
e0f131f
Graph refactor (#1622)
shreyaspimpalgaonkar Nov 21, 2024
70ab046
Graph refactor (#1623)
shreyaspimpalgaonkar Nov 21, 2024
4a33b7b
Fix Response Models, underlying methods (#1624)
NolanTrem Nov 22, 2024
d20456d
Graph refactor (#1625)
shreyaspimpalgaonkar Nov 22, 2024
762063e
Graph refactor (#1626)
shreyaspimpalgaonkar Nov 22, 2024
d7ff034
py SDK (#1627)
shreyaspimpalgaonkar Nov 22, 2024
bf419ea
more changes (#1628)
shreyaspimpalgaonkar Nov 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 0 additions & 23 deletions .github/.codecov.yml

This file was deleted.

10 changes: 10 additions & 0 deletions .github/actions/run-sdk-collections-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,13 @@ runs:
working-directory: ./py
shell: bash
run: poetry run python tests/integration/runner_sdk_basic.py test_delete_chunks

- name: Get all prompts
working-directory: ./py
shell: bash
run: poetry run python tests/integration/runner_sdk_basic.py test_get_all_prompts

- name: Get prompt
working-directory: ./py
shell: bash
run: poetry run python tests/integration/runner_sdk_basic.py test_get_prompt
18 changes: 18 additions & 0 deletions .github/workflows/r2r-full-py-integration-tests-graphrag.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
name: R2R Full Python Integration Test (ubuntu)

on:
push:
branches:
- main
pull_request:
branches:
- dev
- dev-minor
- main
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -47,3 +55,13 @@ jobs:
- name: Run SDK GraphRAG Tests
if: matrix.test_category == 'sdk-graphrag'
uses: ./.github/actions/run-sdk-graphrag-tests

- name: Print Docker logs on failure
if: >
(matrix.test_category == 'cli-graphrag' && failure()) ||
(matrix.test_category == 'sdk-graphrag' && failure())
run: |
echo "::group::Docker Logs"
docker ps -a
docker logs r2r-full-r2r-1
echo "::endgroup::"
23 changes: 23 additions & 0 deletions .github/workflows/r2r-full-py-integration-tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
name: R2R Full Python Integration Test (ubuntu)

on:
push:
branches:
- main
pull_request:
branches:
- dev
- dev-minor
- main
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -72,3 +80,18 @@ jobs:
- name: Run SDK Prompt Tests
if: matrix.test_category == 'sdk-prompts'
uses: ./.github/actions/run-sdk-prompt-management-tests

- name: Print Docker logs on failure
if: >
(matrix.test_category == 'cli-ingestion' && failure()) ||
(matrix.test_category == 'sdk-ingestion' && failure()) ||
(matrix.test_category == 'cli-retrieval' && failure()) ||
(matrix.test_category == 'sdk-retrieval' && failure()) ||
(matrix.test_category == 'sdk-auth' && failure()) ||
(matrix.test_category == 'sdk-collections' && failure()) ||
(matrix.test_category == 'sdk-prompts' && failure())
run: |
echo "::group::Docker Logs"
docker ps -a
docker logs r2r-full-r2r-1
echo "::endgroup::"
9 changes: 9 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ repos:
- id: check-ast
- id: check-yaml

- repo: local
hooks:
- id: check-typing-imports
name: Check for Dict/List usage
entry: bash -c 'echo "Checking for typing imports..." && find . -name "*.py" | xargs grep -n "from typing.*import.*[^d]Dict\\|from typing.*import.*List" || exit 0 && echo "⚠️ Please import dict/list instead of Dict/List from typing" && exit 1'
language: system
types: [python]
pass_filenames: false

- repo: local
hooks:
- id: isort
Expand Down
32 changes: 0 additions & 32 deletions docs/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api-reference.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/add_prompt.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/add_user_to_collection.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/agent.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/analytics.mdx

This file was deleted.

6 changes: 0 additions & 6 deletions docs/api-reference/endpoint/app_settings.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/assign_document_to_collection.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/change_password.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/collections_overview.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/communities.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/completion.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/create_collection.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/create_graph.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/create_vector_index.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/deduplicate_entities.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/delete.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/delete_collection.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/delete_entities_and_triples.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/delete_prompt.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/delete_user_info.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/delete_vector_index.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/document_chunks.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/documents_overview.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/enrich_graph.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/entities.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/get_all_prompts.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/get_collection.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/get_collections_for_user.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/get_document_collections.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/get_prompt.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/get_user_info.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/get_users_in_collection.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/health.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/ingest_chunks.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/ingest_files.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/list_collections.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/list_vector_indices.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/login.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/logout.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/logs.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/put_user_info.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/rag.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/refresh_access_token.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/register.mdx

This file was deleted.

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/remove_user_from_collection.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/request_password_reset.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/score_completion.mdx

This file was deleted.

4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/search.mdx

This file was deleted.

Loading
Loading