Cms for categorical by tyfarnan · Pull Request #892 · capitalone/DataProfiler

tyfarnan · 2023-06-21T19:08:29Z

Looking for feedback on which tests should be duplicated for CMS, and what new tests we should create specific to CMS.

dataprofiler/profilers/categorical_column_profile.py

JGSweets · 2023-06-22T19:56:45Z

.github/workflows/test-python-package.yml

    branches:
      - 'main'
      - 'feature/**'
+      - 'dev'


hmm, not sure why this would be here if dev already has this, are you sure you rebased on to dev

dataprofiler/profilers/categorical_column_profile.py

JGSweets · 2023-06-26T22:24:39Z

Easy fix on failed test, but will review the rest of PR tonight.
Almost done, still need to fix to use CMS, but might be the last few fixes outside of anything I check tonight
https://github.com/capitalone/DataProfiler/pull/892/files#r1242457726

dataprofiler/tests/profilers/profiler_options/test_categorical_options.py

…o validate individual steps

dataprofiler/profilers/categorical_column_profile.py

JGSweets · 2023-06-27T05:59:33Z

FYI, looks like the reqs for this need to be updated for scipy like the other dev PRs

JGSweets · 2023-06-27T18:32:46Z

dataprofiler/profilers/categorical_column_profile.py

