methodology-framework 0.3.2__tar.gz → 0.4.0__tar.gz

{methodology_framework-0.3.2/src/methodology_framework.egg-info → methodology_framework-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: methodology-framework
-Version: 0.3.2
+Version: 0.4.0
 Summary: Portable process tooling for agent-driven delivery — scripts, playbooks, templates, and specs.
 Author: whiteout59
 License-Expression: Apache-2.0

{methodology_framework-0.3.2 → methodology_framework-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "methodology-framework"
-version = "0.3.2"
+version = "0.4.0"
 description = "Portable process tooling for agent-driven delivery — scripts, playbooks, templates, and specs."
 readme = "README.md"
 license = "Apache-2.0"

{methodology_framework-0.3.2 → methodology_framework-0.4.0}/src/methodology_framework/jira_discovery.py

@@ -283,17 +283,25 @@ def discover_issue_types(
     base_url: str,
     project_key: str,
 ) -> dict[str, str]:
-    """Discover issue type name→ID map via GET /rest/api/3/issuetype.
+    """Discover issue type name→ID map for a specific project.
+
+    Uses GET /rest/api/3/project/{key} which returns the project object
+    with its project-scoped ``issueTypes`` array — each project has its
+    own per-project issue type IDs, so the global ``/issuetype`` endpoint
+    is unsafe (it returns types across all projects and dict-overwrite
+    picks the wrong project's ID when names collide).
 
     Returns mapping from issue type name to ID string.
-    Raises DiscoveryError if "Story" or "Sub-task" is missing.
+    Raises DiscoveryError if "Story" or "Sub-task" is missing from the
+    project's issue type list.
     """
-    resp = session.get(f"{base_url}/rest/api/3/issuetype")
+    resp = session.get(f"{base_url}/rest/api/3/project/{project_key}")
     resp.raise_for_status()
-    all_types: list[dict[str, Any]] = resp.json()
+    project_data: dict[str, Any] = resp.json()
+    project_issue_types: list[dict[str, Any]] = project_data.get("issueTypes", [])
 
     name_to_id: dict[str, str] = {}
-    for it in all_types:
+    for it in project_issue_types:
         name_to_id[it["name"]] = it["id"]
 
     for required_name in (ISSUE_TYPE_NAME_STORY, ISSUE_TYPE_NAME_SUBTASK):

{methodology_framework-0.3.2 → methodology_framework-0.4.0}/src/methodology_framework/populate_acus.py

@@ -77,25 +77,32 @@ def rewrite_acus(content: str, acus_value: float) -> tuple[str, str]:
     return content, ""
 
 
-def fetch_acus_from_devin(session_id: str, api_token: str) -> float | None:
+def fetch_acus_from_devin(session_id: str, api_token: str, org_id: str) -> float | None:
     """Fetch ACU consumption from Devin API for a given session ID.
 
     Returns the ACU value or None on error.
-    # Devin API v2: GET /v2/session/{session_id} returns JSON with
-    # "total_acus" at the top level of the response object.
+
+    Devin API v3 (org-scoped, service-user auth):
+      GET /v3/organizations/{org_id}/sessions/{devin_id}
+    Returns JSON with ``acus_consumed`` (float) at the top level.
+
+    The session ID extracted from story file URLs (e.g.
+    ``https://app.devin.ai/sessions/abc123``) is the raw ID without prefix.
+    The v3 path parameter expects the ``devin-`` prefix, so this function
+    prepends it when constructing the URL.
     """
-    url = f"https://api.devin.ai/v2/session/{session_id}"
+    devin_id = f"devin-{session_id}" if not session_id.startswith("devin-") else session_id
+    url = f"https://api.devin.ai/v3/organizations/{org_id}/sessions/{devin_id}"
     headers = {"Authorization": f"Bearer {api_token}"}
     try:
         resp = requests.get(url, headers=headers, timeout=30)
         resp.raise_for_status()
         data = resp.json()
-        acus = data.get("total_acus")
-        if acus is None:
-            # Fallback: try nested under "status_enum" or "acus"
-            acus = data.get("acus")
-        if acus is not None:
-            return float(acus)
+        # v3 field name is "acus_consumed"; keep legacy fallbacks for robustness.
+        for field in ("acus_consumed", "total_acus", "acus"):
+            acus = data.get(field)
+            if acus is not None:
+                return float(acus)
         logger.warning(
             "Session %s: no ACU field found in response keys: %s",
             session_id,
@@ -113,6 +120,7 @@ def fetch_acus_from_devin(session_id: str, api_token: str) -> float | None:
 def scan_and_populate(
     story_path_pattern: str,
     api_token: str,
+    org_id: str,
     *,
     dry_run: bool = False,
 ) -> list[PopulateResult]:
@@ -136,7 +144,7 @@ def scan_and_populate(
             logger.info("Skipping %s: no agent_session_url found", filepath)
             continue
 
-        acus = fetch_acus_from_devin(session_id, api_token)
+        acus = fetch_acus_from_devin(session_id, api_token, org_id)
         if acus is None:
             logger.warning(
                 "Skipping %s: could not fetch ACUs for session %s",
@@ -193,7 +201,16 @@ def main() -> int:
         logger.error("DEVIN_API_TOKEN environment variable is required")
         return 1
 
-    results = scan_and_populate(args.story_path_pattern, api_token, dry_run=args.dry_run)
+    org_id = os.environ.get("DEVIN_ORG_ID", "")
+    if not org_id:
+        logger.error(
+            "DEVIN_ORG_ID environment variable is required "
+            "(the Devin organization ID; obtain from your service user setup "
+            "or the Devin webapp settings)."
+        )
+        return 1
+
+    results = scan_and_populate(args.story_path_pattern, api_token, org_id, dry_run=args.dry_run)
 
     if not results:
         print("Nothing to do — all agent_acus fields already populated.")

{methodology_framework-0.3.2 → methodology_framework-0.4.0/src/methodology_framework.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: methodology-framework
-Version: 0.3.2
+Version: 0.4.0
 Summary: Portable process tooling for agent-driven delivery — scripts, playbooks, templates, and specs.
 Author: whiteout59
 License-Expression: Apache-2.0

{methodology_framework-0.3.2 → methodology_framework-0.4.0}/src/methodology_framework.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ tests/test_bootstrap_jira.py
 tests/test_build_playbook.py
 tests/test_jira_discovery.py
 tests/test_populate_acus.py
+tests/test_populate_acus_integration.py
 tests/test_register_playbook_with_devin.py
 tests/test_sync_stories_to_jira.py
 tests/test_workflows.py

{methodology_framework-0.3.2 → methodology_framework-0.4.0}/tests/test_jira_discovery.py

@@ -111,8 +111,12 @@ def _mock_session(
             resp.json.return_value = statuses or STATUSES_RESPONSE
         elif url.endswith("/issueLinkType"):
             resp.json.return_value = link_types or LINK_TYPES_RESPONSE
-        elif url.endswith("/issuetype"):
-            resp.json.return_value = issue_types or ISSUE_TYPES_RESPONSE
+        elif "/project/" in url:
+            # Project endpoint returns the project object with embedded issueTypes.
+            # (v0.3.3 switched discover_issue_types from the global /issuetype
+            # endpoint to the project-scoped /project/{key} endpoint to fix
+            # cross-project ID collisions.)
+            resp.json.return_value = {"issueTypes": issue_types or ISSUE_TYPES_RESPONSE}
         return resp
 
     session.get = _get

{methodology_framework-0.3.2 → methodology_framework-0.4.0}/tests/test_populate_acus.py

@@ -135,7 +135,7 @@ def test_devin_api_error_skips_file() -> None:
         mock_resp.status_code = 404
         mock_resp.raise_for_status.side_effect = requests.HTTPError(response=mock_resp)
 
-        result = fetch_acus_from_devin("nonexistent-session", "fake-token")
+        result = fetch_acus_from_devin("nonexistent-session", "fake-token", "org-test")
         assert result is None
 
     # Also test 401
@@ -144,5 +144,102 @@ def test_devin_api_error_skips_file() -> None:
         mock_resp.status_code = 401
         mock_resp.raise_for_status.side_effect = requests.HTTPError(response=mock_resp)
 
-        result = fetch_acus_from_devin("bad-auth-session", "fake-token")
+        result = fetch_acus_from_devin("bad-auth-session", "fake-token", "org-test")
         assert result is None
+
+
+# ---------------------------------------------------------------------------
+# test_v3_url_pattern
+# ---------------------------------------------------------------------------
+
+
+def test_v3_url_pattern() -> None:
+    """fetch_acus_from_devin constructs the v3 org-scoped URL with devin- prefix."""
+    with patch("methodology_framework.populate_acus.requests.get") as mock_get:
+        mock_resp = mock_get.return_value
+        mock_resp.raise_for_status.return_value = None
+        mock_resp.json.return_value = {"acus_consumed": 3.5}
+
+        result = fetch_acus_from_devin("abc123", "fake-token", "org-myorg")
+        assert result == 3.5
+
+        # Verify the URL used
+        call_url = mock_get.call_args[0][0]
+        assert call_url == "https://api.devin.ai/v3/organizations/org-myorg/sessions/devin-abc123"
+
+
+def test_v3_url_pattern_already_prefixed() -> None:
+    """Session IDs already prefixed with devin- are not double-prefixed."""
+    with patch("methodology_framework.populate_acus.requests.get") as mock_get:
+        mock_resp = mock_get.return_value
+        mock_resp.raise_for_status.return_value = None
+        mock_resp.json.return_value = {"acus_consumed": 7.0}
+
+        result = fetch_acus_from_devin("devin-abc123", "fake-token", "org-myorg")
+        assert result == 7.0
+
+        call_url = mock_get.call_args[0][0]
+        assert call_url == "https://api.devin.ai/v3/organizations/org-myorg/sessions/devin-abc123"
+
+
+def test_acus_consumed_field_preferred() -> None:
+    """v3 field acus_consumed is preferred over legacy total_acus/acus."""
+    with patch("methodology_framework.populate_acus.requests.get") as mock_get:
+        mock_resp = mock_get.return_value
+        mock_resp.raise_for_status.return_value = None
+        mock_resp.json.return_value = {
+            "acus_consumed": 5.0,
+            "total_acus": 10.0,
+            "acus": 15.0,
+        }
+
+        result = fetch_acus_from_devin("sess1", "fake-token", "org-test")
+        assert result == 5.0
+
+
+def test_legacy_total_acus_fallback() -> None:
+    """Falls back to total_acus when acus_consumed is absent."""
+    with patch("methodology_framework.populate_acus.requests.get") as mock_get:
+        mock_resp = mock_get.return_value
+        mock_resp.raise_for_status.return_value = None
+        mock_resp.json.return_value = {"total_acus": 10.0}
+
+        result = fetch_acus_from_devin("sess1", "fake-token", "org-test")
+        assert result == 10.0
+
+
+def test_no_acu_field_returns_none() -> None:
+    """Returns None and logs warning when no ACU field is present."""
+    with patch("methodology_framework.populate_acus.requests.get") as mock_get:
+        mock_resp = mock_get.return_value
+        mock_resp.raise_for_status.return_value = None
+        mock_resp.json.return_value = {"session_id": "sess1", "status": "exit"}
+
+        result = fetch_acus_from_devin("sess1", "fake-token", "org-test")
+        assert result is None
+
+
+def test_main_fails_without_devin_org_id() -> None:
+    """main() exits 1 with clear error when DEVIN_ORG_ID is missing."""
+    import os
+    import sys
+
+    from methodology_framework.populate_acus import main
+
+    env = {"DEVIN_API_TOKEN": "fake-token"}
+    with patch.dict(os.environ, env, clear=True), patch.object(sys, "argv", ["populate_acus"]):
+        result = main()
+        assert result == 1
+
+
+def test_main_fails_without_devin_api_token() -> None:
+    """main() exits 1 when DEVIN_API_TOKEN is missing."""
+    import os
+    import sys
+
+    from methodology_framework.populate_acus import main
+
+    env = {"DEVIN_ORG_ID": "org-test"}
+    with patch.dict(os.environ, env, clear=True), patch.object(sys, "argv", ["populate_acus"]):
+        result = main()
+        assert result == 1

methodology_framework-0.4.0/tests/test_populate_acus_integration.py

@@ -0,0 +1,97 @@
+"""Integration tests for methodology_framework.populate_acus — contract-level.
+
+These tests hit the real Devin v3 API to verify the URL pattern, auth model,
+and response shape.  They are gated on CI secrets and skip locally when the
+required environment variables are absent.
+
+Required CI secrets / env vars:
+    DEVIN_API_TOKEN      — service-user ``cog_*`` API key
+    DEVIN_ORG_ID         — Devin organization ID (``org-…`` prefix)
+    DEVIN_TEST_SESSION_ID — a known sentinel session ID (raw, without ``devin-`` prefix)
+"""
+
+from __future__ import annotations
+
+import os
+
+import pytest
+import requests
+
+from methodology_framework.populate_acus import fetch_acus_from_devin
+
+_API_TOKEN = os.environ.get("DEVIN_API_TOKEN", "")
+_ORG_ID = os.environ.get("DEVIN_ORG_ID", "")
+_SESSION_ID = os.environ.get("DEVIN_TEST_SESSION_ID", "")
+
+_SKIP_REASON = (
+    "Integration test requires DEVIN_API_TOKEN, DEVIN_ORG_ID, "
+    "and DEVIN_TEST_SESSION_ID environment variables"
+)
+
+pytestmark = pytest.mark.integration
+
+
+@pytest.mark.skipif(
+    not (_API_TOKEN and _ORG_ID and _SESSION_ID),
+    reason=_SKIP_REASON,
+)
+def test_v3_session_endpoint_returns_200() -> None:
+    """The v3 org-scoped session endpoint returns HTTP 200 for a known session."""
+    devin_id = f"devin-{_SESSION_ID}" if not _SESSION_ID.startswith("devin-") else _SESSION_ID
+    url = f"https://api.devin.ai/v3/organizations/{_ORG_ID}/sessions/{devin_id}"
+    headers = {"Authorization": f"Bearer {_API_TOKEN}"}
+
+    resp = requests.get(url, headers=headers, timeout=30)
+
+    assert resp.status_code == 200, (
+        f"Expected 200 from {url}, got {resp.status_code}: {resp.text[:200]}"
+    )
+
+
+@pytest.mark.skipif(
+    not (_API_TOKEN and _ORG_ID and _SESSION_ID),
+    reason=_SKIP_REASON,
+)
+def test_v3_response_contains_acus_consumed() -> None:
+    """The v3 session response contains ``acus_consumed`` as a numeric value."""
+    devin_id = f"devin-{_SESSION_ID}" if not _SESSION_ID.startswith("devin-") else _SESSION_ID
+    url = f"https://api.devin.ai/v3/organizations/{_ORG_ID}/sessions/{devin_id}"
+    headers = {"Authorization": f"Bearer {_API_TOKEN}"}
+
+    resp = requests.get(url, headers=headers, timeout=30)
+    resp.raise_for_status()
+    data = resp.json()
+
+    assert "acus_consumed" in data, (
+        f"Expected 'acus_consumed' in response keys, got: {sorted(data.keys())}"
+    )
+    assert isinstance(data["acus_consumed"], (int, float)), (
+        f"Expected acus_consumed to be numeric, got {type(data['acus_consumed'])}: "
+        f"{data['acus_consumed']}"
+    )
+
+
+@pytest.mark.skipif(
+    not (_API_TOKEN and _ORG_ID and _SESSION_ID),
+    reason=_SKIP_REASON,
+)
+def test_fetch_acus_from_devin_returns_float() -> None:
+    """The ``fetch_acus_from_devin()`` helper returns a float for a known session."""
+    result = fetch_acus_from_devin(_SESSION_ID, _API_TOKEN, _ORG_ID)
+
+    assert result is not None, f"fetch_acus_from_devin returned None for session {_SESSION_ID}"
+    assert isinstance(result, float), f"Expected float, got {type(result)}: {result}"
+
+
+@pytest.mark.skipif(
+    not (_API_TOKEN and _ORG_ID and _SESSION_ID),
+    reason=_SKIP_REASON,
+)
+def test_url_pattern_matches_v3() -> None:
+    """Verify the URL constructed by fetch_acus_from_devin matches v3 pattern."""
+    devin_id = f"devin-{_SESSION_ID}" if not _SESSION_ID.startswith("devin-") else _SESSION_ID
+    expected_url = f"https://api.devin.ai/v3/organizations/{_ORG_ID}/sessions/{devin_id}"
+
+    assert "/v3/organizations/" in expected_url
+    assert _ORG_ID in expected_url
+    assert devin_id in expected_url