Consolidate API access check and folder listing into single request by Copilot · Pull Request #179 · abhimehro/ctrld-sync

Copilot · 2026-02-09T02:28:48Z

Consolidates open PR #178 which was blocked by linting violations. The core change reduces API latency by combining two sequential requests into one.

Changes

API optimization

Replace check_api_access() + list_existing_folders() sequence with verify_access_and_get_folders()
Single request to /groups endpoint validates access and returns folder map
Retry logic with exponential backoff for 5xx errors
Immediate failure on 401/403/404 with actionable error messages

Before:

if not check_api_access(client, profile_id):  # GET /groups
    return False
existing_folders = list_existing_folders(client, profile_id)  # GET /groups again

After:

existing_folders = verify_access_and_get_folders(client, profile_id)  # Single GET /groups
if existing_folders is None:
    return False

Linting fixes from original PR

Logging: f-strings → lazy % formatting
Line length violations fixed
Variable naming: e → err for exception handlers
Test docstrings added

Post-merge cleanup

Close PR Combine API access check and folder listing into single request; close stale Jules PRs #178
Delete branches: copilot/review-open-pull-requests, copilot/refactor-pull-request-170

Original prompt

Hi Copilot,

The remaining open pull requests from Jules and/or agent sessions currently seem to have conflicts with the main branch, which are preventing them from merging via Trunk.

Could you please analyze these branches and consolidate all their updates into a single, conflict-free pull request? Once you’ve verified that the new PR captures all necessary changes, please close the original pull requests and delete their branches to ensure the repository remains clean and up to date.

Thank you for your help!

Custom agent used: Development Partner
The Development Partner Protocol

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

trunk-io · 2026-02-09T02:28:52Z

😎 Merged manually by @abhimehro - details.

github-actions · 2026-02-09T02:31:02Z

👋 Development Partner is reviewing this PR. Will provide feedback shortly.

…date-open-prs

Co-authored-by: abhimehro <84992105+abhimehro@users.noreply.github.com>

github-actions · 2026-02-09T02:35:18Z

👋 Development Partner is reviewing this PR. Will provide feedback shortly.

github-actions · 2026-02-09T02:38:10Z

👋 Development Partner is reviewing this PR. Will provide feedback shortly.

test_main.py

