t-bug-catcher 0.4.1__tar.gz → 0.4.3__tar.gz

{t_bug_catcher-0.4.1 → t_bug_catcher-0.4.3}/PKG-INFO

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

{t_bug_catcher-0.4.1 → t_bug_catcher-0.4.3}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.1
+current_version = 0.4.3
 commit = True
 tag = False
 

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

{t_bug_catcher-0.4.1 → t_bug_catcher-0.4.3}/t_bug_catcher/__init__.py

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

{t_bug_catcher-0.4.1 → t_bug_catcher-0.4.3}/t_bug_catcher/config.py

@@ -15,8 +15,19 @@ class Config:
         SUMMARY_LENGTH: int = 120
         STACK_SCOPE: int = 3
 
+    class TICKET_PRIORITIES:
+        """Priorities class for configuring the application."""
+
+        HIGHEST: str = "1"
+        HIGH: str = "2"
+        MEDIUM: str = "3"
+        LOW: str = "4"
+        LOWEST: str = "5"
+
     SUPPORT_BOARD = "AB"
 
+    KEYS_TO_REMOVE = ["credential", "password"]
+
     RC_RUN_LINK = (
         f"https://cloud.robocorp.com/organizations/{os.environ.get('RC_ORGANIZATION_ID')}"
         f"/workspaces/{os.environ.get('RC_WORKSPACE_ID')}/processes"

{t_bug_catcher-0.4.1 → t_bug_catcher-0.4.3}/t_bug_catcher/jira.py

@@ -209,6 +209,7 @@ class Jira:
         issue_type: str,
         assignee: Optional[str] = None,
         labels: Optional[list] = None,
+        priority: Optional[str] = None,
     ) -> str:
         """Generates the issue body payload for creating a new issue.
 
@@ -218,6 +219,7 @@ class Jira:
             assignee (str): The assignee of the issue.
             issue_type (str): The type of the issue.
             labels (list, optional): The labels of the issue. Defaults to None.
+            priority (str, optional): The priority of the issue. Defaults to None.
 
         Returns:
             The JSON payload for creating a new issue.
@@ -235,6 +237,8 @@ class Jira:
             fields["fields"]["labels"] = labels
         if self._project_key == CONFIG.SUPPORT_BOARD and CONFIG.ADMIN_CODE:
             fields["fields"]["customfield_10077"] = [CONFIG.ADMIN_CODE]
+        if priority:
+            fields["fields"]["priority"] = {"id": priority}
         payload = json.dumps(fields)
         return payload
 
@@ -890,6 +894,7 @@ class Jira:
         assignee_id: Optional[str] = None,
         attachments: Optional[List] = None,
         labels: Optional[list] = None,
+        priority: Optional[str] = None,
     ) -> requests.Response:
         """Create a new ticket.
 
@@ -899,6 +904,7 @@ class Jira:
             assignee_id (str, optional): The assignee of the ticket. Defaults to None.
             attachments (List, optional): The list of attachments. Defaults to None.
             labels (List, optional): The list of labels. Defaults to None.
+            priority (str, optional): The priority of the ticket. Defaults to None.
 
         Returns:
             The response from creating the ticket.
@@ -923,6 +929,7 @@ class Jira:
             assignee=assignee_id,
             issue_type=issue_type,
             labels=labels,
+            priority=priority,
         )
         response = self.post_ticket(issue=issue)
 
@@ -932,6 +939,7 @@ class Jira:
                 description=description,
                 assignee=assignee_id,
                 issue_type=issue_type,
+                priority=priority,
             )
             response = self.post_ticket(issue=issue)
 
@@ -1034,12 +1042,15 @@ class Jira:
                 metadata=metadata,
             )
 
+            priority = CONFIG.TICKET_PRIORITIES.HIGH if CONFIG.STAGE.lower() == "hypercare" else None
+
             response = self.__create_new_ticket(
                 summary=summary,
                 description=description,
                 assignee_id=assignee_id,
                 attachments=attachments,
                 labels=["bug_catcher"],
+                priority=priority,
             )
             if os.path.exists(stack_trace):
                 os.remove(stack_trace)
@@ -1091,12 +1102,15 @@ class Jira:
                 error_id=error_id,
             )
 
