Skip to content

Commit

Permalink
OLIApi Revision (watertap-org#1141)
Browse files Browse the repository at this point in the history
* add credential manager to oli api

* fix incorrect call from credential manager

* run black

* Update watertap/core/util/tests/test_credential_manager.py

exception test for get_credentials()

Co-authored-by: Adam Atia <aatia@keylogic.com>

* fix cryptography module import

* run black on setup.py

* add missing get_login_status args

* Improving credential manager testing

* Helper functions for OLI/MCAS

* Run black

* Add test for MCAS flowsheet method

* watertap_to_oli tests

* run black

* Merge in code demo and required changes

* Add OLI API tests, minor fixes

* Fix temp OLIApi client tests

* Improved formatting and documentation

* add missing __init__.py file

* docstring fix + added inits

* OLI API update setup.py and requirements-dev.txt

* skip test if no cryptography

* pylint

* black

* comment out unused import

* update test skip logic (cryptography)

---------

Co-authored-by: Vecchiarelli <pvecchia@nrel.gov>
Co-authored-by: Adam Atia <aatia@keylogic.com>
Co-authored-by: Bernard Knueven <Bernard.Knueven@nrel.gov>
Co-authored-by: Ludovico Bianchi <lbianchi@lbl.gov>
  • Loading branch information
5 people authored Nov 22, 2023
1 parent f935eb9 commit e1a2a82
Show file tree
Hide file tree
Showing 21 changed files with 18,968 additions and 1,104 deletions.
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ pre-commit
pylint<3
astroid
# Defer to setup.py contents
-e .[dev,notebooks]
-e .[dev,notebooks,oli_api]
4 changes: 4 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@
"jupyter",
"ipykernel",
],
"oli_api": [
"requests",
"cryptography", # for encrypting OLI credentials
],
"dev": [
"nbsphinx", # jupyter notebook support for sphinx
"jinja2<3.1.0", # see watertap-org/watertap#449
Expand Down
Loading

0 comments on commit e1a2a82

Please sign in to comment.