agentic-devtools 0.2.43__tar.gz → 0.2.44__tar.gz

{agentic_devtools-0.2.43 → agentic_devtools-0.2.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentic-devtools
-Version: 0.2.43
+Version: 0.2.44
 Summary: Agentic devtools integrate Jira, DevOps & more
 Author: ayaiayorg
 License-Expression: MIT

{agentic_devtools-0.2.43 → agentic_devtools-0.2.44}/agentic_devtools/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.2.43'
-__version_tuple__ = version_tuple = (0, 2, 43)
+__version__ = version = '0.2.44'
+__version_tuple__ = version_tuple = (0, 2, 44)
 
 __commit_id__ = commit_id = None

{agentic_devtools-0.2.43 → agentic_devtools-0.2.44}/agentic_devtools/cli/azure_devops/async_commands.py

@@ -1174,9 +1174,7 @@ def request_changes_with_suggestion_async(
         set_value("pull_request_id", pull_request_id)
 
     # Validate required values
-    pr_id = _require_int_value(
-        "pull_request_id", "agdt-request-changes-with-suggestion --pull-request-id 12345"
-    )
+    pr_id = _require_int_value("pull_request_id", "agdt-request-changes-with-suggestion --pull-request-id 12345")
     resolved_file_path = _require_value(
         "file_review.file_path", 'agdt-request-changes-with-suggestion --file-path "path/to/file"'
     )

{agentic_devtools-0.2.43 → agentic_devtools-0.2.44}/agentic_devtools/cli/azure_devops/file_review_commands.py

@@ -25,7 +25,7 @@ from .helpers import (
     require_requests,
     resolve_review_artifact_dir_name,
 )
-from .mark_reviewed import mark_file_reviewed
+from .mark_reviewed import fetch_reviewer_context, mark_file_reviewed, set_batch_context
 
 if TYPE_CHECKING:
     from .review_state import ReviewState
@@ -1438,107 +1438,130 @@ def submit_reviews() -> None:
     failed = 0
     errors: list[str] = []
 
-    for i, review in enumerate(reviews):
-        if not isinstance(review, dict):
-            errors.append(f"Review at index {i}: not a JSON object.")
-            failed += 1
-            continue
-
-        file_path = review.get("file_path")
-        if not file_path or not isinstance(file_path, str) or not file_path.strip():
-            errors.append(f"Review at index {i}: missing or empty 'file_path'.")
-            failed += 1
-            continue
-
-        # Resolve outcome with defensive type checking for user-supplied JSON
-        raw_outcome = review.get("outcome")
-        if raw_outcome is None or (isinstance(raw_outcome, str) and not raw_outcome.strip()):
-            raw_outcome = default_outcome
-
-        if not isinstance(raw_outcome, str):
-            errors.append(
-                f"Review at index {i} ({file_path}): 'outcome' must be a string (got {type(raw_outcome).__name__})."
+    # Pre-fetch authenticated user details once for the entire batch.
+    # The cached context is set at module level so that mark_file_reviewed()
+    # (called indirectly via approve_file / request_changes /
+    # request_changes_with_suggestion) can pick it up without signature changes.
+    # Graceful degradation: if context fetch fails (e.g. missing PAT in tests),
+    # each file falls back to per-file fetching inside mark_file_reviewed().
+    dry_run = is_dry_run()
+    # Clear any stale batch context from a previous call before prefetching.
+    set_batch_context(None)
+    if not dry_run:
+        try:
+            batch_ctx = fetch_reviewer_context(AzureDevOpsConfig.from_state())
+            set_batch_context(batch_ctx)
+        except Exception as exc:
+            print(
+                f"Warning: failed to prefetch reviewer context for batch reviews; "
+                f"falling back to per-file fetching ({type(exc).__name__}: {exc})",
+                file=sys.stderr,
             )
-            failed += 1
-            continue
 
-        outcome = raw_outcome.strip().lower()
-        # Resolve summary: per-entry overrides default; validate type + non-empty after strip
-        # to match the constraints of delegated commands (approve_file, request_changes).
-        raw_summary = review.get("summary")
-        if raw_summary is None or (isinstance(raw_summary, str) and not raw_summary.strip()):
-            raw_summary = default_summary
+    try:
+        for i, review in enumerate(reviews):
+            if not isinstance(review, dict):
+                errors.append(f"Review at index {i}: not a JSON object.")
+                failed += 1
+                continue
 
-        if raw_summary is not None and not isinstance(raw_summary, str):
-            errors.append(
-                f"Review at index {i} ({file_path}): 'summary' must be a string (got {type(raw_summary).__name__})."
-            )
-            failed += 1
-            continue
+            file_path = review.get("file_path")
+            if not file_path or not isinstance(file_path, str) or not file_path.strip():
+                errors.append(f"Review at index {i}: missing or empty 'file_path'.")
+                failed += 1
+                continue
 
-        summary = raw_summary.strip() if raw_summary else None
-        suggestions = review.get("suggestions")
+            # Resolve outcome with defensive type checking for user-supplied JSON
+            raw_outcome = review.get("outcome")
+            if raw_outcome is None or (isinstance(raw_outcome, str) and not raw_outcome.strip()):
+                raw_outcome = default_outcome
 
-        if outcome not in _BATCH_VALID_OUTCOMES:
-            errors.append(f"Review at index {i} ({file_path}): unknown outcome '{outcome}'.")
-            failed += 1
-            continue
+            if not isinstance(raw_outcome, str):
+                errors.append(
+                    f"Review at index {i} ({file_path}): 'outcome' must be a string (got {type(raw_outcome).__name__})."
+                )
+                failed += 1
+                continue
 
-        if not summary:
-            errors.append(f"Review at index {i} ({file_path}): summary is required for '{outcome}'.")
-            failed += 1
-            continue
+            outcome = raw_outcome.strip().lower()
+            # Resolve summary: per-entry overrides default; validate type + non-empty after strip
+            # to match the constraints of delegated commands (approve_file, request_changes).
+            raw_summary = review.get("summary")
+            if raw_summary is None or (isinstance(raw_summary, str) and not raw_summary.strip()):
+                raw_summary = default_summary
 
-        if outcome != _BATCH_OUTCOME_APPROVE:
-            # For non-approve outcomes, suggestions must be a non-empty list of dicts
-            if not isinstance(suggestions, list) or not suggestions:
+            if raw_summary is not None and not isinstance(raw_summary, str):
                 errors.append(
-                    f"Review at index {i} ({file_path}): suggestions must be a non-empty list for '{outcome}'."
+                    f"Review at index {i} ({file_path}): 'summary' must be a string (got {type(raw_summary).__name__})."
                 )
                 failed += 1
                 continue
 
-            invalid_suggestion = False
-            for j, suggestion in enumerate(suggestions):
-                if not isinstance(suggestion, dict):
+            summary = raw_summary.strip() if raw_summary else None
+            suggestions = review.get("suggestions")
+
+            if outcome not in _BATCH_VALID_OUTCOMES:
+                errors.append(f"Review at index {i} ({file_path}): unknown outcome '{outcome}'.")
+                failed += 1
+                continue
+
+            if not summary:
+                errors.append(f"Review at index {i} ({file_path}): summary is required for '{outcome}'.")
+                failed += 1
+                continue
+
+            if outcome != _BATCH_OUTCOME_APPROVE:
+                # For non-approve outcomes, suggestions must be a non-empty list of dicts
+                if not isinstance(suggestions, list) or not suggestions:
                     errors.append(
-                        f"Review at index {i} ({file_path}): suggestion at index {j} must be an object/dict"
-                        f" (got {type(suggestion).__name__})."
+                        f"Review at index {i} ({file_path}): suggestions must be a non-empty list for '{outcome}'."
                     )
                     failed += 1
-                    invalid_suggestion = True
-                    break
+                    continue
 
-            if invalid_suggestion:
-                continue
+                invalid_suggestion = False
+                for j, suggestion in enumerate(suggestions):
+                    if not isinstance(suggestion, dict):
+                        errors.append(
+                            f"Review at index {i} ({file_path}): suggestion at index {j} must be an object/dict"
+                            f" (got {type(suggestion).__name__})."
+                        )
+                        failed += 1
+                        invalid_suggestion = True
+                        break
 
-        # Set per-file state
-        set_value("file_review.file_path", file_path)
-        if summary:
-            set_value("file_review.summary", summary)
-        if suggestions is not None:
-            set_value(
-                "file_review.suggestions",
-                json.dumps(suggestions) if isinstance(suggestions, list) else suggestions,
-            )
+                if invalid_suggestion:
+                    continue
 
-        print(f"[{i + 1}/{total}] Processing {outcome} for {file_path}...")
+            # Set per-file state
+            set_value("file_review.file_path", file_path)
+            if summary:
+                set_value("file_review.summary", summary)
+            if suggestions is not None:
+                set_value(
+                    "file_review.suggestions",
+                    json.dumps(suggestions) if isinstance(suggestions, list) else suggestions,
+                )
 
-        try:
-            if outcome == _BATCH_OUTCOME_APPROVE:
-                approve_file()
-            elif outcome == _BATCH_OUTCOME_CHANGES:
-                request_changes()
-            else:
-                request_changes_with_suggestion()
-            succeeded += 1
-            print("  ✅ Done")
-        except SystemExit as exc:
-            if exc.code and exc.code != 0:
-                errors.append(f"Review at index {i} ({file_path}): exited with code {exc.code}")
-                failed += 1
-            else:
+            print(f"[{i + 1}/{total}] Processing {outcome} for {file_path}...")
+
+            try:
+                if outcome == _BATCH_OUTCOME_APPROVE:
+                    approve_file()
+                elif outcome == _BATCH_OUTCOME_CHANGES:
+                    request_changes()
+                else:
+                    request_changes_with_suggestion()
                 succeeded += 1
+                print("  \u2705 Done")
+            except SystemExit as exc:
+                if exc.code and exc.code != 0:
+                    errors.append(f"Review at index {i} ({file_path}): exited with code {exc.code}")
+                    failed += 1
+                else:
+                    succeeded += 1
+    finally:
+        set_batch_context(None)
 
     print(f"\nBatch complete: {succeeded}/{total} succeeded, {failed}/{total} failed.")
     if errors:

{agentic_devtools-0.2.43 → agentic_devtools-0.2.44}/agentic_devtools/cli/azure_devops/mark_reviewed.py

@@ -32,6 +32,28 @@ class AuthenticatedUser:
     subject_descriptor: str | None
 
 
+@dataclass
+class CachedReviewerContext:
+    """Pre-fetched reviewer context for batch operations.
+
+    Caches authenticated user details, auth headers, and reviewer entry
+    so that ``mark_file_reviewed()`` can skip redundant API calls when
+    processing multiple files in a single batch.
+
+    ``reviewer_entry`` is updated by ``mark_file_reviewed()`` after the
+    first successful ``_update_reviewer_entry()`` call, so subsequent
+    files in the batch skip the ``_get_reviewer_entry()`` GET.
+    """
+
+    requests: Any  # requests module reference
+    headers: dict[str, str]
+    auth_user: AuthenticatedUser
+    reviewer_id: str
+    instance_id: str | None
+    organization_account_name: str | None
+    reviewer_entry: dict[str, Any] | None  # Updated after first successful review
+
+
 @dataclass
 class ChangeEntry:
     """PR iteration change entry for a file."""
@@ -299,6 +321,113 @@ def _update_reviewer_entry(
         raise
 
 
+# =============================================================================
+# Batch Context (module-level, single-threaded)
+# =============================================================================
+
+_batch_cached_context: CachedReviewerContext | None = None
+
+
+def set_batch_context(ctx: CachedReviewerContext | None) -> None:
+    """Set the module-level batch cached context.
+
+    Called by ``submit_reviews()`` before the batch loop to enable
+    ``mark_file_reviewed()`` to reuse pre-fetched reviewer details.
+    Must be cleared (set to ``None``) in a ``finally`` block after
+    the loop completes.
+    """
+    global _batch_cached_context
+    _batch_cached_context = ctx
+
+
+def get_batch_context() -> CachedReviewerContext | None:
+    """Return the current module-level batch cached context, or ``None``."""
+    return _batch_cached_context
+
+
+def _build_reviewer_context(config: AzureDevOpsConfig, *, status_label: str = "") -> CachedReviewerContext:
+    """Shared implementation for building a ``CachedReviewerContext``.
+
+    Contains the common setup logic used by both ``fetch_reviewer_context()``
+    (batch path) and ``mark_file_reviewed()`` (standalone path).
+
+    Args:
+        config: Azure DevOps configuration (used to compute ``org_root``).
+        status_label: Optional label appended to the status message
+            (e.g. ``"cached for batch"``).
+
+    Returns:
+        A fully-populated ``CachedReviewerContext`` with
+        ``reviewer_entry=None`` (lazily populated on first use).
+
+    Raises:
+        RuntimeError: When the reviewer identity cannot be resolved.
+        Exception: On network / auth failures from underlying API calls.
+    """
+    org_root = config.organization.rstrip("/")
+    if not org_root.startswith("http"):  # pragma: no cover
+        org_root = f"https://dev.azure.com/{org_root}"
+
+    requests = require_requests()
+    pat = get_pat()
+    headers = get_auth_headers(pat)
+
+    label_suffix = f" ({status_label})" if status_label else ""
+    print(f"Retrieving authenticated user details{label_suffix}...")
+    connection_data = _get_connection_data(requests, headers, org_root)
+    auth_user = _extract_authenticated_user(connection_data)
+    instance_id = connection_data.get("instanceId")
+    organization_account_name = _get_organization_account_name(org_root)
+
+    reviewer_id = auth_user.storage_key
+    if not reviewer_id:
+        descriptor_to_resolve = auth_user.subject_descriptor or auth_user.descriptor
+        if descriptor_to_resolve:  # pragma: no cover
+            print(f"Resolving storage key via Graph API for descriptor: {descriptor_to_resolve}")
+            reviewer_id = _resolve_storage_key_via_graph(requests, headers, org_root, descriptor_to_resolve)
+
+    if not reviewer_id:
+        raise RuntimeError("Unable to resolve reviewer identity (storage key) for current user.")
+
+    identity_summary = f"Authenticated as '{auth_user.display_name or reviewer_id}'"
+    if auth_user.descriptor:  # pragma: no cover
+        identity_summary += f" (descriptor: {auth_user.descriptor})"
+    if reviewer_id:
+        identity_summary += f" (storageKey: {reviewer_id})"
+    print(identity_summary)
+
+    return CachedReviewerContext(
+        requests=requests,
+        headers=headers,
+        auth_user=auth_user,
+        reviewer_id=reviewer_id,
+        instance_id=instance_id,
+        organization_account_name=organization_account_name,
+        reviewer_entry=None,
+    )
+
+
+def fetch_reviewer_context(config: AzureDevOpsConfig) -> CachedReviewerContext:
+    """Perform the one-time setup to build a ``CachedReviewerContext``.
+
+    Delegates to ``_build_reviewer_context()`` with a batch-specific
+    status label.  This is the public entry point used by
+    ``submit_reviews()`` to prefetch reviewer details once per batch.
+
+    Args:
+        config: Azure DevOps configuration (used to compute ``org_root``).
+
+    Returns:
+        A fully-populated ``CachedReviewerContext`` with
+        ``reviewer_entry=None`` (lazily populated on first use).
+
+    Raises:
+        RuntimeError: When the reviewer identity cannot be resolved.
+        Exception: On network / auth failures from underlying API calls.
+    """
+    return _build_reviewer_context(config, status_label="cached for batch")
+
+
 # =============================================================================
 # Viewed Status Sync (Contribution API)
 # =============================================================================
@@ -565,6 +694,7 @@ def mark_file_reviewed(  # pragma: no cover
     config: AzureDevOpsConfig,
     repo_id: str,
     dry_run: bool = False,
+    cached_context: CachedReviewerContext | None = None,
 ) -> bool:
     """
     Mark a file as reviewed in an Azure DevOps pull request.
@@ -579,6 +709,13 @@ def mark_file_reviewed(  # pragma: no cover
         config: Azure DevOps configuration
         repo_id: Repository ID
         dry_run: If True, only print what would be done
+        cached_context: Optional pre-fetched reviewer context for batch
+            operations.  When provided, skips redundant API calls for
+            user details and (when ``reviewer_entry`` is populated)
+            the reviewer entry lookup.  Updates
+            ``cached_context.reviewer_entry`` to the latest reviewer
+            entry after a successful update so subsequent callers
+            benefit.
 
     Returns:
         True if successful, False otherwise
@@ -598,54 +735,44 @@ def mark_file_reviewed(  # pragma: no cover
         print(f"DRY-RUN: Would mark '{normalized_path}' as reviewed on PR {pull_request_id}.")
         return True
 
-    # Only require requests and PAT for actual execution
-    requests = require_requests()
-    pat = get_pat()
-    headers = get_auth_headers(pat)
-
-    # Get authenticated user details
-    print("Retrieving authenticated user details...")
-    try:
-        connection_data = _get_connection_data(requests, headers, org_root)
-    except Exception as e:
-        print(f"Failed to retrieve Azure DevOps connection data: {e}", file=sys.stderr)
-        return False
-
-    auth_user = _extract_authenticated_user(connection_data)
-    instance_id = connection_data.get("instanceId")
-    organization_account_name = _get_organization_account_name(org_root)
-
-    # Determine reviewer identifier - must be storage key (GUID), not descriptor
-    # The Reviewers API requires the storage key as the identifier
-    reviewer_id = auth_user.storage_key
-
-    # If no storage key in connection data, try to resolve via Graph API
-    if not reviewer_id:
-        # Try subject_descriptor first, then descriptor
-        descriptor_to_resolve = auth_user.subject_descriptor or auth_user.descriptor
-        if descriptor_to_resolve:  # pragma: no cover
-            print(f"Resolving storage key via Graph API for descriptor: {descriptor_to_resolve}")
-            reviewer_id = _resolve_storage_key_via_graph(requests, headers, org_root, descriptor_to_resolve)
-
-    if not reviewer_id:
-        print("Unable to resolve reviewer identity (storage key) for current user.", file=sys.stderr)
-        return False
-
-    identity_summary = f"Authenticated as '{auth_user.display_name or reviewer_id}'"
-    if auth_user.descriptor:  # pragma: no cover
-        identity_summary += f" (descriptor: {auth_user.descriptor})"
-    if reviewer_id:
-        identity_summary += f" (storageKey: {reviewer_id})"
-    print(identity_summary)
-
-    # Get existing reviewer entry
-    try:
-        reviewer_entry = _get_reviewer_entry(
-            requests, headers, org_root, project_encoded, repo_id, pull_request_id, reviewer_id
-        )
-    except Exception as e:
-        print(f"Failed to retrieve reviewer entry: {e}", file=sys.stderr)
-        return False
+    # Resolve cached context: explicit parameter > module-level batch > fresh fetch
+    ctx = cached_context or get_batch_context()
+
+    if ctx is not None:
+        # Use pre-fetched values from the cached context
+        requests = ctx.requests
+        headers = ctx.headers
+        reviewer_id = ctx.reviewer_id
+        instance_id = ctx.instance_id
+        organization_account_name = ctx.organization_account_name
+    else:
+        # Standalone (non-batch) path — delegate to shared helper
+        try:
+            ctx = _build_reviewer_context(config)
+        except Exception as e:
+            print(f"Failed to set up reviewer context: {e}", file=sys.stderr)
+            return False
+        requests = ctx.requests
+        headers = ctx.headers
+        reviewer_id = ctx.reviewer_id
+        instance_id = ctx.instance_id
+        organization_account_name = ctx.organization_account_name
+
+    # Get existing reviewer entry (skip if cached context has one)
+    if ctx is not None and ctx.reviewer_entry is not None:
+        reviewer_entry = ctx.reviewer_entry
+    else:
+        try:
+            reviewer_entry = _get_reviewer_entry(
+                requests, headers, org_root, project_encoded, repo_id, pull_request_id, reviewer_id
+            )
+        except Exception as e:
+            print(f"Failed to retrieve reviewer entry: {e}", file=sys.stderr)
+            return False
+        # Cache the fetched entry immediately so early-return paths
+        # (e.g. "already reviewed") don't trigger redundant GETs.
+        if ctx is not None and reviewer_entry is not None:
+            ctx.reviewer_entry = reviewer_entry
 
     # Check if already reviewed
     existing_reviewed = reviewer_entry.get("reviewedFiles", []) if reviewer_entry else []
@@ -672,6 +799,16 @@ def mark_file_reviewed(  # pragma: no cover
         print(f"Failed to update reviewer entry: {e}", file=sys.stderr)
         return False
 
+    # Cache the updated reviewer entry for subsequent batch calls
+    if ctx is not None:
+        ctx.reviewer_entry = {
+            "id": reviewer_id,
+            "vote": reviewer_entry.get("vote", 0) if reviewer_entry else 0,
+            "isFlagged": reviewer_entry.get("isFlagged", False) if reviewer_entry else False,
+            "hasDeclined": reviewer_entry.get("hasDeclined", False) if reviewer_entry else False,
+            "reviewedFiles": updated_reviewed,
+        }
+
     # Get project ID for Contribution API
     try:
         project_id = _get_project_id_via_api(requests, headers, org_root, config.project)