Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merged changes from Master branch, Moved Executor Parameters to Config (
#163) * Merging Recent SQL Executor changes * Fix to Validator Uses unique value metadata to verify if a value is valid * Fix Bug with Widget Rendering frame.py was trying to import luxWidget instead of luxwidget * Added Number of Observations to MetaData, Fixed Interestingness issue with SQL Executor Some interestingness functions required the number of observations in the data and visualization, so I added these values to the metadata to make the scoring work when using the SQL executor Added tests for SQL executor * Re-added Licensing Headers * Adding Recent frame.py changes * Adjusted SQL Executor Tests Removed lines that changed Year column type to datetime * Update Frame with new Action Registering * Resolving Conflicts in frame.py * Commenting out local SQL Executor tests SQL Executor tests interfering with travis build, commenting out for now * Update correlation.py * Update frame.py * bugfix: "number of remaining bars" text overcounts for colored bar charts * update number of bars calculation to account for when len(data) double counts * Fixing Code Format * Cleaning up Pandas Executor imports * Fix Validation Bug Issue where validator was relying on metadata which was not yet generated, moved metadata calculation before validation step in frame.py * Changed metadata variable name Renamed num_obs to length, removed ordinal variable from Executor mapping function * Adding support for setting intent on front end (#112) * added functionality to delete Vis * fixed deletion logic * add observer to automatically update deletions * able to refresh widget on setting intent * support for setting intent from frontend * quick fix to output * changed variable intentindex name * Make default_display a global setting (#121) * remove and register action functions * update changes inframe.py * update changes inframe.py * add documentation and changes * indentation and comments * new line * globally defined default display works with warning * no examples * add back space * new line * uncomment docstring Co-authored-by: Caitlyn Chen <caitlynachen@berkeley.edu> * Added script to generate Postgresql database Updated travis.yml file to create postgresql database in test instance. Added script to populate test database with data. * Update upload_car_data.py Updated database credentials * Updated script name in travis.yml * Removed unnecessary import from travis.yml * Added psycopg2 to requirements.txt * Creating Postgres test database in travis * Fixed directory issue * Updated SQL Executor Tests Added tests for basic SQL Executor functionality. * Update requirements.txt (#128) * basic scatterplot experiments * experiment results with manually binned heatmaps * experiment result * incorporated heatmap code into executor and renderer * additional experiments to evaluate scatter v.s. heatmap performance * experiment based on real estate and airbnb data * modified general sampling criteria, suppress SettingWithCopyWarning stemming from groupby .agg (#93) * decrease sampling parameter * change sampling strategy (above threshold keep 3/4 of data) * remove experiment dir * modified performance param * enforce lux-widget minimum version * update requirement.txt * separate dev and install requirements * replaced _exportedVisIdxs --> _selectedVisIdxs * bugfix: plot config error when current_vis is None * Added sql_executor example notebook, minor bug fix Added an example notebook to showcase how to use the sql-engine. Fixed variable reference in interestingness.py that was causing issues. * Add LuxSeries Implementation (#122) * add preliminary groupby fixes * preliminary LuxSeries implementation * add tests for new Series implementation * clean up the added code * minor code changes * fix issues with Vis with index * small fixes * remove comments * bugfix column group display empty Vis involving groupby index * bugfix Cylinders not showing up as bar charts Co-authored-by: Doris Lee <dorisjunglinlee@gmail.com> * add black to travis (#127) * add black to travis * reformat all code and adjust test * remove .idea * fix contributing doc * small change in contributing * update * reformat, update command to fix version * remove dev dependencies * fix doc failing from black format * Cleaned SQL Executor Example Notebook restarted kernel and cleared output * Update custom action reference to executor Now uses executor tied to the dataframe for execution * Updated Interestingness Tests (#133) * add black * update cars dataset and tests * Delete old dataset * Updated Interestingness Tests Updated tests to use the newly updated cars dataset * switch to local cars reference Co-authored-by: Kunal Agarwal <kagarwal2@berkeley.edu> Co-authored-by: Kunal Agarwal <32151899+westernguy2@users.noreply.github.com> Co-authored-by: 19thyneb <thyne.boonmark@gmail.com> Co-authored-by: Doris Lee <dorisjunglinlee@gmail.com> * fix broken link in docs * Updated Tests, Added benchmarking for SQL Executor Updated Compiler and Interestingness tests to work for SQL executor. Updated SQL Executor to have some benchmarking code for tracking query performance. * Merge with upstream branch, added preliminary benchmarking code * Better warning message for Vis and VisList (#135) * added functionality to delete Vis * fixed deletion logic * add observer to automatically update deletions * able to refresh widget on setting intent * support for setting intent from frontend * quick fix to output * changed variable intentindex name * added better error msg for > 1 intent for vis * reverting some changes * adding warning message for Vis intents being > 1 * passes tests and intent < 3 * minor change to error message, added test * run black * accounted for more edge cases and hid traceback * fixed typo * added tests * format w/ black * ran black again * Update Vis.py minor readability changes Co-authored-by: Doris Lee <dorisjunglinlee@gmail.com> * Pandas rewrite Performance optimizations (#136) * basic scatterplot experiments * experiment results with manually binned heatmaps * experiment result * incorporated heatmap code into executor and renderer * additional experiments to evaluate scatter v.s. heatmap performance * experiment based on real estate and airbnb data * modified general sampling criteria, suppress SettingWithCopyWarning stemming from groupby .agg (#93) * decrease sampling parameter * change sampling strategy (above threshold keep 3/4 of data) * remove experiment dir * modified performance param * enforce lux-widget minimum version * update requirement.txt * testing out modin (Recursion error) * create modin executor, all else in sync with master changes * rewrote .loc with column reference, speed up by 100x * replace agg("count") with .count() --> ~0.1ms speedup * run black * Added 2D Binning functionality to SQL Executor added 2D binning to replace scatterplots when using SQL executor. * Update README.md update slack link * Updated temporal detection and tests (#139) * Updated temporal detection and tests * Reformatted code with black * Update PandasExecutor.py * added stock date test Co-authored-by: Doris Lee <dorisjunglinlee@gmail.com> * Fix Inline comments breaking to new lines (#137) * add black to travis * reformat all code and adjust test * remove .idea * fix contributing doc * small change in contributing * update * reformat, update command to fix version * remove dev dependencies * first pass -- inline comments * _config/config.py * delete test notebook * action * line length 105 * executor * interestingness * processor * vislib * tests, travis, CONTRIBUTING * .format () changed * replace tabs with escape chars * update using black * more rewrites and merges into single line Co-authored-by: Doris Lee <dorisjunglinlee@gmail.com> * Improve warning message when values specified as attributes (#143) * Improve warning message when values specified as attributes (#142) * added test, ran black * bugfix test * Better warning message for Vis and VisList (#146) * added functionality to delete Vis * fixed deletion logic * add observer to automatically update deletions * able to refresh widget on setting intent * support for setting intent from frontend * quick fix to output * changed variable intentindex name * added better error msg for > 1 intent for vis * reverting some changes * adding warning message for Vis intents being > 1 * passes tests and intent < 3 * minor change to error message, added test * run black * accounted for more edge cases and hid traceback * fixed typo * added tests * format w/ black * ran black again * Update Vis.py minor readability changes * added check and tests for Vis list and | syntax * ran black Co-authored-by: Doris Lee <dorisjunglinlee@gmail.com> * Updated docs for JupyterLab (#148) * added functionality to delete Vis * fixed deletion logic * add observer to automatically update deletions * able to refresh widget on setting intent * support for setting intent from frontend * quick fix to output * changed variable intentindex name * added better error msg for > 1 intent for vis * reverting some changes * updated install and faq * added install_lab.sh script * Global shared variable in test (#144) (#149) * using global shared variable in test (#144) * modified fixture scope as session, resolved dependency test cases * run black Co-authored-by: Doris Lee <dorisjunglinlee@gmail.com> * Updated 2D Binning Functionality Interestingness function now compatible with 2D binning with SQL Executor. Fixed issue where some datapoints in heatmap data were of string type instead of integer. * documentation for custom actions (#134) * documentation for custom actions * fix config tests * fix documentaion links * Add default display Config Class documentation * delete hpi * doc resolved changes Co-authored-by: Caitlyn Chen <caitlynachen@berkeley.edu> Co-authored-by: Doris Lee <dorisjunglinlee@gmail.com> * Patch failing test (#134) * Patch failing test (#134) * Patch failing test (#134) * Added Heatmap generation to SQL Executor, Bug fix in PandasExecutor Added 2D Binning function to collect data for heatmaps in the SQL Executor and updated compiler test to reflect heatmap changes in SQL Executor Fixed issue within PandasExecutor where 2D binning function would not color heatmap using temporal variables * Updated Code Formatting with Black * Update Requirements to include psycopg2 * Update upload_car_data.py Updated to use newest car.csv file * Update Compiler tests to use correct test DB * Removed Benchmarking Code * Fixing Black Formatting * Add Toggle button for LuxSeries (#153) * add black * add groupby to history * add LuxSeries visualization implementation * remove groupby extending * run black * merge master into branch * run black * Reformat Warnings Labels (#151) * add format for warnings * fix small details * globally defined lux * fix formatting * Delete similarity.py * Rename similarity_old.py to similarity.py * fix commit * update master with changes to warning labels * fix formatting Co-authored-by: Caitlyn Chen <caitlynachen@berkeley.edu> * Make plot_config a global variable (#152) * plot_config made global config * docs and tests updates; black formatting * Delete Untitled.ipynb * cleanup * remove data encapsulation * black formatting * Update style.rst Co-authored-by: Doris Lee <dorisjunglinlee@gmail.com> * Patch documentation (#134) * code cleanup * making LuxDataFrame pickle-able * various simplification and rewrite to Compiler and Vis * changing `render_VSpec` to `to_code` * bugfix in filter (list comprehension lazily evaluated) * Moved Executor Parameters to Global Config * Black formatting * Fix issue with read_json and add tests for different file types (#156) * fix read_json bug and add tests * convert tests to reference lux-datasets * run black * remove comments * Update __init__.py * Update test_pandas_coverage.py new_df --> df * fix tests to work with lux-datasets * fix init * remove lxml dependency * remove html test Co-authored-by: Doris Lee <dorisjunglinlee@gmail.com> * Improved warning message stack trace for unexpected error (#145) * Moved table_name parameter to frame.py. Removed executor_type parameter executor_type parameter no longer necessary to maintain * Fixed reference to table_name parameter table_name is now a parameter within frame.py * bug fix patching #146 (#159) * remove sys.tracebacklimit to avoid `ERROR:root:Internal Python error in the inspect module` * changed SyntaxError to TypeError to reserved SyntaxError for Pandas native syntax problems * Ensure that recommendation and current_vis properties are accessible before df first printed (#159) * bugfix erased `name` dtype in LuxSeries (#140) * Adjusted Functions to Set SQL Connection Moved set_SQL_connection function to config. Added set_SQL_table function within frame.py to let users specify which database table will be associated with their dataframe * Update Makefile and pyproject.toml (#160) * add black to travis * reformat all code and adjust test * remove .idea * fix contributing doc * small change in contributing * update * reformat, update command to fix version * remove dev dependencies * first pass -- inline comments * _config/config.py * delete test notebook * action * line length 105 * executor * interestingness * processor * vislib * tests, travis, CONTRIBUTING * .format () changed * replace tabs with escape chars * update using black * more rewrites and merges into single line * update pyproject.toml and makefile * updating contributing doc * Update CONTRIBUTING.md Co-authored-by: Doris Lee <dorisjunglinlee@gmail.com> * Update README.md * Update SQLExecutor name parameter * Merging master branch with sql engine. Moving executor parameters to config * Parameter Bug Fix Lux DataFrame current_vis should be an empty list after recs are expired. Executor name for small_df and very_small_df checks should be "PandasExecutor" * Reference Fix in Warning Executor check here should look for name "PandasExecutor" * Black Formatting * Black formatting * Cleaned up executor imports, Fixed issue in AltairRenderer Issue where Altair Renderer was not using lux.config.executor * Black formatting Co-authored-by: 19thyneb <thyne.boonmark@gmail.com> Co-authored-by: Doris Lee <dorisjunglinlee@gmail.com> Co-authored-by: cjachekang <47467363+cjachekang@users.noreply.github.com> Co-authored-by: Caitlyn Chen <caitlynachen@gmail.com> Co-authored-by: Caitlyn Chen <caitlynachen@berkeley.edu> Co-authored-by: Kunal Agarwal <32151899+westernguy2@users.noreply.github.com> Co-authored-by: jinimukh <46768380+jinimukh@users.noreply.github.com> Co-authored-by: Kunal Agarwal <kagarwal2@berkeley.edu> Co-authored-by: Jared Zhao <jaredzhao@berkeley.edu> Co-authored-by: Piyush Gupta <piyushg9794@gmail.com>
- Loading branch information
11 people
committed
Dec 9, 2020
1 parent
bb77423
commit 77a390d