⚡ Bolt: Combine API calls and optimize regex for faster startup by abhimehro · Pull Request #170 · abhimehro/ctrld-sync

abhimehro · 2026-02-07T14:42:15Z

Combines the initial API access check and folder listing into a single request to reduce latency. Optimizes regex compilation for high-frequency validation calls. Updates tests to cover the new implementation.

PR created automatically by Jules for task 12273526941137733078 started by @abhimehro

💡 What: 1. Implemented `verify_access_and_get_folders` to replace separate `check_api_access` and `list_existing_folders` calls. 2. Compiled regex patterns (`RULE_PATTERN`, `PROFILE_ID_PATTERN`) at module level. 3. Updated `sync_profile` to use the combined API call. 4. Removed `check_api_access` function. 🎯 Why: 1. Reduce network latency by 1 round-trip (RTT) per profile sync. 2. Reduce CPU overhead for rule validation (~2x faster per rule). 📊 Impact: - Reduces API calls by 1 per profile. - Improves rule validation performance by ~0.22s per 1M rules (micro-optimization, but high frequency). 🔬 Measurement: - `test_verify_access_and_get_folders_*` tests verify behavior. - Benchmark script showed 2x speedup for `is_valid_rule`. Co-authored-by: abhimehro <84992105+abhimehro@users.noreply.github.com>

google-labs-jules · 2026-02-07T14:42:17Z

👋 Jules, reporting for duty! I'm here to lend a hand with this pull request.

When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down.

I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job!

For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with @jules. You can find this option in the Pull Request section of your global Jules UI settings. You can always switch back!

New to Jules? Learn more at jules.google/docs.

For security, I will only act on instructions from the user who triggered this task.

trunk-io · 2026-02-07T14:42:20Z

Merging to main in this repository is managed by Trunk.

To merge this pull request, check the box to the left or comment /trunk merge below.

gemini-code-assist · 2026-02-07T14:42:32Z

Summary of Changes

Hello @abhimehro, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly enhances the tool's startup efficiency by streamlining its interaction with the Control D API and optimizing internal validation processes. By merging two distinct API calls into one and pre-compiling frequently used regular expressions, the changes aim to reduce network overhead and CPU cycles, resulting in a faster and more responsive application launch.

Highlights

API Call Optimization: The initial API access check and folder listing have been combined into a single verify_access_and_get_folders() function, reducing latency and improving startup performance.
Regex Optimization: Regular expressions used for profile ID and rule validation are now pre-compiled (re.compile()) to optimize performance for high-frequency validation calls.
Documentation Update: The WARP.md documentation has been updated to reflect the new combined API helper and its usage.
Test Suite Refinement: Existing test cases for API access and folder retrieval have been updated and adapted to cover the new verify_access_and_get_folders() implementation, including comprehensive error handling and retry scenarios.

Changelog

WARP.md
- Updated the description of 'Control D API helpers' to introduce verify_access_and_get_folders() and clarify list_existing_folders() as a fallback.
- Modified the main process description to reflect the use of the new combined API call for access verification and folder listing.
main.py
- Added PROFILE_ID_PATTERN and RULE_PATTERN as pre-compiled regex objects for performance.
- Replaced direct re.match calls with the new compiled patterns in is_valid_profile_id_format, validate_profile_id, and is_valid_rule functions.
- Removed the check_api_access function.
- Introduced verify_access_and_get_folders function, which performs both API access verification and existing folder retrieval in a single request, including robust error handling and retry logic.
- Updated the _run_plan function to utilize verify_access_and_get_folders for initial API interaction.
test_main.py
- Renamed and refactored test cases from test_check_api_access_* to test_verify_access_and_get_folders_*.
- Updated test_verify_access_and_get_folders_success to mock a successful JSON response containing folder data.
- Adjusted error handling tests (401, 403, 404, 500, network error) to correctly assert behavior for the new verify_access_and_get_folders function, including mocking retry mechanisms for transient errors.

Activity

PR created automatically by Jules for task 12273526941137733078 started by @abhimehro.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

test_main.py


-    assert m.check_api_access(mock_client, "valid_profile") is True
+    folders = m.verify_access_and_get_folders(mock_client, "valid_profile")
+    assert folders == {"Folder A": "id_a", "Folder B": "id_b"}


