Skip to content

Commit

Permalink
groups to collections (#1191)
Browse files Browse the repository at this point in the history
* checkin

* collection to groups

* Fix bug in deletion (#1190)

* fix pr (#1192)

* Feature/fix collection to groups (#1193)

* fix pr

* collect and raise kg extraction errors

* cleanup

---------

Co-authored-by: Nolan Tremelling <[email protected]>
  • Loading branch information
emrgnt-cmplxty and NolanTrem authored Sep 18, 2024
1 parent ef21fd7 commit ff214da
Show file tree
Hide file tree
Showing 101 changed files with 1,387 additions and 1,199 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export POSTGRES_PASSWORD=your_password
export POSTGRES_HOST=your_host
export POSTGRES_PORT=your_port
export POSTGRES_DBNAME=your_db
export POSTGRES_VECS_COLLECTION=your_vecs_collection
export POSTGRES_PROJECT_NAME=your_vecs_collection

# Environment variables for KG provider (currently only Neo4j)
# export NEO4J_USER=YOUR_NEO4J_USER
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/py-ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }}
POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
POSTGRES_VECS_COLLECTION: ${{ secrets.POSTGRES_VECS_COLLECTION }}
POSTGRES_PROJECT_NAME: ${{ secrets.POSTGRES_PROJECT_NAME }}

steps:
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/r2r-js-sdk-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }}
POSTGRES_DBNAME: ${{ secrets.POSTGRES_DBNAME }}
POSTGRES_VECS_COLLECTION: ${{ secrets.POSTGRES_VECS_COLLECTION }}
POSTGRES_PROJECT_NAME: ${{ secrets.POSTGRES_PROJECT_NAME }}
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
run: |
r2r serve --port=7272 > r2r_server.log 2>&1 &
Expand Down
4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/add_user_to_collection.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: 'Add User to Collection'
openapi: 'POST /v2/add_user_to_collection'
---
4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/add_user_to_group.mdx

This file was deleted.

2 changes: 1 addition & 1 deletion docs/api-reference/endpoint/assign_document_to_group.mdx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
---
title: 'Assign Document to Group'
openapi: 'POST /v2/assign_document_to_group'
openapi: 'POST /v2/assign_document_to_collection'
---
4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/collections_overview.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: 'Groups Overview'
openapi: 'GET /v2/collections_overview'
---
4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/create_collection.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: 'Create Collection'
openapi: 'POST /v2/create_collection'
---
4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/create_group.mdx

This file was deleted.

4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/delete_collection.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: 'Delete Collection'
openapi: 'DELETE /v2/delete_collection/{collection_id}'
---
4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/delete_group.mdx

This file was deleted.

4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/get_collection.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: 'Get Collection'
openapi: 'GET /v2/get_collection/{collection_id}'
---
4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/get_collections_for_user.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: 'Get Collections for User'
openapi: 'GET /v2/get_collections_for_user/{user_id}'
---
4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/get_document_collections.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: 'Get Document Collections'
openapi: 'GET /v2/get_document_collections/{document_id}'
---
4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/get_document_groups.mdx

This file was deleted.

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

This file was deleted.

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

This file was deleted.

4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/get_users_in_collection.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: 'Get Users in Collection'
openapi: 'GET /v2/get_users_in_collection/{collection_id}/{offset}/{limit}'
---
4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/get_users_in_group.mdx

This file was deleted.

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

This file was deleted.

4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/list_collections.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: 'List Groups'
openapi: 'GET /v2/list_collections'
---
4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/list_groups.mdx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: 'Remove Document from Group'
openapi: 'POST /v2/remove_document_from_collection'
---
4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/remove_document_from_group.mdx

This file was deleted.

4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/remove_user_from_collection.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: 'Remove User from Collection'
openapi: 'POST /v2/remove_user_from_collection'
---
4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/remove_user_from_group.mdx

This file was deleted.

4 changes: 4 additions & 0 deletions docs/api-reference/endpoint/update_collection.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: 'Update Group'
openapi: 'GET /v2/update_collection'
---
4 changes: 0 additions & 4 deletions docs/api-reference/endpoint/update_group.mdx

This file was deleted.

2 changes: 1 addition & 1 deletion docs/api-reference/openapi.json

Large diffs are not rendered by default.

Loading

0 comments on commit ff214da

Please sign in to comment.