Skip to content

Tracking for API -> REopt.jl #637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Bill-Becker wants to merge 6 commits into
base: develop
Choose a base branch
from
+13 −2
Draft

Tracking for API -> REopt.jl #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da16816
Add meta data for Settings in REopt.jl for tracking API
Bill-Becker Feb 4, 2025
3ed2a9f
Update REopt#track-api
Bill-Becker Feb 6, 2025
bbad7c8
Merge branch 'develop' into track-api
Bill-Becker Apr 19, 2025
37d086f
Merge branch 'develop' into track-api
Bill-Becker May 4, 2025
c02f9c9
Update REopt.jl#track-api
Bill-Becker May 5, 2025
0cc03d4
Update REopt.jl#track-api
Bill-Becker May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion julia_src/Manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,9 @@ uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"

[[deps.REopt]]
deps = ["ArchGDAL", "CSV", "CoolProp", "DataFrames", "Dates", "DelimitedFiles", "HTTP", "JLD", "JSON", "JuMP", "LinDistFlow", "LinearAlgebra", "Logging", "MathOptInterface", "Requires", "Roots", "Statistics", "TestEnv"]
git-tree-sha1 = "9946abe774e30d82f786e68296ad1fdf8bb7dba4"
git-tree-sha1 = "3f8ecca84dd7c33404145df82b207548d8623a2c"
repo-rev = "track-api"
repo-url = "https://github.com/NREL/REopt.jl.git"
uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6"
version = "0.51.1"

Expand Down
1 change: 1 addition & 0 deletions reoptjl/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8427,6 +8427,7 @@ def filter_none_and_empty_array(d:dict):

d = dict()
d["user_uuid"] = meta.user_uuid
d["portfolio_uuid"] = meta.portfolio_uuid
d["api_key"] = meta.api_key
d["Settings"] = filter_none_and_empty_array(meta.Settings.dict)
d["Financial"] = filter_none_and_empty_array(meta.FinancialInputs.dict)
Expand Down
10 changes: 9 additions & 1 deletion reoptjl/src/run_jump_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,15 @@ def run_jump_model(run_uuid):
name = 'run_jump_model'
data = get_input_dict_from_run_uuid(run_uuid)
user_uuid = data.get('user_uuid')

# data['Settings']['name'] = data.get('description', "")
if data.get('webtool_uuid') not in [None, ""]:
data['Settings']['webtool_run'] = True
else:
data['Settings']['direct_api_run'] = True
data['Settings']['webtool_user_uuid'] = user_uuid
data['Settings']['webtool_portfolio_uuid'] = data.get('portfolio_uuid', "")
data['Settings']['api_run_uuid'] = run_uuid
print("data['Settings'] = ", data['Settings'])
data.pop('user_uuid',None) # Remove user uuid from inputs dict to avoid downstream errors

# can uncomment for debugging
Expand Down
Loading