+            priority = CONFIG.TICKET_PRIORITIES.HIGHEST if CONFIG.STAGE.lower() == "hypercare" else None
+
             response = self.__create_new_ticket(
                 summary=summary,
                 description=description,
                 assignee_id=assignee_id,
                 attachments=[stack_trace] if stack_trace else None,
                 labels=["bug_catcher", "fatal_error"],
+                priority=priority,
             )
             if os.path.exists(stack_trace):
                 os.remove(stack_trace)

{t_bug_catcher-0.4.1 → t_bug_catcher-0.4.3}/t_bug_catcher/stack_saver.py

@@ -1,5 +1,6 @@
 import inspect
 import json
+import linecache
 import os
 import re
 import sys
@@ -12,7 +13,7 @@ import whispers
 
 from .config import CONFIG
 from .utils import logger
-from .utils.common import Encoder
+from .utils.common import Encoder, convert_keys_to_primitives
 
 
 class StackSaver:
@@ -34,8 +35,7 @@ class StackSaver:
         """
         return path.replace(os.getcwd(), "").strip(os.sep)
 
-    @staticmethod
-    def serialize_frame_info(frame_info: dict) -> dict:
+    def serialize_frame_info(self, frame_info: dict) -> dict:
         """A static method to serialize the frame info.
 
         Args:
