t-bug-catcher 0.6.13__tar.gz → 0.6.14__tar.gz

{t_bug_catcher-0.6.13 → t_bug_catcher-0.6.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: t_bug_catcher
-Version: 0.6.13
+Version: 0.6.14
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful

{t_bug_catcher-0.6.13 → t_bug_catcher-0.6.14}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.13
+current_version = 0.6.14
 commit = True
 tag = False
 

{t_bug_catcher-0.6.13 → t_bug_catcher-0.6.14}/setup.py

@@ -26,7 +26,7 @@ setup(
     packages=find_packages(include=["t_bug_catcher", "t_bug_catcher.*"]),
     test_suite="tests",
     url="https://www.thoughtful.ai/",
-    version="0.6.13",
+    version="0.6.14",
     zip_safe=False,
     install_requires=install_requirements,
     include_package_data=True,

{t_bug_catcher-0.6.13 → t_bug_catcher-0.6.14}/t_bug_catcher/__init__.py

@@ -3,7 +3,7 @@
 __author__ = """Thoughtful"""
 __email__ = "support@thoughtful.ai"
 # fmt: off
-__version__ = '0.6.13'
+__version__ = '0.6.14'
 # fmt: on
 
 from .bug_catcher import (

{t_bug_catcher-0.6.13 → t_bug_catcher-0.6.14}/t_bug_catcher/jira.py

@@ -164,6 +164,31 @@ class Jira:
             "Content-Type": "application/json",
         }
 
+    @staticmethod
+    def _adf_to_text(adf) -> str:
+        """Extract plaintext from Atlassian Document Format (ADF) nodes.
+
+        Args:
+            adf: ADF structure (dict/list) or a plain string.
+
+        Returns:
+            str: Concatenated text content.
+        """
+        if not adf:
+            return ""
+        if isinstance(adf, str):
+            return adf
+        if isinstance(adf, list):
+            return "".join(Jira._adf_to_text(item) for item in adf)
+        if isinstance(adf, dict):
+            # Prefer explicit text if present
+            text_value = adf.get("text")
+            if isinstance(text_value, str):
+                return text_value
+            # Otherwise, walk nested content
+            return Jira._adf_to_text(adf.get("content", []))
+        return ""
+
     @retry_if_bad_request
     def get_issues(self, project_key: Optional[str] = None) -> dict:
         """A function to get the issues using a Jira API.
@@ -1406,11 +1431,15 @@ class Jira:
             all_issues = self.get_issues()["issues"]
 
             if group_id:
-                existing_tickets = [
-                    ticket
-                    for ticket in all_issues
-                    if ticket["fields"]["description"] and f"{error_id}-" in ticket["fields"]["description"]
-                ]
+                search_prefix = f"Error string ID: {error_id}"
+                existing_tickets = []
+                for ticket in all_issues:
+                    description = ticket.get("fields", {}).get("description")
+                    if not description:
+                        continue
+                    description_text = self._adf_to_text(description)
+                    if search_prefix in description_text:
+                        existing_tickets.append(ticket)
                 summary = self.__create_summary(
                     type(exception),
                     exception,
@@ -1724,13 +1753,14 @@ class Jira:
         Returns:
             dict or None: The matching ticket if found, otherwise None.
         """
+        search_token = f"Error string ID: {error_id}"
         for ticket in all_tickets:
-            description = ticket.get("fields", {}).get("description", "")
+            description = ticket.get("fields", {}).get("description")
             if not description:
                 continue
-            if f"{error_id}_~" not in description:
-                continue
-            return ticket
+            description_text = self._adf_to_text(description)
+            if search_token in description_text:
+                return ticket
 
         else:
             return None

{t_bug_catcher-0.6.13 → t_bug_catcher-0.6.14}/t_bug_catcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: t_bug_catcher
-Version: 0.6.13
+Version: 0.6.14
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful

{t_bug_catcher-0.6.13 → t_bug_catcher-0.6.14}/t_bug_catcher.egg-info/SOURCES.txt

@@ -22,4 +22,5 @@ t_bug_catcher/resources/whispers_config.yml
 t_bug_catcher/utils/__init__.py
 t_bug_catcher/utils/common.py
 t_bug_catcher/utils/logger.py
+tests/test_jira_grouping.py
 tests/test_t_bug_catcher.py

t_bug_catcher-0.6.14/tests/test_jira_grouping.py

@@ -0,0 +1,112 @@
+import unittest
+from unittest.mock import MagicMock, patch
+
+from t_bug_catcher.jira import Jira
+
+
+class TestJiraGrouping(unittest.TestCase):
+    """Tests for Jira ADF parsing and ticket grouping logic."""
+
+    def setUp(self):
+        """Set up the test environment."""
+        self.jira = Jira()
+
+    def test_adf_to_text_extracts_error_id(self):
+        """Ensure ADF parser extracts plain text including the error id token."""
+        error_id = "abc123"
+        adf = {
+            "type": "doc",
+            "version": 1,
+            "content": [
+                {
+                    "type": "paragraph",
+                    "content": [
+                        {"type": "text", "text": "Error string ID: "},
+                        {"type": "text", "text": error_id, "marks": [{"type": "em"}]},
+                    ],
+                }
+            ],
+        }
+
+        text = Jira._adf_to_text(adf)
+        self.assertIn(f"Error string ID: {error_id}", text)
+
+    def test_filter_tickets_matches_adf_description(self):
+        """filter_tickets should find a ticket when the error id is embedded in ADF description."""
+        error_id = "abc123"
+        ticket = {
+            "id": "10001",
+            "key": "TEST-1",
+            "fields": {
+                "description": {
+                    "type": "doc",
+                    "version": 1,
+                    "content": [
+                        {
+                            "type": "paragraph",
+                            "content": [
+                                {"type": "text", "text": f"Error string ID: {error_id}"},
+                            ],
+                        }
+                    ],
+                }
+            },
+        }
+
+        matched = self.jira.filter_tickets(all_tickets=[ticket], error_id=error_id)
+        self.assertIsNotNone(matched)
+        self.assertEqual(matched["key"], "TEST-1")
+
+    @patch.object(Jira, "_Jira__update_existing_ticket")
+    @patch.object(Jira, "_Jira__create_new_ticket")
+    @patch.object(Jira, "get_issues")
+    @patch.object(Jira, "_Jira__generate_error_id")
+    def test_report_error_groups_updates_existing(self, mock_gen_id, mock_get_issues, mock_create, mock_update):
+        """report_error should create once, then update existing when the same error is reported again."""
+        fixed_id = "deadbeef"
+        mock_gen_id.return_value = fixed_id
+
+        # First call: no issues present -> should create
+        # Second call: an issue present with matching error id in ADF -> should update
+        adf_issue = {
+            "id": "10002",
+            "key": "TEST-2",
+            "fields": {
+                "description": {
+                    "type": "doc",
+                    "version": 1,
+                    "content": [
+                        {
+                            "type": "paragraph",
+                            "content": [
+                                {"type": "text", "text": f"Error string ID: {fixed_id}"},
+                            ],
+                        }
+                    ],
+                }
+            },
+        }
+        mock_get_issues.side_effect = [
+            {"issues": []},
+            {"issues": [adf_issue]},
+        ]
+
+        # Prevent any network side effects
+        mock_create.return_value = MagicMock(status_code=201, json=lambda: {"key": "TEST-NEW", "id": "10010"})
+        mock_update.return_value = None
+
+        # Raise and catch the same exception twice to keep traceback and ids deterministic
+        for call_idx in range(2):
+            try:
+                d = {"a": 1}
+                _ = d["missing"]
+            except Exception as ex:
+                self.jira.report_error(exception=ex)
+
+        # Should create once and then update once
+        self.assertEqual(mock_create.call_count, 1)
+        self.assertEqual(mock_update.call_count, 1)
+
+
+if __name__ == "__main__":
+    unittest.main()