t-bug-catcher 0.4.9__tar.gz → 0.5.0__tar.gz

{t_bug_catcher-0.4.9 → t_bug_catcher-0.5.0}/PKG-INFO

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

{t_bug_catcher-0.4.9 → t_bug_catcher-0.5.0}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.9
+current_version = 0.5.0
 commit = True
 tag = False
 

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

{t_bug_catcher-0.4.9 → t_bug_catcher-0.5.0}/t_bug_catcher/__init__.py

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

{t_bug_catcher-0.4.9 → t_bug_catcher-0.5.0}/t_bug_catcher/config.py

@@ -27,6 +27,7 @@ class Config:
     SUPPORT_BOARD = "AB"
 
     KEYS_TO_REMOVE = ["credential", "password"]
+    BUILD_INFO_FILE = "commit_info.json"
 
     RC_RUN_LINK = (
         f"https://cloud.robocorp.com/organizations/{os.environ.get('RC_ORGANIZATION_ID')}"

{t_bug_catcher-0.4.9 → t_bug_catcher-0.5.0}/t_bug_catcher/jira.py

@@ -20,7 +20,7 @@ from retry import retry
 from .config import CONFIG
 from .exceptions import BadRequestError
 from .utils import logger
-from .utils.common import Encoder, get_frames
+from .utils.common import Encoder, get_frames, retrieve_build_info
 from .workitems import variables
 
 
@@ -54,6 +54,7 @@ class Jira:
         self._webhook_url = None
         self._auth = None
         self._default_assignee = None
+        self._build_info: Optional[dict] = None
 
     @staticmethod
     def _is_json_response(response) -> bool:
@@ -113,6 +114,7 @@ class Jira:
         try:
             self._project_key = project_key if CONFIG.STAGE not in ["hypercare", "support"] else CONFIG.SUPPORT_BOARD
             self._default_assignee = default_assignee
+            self._build_info = retrieve_build_info()
             if not webhook_url:
                 logger.warning("No JIRA webhook URL provided. All issues will be posted to backlog.")
             self._webhook_url = webhook_url
@@ -460,6 +462,114 @@ class Jira:
             else []
         )
 
+    def __branch_info_markup(self, exc_traceback: TracebackType) -> List[dict]:
+        """Create the branch info markup.
+
+        Returns:
+            dict: The branch markup.
+        """
+        if not self._build_info:
+            return []
+        frames = get_frames(exc_traceback)
+        file_name, line_no, _, _ = frames[-1]
+        path = Path.relative_to(Path(file_name), Path.cwd())
+        code_line = (
+            f"{self._build_info['repository_url']}/src/{self._build_info['last_commit']}"
+            f"/{path.as_posix()}?at={self._build_info['branch']}#lines-{line_no}"
+        )
+        input_datetime = datetime.strptime(self._build_info["commit_datetime"], "%Y-%m-%d %H:%M:%S").strftime(
+            "%d %B %Y %I:%M:%S %p"
+        )
+        return [
+            {
+                "type": "paragraph",
+                "content": [
+                    {
+                        "type": "text",
+                        "text": "Bitbucket: ",
+                        "marks": [{"type": "strong"}],
+                    },
+                    {
+                        "type": "text",
+                        "text": self._build_info["repository_name"],
+                        "marks": [
+                            {
+                                "type": "link",
+                                "attrs": {"href": self._build_info["repository_url"]},
+                            }
+                        ],
+                    },
+                    {
+                        "type": "text",
+                        "text": " @ ",
+                    },
+                    {
+                        "type": "text",
+                        "text": self._build_info["branch"],
+                        "marks": [
+                            {
+                                "type": "link",
+                                "attrs": {"href": self._build_info["branch_url"]},
+                            }
+                        ],
+                    },
+                    {
+                        "type": "text",
+                        "text": " > ",
+                    },
+                    {
+                        "type": "text",
+                        "text": f"{str(path.as_posix())}:{line_no}",
+                        "marks": [
+                            {
+                                "type": "link",
+                                "attrs": {"href": code_line},
+                            }
+                        ],
+                    },
+                ],
+            },
+            {
+                "type": "paragraph",
+                "content": [
+                    {
+                        "type": "text",
+                        "text": "Last commit: ",
+                        "marks": [{"type": "strong"}],
+                    },
+                    {
+                        "type": "text",
+                        "text": self._build_info["last_commit"][:7],
+                        "marks": [
+                            {
+                                "type": "link",
+                                "attrs": {"href": self._build_info["commit_url"]},
+                            }
+                        ],
+                    },
+                    {
+                        "type": "text",
+                        "text": " by ",
+                    },
+                    {
+                        "type": "text",
+                        "text": self._build_info["author_username"],
+                        "marks": [
+                            {
+                                "type": "link",
+                                "attrs": {"href": self._build_info["author_email"]},
+                            }
+                        ],
+                    },
+                    {
+                        "type": "text",
+                        "text": " on ",
+                    },
+                    {"type": "text", "text": input_datetime, "marks": [{"type": "code"}]},
+                ],
+            },
+        ]
+
     @staticmethod
     def __environment_markup() -> List[dict]:
         """Create the environment markup.
@@ -706,6 +816,7 @@ class Jira:
             + self.__date_markup()
             + self.__runlink_markup()
             + self.__environment_markup()
+            + self.__branch_info_markup(exc_traceback)
             + (self.__description_markup(additional_info) if additional_info else [])
             + self.__traceback_markup(exc_traceback_info)
             + (self.__metadata_markup(metadata) if metadata else [])

{t_bug_catcher-0.4.9 → t_bug_catcher-0.5.0}/t_bug_catcher/utils/common.py

@@ -1,8 +1,9 @@
 import copy
+import json
 import os
 import traceback
+import urllib
 from datetime import date, datetime
-from json import JSONEncoder
 from pathlib import Path
 from types import TracebackType
 from typing import List
@@ -10,7 +11,7 @@ from typing import List
 from ..config import CONFIG
 
 
-class Encoder(JSONEncoder):
+class Encoder(json.JSONEncoder):
     """This class is used to encode the Episode object to json."""
 
     def default(self, o):
@@ -24,7 +25,7 @@ class Encoder(JSONEncoder):
         """
         try:
             object_copy = copy.deepcopy(o)
-        except TypeError:
+        except (TypeError, AttributeError):
             return str(o)
         try:
             if hasattr(object_copy, "__dict__"):
@@ -87,3 +88,17 @@ def strip_path(path: str):
         str: The stripped path.
     """
     return path.replace(os.getcwd(), "").strip(os.sep)
+
+
+def retrieve_build_info():
+    """Logs build information."""
+    if not os.path.exists(CONFIG.BUILD_INFO_FILE):
+        return
+    with open(CONFIG.BUILD_INFO_FILE, "r") as json_file:
+        commit_info = json.load(json_file)
+    repository_url = commit_info["repository_url"]
+    current_branch = commit_info["branch"]
+    encoded_branch = urllib.parse.quote(current_branch)
+    commit_info["branch_url"] = f"{repository_url}/src/{commit_info['last_commit']}/?at={encoded_branch}"
+    commit_info["commit_url"] = f"{repository_url}/commits/{commit_info['last_commit']}/"
+    return commit_info

{t_bug_catcher-0.4.9 → t_bug_catcher-0.5.0}/t_bug_catcher.egg-info/PKG-INFO

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