test_main.py

    monkeypatch.setattr(m, "log", mock_log)

-    assert m.check_api_access(mock_client, "invalid_token") is False
+    assert m.verify_access_and_get_folders(mock_client, "invalid_token") is None


test_main.py

    monkeypatch.setattr(m, "log", mock_log)

-    assert m.check_api_access(mock_client, "forbidden_profile") is False
+    assert m.verify_access_and_get_folders(mock_client, "forbidden_profile") is None


test_main.py

    monkeypatch.setattr(m, "log", mock_log)

-    assert m.check_api_access(mock_client, "missing_profile") is False
+    assert m.verify_access_and_get_folders(mock_client, "missing_profile") is None


test_main.py

+    monkeypatch.setattr("time.sleep", lambda x: None)
+    monkeypatch.setattr(m, "MAX_RETRIES", 2)
+
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None


test_main.py

+
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None
+    # Should have retried
+    assert mock_client.get.call_count == 2


test_main.py

+    monkeypatch.setattr("time.sleep", lambda x: None)
+    monkeypatch.setattr(m, "MAX_RETRIES", 2)
+
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None


test_main.py

+    monkeypatch.setattr(m, "MAX_RETRIES", 2)
+
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None
+    assert mock_client.get.call_count == 2


main.py

test_main.py


-    assert m.check_api_access(mock_client, "valid_profile") is True
+    folders = m.verify_access_and_get_folders(mock_client, "valid_profile")
+    assert folders == {"Folder A": "id_a", "Folder B": "id_b"}


test_main.py

    monkeypatch.setattr(m, "log", mock_log)

-    assert m.check_api_access(mock_client, "invalid_token") is False
+    assert m.verify_access_and_get_folders(mock_client, "invalid_token") is None


test_main.py

    monkeypatch.setattr(m, "log", mock_log)

-    assert m.check_api_access(mock_client, "forbidden_profile") is False
+    assert m.verify_access_and_get_folders(mock_client, "forbidden_profile") is None


test_main.py

    monkeypatch.setattr(m, "log", mock_log)

-    assert m.check_api_access(mock_client, "missing_profile") is False
+    assert m.verify_access_and_get_folders(mock_client, "missing_profile") is None


test_main.py

+    monkeypatch.setattr("time.sleep", lambda x: None)
+    monkeypatch.setattr(m, "MAX_RETRIES", 2)
+
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None


test_main.py

+
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None
+    # Should have retried
+    assert mock_client.get.call_count == 2


test_main.py

+    monkeypatch.setattr("time.sleep", lambda x: None)
+    monkeypatch.setattr(m, "MAX_RETRIES", 2)
+
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None


test_main.py

+    monkeypatch.setattr(m, "MAX_RETRIES", 2)
+
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None
+    assert mock_client.get.call_count == 2


main.py

+        None if access is denied or request fails after retries.
+    """
+    url = f"{API_BASE}/{profile_id}/groups"
+


main.py

+    for attempt in range(MAX_RETRIES):
+        try:
+            # Don't use _api_get because we need custom error handling for 4xx
+            resp = client.get(url)


main.py

+            resp = client.get(url)
+            resp.raise_for_status()
+
+            # Success! Parse and return


main.py

+            if code in (401, 403, 404):
+                if code == 401:
+                    log.critical(
+                        f"{Colors.FAIL}❌ Authentication Failed: The API Token is invalid.{Colors.ENDC}"


main.py

+        Dict of {folder_name: folder_id} if successful.
+        None if access is denied or request fails after retries.
+    """
+    url = f"{API_BASE}/{profile_id}/groups"


main.py

+            resp.raise_for_status()
+
+            # Success! Parse and return
+            try:


main.py

