RowStatisticsOptions: Implementing option#871
Merged
taylorfturner merged 16 commits intocapitalone:feature/optionsfrom Jun 15, 2023
Merged
RowStatisticsOptions: Implementing option#871taylorfturner merged 16 commits intocapitalone:feature/optionsfrom
taylorfturner merged 16 commits intocapitalone:feature/optionsfrom
Conversation
drahc1R
requested review from
JGSweets,
ksneab7,
micdavis,
taylorfturner and
tyfarnan
as code owners
taylorfturner
added
the
New Feature
taylorfturner
changed the title
Contributor
|
tests failing here @drahc1R |
auto-merge was automatically disabled
June 14, 2023 17:15
Head branch was pushed to by a user without write access
drahc1R
force-pushed
the
row_stats_option_implementation
branch
from
7eab7be to
76feaa1
Compare
JGSweets
reviewed
Jun 14, 2023
JGSweets
reviewed
Jun 14, 2023
JGSweets
reviewed
Jun 14, 2023
JGSweets
reviewed
Jun 14, 2023
JGSweets
reviewed
Jun 14, 2023
JGSweets
reviewed
Jun 14, 2023
JGSweets
reviewed
Jun 14, 2023
JGSweets
reviewed
Jun 14, 2023
JGSweets
reviewed
Jun 14, 2023
JGSweets
reviewed
Jun 14, 2023
JGSweets
reviewed
Jun 14, 2023
JGSweets
reviewed
Jun 14, 2023
JGSweets
reviewed
Jun 14, 2023
…drahc1R/DataProfiler into row_stats_option_implementation
taylorfturner
approved these changes
Jun 14, 2023
Comment on lines
3618
to
3619
| self.assertLess(0, profiler_w_null_count.row_has_null_count) | ||
| self.assertLess(0, profiler_w_null_count.row_is_null_count) |
Contributor
There was a problem hiding this comment.
shouldn't this fail?
JGSweets
reviewed
Jun 14, 2023
Comment on lines
3618
to
3621
| self.assertLess(0, profiler_w_null_count.row_has_null_count) | ||
| self.assertLess(0, profiler_w_null_count.row_is_null_count) | ||
| self.assertEqual(0, profiler_w_disabled_null_count.row_has_null_count) | ||
| self.assertEqual(0, profiler_w_disabled_null_count.row_is_null_count) |
Contributor
There was a problem hiding this comment.
I think we still need to split this out as this isn't testing mismatching of add in terms of the test function naming.
Contributor
There was a problem hiding this comment.
Actually, just noticing the swapping of names above.
If we change this to test_add_profiles_null_count_not_enabled we only need to test one profile and it's values.
specifically: profiler_w_disabled_null_count
Contributor
There was a problem hiding this comment.
We still need to include the tests in this comment: https://github.com/capitalone/DataProfiler/pull/871/files#r1230135673
JGSweets
reviewed
Jun 14, 2023
| cls.data, len(cls.data), options=profiler_options_full | ||
| ) | ||
|
|
||
| def test_add_profiles_null_count_not_enabled(self): |
Contributor
There was a problem hiding this comment.
I believe this is the test_adding_profiles_of_mismatched_null_count_options
| cls.data, len(cls.data), options=profiler_options_full | ||
| ) | ||
|
|
||
| def test_add_profiles_null_count_not_enabled(self): |
Contributor
There was a problem hiding this comment.
based on the name I'd expect both row_statistics.null_count.is_enabled set to False...
Contributor
There was a problem hiding this comment.
this should be: test_adding_profiles_of_mismatched_null_count_options
Contributor
There was a problem hiding this comment.
you can test this error message below by creating a new options config in test_add_profilers_row_statistics_options here
Contributor
There was a problem hiding this comment.
test_adding_profiles_of_mismatched_null_count_optionsandtest_add_profiles_null_count_not_enabledcan be removed since their functionality is being added totest_add_profilers_row_statistics_options.
There needs to be tests to check the base conditions for _get_row_is_null_ratio() and _get_row_has_null_ratio().
- The test to check when
Noneis this. It already exists, it just needs to be updated so the options include"row_statistics.null_count.is_enabled": False,. The test to check when0is returned can be similar to this. - There will need to be two test to check when
0is returned, one for_get_row_is_null_ratio()and one for_get_row_has_null_ratio(). You can follow a similar format as this test.
taylorfturner
suggested changes
Jun 14, 2023
Contributor
taylorfturner
left a comment
taylorfturner
left a comment
There was a problem hiding this comment.
I think this should fail....
JGSweets
reviewed
Jun 14, 2023
Comment on lines
2100
to
2106
| # If sample_ids provided, increment since that means only new data read | ||
| if sample_ids is not None: | ||
| self.row_has_null_count += len(null_in_row_count) | ||
| self.row_is_null_count += len(null_rows) | ||
| else: | ||
| self.row_has_null_count = len(null_in_row_count) | ||
| self.row_is_null_count = len(null_rows) |
Contributor
There was a problem hiding this comment.
I believe this is causing errors bc these should be a single tab and not two tabs over.
micdavis
reviewed
Jun 14, 2023
| cls.data, len(cls.data), options=profiler_options_full | ||
| ) | ||
|
|
||
| def test_add_profiles_null_count_not_enabled(self): |
Contributor
There was a problem hiding this comment.
you can test this error message below by creating a new options config in test_add_profilers_row_statistics_options here
| cls.data, len(cls.data), options=profiler_options_full | ||
| ) | ||
|
|
||
| def test_add_profiles_null_count_not_enabled(self): |
Contributor
There was a problem hiding this comment.
test_adding_profiles_of_mismatched_null_count_optionsandtest_add_profiles_null_count_not_enabledcan be removed since their functionality is being added totest_add_profilers_row_statistics_options.
There needs to be tests to check the base conditions for _get_row_is_null_ratio() and _get_row_has_null_ratio().
- The test to check when
Noneis this. It already exists, it just needs to be updated so the options include"row_statistics.null_count.is_enabled": False,. The test to check when0is returned can be similar to this. - There will need to be two test to check when
0is returned, one for_get_row_is_null_ratio()and one for_get_row_has_null_ratio(). You can follow a similar format as this test.
auto-merge was automatically disabled
June 15, 2023 15:53
Head branch was pushed to by a user without write access
JGSweets
reviewed
Jun 15, 2023
JGSweets
suggested changes
Jun 15, 2023
| if not self.options.row_statistics.is_enabled: | ||
| if ( | ||
| not self.options.row_statistics.is_enabled | ||
| or not self.options.row_statistics.is_enabled |
Contributor
There was a problem hiding this comment.
The second one here needs to be the null_count. Right now it is a duplicate. Same for the one above.
Contributor
There was a problem hiding this comment.
all good :) tests written would catch. If not, we should make sure they exist :)
auto-merge was automatically disabled
June 15, 2023 18:15
Head branch was pushed to by a user without write access
Comment on lines
+1979
to
+1982
| if ( | ||
| not self.options.row_statistics.is_enabled | ||
| or not self.options.row_statistics.null_count.is_enabled | ||
| ): |
Comment on lines
+1991
to
+1994
| if ( | ||
| not self.options.row_statistics.is_enabled | ||
| or not self.options.row_statistics.null_count.is_enabled | ||
| ): |
Comment on lines
+4148
to
+4149
| self.assertIsNone(profiler._get_row_is_null_ratio()) | ||
| self.assertIsNone(profiler._get_row_has_null_ratio()) |
JGSweets
reviewed
Jun 15, 2023
| ): | ||
| profiler_w_null_count + profiler_w_disabled_null_count | ||
|
|
||
| def test_add_profiles_null_count_not_enabled(self): |
Contributor
There was a problem hiding this comment.
rename, not adding profiles
auto-merge was automatically disabled
June 15, 2023 19:30
Head branch was pushed to by a user without write access
JGSweets
approved these changes
Jun 15, 2023
taylorfturner
approved these changes
Jun 15, 2023
taylorfturner
pushed a commit
that referenced
this pull request
Jun 26, 2023
* 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
JGSweets
pushed a commit
that referenced
this pull request
Jun 27, 2023
* 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>
micdavis
added a commit
that referenced
this pull request
Jun 29, 2023
* 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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
related to issue #859