diff --git a/fedcloudclient/endpoint.py b/fedcloudclient/endpoint.py index 8d43cb5..be9bab2 100644 --- a/fedcloudclient/endpoint.py +++ b/fedcloudclient/endpoint.py @@ -243,6 +243,7 @@ def get_projects_from_sites(access_token, site): ) return project_list + def get_projects_from_sites_dict(access_token, site): """ Get all projects as a dictionary from sites using access token, @@ -257,7 +258,7 @@ def get_projects_from_sites_dict(access_token, site): "project_id": p["id"], "name": p["name"], "enabled": p["enabled"], - "site": ep[0] + "site": ep[0], } for p in get_projects(os_auth_url, unscoped_token) ] diff --git a/fedcloudclient/sites.py b/fedcloudclient/sites.py index 8afa190..9dd0c3f 100644 --- a/fedcloudclient/sites.py +++ b/fedcloudclient/sites.py @@ -13,6 +13,7 @@ import builtins import json from pathlib import Path +from typing import List from urllib.request import Request, urlopen import click @@ -20,7 +21,6 @@ import yaml from fedcloudclient.decorators import site_params, site_vo_params from jsonschema import validate -from typing import List __REMOTE_CONFIG_FILE = ( "https://raw.githubusercontent.com/tdviet/fedcloudclient/master/config/sites.yaml" @@ -28,7 +28,7 @@ __LOCAL_CONFIG_DIR = ".config/fedcloud/site-config/" -__site_config_data: List[str] = [] +__site_config_data: List[dict] = [] __FILE_SIZE_LIMIT = 1024 * 1024 # Max size for config files