fix(BA-420): Regression of outdated `vfolder` GQL resolver #3047

jopemachine · 2024-11-07T10:12:03Z

When using vfolder GQL in the main branch, the following error occurs:

{
  "data": {
    "vfolder": null
  },
  "errors": [
    {
      "message": "VirtualFolder.batch_load_by_id() got an unexpected keyword argument 'user_uuid'",
      "locations": [
        {
          "line": 2,
          "column": 5
        }
      ],
      "path": [
        "vfolder"
      ]
    }
  ]
}

This PR resolves several issues causing the VFolder GQL to malfunction in the current main branch.

Request example

query ComputeContainer {
    vfolder (id: "VFOLDER_ID") {
        name
    }
}

Checklist: (if applicable)

Milestone metadata specifying the target backport version

📚 Documentation preview 📚: https://sorna--3047.org.readthedocs.build/en/3047/

📚 Documentation preview 📚: https://sorna-ko--3047.org.readthedocs.build/ko/3047/

jopemachine · 2024-11-07T10:20:28Z

src/ai/backend/manager/models/gql.py

@@ -1875,16 +1875,23 @@ async def resolve_vfolder(
        user_id: Optional[uuid.UUID] = None,
    ) -> Optional[VirtualFolder]:
        graph_ctx: GraphQueryContext = info.context
-        user_role = graph_ctx.user["role"]
        loader = graph_ctx.dataloader_manager.get_loader(
            graph_ctx,
            "VirtualFolder.by_id",


I want to use get_loader_by_func and VirtualFolder.batch_load_by_id here, but then I'm getting a type error since the return type of VirtualFolder.batch_load_by_id differs from what get_loader_by_func expects.

jopemachine · 2024-11-07T10:25:55Z

src/ai/backend/manager/models/vfolder.py

@@ -1627,7 +1627,7 @@ async def batch_load_by_id(
                query,
                cls,
                ids,
-                lambda row: row["user"],


Since user_id is provided as a separate argument, the id here should be the vfolder's id.

fregataa

I think the news fragment has been sabotaged by gitub action.. please resolve it

jopemachine · 2024-11-09T03:52:13Z

I think the news fragment has been sabotaged by gitub action.. please resolve it

Resolved in #3059.

fregataa

Please update the PR title and the news fragment to "which GQL query resolver" is fixed. Broken Vfolder GQL is too vague

fregataa

Please refer which GQL query resolver is fixed. e.g. Fix GraphQL vfolder query.
VFolder GQL could mean many other queries such as vfolder, vfolder_list, vfolder_node etc

jopemachine · 2024-11-13T09:18:06Z

Please refer which GQL query resolver is fixed. e.g. Fix GraphQL vfolder query. VFolder GQL could mean many other queries such as vfolder, vfolder_list, vfolder_node etc

I used uppercase letters to maintain consistency with other PRs, but since it could cause misunderstandings, I changed it to lowercase.

tests/manager/models/test_vfolder.py

HyeockJinKim · 2024-12-16T06:26:12Z

please check CI. @jopemachine

HyeockJinKim · 2024-12-16T06:37:19Z

src/ai/backend/manager/models/vfolder.py

+            case VFolderRow():
+                return cls(
+                    id=row.id,
+                    host=row.host,
+                    quota_scope_id=row.quota_scope_id,
+                    name=row.name,
+                    user=row.user,
+                    user_email=row.user_row.email if row.user_row is not None else None,
+                    group=row.group,
+                    group_name=row.group_row.name if row.group_row is not None else None,
+                    creator=row.creator,
+                    domain_name=row.domain_name,
+                    unmanaged_path=row.unmanaged_path,
+                    usage_mode=row.usage_mode,
+                    permission=row.permission,
+                    ownership_type=row.ownership_type,
+                    max_files=row.max_files,
+                    max_size=row.max_size,  # in MiB
+                    created_at=row.created_at,
+                    last_used=row.last_used,
+                    cloneable=row.cloneable,
+                    status=row.status,
+                    cur_size=row.cur_size,


Is there a reason why it was separated? The behavior seems identical to that of Row

The two codes are not the same although the meaning is almost identical.
For example, on the Row side, it is row["id"], while on the VFolderRow side, it is id=row.id.
But I agree it would be great if there were a way to simplify the code further.

jopemachine · 2024-12-30T02:10:20Z

@HyeockJinKim Could you review the PR again and confirm if it's ready to be merged?

HyeockJinKim · 2025-01-08T02:39:10Z

Could you review this once more? @fregataa

jopemachine · 2025-01-14T07:12:47Z

@fregataa This PR is set to BA Sprint 1.
Are you able to review it? If not, it will need to be postponed to BA Sprint 2.

fregataa

👍

Co-authored-by: Sanghun Lee <[email protected]> Backported-from: main (24.12) Backported-to: 24.03 Backport-of: 3047

Co-authored-by: Sanghun Lee <[email protected]> Backported-from: main (24.12) Backported-to: 24.09 Backport-of: 3047

Co-authored-by: Sanghun Lee <[email protected]> Backported-from: main (24.12) Backported-to: 23.09 Backport-of: 3047

…3452) Co-authored-by: Gyubong Lee <[email protected]> Co-authored-by: Sanghun Lee <[email protected]>

…3453) Co-authored-by: Gyubong Lee <[email protected]> Co-authored-by: Sanghun Lee <[email protected]>

…3454) Co-authored-by: Gyubong Lee <[email protected]> Co-authored-by: Sanghun Lee <[email protected]>

github-actions bot assigned jopemachine Nov 7, 2024

github-actions bot added area:docs Documentations comp:manager Related to Manager component size:S 10~30 LoC labels Nov 7, 2024

jopemachine added the type:bug Reports about that are not working label Nov 7, 2024

jopemachine changed the title ~~fix: Broken vfolders GQL~~ fix: Broken Vfolder GQL Nov 7, 2024

jopemachine commented Nov 7, 2024

View reviewed changes

jopemachine added this to the 23.09 milestone Nov 7, 2024

jopemachine requested a review from fregataa November 7, 2024 10:22

jopemachine marked this pull request as ready for review November 7, 2024 10:22

jopemachine commented Nov 7, 2024

View reviewed changes

fregataa requested changes Nov 9, 2024

View reviewed changes

fregataa self-requested a review November 12, 2024 23:44

fregataa requested changes Nov 13, 2024

View reviewed changes

jopemachine changed the title ~~fix: Broken Vfolder GQL~~ fix: Regression of VFolder GQL outdated resolver Nov 13, 2024

jopemachine changed the title ~~fix: Regression of VFolder GQL outdated resolver~~ fix: Regression of VFolder GQL due to outdated resolver Nov 13, 2024

jopemachine requested a review from fregataa November 13, 2024 06:03

fregataa requested changes Nov 13, 2024

View reviewed changes

jopemachine changed the title ~~fix: Regression of VFolder GQL due to outdated resolver~~ fix: Regression of outdated vfolder GQL resolver Nov 13, 2024

jopemachine requested a review from fregataa November 13, 2024 09:15

jopemachine force-pushed the fix/broken-vfolder-gql branch from 82e5273 to 730212e Compare November 27, 2024 04:30

jopemachine commented Dec 6, 2024

View reviewed changes

tests/manager/models/test_vfolder.py Outdated Show resolved Hide resolved

HyeockJinKim reviewed Dec 16, 2024

View reviewed changes

jopemachine force-pushed the fix/broken-vfolder-gql branch from 8ce145f to 5fd6dd0 Compare December 23, 2024 02:36

github-actions bot added size:L 100~500 LoC and removed size:S 10~30 LoC labels Dec 23, 2024

jopemachine requested a review from HyeockJinKim December 23, 2024 02:50

jopemachine added 9 commits December 30, 2024 11:10

feat: Add test_batch_result_in_scalar_stream

a85106f

refactor: parametrize batch_load_by_id arguments

536040b

fix: Revert unrelated change

e2a7222

fix: Remove unused variable

8ce6708

chore: Rename news fragment

58d5441

fix: Improve comments

ae88328

fix: Rename variable

a930610

chore: with -> by

f0618fe

fix: Broken CI

45cab2f

jopemachine force-pushed the fix/broken-vfolder-gql branch from 019e513 to 45cab2f Compare December 30, 2024 02:10

jopemachine changed the title ~~fix: Regression of outdated vfolder GQL resolver~~ fix(BA-420): Regression of outdated vfolder GQL resolver Jan 6, 2025

fregataa approved these changes Jan 14, 2025

View reviewed changes

fregataa added 2 commits January 14, 2025 16:29

Merge branch 'main' into fix/broken-vfolder-gql

92aa787

Merge branch 'main' into fix/broken-vfolder-gql

5b5f511

fregataa added this pull request to the merge queue Jan 14, 2025

Merged via the queue into main with commit d90f801 Jan 14, 2025
23 checks passed

fregataa deleted the fix/broken-vfolder-gql branch January 14, 2025 08:18

lablup-octodog pushed a commit that referenced this pull request Jan 14, 2025