+                folders = data.get("body", {}).get("groups", [])
+                return {
+                    f["group"].strip(): f["PK"]
+                    for f in folders


test_main.py



-def test_check_api_access_401(monkeypatch):
+def test_verify_access_and_get_folders_401(monkeypatch):


test_main.py



-def test_check_api_access_403(monkeypatch):
+def test_verify_access_and_get_folders_403(monkeypatch):


test_main.py



-def test_check_api_access_404(monkeypatch):
+def test_verify_access_and_get_folders_404(monkeypatch):


test_main.py



-def test_check_api_access_generic_http_error(monkeypatch):
+def test_verify_access_and_get_folders_500_retry(monkeypatch):


test_main.py



-def test_check_api_access_network_error(monkeypatch):
+def test_verify_access_and_get_folders_network_error(monkeypatch):


test_main.py



-def test_check_api_access_network_error(monkeypatch):
+def test_verify_access_and_get_folders_network_error(monkeypatch):


test_main.py



-def test_check_api_access_generic_http_error(monkeypatch):
+def test_verify_access_and_get_folders_500_retry(monkeypatch):


test_main.py



-def test_check_api_access_404(monkeypatch):
+def test_verify_access_and_get_folders_404(monkeypatch):


test_main.py



-def test_check_api_access_403(monkeypatch):
+def test_verify_access_and_get_folders_403(monkeypatch):


test_main.py



-def test_check_api_access_401(monkeypatch):
+def test_verify_access_and_get_folders_401(monkeypatch):


main.py

+                elif code == 403:
+                    log.critical(
+                        f"{Colors.FAIL}🚫 Access Denied: Token lacks permission for Profile {profile_id}.{Colors.ENDC}"
+                    )


main.py

+                    f["group"].strip(): f["PK"]
+                    for f in folders
+                    if f.get("group") and f.get("PK")
+                }


main.py

+                data = resp.json()
+                folders = data.get("body", {}).get("groups", [])
+                return {
+                    f["group"].strip(): f["PK"]


main.py

+            resp.raise_for_status()
+
+            # Success! Parse and return
+            try:


gemini-code-assist

Code Review

This is an excellent pull request that significantly improves startup performance. Combining the API access check and folder listing into a single request is a great optimization, and the implementation in verify_access_and_get_folders is robust with its explicit retry logic. Pre-compiling the regular expressions is another solid performance win. The accompanying test updates are thorough and correctly validate the new behavior, including the retry mechanism.

I have a couple of suggestions in main.py to further improve the maintainability of the new code, mainly by refactoring a large conditional block and removing a piece of unreachable code. Overall, great work!

gemini-code-assist · 2026-02-07T14:45:23Z

main.py

+            if code in (401, 403, 404):
+                if code == 401:
+                    log.critical(
+                        f"{Colors.FAIL}❌ Authentication Failed: The API Token is invalid.{Colors.ENDC}"
+                    )
+                    log.critical(
+                        f"{Colors.FAIL}   Please check your token at: https://controld.com/account/manage-account{Colors.ENDC}"
+                    )
+                elif code == 403:
+                    log.critical(
+                        f"{Colors.FAIL}🚫 Access Denied: Token lacks permission for Profile {profile_id}.{Colors.ENDC}"
+                    )
+                elif code == 404:
+                    log.critical(
+                        f"{Colors.FAIL}🔍 Profile Not Found: The ID '{profile_id}' does not exist.{Colors.ENDC}"
+                    )
+                    log.critical(
+                        f"{Colors.FAIL}   Please verify the Profile ID from your Control D Dashboard URL.{Colors.ENDC}"
+                    )
+                return None


This block for handling specific HTTP status codes (401, 403, 404) is quite large and contains detailed, user-facing log messages. To improve the readability and maintainability of verify_access_and_get_folders, consider extracting this logic into a separate helper function. This would make the main function's flow, which is focused on retries and data fetching, easier to follow.

You could define a new helper function like this elsewhere in the file:

def _log_api_access_error(code: int, profile_id: str) -> None: """Logs a critical, user-facing error for common API access issues.""" if code == 401: log.critical( f"{Colors.FAIL}❌ Authentication Failed: The API Token is invalid.{Colors.ENDC}" ) log.critical( f"{Colors.FAIL} Please check your token at: https://controld.com/account/manage-account{Colors.ENDC}" ) elif code == 403: log.critical( f"{Colors.FAIL}🚫 Access Denied: Token lacks permission for Profile {profile_id}.{Colors.ENDC}" ) elif code == 404: log.critical( f"{Colors.FAIL}🔍 Profile Not Found: The ID '{profile_id}' does not exist.{Colors.ENDC}" ) log.critical( f"{Colors.FAIL} Please verify the Profile ID from your Control D Dashboard URL.{Colors.ENDC}" )

if code in (401, 403, 404): _log_api_access_error(code, profile_id) return None

gemini-code-assist · 2026-02-07T14:45:23Z

main.py

+        )
+        time.sleep(wait_time)
+
+    return None


