t-bug-catcher 0.3.0__tar.gz → 0.3.1__tar.gz

{t_bug_catcher-0.3.0 → t_bug_catcher-0.3.1}/PKG-INFO

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

{t_bug_catcher-0.3.0 → t_bug_catcher-0.3.1}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.0
+current_version = 0.3.1
 commit = True
 tag = False
 

{t_bug_catcher-0.3.0 → t_bug_catcher-0.3.1}/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.3.0",
+    version="0.3.1",
     zip_safe=False,
     install_requires=install_requirements,
 )

{t_bug_catcher-0.3.0 → t_bug_catcher-0.3.1}/t_bug_catcher/__init__.py

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

{t_bug_catcher-0.3.0 → t_bug_catcher-0.3.1}/t_bug_catcher/config.py

@@ -12,6 +12,7 @@ class Config:
         MAX_ATTACHMENTS: int = 5
         MAX_ISSUE_ATTACHMENTS: int = 100
         MAX_DESCRIPTION_LENGTH: int = 250
+        SUMMARY_LENGTH: int = 120
 
     SUPPORT_BOARD = "AB"
 
@@ -29,6 +30,7 @@ class Config:
 
     STAGE = metadata.get("process", dict()).get("implementationStage", "")
     ADMIN_CODE = metadata.get("process", dict()).get("adminCode", "")
+    WORKER_NAME = metadata.get("process", dict()).get("name", "")
     EMPOWER_URL = metadata.get("process", dict()).get("processRunUrl") or variables.get("processRunUrl")
 
 

{t_bug_catcher-0.3.0 → t_bug_catcher-0.3.1}/t_bug_catcher/jira.py

@@ -7,6 +7,7 @@ import os
 import re
 import sys
 import traceback
+from importlib.metadata import version
 from pathlib import Path
 from types import TracebackType
 from typing import List, Optional, Union
@@ -442,6 +443,34 @@ class Jira:
             }
         ]
 
+    @staticmethod
+    def __bot_name_markup() -> List[dict]:
+        """Create the ai worker markup.
+
+        Returns:
+            dict: The ai worker markup.
+        """
+        return (
+            [
+                {
+                    "type": "paragraph",
+                    "content": [
+                        {
+                            "type": "text",
+                            "text": "Process name: ",
+                            "marks": [{"type": "strong"}],
+                        },
+                        {
+                            "type": "text",
+                            "text": f"{CONFIG.ADMIN_CODE} - {CONFIG.WORKER_NAME}",
+                        },
+                    ],
+                }
+            ]
+            if CONFIG.ADMIN_CODE and CONFIG.WORKER_NAME
+            else []
+        )
+
     @staticmethod
     def __traceback_markup(exc_traceback_info: str) -> List[dict]:
         """Create the traceback markup.
@@ -522,6 +551,14 @@ class Jira:
                             {"type": "subsup", "attrs": {"type": "sub"}},
                         ],
                     },
+                    {
+                        "type": "text",
+                        "text": f" (v{version('t_bug_catcher')})",
+                        "marks": [
+                            {"type": "em"},
+                            {"type": "subsup", "attrs": {"type": "sub"}},
+                        ],
+                    },
                 ],
             },
         ]
@@ -540,7 +577,26 @@ class Jira:
                         },
                         {"type": "underline"},
                     ],
-                }
+                },
+                {
+                    "type": "text",
+                    "text": " [Robocloud ",
+                },
+                {
+                    "type": "text",
+                    "text": "link",
+                    "marks": [
+                        {
+                            "type": "link",
+                            "attrs": {"href": CONFIG.RC_RUN_LINK},
+                        },
+                        {"type": "underline"},
+                    ],
+                },
+                {
+                    "type": "text",
+                    "text": "]",
+                },
             ],
             "robocloud": [
                 {
@@ -601,6 +657,7 @@ class Jira:
             "type": "doc",
             "content": []
             + (self.__error_string_markup(error_string, exc_info) if error_string else [])
+            + self.__bot_name_markup()
             + self.__date_markup()
             + self.__runlink_markup()
             + self.__environment_markup()
@@ -1204,7 +1261,7 @@ class Jira:
         return response[0]["accountId"]
 
     @staticmethod
-    def remove_locators_from_exception(exception: Union[Exception, str]) -> str:
+    def sanitize_summary(exception: Union[Exception, str]) -> str:
         """Remove locators from the exception.
 
         Args:
@@ -1213,9 +1270,11 @@ class Jira:
         Returns:
             str: The cleaned exception string.
         """
+        message = re.sub("<([a-z]+)(?![^>]*\/>)[^>]*>", r"<\1>", str(exception))
+        message = re.sub(">([^<]+)<\/", ">...</", message)
         if "selenium" not in exception.__class__.__name__.lower() and not isinstance(exception, AssertionError):
-            return str(exception)
-        return re.sub(r"\'(.+)\'", "'...'", str(exception))
+            return str(message)
+        return re.sub(r"\'(.+)\'", "'...'", message)
 
     def __create_summary(self, exc_type: type, exc_value: Union[Exception, str], exc_traceback: TracebackType) -> str:
         """Create the summary of the ticket.
@@ -1230,10 +1289,16 @@ class Jira:
         """
         frames = get_frames(exc_traceback)
         file_name, line_no, _, _ = frames[-1]
-        summary = (
-            f"[{exc_type.__name__}:{os.path.basename(file_name)}:{line_no}] "
-            f"{self.remove_locators_from_exception(exc_value)}"
-        )
+        summary = f"[{exc_type.__name__}:{os.path.basename(file_name)}:{line_no}]"
         if self._project_key == CONFIG.SUPPORT_BOARD and CONFIG.ADMIN_CODE:
             summary = CONFIG.ADMIN_CODE + " - " + summary
-        return summary
+        if CONFIG.LIMITS.SUMMARY_LENGTH <= len(summary):
+            return summary
+        else:
+            message = self.sanitize_summary(exc_value)
+            message = (
+                message
+                if len(message) <= CONFIG.LIMITS.SUMMARY_LENGTH - len(summary)
+                else message[: CONFIG.LIMITS.SUMMARY_LENGTH - len(summary)] + "..."
+            )
+            return summary + " " + message

{t_bug_catcher-0.3.0 → t_bug_catcher-0.3.1}/t_bug_catcher.egg-info/PKG-INFO

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