From da168163bc84d8403ebd2f1f8455d54998c8db29 Mon Sep 17 00:00:00 2001 From: bill-becker Date: Mon, 3 Feb 2025 23:12:42 -0700 Subject: [PATCH] Add meta data for Settings in REopt.jl for tracking API --- julia_src/Manifest.toml | 4 +++- reoptjl/models.py | 1 + reoptjl/src/run_jump_model.py | 10 +++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/julia_src/Manifest.toml b/julia_src/Manifest.toml index 1803c1732..4a6d79f52 100644 --- a/julia_src/Manifest.toml +++ b/julia_src/Manifest.toml @@ -929,7 +929,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 = "324394f21cb7e2db3d9e7ebde19c4e83c5a64e0f" +git-tree-sha1 = "51f351313ff5c4ce51e5c8cbbf36447997b3e9f2" +repo-rev = "track-api" +repo-url = "https://github.com/NREL/REopt.jl.git" uuid = "d36ad4e8-d74a-4f7a-ace1-eaea049febf6" version = "0.50.0" diff --git a/reoptjl/models.py b/reoptjl/models.py index f6a5680eb..85ad524bf 100644 --- a/reoptjl/models.py +++ b/reoptjl/models.py @@ -8237,6 +8237,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) diff --git a/reoptjl/src/run_jump_model.py b/reoptjl/src/run_jump_model.py index 34ab85812..e8639f366 100644 --- a/reoptjl/src/run_jump_model.py +++ b/reoptjl/src/run_jump_model.py @@ -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