@@ -44,26 +44,13 @@ class StackSaver:
         Returns:
             dict: The serialized frame info.
         """
-        run_locals = {}
-        run_args = {}
-        if frame_info["locals"]:
-            for key, value in frame_info["locals"].items():
-                if str(key).lower() == "credentials":
-                    continue
-                if isinstance(value, dict):
-                    run_locals[str(key)] = value
-                else:
-                    run_locals[str(key)] = str(value)
-        for key, value in frame_info["args"].items():
-            if str(key).lower() == "credentials":
-                continue
-            if isinstance(value, dict):
-                run_args[str(key)] = value
-            else:
-                run_args[str(key)] = str(value)
+        run_locals = convert_keys_to_primitives(frame_info["locals"]) if frame_info["locals"] else {}
+        run_args = convert_keys_to_primitives(frame_info["args"]) if frame_info["args"] else {}
         serializable_frame_info = {
             "filename": frame_info["filename"],
             "function_name": frame_info["function_name"],
+            "line_number": frame_info["line_number"],
+            "line": frame_info["line"],
             "locals": run_locals,
             "args": run_args,
         }
@@ -88,7 +75,7 @@ class StackSaver:
                     continue
                 if isinstance(var, (ModuleType, FunctionType)):
                     continue
-                local_variables[var_name] = var
+                local_variables[str(var_name)] = var
             return local_variables
 
     def mask_credentials(self, file_path: str) -> None:
@@ -111,25 +98,18 @@ class StackSaver:
         args = f"-c {config_path} {file_path}"
 
         secrets = [secret for secret in whispers.secrets(args)]
-        unique_secrets = []
-        seen = set()
-        for secret in secrets:
-            item = (secret.key, secret.value, secret.line)
-            if item not in seen:
-                seen.add(item)
-                unique_secrets.append(secret)
 
         for index, line in enumerate(filedata):
-            if not unique_secrets:
+            if not secrets:
                 break
 
-            for secret in unique_secrets:
+            for secret in secrets:
                 if secret.key in line and secret.value in line:
                     filedata[index] = line.replace(secret.value, secret.value[:1] + "***")
-                    unique_secrets.pop(unique_secrets.index(secret))
+                    secrets.pop(secrets.index(secret))
                     break
 
-        if unique_secrets:
+        if secrets:
             logger.warning("Failed to mask credentials")
             os.remove(file_path)
             raise Exception("Failed to mask credentials")
@@ -149,20 +129,27 @@ class StackSaver:
         try:
             frames = []
             stack_details_json = []
+            seen_frames = set()
             tb = exception.__traceback__ if exception else sys.exc_info()[2]
             while tb is not None:
                 frame = tb.tb_frame
+                if frame.f_code.co_name in seen_frames:
+                    tb = tb.tb_next
+                    continue
+                seen_frames.add(frame.f_code.co_name)
                 if "site-packages" in frame.f_code.co_filename:
                     tb = tb.tb_next
                     continue
                 frames.append(frame)
                 tb = tb.tb_next
-            frames = frames[: CONFIG.LIMITS.STACK_SCOPE]
+            frames = frames[-CONFIG.LIMITS.STACK_SCOPE :]
 
             for frame in frames:
                 frame_info = {
                     "filename": self.strip_path(frame.f_code.co_filename),
                     "function_name": frame.f_code.co_name,
+                    "line_number": frame.f_lineno,
+                    "line": linecache.getline(frame.f_code.co_filename, frame.f_lineno).strip(),
                     "locals": self.filter_variables(frame.f_locals),
                     "args": self.filter_variables(inspect.getargvalues(frame)[3]),
                 }

t_bug_catcher-0.4.3/t_bug_catcher/utils/common.py

@@ -0,0 +1,69 @@
+import traceback
+from datetime import date, datetime
+from json import JSONEncoder
+from pathlib import Path
+from types import TracebackType
+from typing import List
+
+from ..config import CONFIG
+
+
+class Encoder(JSONEncoder):
+    """This class is used to encode the Episode object to json."""
+
+    def default(self, o):
+        """This method is used to encode the Episode object to json.
+
+        Args:
+            o (object): The object to be encoded.
+
+        Returns:
+            str: The json string.
+        """
+        try:
+            if hasattr(o, "__dict__"):
+                keys_to_remove = [
+                    key for key in o.__dict__.keys() if any(s in str(key).lower() for s in CONFIG.KEYS_TO_REMOVE)
+                ]
+                for key in keys_to_remove:
+                    del o.__dict__[key]
+                return {str(key): str(value) for key, value in o.__dict__.items()}
+            if isinstance(o, (datetime, date)):
+                return o.isoformat()
+            if isinstance(o, Path):
+                return str(o)
+            return super().default(self, o)
+        except TypeError:
+            return str(o)
+
+
+def get_frames(exc_traceback: TracebackType) -> List:
+    """Get the frames of the exception.
+
+    Args:
+        exc_traceback (TracebackType): The traceback of the exception.
+
+    Returns:
+        List: The frames of the exception.
+    """
+    return [
+        frame for frame in traceback.extract_tb(exc_traceback) if "site-packages" not in str(frame.filename).lower()
+    ]
+
+
+def convert_keys_to_primitives(data: dict) -> dict:
+    """A function that recursively converts keys in a nested dictionary to primitives.
+
+    Args:
+        data (dict): The input dictionary to convert keys.
+
+    Returns:
+        dict: A new dictionary with keys converted to strings.
+    """
+    new_dict = {}
+    for key, value in data.items():
+        if isinstance(value, dict):
+            new_dict[str(key)] = convert_keys_to_primitives(value)
+        else:
+            new_dict[str(key)] = value
+    return new_dict

{t_bug_catcher-0.4.1 → t_bug_catcher-0.4.3}/t_bug_catcher.egg-info/PKG-INFO

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

t_bug_catcher-0.4.1/t_bug_catcher/utils/common.py

@@ -1,41 +0,0 @@
-import traceback
-from datetime import date, datetime
-from json import JSONEncoder
-from pathlib import Path
-from types import TracebackType
-from typing import List
-
-
-class Encoder(JSONEncoder):
-    """This class is used to encode the Episode object to json."""
-
-    def default(self, o):
-        """This method is used to encode the Episode object to json.
-
-        Args:
-            o (object): The object to be encoded.
-
-        Returns:
-            str: The json string.
-        """
-        if hasattr(o, "__dict__"):
-            return o.__dict__
-        if isinstance(o, (datetime, date)):
-            return o.isoformat()
-        if isinstance(o, Path):
-            return str(o)
-        return JSONEncoder.default(self, o)
-
-
-def get_frames(exc_traceback: TracebackType) -> List:
-    """Get the frames of the exception.
-
-    Args:
-        exc_traceback (TracebackType): The traceback of the exception.
-
-    Returns:
-        List: The frames of the exception.
-    """
-    return [
-        frame for frame in traceback.extract_tb(exc_traceback) if "site-packages" not in str(frame.filename).lower()
-    ]