+    mock_response.raise_for_status.return_value = None
+
+    result = m.verify_access_and_get_folders(mock_client, "valid_profile")
+    assert result == {"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(m, "MAX_RETRIES", 2)

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


test_main.py


-    assert m.check_api_access(mock_client, "profile") is False
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None
+    assert mock_client.get.call_count == 2


test_main.py

+    monkeypatch.setattr(m, "MAX_RETRIES", 2)

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


test_main.py


-    assert m.check_api_access(mock_client, "profile") is False
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None
+    assert mock_client.get.call_count == 2


test_main.py

    assert mock_log.error.called
-    assert "Network failure" in str(mock_log.error.call_args)
+    error_msg = str(mock_log.error.call_args)
+    assert "Network error" in error_msg or "access verification" in error_msg


test_main.py

+    mock_response.raise_for_status.return_value = None
+
+    result = m.verify_access_and_get_folders(mock_client, "valid_profile")
+    assert result == {"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(m, "MAX_RETRIES", 2)

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


test_main.py


-    assert m.check_api_access(mock_client, "profile") is False
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None
+    assert mock_client.get.call_count == 2


test_main.py

+    monkeypatch.setattr(m, "MAX_RETRIES", 2)

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


test_main.py


-    assert m.check_api_access(mock_client, "profile") is False
+    assert m.verify_access_and_get_folders(mock_client, "profile") is None
+    assert mock_client.get.call_count == 2


test_main.py

    assert mock_log.error.called
-    assert "Network failure" in str(mock_log.error.call_args)
+    error_msg = str(mock_log.error.call_args)
+    assert "Network error" in error_msg or "access verification" in error_msg


main.py

+
+                body = data.get("body")
+                if not isinstance(body, dict):
+                    log.error(


main.py

+
+                body = data.get("body")
+                if not isinstance(body, dict):
+                    log.error(


main.py

+
+                body = data.get("body")
+                if not isinstance(body, dict):
+                    log.error(


main.py

+                body = data.get("body")
+                if not isinstance(body, dict):
+                    log.error(
+                        "Failed to parse folders data: expected 'body' to be an object, "


main.py

+                        f"{Colors.FAIL}   Please check your token at: https://controld.com/account/manage-account{Colors.ENDC}"
+                    )
+                elif code == 403:
+                    log.critical(


main.py

+    return None
+
+
 def get_all_existing_rules(


test_main.py

-# Case 7: check_api_access handles success and errors correctly
-def test_check_api_access_success(monkeypatch):
+# Case 7: verify_access_and_get_folders handles success and errors correctly
+def test_verify_access_and_get_folders_success(monkeypatch):


test_main.py

+    assert result == {"Folder A": "id_a", "Folder B": "id_b"}
+
+
+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_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

+    assert result == {"Folder A": "id_a", "Folder B": "id_b"}
+
+
+def test_verify_access_and_get_folders_401(monkeypatch):


test_main.py

-# Case 7: check_api_access handles success and errors correctly
-def test_check_api_access_success(monkeypatch):
+# Case 7: verify_access_and_get_folders handles success and errors correctly
+def test_verify_access_and_get_folders_success(monkeypatch):


main.py


-            existing_folders = list_existing_folders(client, profile_id)
            if not no_delete:
                deletion_occurred = False


main.py

+
+                # Only process entries that are dicts and have the required keys.
+                result: Dict[str, str] = {}
+                for f in folders:


main.py

+
+                # Only process entries that are dicts and have the required keys.
+                result: Dict[str, str] = {}
+                for f in folders:


main.py

                return False

-            existing_folders = list_existing_folders(client, profile_id)
            if not no_delete:


main.py

Copilot

Pull request overview

This PR reduces Control D API latency by consolidating the access check and folder listing into a single /groups request via a new helper, and updates tests/docs accordingly.

Changes:

Add verify_access_and_get_folders() to combine access verification + folder map retrieval in one call (with retry logic).
Update sync_profile() and parallel deletion tests to use the combined helper instead of check_api_access() + list_existing_folders().
Update unit tests and documentation to reflect the new helper and behavior.

Reviewed changes

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

File	Description
`main.py`	Introduces `verify_access_and_get_folders()` and switches `sync_profile()` to the single-call approach.
`test_main.py`	Replaces `check_api_access` tests with coverage for `verify_access_and_get_folders` (success, auth errors, retry, network errors).
`tests/test_parallel_deletion.py`	Updates mocks to use `verify_access_and_get_folders()` so deletion tests match the new call flow.
`WARP.md`	Documents the new helper and updated workflow in the API helper section.

Copilot · 2026-02-09T02:42:28Z

main.py

+        log.warning(
+            "Request failed (attempt %d/%d). Retrying in %ds...",
+            attempt + 1,
+            MAX_RETRIES,
+            wait_time,
+        )


The retry log message uses a %d placeholder for wait_time, but wait_time can be a float (e.g., if RETRY_DELAY is configured/overridden as a non-integer for faster retries). Using %d will raise a formatting TypeError at runtime. Consider switching to %s/%.3f (or explicitly casting) so retries can't crash due to logging format mismatch.

main.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

github-actions · 2026-02-09T02:44:20Z

👋 Development Partner is reviewing this PR. Will provide feedback shortly.

main.py

github-actions · 2026-02-09T03:29:27Z

👋 Development Partner is reviewing this PR. Will provide feedback shortly.

Initial plan

a5dfc62

Copilot AI assigned Copilot and abhimehro Feb 9, 2026

Copilot started work on behalf of abhimehro February 9, 2026 02:29 View session

Copilot AI and others added 2 commits February 9, 2026 02:33

Merge branch 'copilot/review-open-pull-requests' into copilot/consoli…

7dcaa84

…date-open-prs

Address code review feedback: improve comments and error handling

60f1518

Co-authored-by: abhimehro <84992105+abhimehro@users.noreply.github.com>

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

Copilot AI changed the title ~~[WIP] Consolidate open pull requests into single merge~~ Consolidate API access check and folder listing into single request Feb 9, 2026

Copilot AI requested a review from abhimehro February 9, 2026 02:37

Copilot finished work on behalf of abhimehro February 9, 2026 02:37

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

View reviewed changes

abhimehro marked this pull request as ready for review February 9, 2026 02:38

Copilot AI review requested due to automatic review settings February 9, 2026 02:38

Copilot started reviewing on behalf of abhimehro February 9, 2026 02:39 View session

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

View reviewed changes

main.py Dismissed Show dismissed Hide dismissed

main.py Dismissed Show dismissed Hide dismissed

main.py Dismissed Show dismissed Hide dismissed

main.py Dismissed Show dismissed Hide dismissed

main.py Dismissed Show dismissed Hide dismissed

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

View reviewed changes

Copilot AI reviewed Feb 9, 2026

View reviewed changes

Update main.py

a0e7bc6

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

abhimehro approved these changes Feb 9, 2026

View reviewed changes

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

View reviewed changes

main.py Dismissed Show dismissed Hide dismissed

main.py Dismissed Show dismissed Hide dismissed

Merge branch 'main' into copilot/consolidate-open-prs

6688c79

github-actions bot removed the documentation Improvements or additions to documentation label Feb 9, 2026

abhimehro merged commit da4046b into main Feb 9, 2026
12 checks passed

abhimehro deleted the copilot/consolidate-open-prs branch February 9, 2026 03:30

		assert result == {"Folder A": "id_a", "Folder B": "id_b"}


		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):

Conversation

Copilot AI commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Uh oh!

trunk-io bot commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Feb 9, 2026

Uh oh!

github-actions bot commented Feb 9, 2026

Uh oh!

github-actions bot commented Feb 9, 2026

Uh oh!

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Check notice

Uh oh!

Uh oh!

Uh oh!

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

Check warning

Check warning

Check warning

Check warning

Check warning

Check notice

Check notice

Check notice

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Feb 9, 2026

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Feb 9, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

Copilot AI commented Feb 9, 2026 •

edited

Loading

trunk-io bot commented Feb 9, 2026 •

edited

Loading