t-bug-catcher 0.6.5__tar.gz → 0.6.7__tar.gz

{t_bug_catcher-0.6.5 → t_bug_catcher-0.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: t_bug_catcher
-Version: 0.6.5
+Version: 0.6.7
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful
@@ -14,6 +14,15 @@ Requires-Python: >=3.9
 Requires-Dist: requests<3.0.0,>=2.31.0
 Requires-Dist: bugsnag>=4.6.1
 Requires-Dist: retry~=0.9.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 t-bug-catcher
 ==============

{t_bug_catcher-0.6.5 → t_bug_catcher-0.6.7}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.5
+current_version = 0.6.7
 commit = True
 tag = False
 

{t_bug_catcher-0.6.5 → t_bug_catcher-0.6.7}/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.5",
+    version="0.6.7",
     zip_safe=False,
     install_requires=install_requirements,
     include_package_data=True,

{t_bug_catcher-0.6.5 → t_bug_catcher-0.6.7}/t_bug_catcher/__init__.py

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

{t_bug_catcher-0.6.5 → t_bug_catcher-0.6.7}/t_bug_catcher/jira.py

@@ -22,7 +22,7 @@ from retry import retry
 from .config import CONFIG
 from .exceptions import BadRequestError
 from .utils import logger
-from .utils.common import Encoder, get_frames, remove_holotree_id, retrieve_build_info
+from .utils.common import Encoder, clean_nested_data, get_frames, remove_holotree_id, retrieve_build_info
 from .workitems import variables
 
 
@@ -856,8 +856,7 @@ class Jira:
             exc_traceback_info: str = (
                 f"Traceback (most recent call last):\n{''.join(traceback.format_tb(exc_traceback)[-1])}{exc_info}"
             )
-
-        return {
+        description = {
             "version": 1,
             "type": "doc",
             "content": []
@@ -873,6 +872,7 @@ class Jira:
             + (self.__metadata_markup(metadata) if metadata else [])
             + self.__error_markup(error_id),
         }
+        return clean_nested_data(description)
 
     def __create_warning_description_markup(
         self,
@@ -993,6 +993,7 @@ class Jira:
     def __create_comment_markup(
         self,
         error: Optional[str] = None,
+        exc_traceback: Optional[TracebackType] = None,
         attachments: Optional[List] = None,
         additional_info: Optional[str] = None,
         metadata: Optional[dict] = None,
@@ -1002,8 +1003,8 @@ class Jira:
         Args:
             error (str): The error string.
             attachments (List): The list of attachments.
-            issue_status (str, optional): The issue status. Defaults to "".
             additional_info (str, optional): Additional information. Defaults to "".
+            metadata (dict, optional): Additional metadata. Defaults to None.
 
         Returns:
             dict: The comment.
@@ -1030,12 +1031,22 @@ class Jira:
             },
         ]
 
+        branch_markup = []
+        if exc_traceback and self._build_info:
+            branch_markup = [
+                {
+                    "type": "expand",
+                    "attrs": {"title": "Commit Info"},
+                    "content": self.__branch_info_markup(exc_traceback),
+                },
+            ]
+
         comment_markup = [
             {
                 "type": "paragraph",
                 "content": (
                     [
-                        {"type": "text", "text": "Error occures again in "},
+                        {"type": "text", "text": "Error occurs again in "},
                     ]
                     + self.__link_markup()
                     + date_markup
@@ -1080,7 +1091,8 @@ class Jira:
                 + (comment_markup if error else [])
                 + (self.__description_markup(additional_info) if additional_info else [])
                 + (attach_markup if attachments else [])
-                + (self.__metadata_markup(metadata) if metadata else []),
+                + (self.__metadata_markup(metadata) if metadata else [])
+                + branch_markup,
             }
         }
 
@@ -1107,6 +1119,7 @@ class Jira:
         self,
         existing_ticket: dict,
         summary: str,
+        exception: Optional[Exception] = None,
         attachments: Optional[List] = None,
         additional_info: Optional[str] = None,
         metadata: Optional[dict] = None,
@@ -1166,6 +1179,7 @@ class Jira:
             ticket_id=issue["id"],
             comments=self.__create_comment_markup(
                 error=summary,
+                exc_traceback=exception.__traceback__,
                 attachments=posted_attachments,
                 additional_info=additional_info,
                 metadata=metadata,
@@ -1380,6 +1394,7 @@ class Jira:
             if existing_ticket:
                 self.__update_existing_ticket(
                     existing_ticket=existing_ticket,
+                    exception=exception,
                     attachments=attachments,
                     summary=summary,
                     additional_info=additional_info,
@@ -1450,6 +1465,7 @@ class Jira:
             if existing_ticket:
                 self.__update_existing_ticket(
                     existing_ticket=existing_ticket,
+                    exception=exception,
                     summary=summary,
                 )
                 if stack_trace and os.path.exists(stack_trace):
@@ -1485,7 +1501,9 @@ class Jira:
             return response
         except Exception as ex:
             logger.warning(f"Failed to create Jira issue due to: {type(ex)}: {ex}")
-            self.report_internal_error(exception=ex, additional_info="Failed to report unhandled error.")
+            self.report_internal_error(
+                exception=ex, metadata=variables, additional_info="Failed to report unhandled error."
+            )
             return False
 
     def report_internal_error(self, exception: Exception, metadata: dict = None, additional_info: str = None):

{t_bug_catcher-0.6.5 → t_bug_catcher-0.6.7}/t_bug_catcher/utils/common.py

@@ -115,6 +115,23 @@ def remove_holotree_id(path: str) -> str:
     return re.sub(pattern, r"\1", path)
 
 
+def clean_nested_data(data):
+    """Recursively replaces None values with empty strings in nested dictionaries and lists.
+
+    Args:
+        data: Input data structure (dict, list, or other type)
+
+    Returns:
+        Cleaned data structure with None values replaced by empty strings
+    """
+    if isinstance(data, dict):
+        return {key: clean_nested_data(value) for key, value in data.items()}
+    elif isinstance(data, (list, tuple)):
+        return [clean_nested_data(item) for item in data]
+    else:
+        return "" if data is None else data
+
+
 def retrieve_build_info():
     """Logs build information."""
     if not os.path.exists(CONFIG.BUILD_INFO_FILE):

{t_bug_catcher-0.6.5 → t_bug_catcher-0.6.7}/t_bug_catcher.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: t_bug_catcher
-Version: 0.6.5
+Version: 0.6.7
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful
@@ -14,6 +14,15 @@ Requires-Python: >=3.9
 Requires-Dist: requests<3.0.0,>=2.31.0
 Requires-Dist: bugsnag>=4.6.1
 Requires-Dist: retry~=0.9.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 t-bug-catcher
 ==============