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.

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

Refactor rule tree #416

Merged
merged 14 commits into from
Sep 6, 2023
Merged

Refactor rule tree #416

merged 14 commits into from
Sep 6, 2023

Conversation

ppcad
Copy link
Collaborator

@ppcad ppcad commented Jun 30, 2023

No description provided.

@codecov-commenter
Copy link

codecov-commenter commented Jun 30, 2023

Codecov Report

Patch coverage: 97.59% and project coverage change: +0.11% 🎉

Comparison is base (742d1ba) 92.22% compared to head (c2140cb) 92.33%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #416      +/-   ##
==========================================
+ Coverage   92.22%   92.33%   +0.11%     
==========================================
  Files         133      137       +4     
  Lines        9450     9626     +176     
==========================================
+ Hits         8715     8888     +173     
- Misses        735      738       +3     
Files Changed Coverage Δ
logprep/framework/rule_tree/rule_tree.py 91.96% <92.00%> (+1.86%) ⬆️
logprep/filter/expression/filter_expression.py 96.09% <95.23%> (-0.86%) ⬇️
logprep/framework/rule_tree/rule_parser.py 97.36% <96.42%> (-0.33%) ⬇️
logprep/framework/rule_tree/rule_segmenter.py 98.00% <98.00%> (ø)
logprep/framework/rule_tree/demorgan_resolver.py 100.00% <100.00%> (ø)
logprep/framework/rule_tree/node.py 100.00% <100.00%> (ø)
logprep/framework/rule_tree/rule_sorter.py 100.00% <100.00%> (ø)
logprep/framework/rule_tree/rule_tagger.py 100.00% <100.00%> (ø)

... and 24 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ppcad ppcad requested a review from ekneg54 June 30, 2023 12:30
@ppcad ppcad marked this pull request as ready for review June 30, 2023 12:45
@ppcad ppcad self-assigned this Jun 30, 2023
@ppcad ppcad linked an issue Jul 7, 2023 that may be closed by this pull request
Copy link
Collaborator

@ekneg54 ekneg54 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your work. This was a lot. But I can`t merge it, because I do not understand main parts of it. please read through the comments and write me a mail. We need to come together for some pair programming sessions to get this important part of logprep right and to ensure, that we not have to touch it again in the next steps.

tests/unit/framework/rule_tree/test_demorgan_resolver.py Outdated Show resolved Hide resolved
tests/unit/framework/rule_tree/test_demorgan_resolver.py Outdated Show resolved Hide resolved
logprep/framework/rule_tree/demorgan_resolver.py Outdated Show resolved Hide resolved
tests/unit/framework/rule_tree/test_demorgan_resolver.py Outdated Show resolved Hide resolved
tests/unit/framework/rule_tree/test_demorgan_resolver.py Outdated Show resolved Hide resolved
logprep/framework/rule_tree/node.py Show resolved Hide resolved
logprep/framework/rule_tree/node.py Show resolved Hide resolved
logprep/filter/expression/filter_expression.py Outdated Show resolved Hide resolved
logprep/framework/rule_tree/rule_segmenter.py Outdated Show resolved Hide resolved
@ppcad ppcad requested a review from ekneg54 July 25, 2023 07:03
Copy link
Collaborator

@ekneg54 ekneg54 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you for the changes.
plz merge if ready

@ppcad ppcad requested a review from ekneg54 September 1, 2023 05:41
@ppcad
Copy link
Collaborator Author

ppcad commented Sep 1, 2023

I had to remove __slots__ from children in FilterExpression, since this caused some rules to not match. I added a unit test for such a rule.
I don't know why __slots__ causes this.

@ekneg54
Can you please have a look at the fix?
The changes are in commit 8190857f55b39c50872d921f3e5ea8821b266947.

@ekneg54
Copy link
Collaborator

ekneg54 commented Sep 6, 2023

I'm fine with it 👍

@ppcad ppcad merged commit d069436 into main Sep 6, 2023
10 checks passed
@ekneg54 ekneg54 deleted the dev-refactor-rule-tree branch February 7, 2024 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rewrite RuleParser
3 participants