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

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

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

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

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

{t_bug_catcher-0.2.6 → 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.2.6",
+    version="0.3.1",
     zip_safe=False,
     install_requires=install_requirements,
 )

{t_bug_catcher-0.2.6 → 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.2.6'
+__version__ = '0.3.1'
 # fmt: on
 
 from .bug_catcher import (

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

@@ -1,6 +1,6 @@
 import os
 
-from .workitems import variables
+from .workitems import metadata, variables
 
 
 class Config:
@@ -12,6 +12,9 @@ class Config:
         MAX_ATTACHMENTS: int = 5
         MAX_ISSUE_ATTACHMENTS: int = 100
         MAX_DESCRIPTION_LENGTH: int = 250
+        SUMMARY_LENGTH: int = 120
+
+    SUPPORT_BOARD = "AB"
 
     RC_RUN_LINK = (
         f"https://cloud.robocorp.com/organizations/{os.environ.get('RC_ORGANIZATION_ID')}"
@@ -25,5 +28,10 @@ class Config:
         else variables.get("environment", "local")
     )
 
+    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")
+
 
 CONFIG = Config()

{t_bug_catcher-0.2.6 → 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
@@ -89,7 +90,12 @@ class Jira:
                 )
 
     def config(
-        self, login, api_token, project_key, webhook_url: Optional[str] = None, default_assignee: Optional[str] = None
+        self,
+        login: str,
+        api_token: str,
+        project_key: str,
+        webhook_url: Optional[str] = None,
+        default_assignee: Optional[str] = None,
     ) -> bool:
         """Sets the webhook URL for the Jira project.
 
@@ -104,7 +110,7 @@ class Jira:
             bool: True if the configuration was successful, False otherwise.
         """
         try:
-            self._project_key = project_key
+            self._project_key = project_key if CONFIG.STAGE not in ["hypercare", "support"] else CONFIG.SUPPORT_BOARD
             self._default_assignee = default_assignee
             if not webhook_url:
                 logger.warning("No JIRA webhook URL provided. All issues will be posted to backlog.")
@@ -227,6 +233,8 @@ class Jira:
         }
         if labels:
             fields["fields"]["labels"] = labels
+        if self._project_key == CONFIG.SUPPORT_BOARD and CONFIG.ADMIN_CODE:
+            fields["fields"]["customfield_10077"] = [CONFIG.ADMIN_CODE]
         payload = json.dumps(fields)
         return payload
 
@@ -435,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.
@@ -515,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"}},
+                        ],
+                    },
                 ],
             },
         ]
@@ -525,15 +569,34 @@ class Jira:
             variables.get("environment"): [
                 {
                     "type": "text",
-                    "text": variables.get("processRunUrl"),
+                    "text": CONFIG.EMPOWER_URL,
                     "marks": [
                         {
                             "type": "link",
-                            "attrs": {"href": variables.get("processRunUrl")},
+                            "attrs": {"href": CONFIG.EMPOWER_URL},
                         },
                         {"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": [
                 {
@@ -594,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()
@@ -839,11 +903,20 @@ class Jira:
         Returns:
             The response from creating the ticket.
         """
-        issue_type = (
-            self._issue_types.get("bug")
-            or self._issue_types.get("task")
-            or self._issue_types.get("support", self._issue_types["epic"])
-        )
+        if CONFIG.STAGE.lower() == "hypercare":
+            issue_type = self._issue_types.get("hypercare") or self._issue_types.get("epic")
+        elif CONFIG.STAGE.lower() == "support":
+            issue_type = self._issue_types.get("support") or self._issue_types.get("epic")
+        elif CONFIG.STAGE.lower() == "delivery" and self._project_key == CONFIG.SUPPORT_BOARD:
+            issue_type = self._issue_types.get("development") or self._issue_types.get("epic")
+        else:
+            issue_type = (
+                self._issue_types.get("bug")
+                or self._issue_types.get("task")
+                or self._issue_types.get("support")
+                or self._issue_types.get("epic")
+            )
+
         issue = self.__generate_issue_body(
             summary=summary[:255].split("\n")[0],
             description=description,
@@ -877,7 +950,7 @@ class Jira:
             for attachment in attachments:
                 if os.path.exists(str(attachment)):
                     self.add_attachment(attachment, ticket_id)
-        if self._webhook_url:
+        if self._webhook_url and self._project_key != CONFIG.SUPPORT_BOARD:
             self.move_ticket_to_board(ticket_id)
         return response
 
@@ -1188,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:
@@ -1197,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.
@@ -1214,8 +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)}"
-        )
-        return summary
+        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
+        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.2.6 → t_bug_catcher-0.3.1}/t_bug_catcher/workitems.py

@@ -7,6 +7,8 @@ try:
     work_items.get_input_work_item()
     work_item = work_items.get_work_item_variables()
     variables = work_item.get("variables", dict())
+    metadata = work_item.get("metadata", dict())
 except (ImportError, KeyError):
     logger.warning("Workitems unavailable. Variables will be empty.")
     variables = {}
+    metadata = {}

{t_bug_catcher-0.2.6 → 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.2.6
+Version: 0.3.1
 Summary: Bug catcher
 Home-page: https://www.thoughtful.ai/
 Author: Thoughtful