Skip to content

Commit 0a3af2f

Browse files
committed
simplified projects fetching
1 parent 0e5a9c2 commit 0a3af2f

1 file changed

Lines changed: 13 additions & 14 deletions

File tree

ayon_api/server_api.py

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4419,7 +4419,6 @@ def get_rest_projects(
44194419
for project_name in self.get_project_names(active, library):
44204420
project = self.get_rest_project(project_name)
44214421
if project:
4422-
self._fill_project_entity_data(project)
44234422
yield project
44244423

44254424
def get_rest_entity_by_id(
@@ -4609,23 +4608,23 @@ def get_projects(
46094608
)
46104609
return
46114610

4612-
p_by_name = {}
46134611
if use_graphql:
4614-
p_by_name = {
4615-
p["name"]: p
4616-
for p in self._get_graphql_projects(
4617-
active,
4618-
library,
4619-
fields={"name", "productTypes"},
4620-
own_attributes=own_attributes,
4621-
)
4622-
}
4612+
for graphql_project in self._get_graphql_projects(
4613+
active,
4614+
library,
4615+
fields={"name", "productTypes"},
4616+
own_attributes=own_attributes,
4617+
):
4618+
project = self.get_project(graphql_project["name"])
4619+
if own_attributes:
4620+
fill_own_attribs(project)
4621+
project["productTypes"] = graphql_project["productTypes"]
4622+
yield project
4623+
return
4624+
46234625
for project in self.get_rest_projects(active, library):
46244626
if own_attributes:
46254627
fill_own_attribs(project)
4626-
graphql_p = p_by_name.get(project["name"])
4627-
if graphql_p:
4628-
project["productTypes"] = graphql_p["productTypes"]
46294628
yield project
46304629

46314630
def get_project(

0 commit comments

Comments
 (0)