Skip to content

Projects: Fix fetching of projects #313

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.

Sign up for GitHub

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

Open
iLLiCiTiT wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Projects: Fix fetching of projects #313

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c94b0e7
actually filter graphql project by name
iLLiCiTiT Mar 19, 2026
25fd603
better merge of rest and graphql project data
iLLiCiTiT Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 30 additions & 16 deletions ayon_api/_api_helpers/projects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,16 +291,14 @@ def get_projects(
return
projects_by_name = {p["name"]: p for p in projects}

for project in self.get_rest_projects(active, library):
for project in self.get_rest_projects(active=active, library=library):
if own_attributes:
fill_own_attribs(project)

name = project["name"]
graphql_p = projects_by_name.get(name)
if graphql_p:
for key in (
"productTypes",
"usedTags",
):
if key in graphql_p:
project[key] = graphql_p[key]
graphql_project = projects_by_name.get(name)
self._merge_project_graphql_data(project, graphql_project)

yield project

def get_project(
Expand Down Expand Up @@ -332,6 +330,7 @@ def get_project(
graphql_project = next(self._get_graphql_projects(
None,
None,
project_name=project_name,
fields=graphql_fields,
own_attributes=own_attributes,
), None)
Expand All @@ -341,13 +340,9 @@ def get_project(
project = self.get_rest_project(project_name)
if own_attributes:
fill_own_attribs(project)
if graphql_project:
for key in (
"productTypes",
"usedTags",
):
if key in graphql_project:
project[key] = graphql_project[key]

self._merge_project_graphql_data(project, graphql_project)

return project

def create_project(
Expand Down Expand Up @@ -817,6 +812,25 @@ def _get_graphql_projects(
self._fill_project_entity_data(project)
yield project

def _merge_project_graphql_data(
self,
rest_project: dict[str, Any],
graphql_project: Optional[dict[str, Any]],
) -> None:
if not graphql_project:
return

for key, value in graphql_project.items():
if (
key not in rest_project
or key in (
"productBaseTypes",
"productTypes",
"usedTags",
)
):
rest_project[key] = value

def _get_project_roots_values(
self,
project_name: str,
Expand Down
Loading