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

Dev minor #1321

Merged
merged 7 commits into from
Oct 3, 2024
Merged

Dev minor #1321

merged 7 commits into from
Oct 3, 2024

Conversation

emrgnt-cmplxty
Copy link
Contributor

@emrgnt-cmplxty emrgnt-cmplxty commented Oct 3, 2024

Important

This PR renames POSTGRES_PROJECT_NAME to R2R_PROJECT_NAME, updates knowledge graph creation with cost estimation, and modifies API endpoints and documentation accordingly.

  • Environment Variables:
    • Rename POSTGRES_PROJECT_NAME to R2R_PROJECT_NAME in .env.example, integration-test-workflow-debian.yml, py-ci-cd.yml, r2r-js-sdk-integration-tests.yml, and other files.
  • Knowledge Graph:
    • Update create-graph and enrich-graph commands in graphrag.mdx to include cost estimation steps.
    • Add run and estimate options to create_graph and enrich_graph in kg.py.
    • Implement get_creation_estimate and get_enrichment_estimate in kg_service.py and postgres.py.
  • API Changes:
    • Update put_user_app in auth_router.py to allow superuser status updates.
    • Add get_entities and get_triples endpoints in kg_router.py.
  • Testing and SDK:
    • Update r2rClientIntegrationUser.test.ts to include tests for user profile updates and login.
    • Modify updateUser function in r2rClient.ts to include userId and isSuperuser parameters.
  • Documentation:
    • Update whats-new.mdx to reflect changes in version 0.3.20.
    • Modify postgres.mdx, database.mdx, and vector_store_issues.mdx to reflect environment variable changes.

This description was created by Ellipsis for 989ce1a. It will automatically update as commits are pushed.

emrgnt-cmplxty and others added 7 commits October 2, 2024 12:24
* no-verify