+
+            assert isinstance(self._cms_max_num_heavy_hitters, int)
+            assert isinstance(other._cms_max_num_heavy_hitters, int)
+            cms_max_num_heavy_hitters: int = min(


i'd say we could have assigned here and not output at merge (currently just passing through), but that can be a future refactor.

dataprofiler/profilers/categorical_column_profile.py

Co-authored-by: ksneab7 <91956551+ksneab7@users.noreply.github.com>

* feat: add dev to workfow for testing (#897) * Reservoir sampling (#826) * add code for reservoir sampling and insert sample_nrows options * pre commit fix * add tests for reservoir sampling * fixed mypy issues * fix import to relative path --------- Co-authored-by: Taylor Turner <taylorfturner@gmail.com> Co-authored-by: Richard Bann <richard@bann.com> * [WIP] staging/dev/options (#909) * New preset implementation and test (#867) * memory optimization preset ttrying again ttrying again 3 ttrying again 4 accidentally pushed my updated makefile * Wrote catch for invalid presets, wrote test for catch for invalid presets, debugged new optimization preset * Forgot to run pre-commit, fixed those issues * black doing weird things * made preset validation more maintainable by moving it to the constructor and getting rid of preset list * RowStatisticsOptions: Add option (#865) * RowStatisticsOptions: Add null row count Added null_row_count as an option in RowStatisticsOptions. It toggles the functionality for row_has_null_ratio and row_is_null_ratio in _update_row_statistics. * Unit test for RowStatisticOptions: * Black formatting * RowStatisticsOptions: Add null row count Added null_row_count as an option in RowStatisticsOptions. It toggles the functionality for row_has_null_ratio and row_is_null_ratio in _update_row_statistics. * Unit test for RowStatisticOptions: * Black formatting * added a unit test for RowStatisticsOptions * Deleted test cases that were written in the wrong file * updated testing for null_count toggle in _update_row_statistics * removed the RowStatisticsOptions from test_profiler_options imports * add line * Created toggle option for null_count * RowStatisticsOptions: Add implementation * Revert "RowStatisticsOptions: Add implementation" This reverts commit 2da6a93. * RowStatsticsOptions: Create option * fixed pre-commit error * Update dataprofiler/profilers/profiler_options.py Co-authored-by: Taylor Turner <taylorfturner@gmail.com> * Update dataprofiler/profilers/profiler_options.py Co-authored-by: Taylor Turner <taylorfturner@gmail.com> * fixed documentation --------- Co-authored-by: Taylor Turner <taylorfturner@gmail.com> * Preset test updated w new names and different toggles (#880) * memory optimization preset ttrying again ttrying again 3 ttrying again 4 accidentally pushed my updated makefile * trying * trying * black doing weird things * trying * made preset validation more maintainable by moving it to the constructor and getting rid of preset list * Update to open-source in prep for wrapper changes for mem op preset * updated preset toggles and preset name (mem op -> large data) * updated tests to match * continued name and test and toggle updates * fix comments * RowStatisticsOptions: Implementing option (#871) * Implementing option * Implementing option * took out redundant if statement. added test case for when null_count is disabled. * attempt to check for conflicts between profile merges * added test to check if two profilers have null_count enabled before merging them together * fixed typo and added a trycatch to prevent failing test * No mocks needed. Fixed assertRaisesRegex error * Changed variables names and added a new test to check for check the null_count when null_count is disabled. * Changed name of test, moved tests to TestStructuredProfilerRowStatistics. Fixed position of if statement to prevent unnecessary code from running. * added null_count test cases * fixed indentation mistake * fixed typo * removed a useless commented a line * Updated test name * update --------- Co-authored-by: Liz Smith <liz.smith@richmond.edu> Co-authored-by: Richard Bann <87214439+drahc1R@users.noreply.github.com> * Cms for categorical (#892) * WIP cms implementation * add heavy hitters implementation * add heavy hitters implementation * WIP: mypy issue * WIP: mypy issue * add cms bool and refactor options handler * WIP: testing for CMS * WIP: testing for CMS * use new heavy_hitters_threshold, add test for it * Reservoir sampling refactor (#910) * refactored all but tests * removed some superfluous tests * moved variables around * Staging/dev/profile serialization (#940) * initial changes to categoricalColumn decoder (#818) * Implemented decoding for numerical stats mixin and integer profiles (#844) * hot fixes for encode and decode of numeric stats mixin and intcol profiler (#852) * Float column profiler encode decode (#854) * hot fixes for encode and decode of numeric stats mixin and intcol profiler * cleaned up type checking and updated numericstatsmixin readin helper to give type conversions to more attributes * Added docstring to the _load_stats_helper function * Update dataprofiler/profilers/numerical_column_stats.py Co-authored-by: Taylor Turner <taylorfturner@gmail.com> * Update dataprofiler/profilers/numerical_column_stats.py * fix for nan values issue in pytesting * Implementation of float profiler encode and decode process --------- Co-authored-by: Taylor Turner <taylorfturner@gmail.com> * Json decode date time column (#861) * more verbose error log with types for easy debug * add load_from_dict to handle tiimestamps * add json decode tests * include DateTimeColumn class * Added decoding for encoding of ordered column profiles (#864) * Added ordered col test to ensure correct response to update when different ordering of values is introduced (#868) * added decode text_column_profiler functionality and tests (#870) * Created encoder for the datalabelercolumn (#869) * feat: add test and compiler serialization (#884) * [WIP] Adds tests validating serialization with Primitive type for compiler (#885) * feat: add test and compiler serialization * fix: move primitive tests to own class * feat: add primitive col compiler save tests * fix: float serializers asserts * Adds deserialization for compilers and validates tests for Primitive; fixes numerical deserialization (#886) * feat: add test and compiler serialization * fix: move primitive tests to own class * feat: add primitive col compiler save tests * fix: float serializers asserts * feat: add tests and allow primitive compiler to deserialize * fix: bug in numeric stats deserial * fix: missing `)` after conflict resolution * Add Serialization and Deserialization Tests for Stats Compiler, plus refactors for order Typing (#887) * fix: organize categorical and add get function * refactor: reorganize tests and add stats test * feat: order typing * feat: add serial and deserial for stats compiler * fix: bug when sample_size == 0 * ready datalabeler for deserialization and improvement on serialization for datalabeler (#879) * Deserialization of datalabeler (#891) * Added initial profiler decoding for datalabeler column (WIP) * Intialial implementation for deserialization of datalabelercolumn * Fix LSP violations (#840) * Make profiler superclasses generic Makes the superclasses BaseColumnProfiler, NumericStatsMixin, and BaseCompiler generic, to avoid casting in subclass diff() methods and violating LSP in principle. * Add needed cast import --------- Co-authored-by: Junho Lee <53921230+junholee6a@users.noreply.github.com> * Encode Options (#875) * encode testing * encode dataLabeler testing * encode structuredOptions testing * cleaned up datalabeler test * added text options * [WIP] ColumnDataLabelerCompiler: serialize / deserialize (#888) * formatting * update formatting * setting up full test suite for DataLabelerCompiler * update isort * updates to test -- still failing * update * Quick Test update (#893) * update * string in list * formatting * Decode options (#894) * refactored options encode testing * updated test name * updated class names * fixing test * initial base option decode * inital tests * refactor: allow options to go through all (#902) * refactor: allow options to go through all * fix: bug * StructuredColProfiler Encode / Decode (#901) * refactor: allow options to go through all * fix: bug * update * update * update * updates * update * Fixes for taylors StructuredCol Issue * update * update * remove try/except --------- Co-authored-by: Jeremy Goodsitt <jeremy.goodsitt@gmail.com> Co-authored-by: ksneab7 <ksneab7@gmail.com> * fix: bug and add tests for structuredcolprofiler (#904) * fix: bug and add tests * fix: limit scipy requirements till problem understood and fixed * Stuctured profiler encode decode (#903) * refactor: allow options to go through all * fix: bug in loading options * update * update * Fixes for taylors StructuredCol Issue * Created load and save code from structuredprofiler * intermidiate commit for fixing structured profile --------- Co-authored-by: Jeremy Goodsitt <jeremy.goodsitt@gmail.com> Co-authored-by: taylorfturner <taylorfturner@gmail.com> * [WIP] Added NoImplementationError for UnstructuredProfiler (#907) * refactor: allow options to go through all * fix: bug in loading options * update * update * Fixes for taylors StructuredCol Issue * Created load and save code from structuredprofiler * intermidiate commit for fixing structured profile * test fix * mypy fixes for typing issues * fix for none case of the datalabler in options * Added mock of datalabeler to structured profile test * Added tests for encoding of the Structured profiler * Update dataprofiler/profilers/json_decoder.py Co-authored-by: Michael Davis <36012613+micdavis@users.noreply.github.com> * Update dataprofiler/profilers/profile_builder.py Co-authored-by: Michael Davis <36012613+micdavis@users.noreply.github.com> * Update dataprofiler/profilers/profiler_options.py Co-authored-by: Michael Davis <36012613+micdavis@users.noreply.github.com> * Pr fixes * Fixed typo in test * Update dataprofiler/profilers/json_decoder.py Co-authored-by: Taylor Turner <taylorfturner@gmail.com> * Update dataprofiler/profilers/profile_builder.py Co-authored-by: Michael Davis <36012613+micdavis@users.noreply.github.com> * Update dataprofiler/tests/profilers/utils.py Co-authored-by: Taylor Turner <taylorfturner@gmail.com> * Update dataprofiler/profilers/profile_builder.py Co-authored-by: Michael Davis <36012613+micdavis@users.noreply.github.com> * Fixes for unneeeded callout for _profile check * small change --------- Co-authored-by: Jeremy Goodsitt <jeremy.goodsitt@gmail.com> Co-authored-by: taylorfturner <taylorfturner@gmail.com> Co-authored-by: ksneab7 <ksneab7@gmail.com> Co-authored-by: ksneab7 <91956551+ksneab7@users.noreply.github.com> * Added testing for values for test_json_decode_after_update (#915) * Reuse passed labeler (#924) * refactor: loading labeler for reuse and abstract loading * refactor: use for DataLabelerColumn as well * fix: don't error if doesn't exist * refactor: allow for config dict to be passed entire way * fix: compiler tests * fix: structCol tests * fix: test * BaseProfiler save() for json (#923) * added save for top level and tests * small refactor * small fix * refactor: use seed for sample for consistency (#927) * refactor: use seed for sample for consistency * fix: formatting and variables * WIP top level load (#925) * quick hot fix for input validation on save() save_metho (#931) * BaseProfiler: `load_method` hotfix (#932) * added load_method * updated tests * fix: null_rep mat should calculate even if datetime (#933) * Notebook Example save/load Profile (#930) * update example data profiler demo save/load * update notebook cells * Update examples/data_profiler_demo.ipynb * Update examples/data_profiler_demo.ipynb * fix: order bug (#939) * fix: typo on rebase * fix: typing and bugs from rebase * fix: options tests due to merge and loading new options --------- Co-authored-by: Michael Davis <36012613+micdavis@users.noreply.github.com> Co-authored-by: ksneab7 <91956551+ksneab7@users.noreply.github.com> Co-authored-by: Taylor Turner <taylorfturner@gmail.com> Co-authored-by: Tyler <tfarnan@ucsd.edu> Co-authored-by: Junho Lee <53921230+junholee6a@users.noreply.github.com> Co-authored-by: ksneab7 <ksneab7@gmail.com> * Hotfix: fix post feature serialization merge (#942) * fix: to use config instead of options * fix: comment * fix: maxdiff * version bump (#944) --------- Co-authored-by: JGSweets <JGSweets@users.noreply.github.com> Co-authored-by: Rushabh Vinchhi <rushabhuvinchhi@gmail.com> Co-authored-by: Richard Bann <richard@bann.com> Co-authored-by: Liz Smith <liz.smith@richmond.edu> Co-authored-by: Richard Bann <87214439+drahc1R@users.noreply.github.com> Co-authored-by: Tyler <tfarnan@ucsd.edu> Co-authored-by: Michael Davis <36012613+micdavis@users.noreply.github.com> Co-authored-by: ksneab7 <91956551+ksneab7@users.noreply.github.com> Co-authored-by: Junho Lee <53921230+junholee6a@users.noreply.github.com> Co-authored-by: ksneab7 <ksneab7@gmail.com>

tyfarnan added 8 commits June 20, 2023 13:10

WIP cms implementation

3d25015

add heavy hitters implementation

94e53ec

add heavy hitters implementation

1ff4d02

WIP: mypy issue

8c750a6

WIP: mypy issue

2f27a92

add cms bool and refactor options handler

b7feeb5

WIP: testing for CMS

466c76a

WIP: testing for CMS

aeb19ae

tyfarnan requested review from JGSweets, ksneab7, micdavis and taylorfturner as code owners June 21, 2023 19:08

tyfarnan commented Jun 21, 2023

View reviewed changes

dataprofiler/profilers/categorical_column_profile.py Outdated Show resolved Hide resolved

use new heavy_hitters_threshold, add test for it

e7f84d1

tyfarnan commented Jun 21, 2023

View reviewed changes

dataprofiler/profilers/categorical_column_profile.py Outdated Show resolved Hide resolved

JGSweets enabled auto-merge (squash) June 21, 2023 21:50

JGSweets reviewed Jun 21, 2023

View reviewed changes

dataprofiler/profilers/categorical_column_profile.py Show resolved Hide resolved

JGSweets reviewed Jun 21, 2023

View reviewed changes

dataprofiler/profilers/categorical_column_profile.py Show resolved Hide resolved

taylorfturner assigned tyfarnan Jun 22, 2023

taylorfturner added New Feature A feature addition not currently in the library Refactor Code that is being modified to improve the library labels Jun 22, 2023

JGSweets reviewed Jun 22, 2023

View reviewed changes

dataprofiler/profilers/categorical_column_profile.py Outdated Show resolved Hide resolved

feat: add dev to workfow for testing (capitalone#897)

3132b0e

JGSweets reviewed Jun 22, 2023

View reviewed changes

tyfarnan and others added 4 commits June 23, 2023 15:33

allow for hybrid handling of stream and batch for CMS

3b307b8

allow for hybrid handling of stream and batch for CMS

085024a

add tests for edge cases and various ways of merging profiles with cms

efa958b

Merge branch 'dev' into cms_for_categorical

05526c6

JGSweets reviewed Jun 26, 2023

View reviewed changes

dataprofiler/profilers/categorical_column_profile.py Show resolved Hide resolved

JGSweets reviewed Jun 26, 2023

View reviewed changes

dataprofiler/profilers/categorical_column_profile.py Outdated Show resolved Hide resolved

tyfarnan added 2 commits June 26, 2023 13:51

update tests for new conditions

ddd212e

handle case where two profiles have different max_num_heavy_hitters

3be6229

JGSweets reviewed Jun 26, 2023

View reviewed changes

dataprofiler/tests/profilers/profiler_options/test_categorical_options.py Outdated Show resolved Hide resolved

tyfarnan added 2 commits June 26, 2023 16:41

change default test value for max_num_heavy_hitters

16e1247

move edge case condition inside _merge_categorical_cms, modify test t…

b91384b

…o validate individual steps

JGSweets reviewed Jun 27, 2023

View reviewed changes

dataprofiler/profilers/categorical_column_profile.py Outdated Show resolved Hide resolved

JGSweets reviewed Jun 27, 2023

View reviewed changes

dataprofiler/profilers/categorical_column_profile.py Outdated Show resolved Hide resolved

JGSweets reviewed Jun 27, 2023

View reviewed changes

dataprofiler/profilers/categorical_column_profile.py Outdated Show resolved Hide resolved

JGSweets reviewed Jun 27, 2023

View reviewed changes

dataprofiler/profilers/categorical_column_profile.py Outdated Show resolved Hide resolved

tyfarnan added 4 commits June 27, 2023 09:28

add tests for edge cases, refactor

4666681

scipy req limit

dacbb1a

update docstrings for new CMS params

f843a0f

update default val in expected results

7785d97

tyfarnan requested a review from JGSweets June 27, 2023 17:59

JGSweets reviewed Jun 27, 2023

View reviewed changes

JGSweets previously approved these changes Jun 27, 2023

View reviewed changes

Merge branch 'dev' into cms_for_categorical

66f30a5

ksneab7 reviewed Jun 27, 2023

View reviewed changes

dataprofiler/profilers/categorical_column_profile.py Outdated Show resolved Hide resolved

Update dataprofiler/profilers/categorical_column_profile.py

81ac139

Co-authored-by: ksneab7 <91956551+ksneab7@users.noreply.github.com>

tyfarnan dismissed JGSweets’s stale review via 81ac139 June 27, 2023 19:48

tyfarnan requested review from JGSweets and ksneab7 June 27, 2023 19:49

JGSweets approved these changes Jun 27, 2023

View reviewed changes

ksneab7 approved these changes Jun 27, 2023

View reviewed changes

taylorfturner added the High Priority Dramatic improvement, inaccurate calculation(s) or bug / feature making the library unusable label Jun 27, 2023

taylorfturner approved these changes Jun 27, 2023

View reviewed changes

JGSweets merged commit a2b0d5e into capitalone:dev Jun 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Cms for categorical#892

Cms for categorical#892
JGSweets merged 26 commits intocapitalone:devfrom
tyfarnan:cms_for_categorical

tyfarnan commented Jun 21, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JGSweets Jun 22, 2023

Uh oh!

taylorfturner Jun 23, 2023

Uh oh!

Uh oh!

Uh oh!

JGSweets commented Jun 26, 2023 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JGSweets commented Jun 27, 2023

Uh oh!

JGSweets Jun 27, 2023

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Comments

Conversation

tyfarnan commented Jun 21, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JGSweets Jun 22, 2023

Choose a reason for hiding this comment

Uh oh!

taylorfturner Jun 23, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

JGSweets commented Jun 26, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JGSweets commented Jun 27, 2023

Uh oh!

JGSweets Jun 27, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

JGSweets commented Jun 26, 2023 •

edited

Loading