This return None statement appears to be unreachable. The for loop above will always exit via a return statement within its body, either on success from the try block or on failure from the except blocks (especially on the last attempt). Removing this line will make the code cleaner and avoid confusion.

Copilot

Pull request overview

This PR reduces sync startup latency by combining the initial API access check and folder listing into a single request, and improves runtime performance by pre-compiling frequently used validation regexes.

Changes:

Replace the separate API access preflight (check_api_access) + folder listing with verify_access_and_get_folders() using one request.
Pre-compile regex patterns used in validate_profile_id() / is_valid_rule() to avoid repeated compilation.
Update pytest coverage to validate the new access+folders helper behavior and retry handling.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.

File	Description
main.py	Adds compiled regex constants; replaces `check_api_access` with `verify_access_and_get_folders()` and uses it in the main sync workflow.
test_main.py	Updates/renames tests to target `verify_access_and_get_folders()` and adds coverage for success/auth failures/retry paths.
WARP.md	Updates documentation to reflect the new combined access+folders helper and workflow steps.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-07T14:47:33Z

main.py

+        except httpx.HTTPStatusError as e:
+            code = e.response.status_code
+            if code in (401, 403, 404):
+                if code == 401:
+                    log.critical(
+                        f"{Colors.FAIL}❌ Authentication Failed: The API Token is invalid.{Colors.ENDC}"
+                    )
+                    log.critical(
+                        f"{Colors.FAIL}   Please check your token at: https://controld.com/account/manage-account{Colors.ENDC}"
+                    )
+                elif code == 403:
+                    log.critical(
+                        f"{Colors.FAIL}🚫 Access Denied: Token lacks permission for Profile {profile_id}.{Colors.ENDC}"
+                    )
+                elif code == 404:
+                    log.critical(
+                        f"{Colors.FAIL}🔍 Profile Not Found: The ID '{profile_id}' does not exist.{Colors.ENDC}"
+                    )
+                    log.critical(
+                        f"{Colors.FAIL}   Please verify the Profile ID from your Control D Dashboard URL.{Colors.ENDC}"
+                    )
+                return None
+
+            # For 5xx errors, retry
+            if attempt == MAX_RETRIES - 1:
+                log.error(f"API Request Failed ({code}): {e}")
+                return None
+


verify_access_and_get_folders() retries on any HTTPStatusError that isn’t 401/403/404, which includes non-retriable 4xx responses (e.g., 400/409). This can cause long backoffs for permanent client errors and contradicts the “For 5xx errors, retry” comment. Consider explicitly retrying only for 5xx (and possibly 429 with Retry-After), and for other 4xx log once and return None immediately.

Copilot · 2026-02-07T14:47:33Z

main.py

+        log.warning(
+            f"Request failed (attempt {attempt + 1}/{MAX_RETRIES}). Retrying in {wait_time}s..."
+        )


The retry warning log (Request failed... Retrying in ...) doesn’t include the underlying exception/status code, which makes diagnosing repeated failures harder. Consider including the caught exception (sanitized) or at least the HTTP status code in this warning message.

Copilot · 2026-02-07T14:47:34Z

test_main.py

@@ -335,12 +348,19 @@ def test_check_api_access_generic_http_error(monkeypatch):
    mock_log = MagicMock()
    monkeypatch.setattr(m, "log", mock_log)

-    assert m.check_api_access(mock_client, "profile") is False
+    # Speed up sleep
+    monkeypatch.setattr(m, "RETRY_DELAY", 0.001)
+    monkeypatch.setattr("time.sleep", lambda x: None)
+    monkeypatch.setattr(m, "MAX_RETRIES", 2)
+
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None
+    # Should have retried
+    assert mock_client.get.call_count == 2
    assert mock_log.error.called
    assert "500" in str(mock_log.error.call_args)



