Skip to content
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

Jump to bottom

Fix btax backend bug caused by PR #641 #651

Merged
merged 5 commits into from
Sep 18, 2017
Merged

Fix btax backend bug caused by PR #641 #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e89f941
Add back package_up_vars for btax
Sep 18, 2017
18b54d4
Remove user_mods=mods
Sep 18, 2017
0419853
Fix typo in variable name
Sep 18, 2017
58ca986
Add package_up_user_mods keyword
Sep 18, 2017
04eab2d
Merge branch '634_btax_dataframes' of https://github.com/OpenSourcePo…
Sep 18, 2017
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
3 changes: 2 additions & 1 deletion webapp/apps/dynamic/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@ def dynamic_behavioral(request, pk):
reform_dict,
int(start_year),
is_file=is_file,
additional_data=assumptions_dict
additional_data=assumptions_dict,
package_up_user_mods=False
)

if not submitted_ids:
Expand Down
18 changes: 14 additions & 4 deletions webapp/apps/taxbrain/compute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ class DropqCompute(object):

num_budget_years = NUM_BUDGET_YEARS

def package_up_vars(self, *args, **kwargs):
return _package_up_vars(*args, **kwargs)

def remote_submit_job(self, theurl, data, timeout=TIMEOUT_IN_SECONDS):
response = requests.post(theurl, data=data, timeout=timeout)
return response
Expand All @@ -54,12 +57,13 @@ def submit_json_dropq_calculation(self, user_mods, first_budget_year, additional
pack_up_user_mods=False,
additional_data=additional_data)

def submit_dropq_calculation(self, user_mods, first_budget_year, additional_data={}, is_file=False):
def submit_dropq_calculation(self, user_mods, first_budget_year, additional_data={}, is_file=False,
package_up_user_mods=True):
url_template = "http://{hn}" + DROPQ_URL
return self.submit_calculation(user_mods, first_budget_year, url_template,
num_years=NUM_BUDGET_YEARS,
additional_data=additional_data,
pack_up_user_mods=not is_file)
pack_up_user_mods=package_up_user_mods)

def submit_json_dropq_small_calculation(self, user_mods, first_budget_year):
url_template = "http://{hn}" + DROPQ_SMALL_URL
Expand All @@ -68,13 +72,14 @@ def submit_json_dropq_small_calculation(self, user_mods, first_budget_year):
increment_counter=False,
pack_up_user_mods=False)

def submit_dropq_small_calculation(self, user_mods, first_budget_year, additional_data={}, is_file=False):
def submit_dropq_small_calculation(self, user_mods, first_budget_year, additional_data={}, is_file=False,
package_up_user_mods=True):
url_template = "http://{hn}" + DROPQ_SMALL_URL
return self.submit_calculation(user_mods, first_budget_year, url_template,
num_years=NUM_BUDGET_YEARS_QUICK,
additional_data=additional_data,
increment_counter=False,
pack_up_user_mods=not is_file)
pack_up_user_mods=package_up_user_mods)

def submit_elastic_calculation(self, user_mods, first_budget_year, is_file=False, additional_data={}):
url_template = "http://{hn}/elastic_gdp_start_job"
Expand All @@ -91,6 +96,11 @@ def submit_calculation(self, user_mods, first_budget_year, url_template,
use_wnc_offset=True,
pack_up_user_mods=True,
additional_data={}):
if pack_up_user_mods:
user_mods = self.package_up_vars(user_mods, first_budget_year)
if not bool(user_mods):
return False
user_mods = {first_budget_year: user_mods}
data = {}
years = self._get_years(start_budget_year, num_years, first_budget_year)
if use_wnc_offset:
Expand Down
8 changes: 5 additions & 3 deletions webapp/apps/taxbrain/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,14 +406,16 @@ def submit_reform(request, user=None):
reform_dict,
int(start_year),
is_file=is_file,
additional_data=assumptions_dict
additional_data=assumptions_dict,
package_up_user_mods=False
)
else:
submitted_ids, max_q_length = dropq_compute.submit_dropq_small_calculation(
reform_dict,
int(start_year),
is_file=is_file,
additional_data=assumptions_dict
additional_data=assumptions_dict,
package_up_user_mods=False
)
job_ids = denormalize(submitted_ids)
json_reform = JSONReformTaxCalculator()
Expand Down Expand Up @@ -650,7 +652,7 @@ def get_result_context(model, request, url):
}

if (model.json_text is not None and (model.json_text.raw_reform_text and
model.json_text.raw_assumptions_text)):
model.json_text.raw_assumption_text)):
reform_file_contents = model.json_text.reform_text
reform_file_contents = reform_file_contents.replace(" "," ")
assump_file_contents = model.json_text.assumption_text
Expand Down