* update readme
* Feature/encapsulate orchestration (#1265)

* fully encapsulate orchestration

* fully encapsulate orchestration

* complete encapsulation

* revert import cmt

* making default r2r lighter (#1268)

* making default r2r lighter

* fix bug in ingest files

* checkin

* workingupdate

* complete simple orch

* update docs

* up (#1273)

* up

* up

* merge (#1276)

* Postgres configuration settings (#1277)

* Improvements on Auth in JS, CLI (#1267)

* CLI Telemetry (#1266)

* check in

* working

* redundant

* JS auth improvements (#1263)

* Check in JS auth improvements

* Update login with toke

* Fix to allow disabling telemetry

* fix lock

* Try to avoid merge conflicts

* Clean up collection bugs

* remove comments

* Add Postgres configuration settings

* Image

* bad github conflict

* merge (#1278)

* port KG to postgres (#1272)

* create + cluster

* local search

* up

* clean

* format

* basics

* add collection_id and paginate

* rename

* change api

* up

* kg_creation_status

* up

* up

* up

* Feature/cleanup docker (#1279)

* merge

* up

* rm neo4j refs and cleanup docker cmds

* fixup

* up

* up

* cleanup kg migration

* up

* up

* up

* Kg testing (#1280)

* up

* up

* up

* up

* rename

* Patch/cleanup kg migration (#1281)

* cleanup kg migration

* up

* Kg testing (#1280)

* up

* up

* up

* up

* slay neo4j

---------

Co-authored-by: Shreyas Pimpalgaonkar <[email protected]>

* add back poetry lock

* Default Collections (#1282)

* Default collections

* Naughty naughty need to follow the SRP

* project name

* up

* add chunk order

* fragments => extractions

* bug squash

* up

* up

* up

* Testing (#1284)

* CICD

* actions

* poetry

* poetry

* Add env vars

* name

* increase timeout

* add user to collection

* change postgres project name

* Kg testing (#1283)

* up

* up

* cleanup kg migration

* up

* up

* up

* Kg testing (#1280)

* up

* up

* up

* up

* rename

* project name

* up

* add chunk order

* fragments => extractions

* bug squash

* up

* up

* up

* change postgres project name

---------

Co-authored-by: emrgnt-cmplxty <[email protected]>

* Feature/fix logic bugs (#1285)

* fixing minor logic bugs in dev branch

* fixing minor logic bugs in dev branch

* merge

* up

* Application docs

* add image (#1287)

* Add version to CLI telemetry (#1288)

* add image

* Add version to cli telemetry

* up

* KG hatchet orchestration (#1286)

* up

* up

* cleanup kg migration

* up

* up

* up

* Kg testing (#1280)

* up

* up

* up

* up

* rename

* project name

* up

* add chunk order

* fragments => extractions

* bug squash

* up

* up

* up

* change postgres project name

* up

* up

---------

Co-authored-by: emrgnt-cmplxty <[email protected]>

* Feature/update documentation rebased (#1289)

* up

* merge

* rebase

* fix ingestion issues (#1291)

* fix ingestion issues

* fix lock file

* fix embedding

* Fix SDK KG Serialization (#1292)

* add image

* serialization

* cleanup cli (#1294)

* CLI serialization (#1295)

* add image

* Fix more serialization around kg

* Nolan/schemacreation (#1296)

* add image

* Fix more serialization around kg

* add quotes to prevent reserved keywords from failing

* Prevent errors if config name is reserved name in postgres (#1297)

* Prevent reserved words (#1298)

* default collection ID

* up

* Move default collection id method to utils (#1299)

* up

* Allow json fallback (#1301)

* hotfix: import

* Fix description error (#1302)

* up

* push

* up (#1303)

* up

* up

* up

* up

* minor tweaks

* up

* mypy

* add back missing file

* up

* up

* up

* fix id

* up

---------

Co-authored-by: emrgnt-cmplxty <[email protected]>
Co-authored-by: emrgnt-cmplxty <[email protected]>
Co-authored-by: Nolan Tremelling <[email protected]>
* Feature/encapsulate orchestration (#1265)

* fully encapsulate orchestration

* fully encapsulate orchestration

* complete encapsulation

* revert import cmt

* making default r2r lighter (#1268)

* making default r2r lighter

* fix bug in ingest files

* checkin

* workingupdate

* complete simple orch

* update docs

* up (#1273)

* up

* up

* merge (#1276)

* Postgres configuration settings (#1277)

* Improvements on Auth in JS, CLI (#1267)

* CLI Telemetry (#1266)

* check in

* working

* redundant

* JS auth improvements (#1263)

* Check in JS auth improvements

* Update login with toke

* Fix to allow disabling telemetry

* fix lock

* Try to avoid merge conflicts

* Clean up collection bugs

* remove comments

* Add Postgres configuration settings

* Image

* bad github conflict

* merge (#1278)

* port KG to postgres (#1272)

* create + cluster

* local search

* up

* clean

* format

* basics

* add collection_id and paginate

* rename

* change api

* up

* kg_creation_status

* up

* up

* up

* Feature/cleanup docker (#1279)

* merge

* up

* rm neo4j refs and cleanup docker cmds

* fixup

* up

* up

* cleanup kg migration

* up

* up

* up

* Kg testing (#1280)

* up

* up

* up

* up

* rename

* Patch/cleanup kg migration (#1281)

* cleanup kg migration

* up

* Kg testing (#1280)

* up

* up

* up

* up

* slay neo4j

---------

Co-authored-by: Shreyas Pimpalgaonkar <[email protected]>

* add back poetry lock

* Default Collections (#1282)

* Default collections

* Naughty naughty need to follow the SRP

* project name

* up

* add chunk order

* fragments => extractions

* bug squash

* up

* up

* up

* Testing (#1284)

* CICD

* actions

* poetry

* poetry

* Add env vars

* name

* increase timeout

* add user to collection

* change postgres project name

* Kg testing (#1283)

* up

* up

* cleanup kg migration

* up

* up

* up

* Kg testing (#1280)

* up

* up

* up

* up

* rename

* project name

* up

* add chunk order

* fragments => extractions

* bug squash

* up

* up

* up

* change postgres project name

---------

Co-authored-by: emrgnt-cmplxty <[email protected]>

* Feature/fix logic bugs (#1285)

* fixing minor logic bugs in dev branch

* fixing minor logic bugs in dev branch

* merge

* up

* Application docs

* add image (#1287)

* Add version to CLI telemetry (#1288)

* add image

* Add version to cli telemetry

* up

* KG hatchet orchestration (#1286)

* up

* up

* cleanup kg migration

* up

* up

* up

* Kg testing (#1280)

* up

* up

* up

* up

* rename

* project name

* up

* add chunk order

* fragments => extractions

* bug squash

* up

* up

* up

* change postgres project name

* up

* up

---------

Co-authored-by: emrgnt-cmplxty <[email protected]>

* Feature/update documentation rebased (#1289)

* up

* merge

* rebase

* fix ingestion issues (#1291)

* fix ingestion issues

* fix lock file

* fix embedding

* Fix SDK KG Serialization (#1292)

* add image

* serialization

* cleanup cli (#1294)

* CLI serialization (#1295)

* add image

* Fix more serialization around kg

* Nolan/schemacreation (#1296)

* add image

* Fix more serialization around kg

* add quotes to prevent reserved keywords from failing

* Prevent errors if config name is reserved name in postgres (#1297)

* Prevent reserved words (#1298)

* default collection ID

* up

* Move default collection id method to utils (#1299)

* up

* Allow json fallback (#1301)

* hotfix: import

* Fix description error (#1302)

* up

* push

* up (#1303)

* up

* up

* up

* up

* minor tweaks

* up

* mypy

* add back missing file

* up

* add way to access entities and relationships

* up

* up

* fix id

* up

* refine end pts

---------

Co-authored-by: Nolan Tremelling <[email protected]>
Co-authored-by: Shreyas Pimpalgaonkar <[email protected]>
* add filters (in progress)

* todo comment

* minor addition

* modify command
* Allow super users to update others to super user status

* Fix auth on collections endpoints

* Better error message
* up

* slightly modify

* up

* minor fix

* docs
@emrgnt-cmplxty emrgnt-cmplxty marked this pull request as ready for review October 3, 2024 01:11
@emrgnt-cmplxty emrgnt-cmplxty merged commit 55d7d87 into main Oct 3, 2024
12 of 16 checks passed
Copy link
Contributor

@ellipsis-dev ellipsis-dev bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Looks good to me! Reviewed everything up to 989ce1a in 2 minutes and 4 seconds

More details
  • Looked at 4234 lines of code in 76 files
  • Skipped 2 files when reviewing.
  • Skipped posting 2 drafted comments based on config settings.
1. templates/agentic_rag_chatbot/web-app/public/data/r2r-installation.html:72
  • Draft comment:
    Update POSTGRES_VECS_COLLECTION to R2R_PROJECT_NAME for consistency with other changes.
  • Reason this comment was not posted:
    Decided after close inspection that this draft comment was likely wrong and/or not actionable:
    The comment is suggesting a change for consistency, which is a valid code quality improvement. The diff shows that R2R_PROJECT_NAME is introduced, which aligns with the comment's suggestion. This indicates that the comment is relevant to the changes made in the diff.
    I might be missing whether the change is actually necessary for functionality or if it's purely for naming consistency. The comment doesn't specify if there's a functional impact.
    Even if the change is for naming consistency, it can still be important for code readability and maintainability, which are valid reasons to keep the comment.
    The comment is relevant to the changes made in the diff and suggests a valid improvement for consistency. It should be kept.
2. templates/ycombinator_graphrag/web-app/public/data/r2r-installation.html:72
  • Draft comment:
    Update POSTGRES_VECS_COLLECTION to R2R_PROJECT_NAME for consistency with other changes.
  • Reason this comment was not posted:
    Marked as duplicate.

Workflow ID: wflow_80I8UyAPlquId28g


You can customize Ellipsis with 👍 / 👎 feedback, review rules, user-specific overrides, quiet mode, and more.

@emrgnt-cmplxty emrgnt-cmplxty deleted the dev-minor branch October 3, 2024 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants