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

feat(server): allow A/B test with a restricted set of rules #10966

Merged
merged 4 commits into from
Oct 28, 2024
Merged

Conversation

fabrichter
Copy link
Collaborator

@fabrichter fabrichter commented Oct 25, 2024

Summary by CodeRabbit

  • New Features
    • Enhanced user-specific rule management, allowing designated users to access only certain rules based on environment settings and A/B testing configurations.
  • Bug Fixes
    • Improved error handling and logging related to user limits and request processing.

Copy link
Contributor

coderabbitai bot commented Oct 25, 2024

Warning

Rate limit exceeded

@fabrichter has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 22 minutes and 18 seconds before requesting another review.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

📥 Commits

Files that changed from the base of the PR and between 8ab8678 and 14a5162.

Walkthrough

The pull request introduces modifications to the TextChecker class in the languagetool-server module. Four static final lists, onlyTestUsers, onlyTestRules, onlyTestLanguages, and onlyTestClients, are added to store values from environment variables. These lists are populated during static initialization. The checkText method is updated to set a flag and modify the enabledRules list based on user conditions and A/B testing. Additionally, adjustments are made to error handling and logging related to user limits and request processing.

Changes

File Change Summary
languagetool-server/src/main/java/org/languagetool/server/TextChecker.java Added static final lists onlyTestUsers, onlyTestRules, onlyTestLanguages, and onlyTestClients; added method shouldApplyTestRules; updated checkText method for user-specific rule management; adjusted error handling and logging.

Suggested reviewers

  • p-goulart

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between b474be4 and 22e3744.

📒 Files selected for processing (1)
  • languagetool-server/src/main/java/org/languagetool/server/TextChecker.java (2 hunks)
🔇 Additional comments (1)
languagetool-server/src/main/java/org/languagetool/server/TextChecker.java (1)

483-487: ⚠️ Potential issue

Improve A/B test condition and add validation.

The current implementation has potential issues:

  1. The condition abTest.contains("only") is too broad and could match unintended test names.
  2. Missing validation that onlyRules is not empty when enabling the restriction.
  3. No logging when restrictions are applied.

Apply this diff to improve the implementation:

-    if (onlyUsers.contains(params.getOrDefault("username", "")) ||
-      (abTest != null && abTest.contains("only"))) {
+    String username = params.getOrDefault("username", "");
+    boolean isTestUser = !onlyUsers.isEmpty() && onlyUsers.contains(username);
+    boolean isOnlyTest = abTest != null && abTest.contains("only_rules_test");
+    if ((isTestUser || isOnlyTest) && !onlyRules.isEmpty()) {
       useEnabledOnly = true;
       enabledRules = onlyRules;
+      log.debug("Applying rule restrictions for user: {}, isTestUser: {}, isOnlyTest: {}, rules: {}",
+        username, isTestUser, isOnlyTest, onlyRules);
+    } else if (isTestUser || isOnlyTest) {
+      log.warn("Rule restrictions not applied because onlyRules is empty. User: {}, isTestUser: {}, isOnlyTest: {}",
+        username, isTestUser, isOnlyTest);
     }

This implementation:

  • Uses a more specific test name to avoid accidental matches
  • Validates that onlyRules is not empty before applying restrictions
  • Adds logging for debugging and monitoring purposes

Run the following script to verify the A/B test name usage:

Comment on lines 107 to 133
private final static List<String> onlyUsers;
private final static List<String> onlyRules;

static {
String onlyUsersEnv = System.getenv("LT_TEST_ONLY_USERS");
if (onlyUsersEnv == null) {
onlyUsersEnv = "";
}
String onlyRulesEnv = System.getenv("LT_TEST_ONLY_RULES");
if (onlyRulesEnv == null) {
onlyRulesEnv = "";
}
onlyUsers = Arrays.asList(onlyUsersEnv.split(","));
onlyRules = Arrays.asList(onlyRulesEnv.split(","));
}
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Improve environment variable handling and validation.

The current implementation has several potential issues:

  1. Splitting an empty string creates a list with one empty element, which could cause issues with contains() checks.
  2. Missing validation of environment variable values.
  3. No logging of initialization values for debugging purposes.

Apply this diff to improve the implementation:

 private final static List<String> onlyUsers;
 private final static List<String> onlyRules;

 static {
   String onlyUsersEnv = System.getenv("LT_TEST_ONLY_USERS");
   if (onlyUsersEnv == null) {
-    onlyUsersEnv = "";
+    onlyUsers = Collections.emptyList();
+  } else {
+    onlyUsers = Arrays.stream(onlyUsersEnv.split(","))
+      .map(String::trim)
+      .filter(s -> !s.isEmpty())
+      .collect(Collectors.toList());
   }
   String onlyRulesEnv = System.getenv("LT_TEST_ONLY_RULES");
   if (onlyRulesEnv == null) {
-    onlyRulesEnv = "";
+    onlyRules = Collections.emptyList();
+  } else {
+    onlyRules = Arrays.stream(onlyRulesEnv.split(","))
+      .map(String::trim)
+      .filter(s -> !s.isEmpty())
+      .collect(Collectors.toList());
   }
-  onlyUsers = Arrays.asList(onlyUsersEnv.split(","));
-  onlyRules = Arrays.asList(onlyRulesEnv.split(","));
+  log.info("Initialized A/B test restrictions - users: {}, rules: {}", onlyUsers, onlyRules);
 }

This implementation:

  • Handles empty/null environment variables correctly
  • Trims whitespace and filters empty values
  • Adds logging for debugging purposes

Consider adding Javadoc to document the format and purpose of these environment variables:

/**
 * List of usernames for A/B testing with restricted rules.
 * Populated from LT_TEST_ONLY_USERS environment variable.
 * Format: comma-separated list of usernames
 */
private final static List<String> onlyUsers;

/**
 * List of rule IDs enabled for A/B testing.
 * Populated from LT_TEST_ONLY_RULES environment variable.
 * Format: comma-separated list of rule IDs
 */
private final static List<String> onlyRules;

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 22e3744 and 51e5902.

📒 Files selected for processing (1)
  • languagetool-server/src/main/java/org/languagetool/server/TextChecker.java (2 hunks)

fabrichter and others added 2 commits October 25, 2024 15:35
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🧹 Outside diff range and nitpick comments (1)
languagetool-server/src/main/java/org/languagetool/server/TextChecker.java (1)

547-553: Add a comment explaining the A/B testing logic.

While the implementation is correct, adding a comment would help explain the purpose and impact of applying test rules.

Consider adding this comment:

+    // Apply A/B test rules for specific users/clients/languages
+    // This overrides normal rule selection and enables only the test rules
     if (shouldApplyTestRules(params, agent, lang, abTest)) {
       log.debug("Applying test rules for user: {}, language: {}, client: {}", 
         params.getOrDefault("username", ""), lang.getShortCodeWithCountryAndVariant(), agent);
       useEnabledOnly = true;
       enabledRules = onlyTestRules;
     }
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between 51e5902 and 8ab8678.

📒 Files selected for processing (1)
  • languagetool-server/src/main/java/org/languagetool/server/TextChecker.java (2 hunks)
🔇 Additional comments (1)
languagetool-server/src/main/java/org/languagetool/server/TextChecker.java (1)

107-178: LGTM! Well-documented and robust implementation.

The implementation of test restriction fields and their initialization is well-structured with:

  • Clear Javadoc documentation for each field
  • Robust environment variable handling
  • Proper empty/null checks
  • Debug logging

Comment on lines 540 to 545
private boolean shouldApplyTestRules(Map<String, String> params, String agent, Language lang, List<String> abTest) {
String username = params.getOrDefault("username", "");
return (onlyTestUsers.contains(username) || (abTest != null && abTest.contains("only"))) &&
onlyTestLanguages.contains(lang.getShortCodeWithCountryAndVariant()) &&
onlyTestClients.contains(agent);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Consider improving readability of the boolean conditions.

While the logic is correct, the complex boolean expression could be more readable by breaking it down into named components.

Consider this refactoring:

 private boolean shouldApplyTestRules(Map<String, String> params, String agent, Language lang, List<String> abTest) {
   String username = params.getOrDefault("username", "");
-  return (onlyTestUsers.contains(username) || (abTest != null && abTest.contains("only"))) &&
-         onlyTestLanguages.contains(lang.getShortCodeWithCountryAndVariant()) &&
-         onlyTestClients.contains(agent);
+  boolean isTestUser = onlyTestUsers.contains(username);
+  boolean isAbTestOnly = abTest != null && abTest.contains("only");
+  boolean isTestLanguage = onlyTestLanguages.contains(lang.getShortCodeWithCountryAndVariant());
+  boolean isTestClient = onlyTestClients.contains(agent);
+  
+  return (isTestUser || isAbTestOnly) && isTestLanguage && isTestClient;
 }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
private boolean shouldApplyTestRules(Map<String, String> params, String agent, Language lang, List<String> abTest) {
String username = params.getOrDefault("username", "");
return (onlyTestUsers.contains(username) || (abTest != null && abTest.contains("only"))) &&
onlyTestLanguages.contains(lang.getShortCodeWithCountryAndVariant()) &&
onlyTestClients.contains(agent);
}
private boolean shouldApplyTestRules(Map<String, String> params, String agent, Language lang, List<String> abTest) {
String username = params.getOrDefault("username", "");
boolean isTestUser = onlyTestUsers.contains(username);
boolean isAbTestOnly = abTest != null && abTest.contains("only");
boolean isTestLanguage = onlyTestLanguages.contains(lang.getShortCodeWithCountryAndVariant());
boolean isTestClient = onlyTestClients.contains(agent);
return (isTestUser || isAbTestOnly) && isTestLanguage && isTestClient;
}

@fabrichter fabrichter merged commit 1004b26 into master Oct 28, 2024
5 checks passed
@fabrichter fabrichter deleted the only branch October 28, 2024 15:41
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.

2 participants