fix(BA-420): Regression of outdated vfolder GQL resolver (#3047)

41f1306

Co-authored-by: Sanghun Lee <[email protected]> Backported-from: main (24.12) Backported-to: 24.03 Backport-of: 3047

lablup-octodog pushed a commit that referenced this pull request Jan 14, 2025

fix(BA-420): Regression of outdated vfolder GQL resolver (#3047)

e5972cb

Co-authored-by: Sanghun Lee <[email protected]> Backported-from: main (24.12) Backported-to: 24.09 Backport-of: 3047

This was referenced Jan 14, 2025

fix(BA-420): Regression of outdated vfolder GQL resolver (#3047) #3452

Merged

fix(BA-420): Regression of outdated vfolder GQL resolver (#3047) #3453

Merged

lablup-octodog pushed a commit that referenced this pull request Jan 14, 2025

fix(BA-420): Regression of outdated vfolder GQL resolver (#3047)

62003b0

Co-authored-by: Sanghun Lee <[email protected]> Backported-from: main (24.12) Backported-to: 23.09 Backport-of: 3047

lablup-octodog mentioned this pull request Jan 14, 2025

fix(BA-420): Regression of outdated vfolder GQL resolver (#3047) #3454

Merged

github-merge-queue bot pushed a commit that referenced this pull request Jan 14, 2025

fix(BA-420): Regression of outdated vfolder GQL resolver (#3047) (#…

0221158

…3452) Co-authored-by: Gyubong Lee <[email protected]> Co-authored-by: Sanghun Lee <[email protected]>

github-merge-queue bot pushed a commit that referenced this pull request Jan 14, 2025

fix(BA-420): Regression of outdated vfolder GQL resolver (#3047) (#…

32b0008

…3453) Co-authored-by: Gyubong Lee <[email protected]> Co-authored-by: Sanghun Lee <[email protected]>

github-merge-queue bot pushed a commit that referenced this pull request Jan 14, 2025

fix(BA-420): Regression of outdated vfolder GQL resolver (#3047) (#…

cdb36c8

…3454) Co-authored-by: Gyubong Lee <[email protected]> Co-authored-by: Sanghun Lee <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(BA-420): Regression of outdated `vfolder` GQL resolver #3047

fix(BA-420): Regression of outdated `vfolder` GQL resolver #3047

jopemachine commented Nov 7, 2024 •

edited by github-actions bot

Loading

jopemachine Nov 7, 2024 •

edited

Loading

jopemachine Nov 7, 2024 •

edited

Loading

fregataa left a comment

jopemachine commented Nov 9, 2024

fregataa left a comment

fregataa left a comment •

edited

Loading

jopemachine commented Nov 13, 2024 •

edited

Loading

HyeockJinKim commented Dec 16, 2024

HyeockJinKim Dec 16, 2024

jopemachine Dec 23, 2024

jopemachine commented Dec 30, 2024

HyeockJinKim commented Jan 8, 2025

jopemachine commented Jan 14, 2025

fregataa left a comment

fix(BA-420): Regression of outdated vfolder GQL resolver #3047

fix(BA-420): Regression of outdated vfolder GQL resolver #3047

Conversation

jopemachine commented Nov 7, 2024 • edited by github-actions bot Loading

Request example

jopemachine Nov 7, 2024 • edited Loading

Choose a reason for hiding this comment

jopemachine Nov 7, 2024 • edited Loading

Choose a reason for hiding this comment

fregataa left a comment

Choose a reason for hiding this comment

jopemachine commented Nov 9, 2024

fregataa left a comment

Choose a reason for hiding this comment

fregataa left a comment • edited Loading

Choose a reason for hiding this comment

jopemachine commented Nov 13, 2024 • edited Loading

HyeockJinKim commented Dec 16, 2024

HyeockJinKim Dec 16, 2024

Choose a reason for hiding this comment

jopemachine Dec 23, 2024

Choose a reason for hiding this comment

jopemachine commented Dec 30, 2024

HyeockJinKim commented Jan 8, 2025

jopemachine commented Jan 14, 2025

fregataa left a comment

Choose a reason for hiding this comment

fix(BA-420): Regression of outdated `vfolder` GQL resolver #3047

fix(BA-420): Regression of outdated `vfolder` GQL resolver #3047

jopemachine commented Nov 7, 2024 •

edited by github-actions bot

Loading

jopemachine Nov 7, 2024 •

edited

Loading

jopemachine Nov 7, 2024 •

edited

Loading

fregataa left a comment •

edited

Loading

jopemachine commented Nov 13, 2024 •

edited

Loading