docassemble.InterviewStats 0.5.0__tar.gz → 0.5.3__tar.gz

docassemble_interviewstats-0.5.3/MANIFEST.in

@@ -0,0 +1,18 @@
+include README.md
+graft docassemble/InterviewStats/data
+recursive-exclude * *.egg-info
+recursive-exclude .git *
+recursive-exclude venv *
+recursive-exclude .github *
+recursive-exclude .pytest_cache *
+recursive-exclude .vscode *
+recursive-exclude build *
+recursive-exclude dist *
+recursive-exclude * __pycache__
+recursive-exclude * *.pyc
+recursive-exclude * *.pyo
+recursive-exclude * *.orig
+recursive-exclude * *~
+recursive-exclude * *.bak
+recursive-exclude * *.swp
+

{docassemble.InterviewStats-0.5.0/docassemble.InterviewStats.egg-info → docassemble_interviewstats-0.5.3}/PKG-INFO

@@ -1,16 +1,24 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: docassemble.InterviewStats
-Version: 0.5.0
-Summary: A docassemble extension, to view stats from other interviews
-Home-page: https://courtformsonline.org/about/
-Author: Bryce Willey, Quinten Steenhuis
-Author-email: bwilley@suffolk.com
-License: The MIT License (MIT)
+Version: 0.5.3
+Summary: A docassemble interview to view statistics from other saved interview responses.
+Author-email: Suffolk Legal Innovation and Technology Lab <litlab@suffolk.edu>
+License-Expression: MIT
+Project-URL: GitHub, https://github.com/SuffolkLITLab/docassemble-InterviewStats
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: bokeh>=2.4.2
+Requires-Dist: cenpy>=1.0.0.post4
+Requires-Dist: geopandas>=0.9.0
+Requires-Dist: numpy>=1.0.4
+Requires-Dist: pandas>=1.4.2
+Requires-Dist: requests>=2.27.1
+Dynamic: license-file
 
 # docassemble.InterviewStats
 