Tests cover 401/403/404 and a 500 retry, but there’s no coverage for how verify_access_and_get_folders() behaves on other 4xx responses (e.g., 400/409) or 429 rate limiting. Adding a test for a representative non-auth 4xx would help prevent accidental retry/backoff changes for permanent client errors.

💡 What: 1. Implemented `verify_access_and_get_folders` to replace separate `check_api_access` and `list_existing_folders` calls. 2. Compiled regex patterns (`RULE_PATTERN`, `PROFILE_ID_PATTERN`) at module level. 3. Updated `sync_profile` to use the combined API call. 4. Removed `check_api_access` function. 5. Fixed CodeQL alerts by sanitizing `profile_id` and exception messages in logs. 🎯 Why: 1. Reduce network latency by 1 round-trip (RTT) per profile sync. 2. Reduce CPU overhead for rule validation (~2x faster per rule). 3. Fix potential sensitive data exposure in logs. 📊 Impact: - Reduces API calls by 1 per profile. - Improves rule validation performance by ~0.22s per 1M rules. - Eliminates 2 High Severity security alerts. 🔬 Measurement: - `test_verify_access_and_get_folders_*` tests verify behavior. - Benchmark script showed 2x speedup for `is_valid_rule`. Co-authored-by: abhimehro <84992105+abhimehro@users.noreply.github.com>

main.py

+                    )
+                    log.critical(
+                        f"{Colors.FAIL}   Please verify the Profile ID from your Control D Dashboard URL.{Colors.ENDC}"
+                    )


main.py

+                return None
+
+            # For 5xx errors, retry
+            if attempt == MAX_RETRIES - 1:


main.py

+            if attempt == MAX_RETRIES - 1:
+                log.error(f"Network Error: {sanitize_for_log(e)}")
+                return None
+


main.py

+                log.error(f"API Request Failed ({code}): {sanitize_for_log(e)}")
+                return None
+
+        except httpx.RequestError as e:


main.py

+        time.sleep(wait_time)
+
+    return None
+


main.py

+        time.sleep(wait_time)
+
+    return None
+


main.py

Copilot AI review requested due to automatic review settings February 7, 2026 14:42

github-actions bot added documentation Improvements or additions to documentation python labels Feb 7, 2026

github-advanced-security bot found potential problems Feb 7, 2026

View reviewed changes

Copilot started reviewing on behalf of abhimehro February 7, 2026 14:42 View session

github-advanced-security bot found potential problems Feb 7, 2026

View reviewed changes

main.py Fixed Show fixed Hide fixed

main.py Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems Feb 7, 2026

View reviewed changes

gemini-code-assist bot reviewed Feb 7, 2026

View reviewed changes

Copilot AI reviewed Feb 7, 2026

View reviewed changes

github-advanced-security bot found potential problems Feb 7, 2026

View reviewed changes



		def test_check_api_access_401(monkeypatch):
		def test_verify_access_and_get_folders_401(monkeypatch):



		def test_check_api_access_403(monkeypatch):
		def test_verify_access_and_get_folders_403(monkeypatch):



		def test_check_api_access_404(monkeypatch):
		def test_verify_access_and_get_folders_404(monkeypatch):



		def test_check_api_access_generic_http_error(monkeypatch):
		def test_verify_access_and_get_folders_500_retry(monkeypatch):



		def test_check_api_access_network_error(monkeypatch):
		def test_verify_access_and_get_folders_network_error(monkeypatch):

Conversation

abhimehro commented Feb 7, 2026

Uh oh!

google-labs-jules bot commented Feb 7, 2026

Uh oh!

trunk-io bot commented Feb 7, 2026

Uh oh!

gemini-code-assist bot commented Feb 7, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Uh oh!

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check warning

Check warning

Check warning

Check warning

Uh oh!

Uh oh!

Check warning

Uh oh!

Uh oh!

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Check warning

Uh oh!

Check notice

Check notice

Check notice

Check notice

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Feb 7, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Feb 7, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 7, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 7, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 7, 2026

Choose a reason for hiding this comment

Uh oh!