Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit bafea19

Browse files
committedJan 27, 2025
Add ability to authenticate with a JWT loaded from a file.
1 parent afac61e commit bafea19

File tree

2 files changed

+47
-18
lines changed

2 files changed

+47
-18
lines changed
 

‎CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
- Implement 100% test coverage ([\#27](https://github.com/ubccr/xdmod-data/pull/27)).
77
- Update Flake8 rules ([\#28](https://github.com/ubccr/xdmod-data/pull/28)).
88
- Change to using CircleCI instead of GitHub Actions for continuous integration ([\#48](https://github.com/ubccr/xdmod-data/pull/48), [\#49](https://github.com/ubccr/xdmod-data/pull/49)).
9-
- Set up Docker Compose for CI testing ([\#51](https://github.com/ubccr/xdmod-data/pull/51)).
10-
- Add XDMoD 11.0 development version to CI testing ([\#52](https://github.com/ubccr/xdmod-data/pull/52)).
9+
- Set up Docker Compose for CI testing ([\#51](https://github.com/ubccr/xdmod-data/pull/51), [\#52](https://github.com/ubccr/xdmod-data/pull/52)).
10+
- Add ability to authenticate with a JWT loaded from a file ([\#](https://github.com/ubccr/xdmod-data/pull/)).
1111

1212
## v1.0.2 (2024-10-31)
1313

‎README.md

+45-16
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# xdmod-data
2-
As part of the Data Analytics Framework for [XDMoD](https://open.xdmod.org), this Python package provides API access to the data warehouse of instances of Open XDMoD.
2+
As part of the Data Analytics Framework for [XDMoD](https://open.xdmod.org),
3+
this Python package provides API access to the data warehouse of instances of
4+
Open XDMoD.
35

4-
This documentation is for **v2.x.y (main development branch)**. For documentation of other versions:
6+
This documentation is for **v2.x.y (main development branch)**. For
7+
documentation of other versions:
58

69
- [v1.0.2](https://github.com/ubccr/xdmod-data/tree/v1.0.2?tab=readme-ov-file#xdmod-data)
710
- [v1.0.1](https://github.com/ubccr/xdmod-data/tree/v1.0.1?tab=readme-ov-file#xdmod-data)
@@ -12,22 +15,35 @@ The package can be installed from PyPI via `pip install xdmod-data`.
1215

1316
Existing installations can be upgraded via `pip install --upgrade xdmod-data`.
1417

15-
The package has dependencies on [NumPy](https://pypi.org/project/numpy/), [Pandas](https://pypi.org/project/pandas/), [Plotly](https://pypi.org/project/plotly/), and [Requests](https://pypi.org/project/requests/).
18+
The package has dependencies on [NumPy](https://pypi.org/project/numpy/),
19+
[python-dotenv](https://pypi.org/project/python-dotenv/),
20+
[Pandas](https://pypi.org/project/pandas/),
21+
[Plotly](https://pypi.org/project/plotly/), and
22+
[Requests](https://pypi.org/project/requests/).
1623

17-
Example usage is documented through Jupyter notebooks in the [xdmod-notebooks](https://github.com/ubccr/xdmod-notebooks) repository.
24+
Example usage is documented through Jupyter notebooks in the
25+
[xdmod-notebooks](https://github.com/ubccr/xdmod-notebooks) repository.
1826

1927
## Compatibility with Open XDMoD
20-
Specific versions of this package are compatible with specific versions of Open XDMoD as indicated in the table below.
28+
Specific versions of this package are compatible with specific versions of Open
29+
XDMoD as indicated in the table below.
2130

2231
| `xdmod-data` version | Open XDMoD versions |
2332
| -------------------- | ------------------- |
2433
| 1.0.2, 1.0.1 | 11.0.x, 10.5.x |
2534
| 1.0.0 | 10.5.x |
2635

27-
## API Token Access
28-
Use of the Data Analytics Framework requires an API token. To obtain an API token, follow the steps below to obtain an API token from the XDMoD portal.
36+
## API Token or JupyterHub Access
37+
Use of the Data Analytics Framework requires an API token, unless you are
38+
running in an XDMoD-hosted JupyterHub such as the one provided by ACCESS XDMoD
39+
(https://xdmod.access-ci.org/jupyter-hub), in which case authentication is
40+
handled automatically.
2941

30-
1. First, if you are not already signed in to the portal, sign in in the top-left corner:
42+
If you need to obtain an API token, you can follow the steps below to obtain
43+
one from the XDMoD portal.
44+
45+
1. First, if you are not already signed in to the portal, sign in in the
46+
top-left corner:
3147

3248
![Screenshot of "Sign In" button](https://raw.githubusercontent.com/ubccr/xdmod-data/main/docs/images/api-token/sign-in.jpg)
3349

@@ -49,17 +65,21 @@ Use of the Data Analytics Framework requires an API token. To obtain an API toke
4965

5066
![Screenshot of "Generate API Token" button](https://raw.githubusercontent.com/ubccr/xdmod-data/main/docs/images/api-token/generate.jpg)
5167

52-
1. Copy the token to your clipboard. Make sure to paste it somewhere secure for saving, as you will not be able to see the token again once you close the window:
68+
1. Copy the token to your clipboard. Make sure to paste it somewhere secure for
69+
saving, as you will not be able to see the token again once you close the
70+
window:
5371

5472
![Screenshot of "Copy API Token to Clipboard" button](https://raw.githubusercontent.com/ubccr/xdmod-data/main/docs/images/api-token/copy.jpg)
5573

5674
**Note:** If you lose your token, simply delete it and generate a new one.
5775

5876
## Feedback / Feature Requests
59-
We welcome your feedback and feature requests for the Data Analytics Framework for XDMoD via email: ccr-xdmod-help@buffalo.edu.
77+
We welcome your feedback and feature requests for the Data Analytics Framework
78+
for XDMoD via email: ccr-xdmod-help@buffalo.edu.
6079

6180
## Support
62-
For support, please see [this page](https://open.xdmod.org/support.html). If you email for support, please include the following:
81+
For support, please see [this page](https://open.xdmod.org/support.html). If
82+
you email for support, please include the following:
6383
* `xdmod-data` version number, obtained by running this Python code:
6484
```
6585
from xdmod_data import __version__
@@ -70,15 +90,24 @@ For support, please see [this page](https://open.xdmod.org/support.html). If you
7090
* Detailed steps to reproduce the problem.
7191
7292
## License
73-
`xdmod-data` is released under the GNU Lesser General Public License ("LGPL") Version 3.0. See the [LICENSE](LICENSE) file for details.
93+
`xdmod-data` is released under the GNU Lesser General Public License ("LGPL")
94+
Version 3.0. See the [LICENSE](LICENSE) file for details.
7495
7596
## References
7697
77-
When referencing the Data Analytics Framework for XDMoD, please cite the following publication:
98+
When referencing the Data Analytics Framework for XDMoD, please cite the
99+
following publication:
78100
79-
> Weeden, A., White, J.P., DeLeon, R.L., Rathsam, R., Simakov, N.A., Saeli, C., and Furlani, T.R. The Data Analytics Framework for XDMoD. _SN COMPUT. SCI._ 5, 462 (2024). https://doi.org/10.1007/s42979-024-02789-2
101+
> Weeden, A., White, J.P., DeLeon, R.L., Rathsam, R., Simakov, N.A., Saeli, C.,
102+
and Furlani, T.R. The Data Analytics Framework for XDMoD. _SN COMPUT. SCI._
103+
5, 462 (2024). https://doi.org/10.1007/s42979-024-02789-2
80104
81105
When referencing XDMoD, please cite the following publication:
82106
83-
> Jeffrey T. Palmer, Steven M. Gallo, Thomas R. Furlani, Matthew D. Jones, Robert L. DeLeon, Joseph P. White, Nikolay Simakov, Abani K. Patra, Jeanette Sperhac, Thomas Yearke, Ryan Rathsam, Martins Innus, Cynthia D. Cornelius, James C. Browne, William L. Barth, Richard T. Evans, "Open XDMoD: A Tool for the Comprehensive Management of High-Performance Computing Resources", *Computing in Science & Engineering*, Vol 17, Issue 4, 2015, pp. 52-62. DOI:[10.1109/MCSE.2015.68](https://doi.org/10.1109/MCSE.2015.68)
84-
107+
> Jeffrey T. Palmer, Steven M. Gallo, Thomas R. Furlani, Matthew D. Jones,
108+
Robert L. DeLeon, Joseph P. White, Nikolay Simakov, Abani K. Patra, Jeanette
109+
Sperhac, Thomas Yearke, Ryan Rathsam, Martins Innus, Cynthia D. Cornelius,
110+
James C. Browne, William L. Barth, Richard T. Evans, "Open XDMoD: A Tool for
111+
the Comprehensive Management of High-Performance Computing Resources",
112+
*Computing in Science & Engineering*, Vol 17, Issue 4, 2015, pp. 52-62.
113+
DOI:[10.1109/MCSE.2015.68](https://doi.org/10.1109/MCSE.2015.68)

0 commit comments

Comments
 (0)