+[![PyPI version](https://badge.fury.io/py/docassemble.InterviewStats.svg)](https://badge.fury.io/py/docassemble.InterviewStats)
+
 A docassemble interview that lets you view statistics from other saved interview responses. 
 
 ## Getting Started

{docassemble.InterviewStats-0.5.0 → docassemble_interviewstats-0.5.3}/README.md

@@ -1,5 +1,7 @@
 # docassemble.InterviewStats
 
+[![PyPI version](https://badge.fury.io/py/docassemble.InterviewStats.svg)](https://badge.fury.io/py/docassemble.InterviewStats)
+
 A docassemble interview that lets you view statistics from other saved interview responses. 
 
 ## Getting Started

docassemble_interviewstats-0.5.3/docassemble/InterviewStats/__init__.py

@@ -0,0 +1 @@
+__version__ = '0.5.3'

{docassemble.InterviewStats-0.5.0 → docassemble_interviewstats-0.5.3}/docassemble/InterviewStats/data/questions/data_report.yml

@@ -351,9 +351,9 @@ code: |
     xlsx_output.initialize(filename=proper_name + ".xlsx")
     writer = pd.ExcelWriter(xlsx_output.path(),
       engine='xlsxwriter',
-      options={'remove_timezone': True})
+      engine_kwargs={'options': {'remove_timezone': True}})
     excel_formatted_data.to_excel(writer, index=False)
-    writer.save()
+    writer.close()
     xlsx_output.commit()
     del writer
     show_excel_download
@@ -374,9 +374,9 @@ code: |
   xlsx_output.initialize(filename=proper_name + ".xlsx")
   writer = pd.ExcelWriter(xlsx_output.path(),
     engine='xlsxwriter',
-    options={'remove_timezone': True})
+    engine_kwargs={'options': {'remove_timezone': True}})
   bg_data.to_excel(writer, index=False)
-  writer.save()
+  writer.close()
   xlsx_output.commit()
   del writer
   background_response_action('excel_resp', the_excel=xlsx_output) 

docassemble_interviewstats-0.5.3/docassemble/InterviewStats/data/questions/stats.yml

@@ -0,0 +1,450 @@
+---
+metadata:
+  title: All Interview Statistics
+  short title: View Stats
+  temporary session: True
+  required privileges:
+    - admin
+    - developer
+    - stats_viewer
+---
+features:
+  javascript:
+    - sortable.js
+  css:
+    - summary.css
+  question help button: True
+  question back button: True
+---
+default screen parts: 
+  footer: |
+    [:sync-alt: Restart](${ url_of('restart') } )
+---
+modules:
+  - .snapshot_statistics
+  # - .snapshot_geography
+---
+objects:
+  - xlsx_output: DAFile.using(filename="stats.xlsx")
+---
+#mandatory: True
+code: |
+  message(get_filenames())
+---
+id: interview order
+mandatory: True
+code: |
+  # intro
+  filename
+  simple_data
+  formatted_data
+  display_grouped_data
+  # viewed_filtered  
+---
+event: generate_excel
+code: |
+  if stats_size > 10000:
+    if make_excel_task.ready():
+      if make_excel_task.failed():
+        show_failed_screen
+      show_excel_download
+    else:
+      waiting_screen
+  else:
+    proper_name = space_to_underscore(filename) + "_stats"
+    xlsx_output.initialize(filename=proper_name + ".xlsx")
+    writer = pd.ExcelWriter(xlsx_output.path(),
+      engine='xlsxwriter',
+      engine_kwargs={'options': {'remove_timezone': True}})
+    formatted_data.to_excel(writer, index=False)
+    writer.close()
+    xlsx_output.commit()
+    del writer
+    show_excel_download
+    generate_excel = True
+---
+event: show_excel_download
+question: |
+  Excel Download
+subquestion: |
+  [:file-excel: Download](${ xlsx_output.url_for() })
+---
+code: |
+  make_excel_task = background_action('excel_task', data=formatted_data)
+---
+event: excel_task
+code: |
+  bg_data = action_argument('data')
+  proper_name = space_to_underscore(filename) + "_stats"
+  xlsx_output.initialize(filename=proper_name + ".xlsx")
+  writer = pd.ExcelWriter(xlsx_output.path(),
+    engine='xlsxwriter',
+    engine_kwargs={'options': {'remove_timezone': True}})
+  bg_data.to_excel(writer, index=False)
+  writer.close()
+  xlsx_output.commit()
+  del writer
+  background_response_action('excel_resp', the_excel=xlsx_output) 
+---
+event: generate_summary_excel
+code: |
+  import pandas as pd
+  proper_name = 'snapshot_summary'
+  xlsx_output.initialize(filename=proper_name + ".xlsx")
+  df = pd.DataFrame(summary_by_filename)
+  writer = pd.ExcelWriter(xlsx_output.path(),
+    engine='xlsxwriter',
+    engine_kwargs={'options': {'remove_timezone': True}})
+  df.to_excel(writer, index=False)
+  writer.close()
+  xlsx_output.commit()
+  del writer
+  show_excel_download
+---
+event: generate_sessions_excel
+code: |
+  import pandas as pd
+  proper_name = 'sessions_summary'
+  xlsx_output.initialize(filename=proper_name + ".xlsx")
+  df = pd.DataFrame(session_summary_by_filename)
+  writer = pd.ExcelWriter(xlsx_output.path(),
+    engine='xlsxwriter',
+    engine_kwargs={'options': {'remove_timezone': True}})
+  df.to_excel(writer, index=False)
+  writer.close()
+  xlsx_output.commit()
+  del writer
+  show_excel_download
+---
+event: waiting_screen
+id: waiting screen
+question: |
+  We're generating your excel sheet.
+subquestion: |
+  This may take a few minutes, so leave this tab open. Thanks for waiting.
+reload: True
+---
+event: show_failed_screen
+question: |
+  Sorry, something went wrong
+subquestion: |
+  We had some trouble trying to assemble your excel sheet.
+
+  ${ make_excel_task.result() }
+buttons:
+  - Restart: restart
+---
+event: excel_resp
+code: |
+  xlsx_output = action_argument('the_excel')
+  background_response()
+---
+code: |
+  summary_stats = get_summary_stats(filename)
+---
+reconsider: summary_stats
+question: |
+  Summary data for ${ interview_title }
+subquestion: |
+  * Total sessions: ${ summary_stats[0] }
+  * First session: ${ format_date(summary_stats[1], format='MM/dd/yyyy') }
+  * Latest session: ${ format_date(summary_stats[2], format='MM/dd/yyyy') }
+  
+  % if summary_stats[0] > 10000:
+  You have a lot of sessions; some operations might
+  take a long time.
+  % endif
+continue button field: simple_data
+# ---
+# code: |
+#   geo_layout = make_usage_map(formatted_data)
+#   map_script, map_div, map_inline = get_embedable_usage_map(geo_layout)
+#   del geo_layout
+---
+# question: Interview Statistics 
+# subquestion: |      
+#   We have two features in this repo:
+  
+#   1. Stats - it generates statistics, maps, charts and a downadable excel file.
+#       - If you have any inteview that uses `store_variables_snapshot(data={'zip': users[0].address.zip})` to save zip data, you should use Stats.
+#       - You can filter your data by date or by state.
+#       - Click the **Continue button** below to use this feature.
+#   1. Data Reporting - it generates statistics tables and a downloadable excel file. 
+#       - If you have any interview that uses `save_input_data()` to save reportable data, you should use Data Reporting.
+#       - You can filter your data by date.
+#       - [Click here to use Data Reporting](${interview_url(i=user_info().package + ":data_report.yml")}) 
+
+# field: intro
+---
+code: |
+  overall_stats = get_overall_stats()
+  summary_by_filename = get_summary_stats_by_filename()
+  session_overall_stats = get_session_overall_stats()
+  session_summary_by_filename = get_session_summary_stats_by_filename()
+---
+question: |
+  What interview do you want to view statistics for?
+under: |
+  #### Summary statistics
+  
+  Keep in mind:
+
+  % if isinstance(get_config("interview delete days"), int):
+  Docassemble sessions on this server are kept for only ${ get_config("interview delete days") } days. 
+  % else:
+  Docassemble sessions typically are kept for only 90 days.
+  % endif
+  Snapshotted sessions
+  may or may not be set to be kept longer. Statistics below will reflect the settings
+  on your server and interviews.
+
+  Total sessions with saved statistics across all interviews: ${ overall_stats[0] }
+  
+  <div class="stats-tabs">
+    <ul class="nav nav-tabs" id="stats-tabs">
+      <li class="nav-item">
+        <a href="#" class="nav-link active" id="snapshots-tab">Snapshots</a>
+      </li>
+      <li class="nav-item">
+        <a href="#" class="nav-link" id="sessions-tab">All sessions</a>
+      </li>
+    </ul>
+  </div>
+
+  % if summary_by_filename:
+  <div id="snapshots-panel">
+  <div style="margin-bottom:0.5rem">
+    <a href="${ url_ask('generate_summary_excel') }" class="btn btn-link">
+      <i class="fa fa-file-excel" aria-hidden="true"></i>
+      Download snapshot summary
+    </a>
+  </div>
+  <h2 class="h4">Snapshotted sessions by interview title</h2>
+  <table id="summary-table" class="table table-striped table-bordered sortable">
+    <thead>
+      <tr>
+        <th>Interview (click to sort)</th>
+        <th data-type="number">30 days</th>
+        <th data-type="number">90 days</th>
+        <th data-type="number">365 days</th>
+        <th data-type="number">All time</th>
+        <th data-type="date">Last (30d)</th>
+        <th data-type="date">Latest</th>
+      </tr>
+    </thead>
+    <tbody>
+    % for row in summary_by_filename:
+      <tr>
+        <td title="${ row['filename'] }"><span class="short-name">${ shorten_filename(row['filename']) }</span></td>
+        <td>${ row.get('count_30d', 0) }</td>
+        <td>${ row.get('count_90d', 0) }</td>
+        <td>${ row.get('count_365d', 0) }</td>
+        <td>${ row.get('count_all', 0) }</td>
+        <td>${ format_date(row.get('max_30d'), format='MM/dd/yyyy') if row.get('max_30d') else '' }</td>
+        <td>${ format_date(row.get('max_all'), format='MM/dd/yyyy') if row.get('max_all') else '' }</td>
+      </tr>
+    % endfor
+    </tbody>
+  </table>
+  </div>
+
+  
+  % endif
+  % if session_summary_by_filename:
+  <div id="sessions-panel" style="display:none;">
+  <div style="margin-bottom:0.5rem">
+    <a href="${ url_ask('generate_sessions_excel') }" class="btn btn-link">
+      <i class="fa fa-file-excel" aria-hidden="true"></i>
+      Download session summary
+    </a>
+  </div>
+  <h2 class="h4">All sessions by interview title</h2>
+  <table id="sessions-table" class="table table-striped table-bordered sortable">
+    <thead>
+      <tr>
+          <th>Interview</th>
+          <th data-type="number">30 days</th>
+          <th data-type="number">90 days</th>
+          <th data-type="number">365 days</th>
+          <th data-type="number">All time</th>
+          <th data-type="date">Latest</th>
+        </tr>
+    </thead>
+    <tbody>
+    % for row in session_summary_by_filename:
+      <tr>
+        <td title="${ row['filename'] }"><span class="short-name">${ shorten_filename(row['filename']) }</span></td>
+        <td>${ row.get('count_30d', 0) }</td>
+        <td>${ row.get('count_90d', 0) }</td>
+        <td>${ row.get('count_365d', 0) }</td>
+  <td>${ row.get('count_all', 0) }</td>
+  <td>${ format_date(row.get('max_all'), format='MM/dd/yyyy') if row.get('max_all') else '' }</td>
+      </tr>
+    % endfor
+    </tbody>
+  </table>
+  </div>
+  % endif
+fields:
+  - Filename: filename
+    datatype: combobox
+    code: |
+      get_combined_filename_list()
+---
+code: |
+  if filename is not None:
+    if 'data/questions' in filename or 'playground' in filename:
+      stats = get_stats(filename)
+    else:
+      stats = get_stats(filename.replace(':',':data/questions/'))
+  else:
+    no_interview_stats
+---
+code: |
+  try:
+    interview_title = next(iter([interview.get('title') for interview in interview_menu() if interview.get('filename') == filename]), filename)
+  except:
+    interview_title = filename
+  # A survey interview's title is saved in Stats, yet interview_title is used on Summary page which comes before we kick out survey interviews, so we set the value here.
+  if stats and 'title' in stats[0].keys():
+    interview_title = stats[0]['title']
+---
+event: no_interview_stats
+question: There are no interviews to look for data in!
+subquestion: |
+  There aren't any interviews that we can look for data in. There should be at least one interview
+  listed in the 'dispatch' section of the configuration. See
+  [the docassemble documentation](https://docassemble.org/docs/config.html#dispatch) for more information
+buttons:
+  - Exit: exit
+---
+need: stats
+code: |
+  columns = get_columns(stats)
+  my_col = next(iter(columns), None)
+  groupable_columns = list(set(columns).difference(set(['modtime'])))
+  possible_states = get_column_values(stats, 'state')
+---
+code: |
+  import pandas as pd
+---
+code: |
+  formatted_data = pd.DataFrame()
+  stats_size = 0
+  if stats is not None:
+    formatted_data = pd.DataFrame(stats)
+    stats_size = formatted_data.shape[0]
+---
+# mandatory: True
+id: view_data
+question: |
+  Stats for ${interview_title}
+subquestion: |
+  Total submissions: ${ len(stats) }
+
+  % if len(stats):
+  Group by:
+  % for col in groupable_columns:
+  [${col}](${ url_action('show_grouped_data', group_by = col ) }) |
+  % endfor
+
+  [:file-excel: Make Excel Download](${ url_ask('generate_excel') })
+  % endif
+# under: |
+#   ${ map_div }
+fields:
+  - Filter State: filter_state
+    datatype: yesno
+    disable if:
+      code: |
+        'state' not in formatted_data.columns or not possible_states
+  - Find States that: state_op
+    datatype: dropdown
+    show if: filter_state
+    code: |
+      [{'eq': "equal"},
+       {'ne': "don't equal"}]
+  - this state: state_to_filter
+    datatype: dropdown
+    show if: filter_state
+    code: |
+      possible_states
+  - Filter by Date: filter_date
+    datatype: yesno
+    disable if:
+      code: |
+        'modtime' not in formatted_data.columns
+  - Find submissions that are: date_op
+    datatype: dropdown
+    show if: filter_date
+    code: |
+      [{'gt': 'after'},
+       {'lt': 'before'},
+       {'eq': 'the same day as'}]
+  - this date: date_to_filter
+    datatype: date
+    show if: filter_date
+# script: |
+#     ${ map_script}
+continue button field: start_filter
+continue button label: Filter
+#help: |
+#  ${ formatted_data.to_html() }
+# ---
+# mandatory: True
+# event: viewed_filtered
+# depends on: filt_map_script, filt_map_div
+# need: filt_map_script, filt_map_div
+# id: view_filtered_data
+# question: |
+#   Filtered: ${ filter_description }
+# under: |
+#   ${ filt_map_div }
+# script: |
+#     ${ filt_map_script }
+# back button: True
+---
+event: show_grouped_data
+code: |
+  my_col = action_argument('group_by')
+  force_ask('display_grouped_data')
+---
+question: |
+  Stats for ${interview_title}
+subquestion: |
+  Total submissions: ${ len(stats) }
+
+  Group by:
+  % for col in groupable_columns:
+  [${col}](${ url_action('show_grouped_data', group_by = col)  })
+  % endfor
+
+  ${ formatted_data.groupby(by=my_col).count().to_html(classes=('table','table-striped')) }
+
+  [:file-excel: Download](${ url_ask('generate_excel') })
+# under: |
+#   ${ map_div }
+# script: |
+#   ${ map_script }
+event: display_grouped_data
+# ---
+# need: start_filter
+# depends on: state_op, state_to_filter
+# code: |
+#   filter_list = []
+#   readable = {'state': 'State', 'modtime': 'Date',
+#               'eq': 'is', 'ne': 'is not', 'lt': '<', 'gt': '>'}
+#   if defined('filter_state') and filter_state:
+#     filter_list.append(('state', state_op, state_to_filter))
+#   if defined('filter_date') and filter_date:
+#     date_to_filter = date_to_filter.replace(tzinfo=None)
+#     filter_list.append(('modtime', date_op, date_to_filter))
+
+#   filter_description = ' and '.join(
+#       ['{} {} {}'.format(readable[elem[0]], readable[elem[1]], elem[2])
+#        for elem in filter_list])
+#   filters = get_filters_from_strings(filter_list)
+#   # filt_geo_layout = make_usage_map(formatted_data, geo_col='zip',
+#   #                                  time_col='modtime', filters=filters)
+#   # filt_map_script, filt_map_div, _ = get_embedable_usage_map(filt_geo_layout)
+#   # del filt_geo_layout

{docassemble.InterviewStats-0.5.0 → docassemble_interviewstats-0.5.3}/docassemble/InterviewStats/data/questions/subscribe.yml

@@ -85,9 +85,9 @@ code: |
   xlsx_output.initialize(filename=proper_name + ".xlsx")
   writer = pd.ExcelWriter(xlsx_output.path(),
     engine='xlsxwriter',
-    options={'remove_timezone': True})
+    engine_kwargs={'options': {'remove_timezone': True}})
   formatted_data.to_excel(writer, index=False)
-  writer.save()
+  writer.close()
   xlsx_output.commit()
   del writer
   saved_data = True

docassemble_interviewstats-0.5.3/docassemble/InterviewStats/data/static/sortable.js

@@ -0,0 +1,86 @@
+// Sortable + summary helpers for Stats table
+(function(){
+  // --- existing sorter logic ---
+  function parseValue(value, type){
+    if(type === 'number'){
+      var n = parseFloat(String(value).replace(/[^0-9.+-eE]/g, ''));
+      return isNaN(n) ? 0 : n;
+    }
+    if(type === 'date'){
+      var d = Date.parse(value);
+      return isNaN(d) ? 0 : d;
+    }
+    return String(value).toLowerCase();
+  }
+
+  function sortTable(table, colIndex, type, asc){
+    var tbody = table.tBodies[0];
+    if(!tbody) return;
+    var rows = Array.prototype.slice.call(tbody.querySelectorAll('tr'));
+    rows.sort(function(a,b){
+      var aText = (a.children[colIndex] && a.children[colIndex].textContent) || '';
+      var bText = (b.children[colIndex] && b.children[colIndex].textContent) || '';
+      var va = parseValue(aText.trim(), type);
+      var vb = parseValue(bText.trim(), type);
+      if(va < vb) return asc ? -1 : 1;
+      if(va > vb) return asc ? 1 : -1;
+      return 0;
+    });
+    var frag = document.createDocumentFragment();
+    rows.forEach(function(r){ frag.appendChild(r); });
+    tbody.appendChild(frag);
+  }
+
+  function makeSortable(table){
+    var ths = table.tHead ? table.tHead.querySelectorAll('th') : [];
+    if(!ths.length) return;
+    Array.prototype.forEach.call(ths, function(th, i){
+      var type = th.getAttribute('data-type') || 'string';
+      var asc = true;
+      th.style.cursor = 'pointer';
+      th.addEventListener('click', function(){
+        Array.prototype.forEach.call(th.parentNode.children, function(s){
+          if(s !== th) s.removeAttribute('data-sort');
+        });
+        asc = ! (th.getAttribute('data-sort') === 'asc');
+        th.setAttribute('data-sort', asc ? 'asc' : 'desc');
+        sortTable(table, i, type, asc);
+      });
+    });
+  }
+
+
+  function setupTabs(){
+    var snapTab = document.getElementById('snapshots-tab');
+    var sessTab = document.getElementById('sessions-tab');
+    var snapPanel = document.getElementById('snapshots-panel');
+    var sessPanel = document.getElementById('sessions-panel');
+    if(!snapTab || !sessTab || !snapPanel || !sessPanel) return;
+    if(!snapTab._daTabAttached){
+      snapTab._daTabAttached = true;
+      snapTab.addEventListener('click', function(e){
+        e.preventDefault();
+        snapTab.classList.add('active');
+        sessTab.classList.remove('active');
+        snapPanel.style.display = '';
+        sessPanel.style.display = 'none';
+      });
+    }
+    if(!sessTab._daTabAttached){
+      sessTab._daTabAttached = true;
+      sessTab.addEventListener('click', function(e){
+        e.preventDefault();
+        sessTab.classList.add('active');
+        snapTab.classList.remove('active');
+        sessPanel.style.display = '';
+        snapPanel.style.display = 'none';
+      });
+    }
+  }
+
+$(document).on('daPageLoad', function(){
+    var tables = document.querySelectorAll('table.sortable');
+    Array.prototype.forEach.call(tables, makeSortable);
+    setupTabs();
+});
+})();

docassemble_interviewstats-0.5.3/docassemble/InterviewStats/data/static/summary.css

@@ -0,0 +1,8 @@
+/* Summary table styles moved out of the template */
+#summary-table { width: 100%; border-collapse: collapse; }
+#summary-table th { background: #f8f9fa; padding: 8px; text-align: left; }
+#summary-table td { padding: 8px; vertical-align: top; }
+#summary-table th[data-sort="asc"]::after { content: " \25B2"; }
+#summary-table th[data-sort="desc"]::after { content: " \25BC"; }
+#summary-table th { cursor: pointer; }
+.short-name { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; display: inline-block; max-width: 20ch; }

{docassemble.InterviewStats-0.5.0 → docassemble_interviewstats-0.5.3}/docassemble/InterviewStats/data_report.py

@@ -1,8 +1,17 @@
-from docassemble.webapp.jsonstore import read_answer_json, write_answer_json, JsonStorage, JsonDb
+import random
 from docassemble.base.generate_key import random_alphanumeric
 from docassemble.base.functions import get_current_info
-from docassemble.base.util import variables_snapshot_connection
-import random
+from docassemble.webapp.jsonstore import JsonStorage
+
+try:
+    from docassemble.webapp.jsonstore import JsonDb
+except ImportError:
+    # Will happen on 1.9.8 and up
+    from docassemble.webapp.jsonstore import db
+
+    JsonDb = db.session
+
+
 from .snapshot_statistics import *
 
 __all__ = ['get_column_values_list', 
@@ -135,6 +144,6 @@ def save_random_records(number_of_records, title = '', seed_data_list = None, da
       JsonDb.add(new_entry)
     JsonDb.commit()
     
-def phrase(input:str = None) -> str:
+def phrase(input:str) -> str:
     base = {'eq': 'on', 'gt': 'after', 'lt': 'before', 'between': 'between'}
     return base[input]

{docassemble.InterviewStats-0.5.0 → docassemble_interviewstats-0.5.3}/docassemble/InterviewStats/generate_test_data.py

@@ -1,7 +1,15 @@
-from docassemble.webapp.jsonstore import read_answer_json, write_answer_json, JsonStorage, JsonDb
 from docassemble.base.generate_key import random_alphanumeric
 from docassemble.base.functions import get_current_info
 from docassemble.base.util import variables_snapshot_connection
+from docassemble.webapp.jsonstore import JsonStorage
+
+try:
+    from docassemble.webapp.jsonstore import JsonDb
+except ImportError:
+    # Will happen on 1.9.8 and up
+    from docassemble.webapp.jsonstore import db
+
+    JsonDb = db.session
 
 __all__ = ['write_random_user', 'delete_data_from_interview']