@@ -28,6 +28,7 @@ def _format_role(self, role: dict) -> Role:
2828 permissions_provide_models = True if "provide_models" in role ["permissions" ] else False
2929
3030 limits_dict = defaultdict (lambda : {"rpm" : None , "rpd" : None , "tpm" : None , "tpd" : None })
31+
3132 for limit in role ["limits" ]:
3233 router_name = router_dict_reverse [limit ["router" ]]
3334 limits_dict [router_name ][limit ["type" ]] = limit ["value" ]
@@ -78,6 +79,19 @@ async def load_entities(self):
7879
7980 response = None
8081 try :
82+ async with httpx .AsyncClient () as client :
83+ response = await client .get (
84+ f"{ self .opengatellm_url } /v1/admin/routers" ,
85+ headers = {"Authorization" : f"Bearer { self .api_key } " },
86+ timeout = configuration .settings .playground_opengatellm_timeout ,
87+ )
88+
89+ response .raise_for_status ()
90+ data = response .json ()
91+ routers_data = data .get ("data" , [])
92+ self .routers_list = [{"id" : router ["id" ], "name" : router ["name" ]} for router in routers_data ]
93+ self .routers_dict = {router ["name" ]: router ["id" ] for router in routers_data }
94+
8195 async with httpx .AsyncClient () as client :
8296 response = await client .get (
8397 f"{ self .opengatellm_url } /v1/admin/roles" ,
@@ -97,19 +111,6 @@ async def load_entities(self):
97111 for role in data .get ("data" , []):
98112 self .entities .append (self ._format_role (role ))
99113
100- async with httpx .AsyncClient () as client :
101- response = await client .get (
102- f"{ self .opengatellm_url } /v1/admin/routers" ,
103- headers = {"Authorization" : f"Bearer { self .api_key } " },
104- timeout = configuration .settings .playground_opengatellm_timeout ,
105- )
106-
107- response .raise_for_status ()
108- data = response .json ()
109- routers_data = data .get ("data" , [])
110- self .routers_list = [{"id" : router ["id" ], "name" : router ["name" ]} for router in routers_data ]
111- self .routers_dict = {router ["name" ]: router ["id" ] for router in routers_data }
112-
113114 self .has_more_page = len (self .entities ) == self .per_page
114115
115116 except Exception as e :
0 commit comments