@@ -49,6 +49,7 @@ <h1>Source code for gen3.metadata</h1><div class="highlight"><pre>
4949< span class ="kn "> import</ span > < span class ="nn "> sys</ span >
5050
5151< span class ="kn "> from</ span > < span class ="nn "> gen3.utils</ span > < span class ="k "> import</ span > < span class ="n "> append_query_params</ span > < span class ="p "> ,</ span > < span class ="n "> DEFAULT_BACKOFF_SETTINGS</ span >
52+ < span class ="kn "> from</ span > < span class ="nn "> gen3.auth</ span > < span class ="k "> import</ span > < span class ="n "> Gen3Auth</ span >
5253
5354
5455< div class ="viewcode-block " id ="Gen3Metadata "> < a class ="viewcode-back " href ="../../metadata.html#gen3.metadata.Gen3Metadata "> [docs]</ a > < span class ="k "> class</ span > < span class ="nc "> Gen3Metadata</ span > < span class ="p "> :</ span >
@@ -59,17 +60,17 @@ <h1>Source code for gen3.metadata</h1><div class="highlight"><pre>
5960< span class ="sd "> This generates the Gen3Metadata class pointed at the sandbox commons while</ span >
6061< span class ="sd "> using the credentials.json downloaded from the commons profile page.</ span >
6162
62- < span class ="sd "> >>> auth = Gen3Auth(endpoint, refresh_file="credentials.json")</ span >
63- < span class ="sd "> ... sub = Gen3Metadata(auth.endpoint, auth )</ span >
63+ < span class ="sd "> >>> auth = Gen3Auth(refresh_file="credentials.json")</ span >
64+ < span class ="sd "> ... sub = Gen3Metadata(auth)</ span >
6465
6566< span class ="sd "> Attributes:</ span >
66- < span class ="sd "> admin_endpoint (str): endpoint for admin functionality (Create/Update/Delete) </ span >
67- < span class ="sd "> endpoint (str ): public endpoint for reading/querying metadata </ span >
67+ < span class ="sd "> endpoint (str): public endpoint for reading/querying metadata - only necessary if auth_provider not provided </ span >
68+ < span class ="sd "> auth_provider (Gen3Auth ): auth manager </ span >
6869< span class ="sd "> """</ span >
6970
7071 < span class ="k "> def</ span > < span class ="nf "> __init__</ span > < span class ="p "> (</ span >
7172 < span class ="bp "> self</ span > < span class ="p "> ,</ span >
72- < span class ="n "> endpoint</ span > < span class ="p "> ,</ span >
73+ < span class ="n "> endpoint</ span > < span class ="o " > = </ span > < span class =" kc " > None </ span > < span class =" p "> ,</ span >
7374 < span class ="n "> auth_provider</ span > < span class ="o "> =</ span > < span class ="kc "> None</ span > < span class ="p "> ,</ span >
7475 < span class ="n "> service_location</ span > < span class ="o "> =</ span > < span class ="s2 "> "mds"</ span > < span class ="p "> ,</ span >
7576 < span class ="n "> admin_endpoint_suffix</ span > < span class ="o "> =</ span > < span class ="s2 "> "-admin"</ span > < span class ="p "> ,</ span >
@@ -84,6 +85,12 @@ <h1>Source code for gen3.metadata</h1><div class="highlight"><pre>
8485< span class ="sd "> service_location (str, optional): deployment location relative to the</ span >
8586< span class ="sd "> endpoint provided</ span >
8687< span class ="sd "> """</ span >
88+ < span class ="c1 "> # legacy interface required endpoint as 1st arg</ span >
89+ < span class ="k "> if</ span > < span class ="n "> endpoint</ span > < span class ="ow "> and</ span > < span class ="nb "> isinstance</ span > < span class ="p "> (</ span > < span class ="n "> endpoint</ span > < span class ="p "> ,</ span > < span class ="n "> Gen3Auth</ span > < span class ="p "> ):</ span >
90+ < span class ="n "> auth_provider</ span > < span class ="o "> =</ span > < span class ="n "> endpoint</ span >
91+ < span class ="n "> endpoint</ span > < span class ="o "> =</ span > < span class ="kc "> None</ span >
92+ < span class ="k "> if</ span > < span class ="n "> auth_provider</ span > < span class ="ow "> and</ span > < span class ="nb "> isinstance</ span > < span class ="p "> (</ span > < span class ="n "> auth_provider</ span > < span class ="p "> ,</ span > < span class ="n "> Gen3Auth</ span > < span class ="p "> ):</ span >
93+ < span class ="n "> endpoint</ span > < span class ="o "> =</ span > < span class ="n "> auth_provider</ span > < span class ="o "> .</ span > < span class ="n "> endpoint</ span >
8794 < span class ="n "> endpoint</ span > < span class ="o "> =</ span > < span class ="n "> endpoint</ span > < span class ="o "> .</ span > < span class ="n "> strip</ span > < span class ="p "> (</ span > < span class ="s2 "> "/"</ span > < span class ="p "> )</ span >
8895 < span class ="c1 "> # if running locally, mds is deployed by itself without a location relative</ span >
8996 < span class ="c1 "> # to the commons</ span >
0 commit comments