robotcode-debugger 0.66.1__tar.gz → 0.68.0__tar.gz

{robotcode_debugger-0.66.1 → robotcode_debugger-0.68.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robotcode-debugger
-Version: 0.66.1
+Version: 0.68.0
 Summary: RobotCode Debugger for Robot Framework
 Project-URL: Homepage, https://robotcode.io
 Project-URL: Donate, https://github.com/sponsors/d-biehl
@@ -25,8 +25,8 @@ Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: robotcode-jsonrpc2==0.66.1
-Requires-Dist: robotcode-runner==0.66.1
+Requires-Dist: robotcode-jsonrpc2==0.68.0
+Requires-Dist: robotcode-runner==0.68.0
 Requires-Dist: robotframework>=4.1.0
 Provides-Extra: debugpy
 Requires-Dist: debugpy; extra == 'debugpy'

{robotcode_debugger-0.66.1 → robotcode_debugger-0.68.0}/pyproject.toml

@@ -28,8 +28,8 @@ classifiers = [
 dynamic = ["version"]
 dependencies = [
   "robotframework>=4.1.0",
-  "robotcode-jsonrpc2==0.66.1",
-  "robotcode-runner==0.66.1",
+  "robotcode-jsonrpc2==0.68.0",
+  "robotcode-runner==0.68.0",
 ]
 
 [project.optional-dependencies]

robotcode_debugger-0.68.0/src/robotcode/debugger/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.68.0"

{robotcode_debugger-0.66.1 → robotcode_debugger-0.68.0}/src/robotcode/debugger/cli.py

@@ -11,7 +11,6 @@ from robotcode.plugin.click_helper.types import (
 )
 
 from .__version__ import __version__
-from .run import run_debugger
 
 DEBUGGER_DEFAULT_PORT = 6612
 DEBUGPY_DEFAULT_PORT = 5678
@@ -136,6 +135,7 @@ def debug(
     robot_options_and_args: Tuple[str, ...],
 ) -> None:
     """Starts a Robot Framework debug session and waits for incomming connections."""
+    from .run import run_debugger
 
     mode, port, bind, pipe_name = resolve_server_options(
         ctx, app, mode, port, bind, pipe_name, tcp, None, None, None, pipe_server

{robotcode_debugger-0.66.1 → robotcode_debugger-0.68.0}/src/robotcode/debugger/dap_types.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass, field
 from enum import Enum
 from typing import Any, Dict, Iterator, List, Literal, Optional, Union
 
-from robotcode.core.dataclasses import to_camel_case, to_snake_case
+from robotcode.core.utils.dataclasses import to_camel_case, to_snake_case
 
 
 @dataclass

{robotcode_debugger-0.66.1 → robotcode_debugger-0.68.0}/src/robotcode/debugger/debugger.py

@@ -36,11 +36,10 @@ from robot.api.parsing import get_model
 from robot.errors import VariableError
 from robot.output import LOGGER
 from robot.running import EXECUTION_CONTEXTS, Keyword, TestCase, TestSuite
-from robot.running.userkeyword import UserKeywordHandler
 from robot.utils import NormalizedDict
 from robot.variables import evaluate_expression
 from robotcode.core.event import event
-from robotcode.core.logging import LoggingDescriptor
+from robotcode.core.utils.logging import LoggingDescriptor
 from robotcode.robot.utils import get_robot_version
 
 from .dap_types import (
@@ -72,6 +71,11 @@ from .dap_types import (
     VariablePresentationHint,
 )
 
+if get_robot_version() >= (7, 0):
+    from robot.running.invalidkeyword import InvalidKeywordRunner as UserKeywordHandler
+else:
+    from robot.running.userkeyword import UserKeywordHandler
+
 if get_robot_version() >= (6, 1):
 
     def internal_evaluate_expression(expression: str, variable_store: Any) -> Any:
@@ -298,6 +302,7 @@ class Debugger:
         self.output_messages: bool = False
         self.output_log: bool = False
         self.output_timestamps: bool = False
+        self.colored_output: bool = True
         self.group_output: bool = False
         self.hit_counts: Dict[HitCountEntry, int] = {}
         self.last_fail_message: Optional[str] = None
@@ -1195,9 +1200,16 @@ class Debugger:
         )
 
     def _build_output(self, level: str, msg: str, timestamp: str) -> str:
+        if self.colored_output:
+            return (
+                (f"\u001b[38;5;243m{timestamp.split(' ', 1)[1]}\u001b[0m " if self.output_timestamps else "")
+                + (f"[ {self.MESSAGE_COLORS.get(level, '')}{level}\u001b[0m ] " if level != "INFO" else "")
+                + f"{msg}\n"
+            )
+
         return (
-            (f"\u001b[38;5;237m{timestamp.split(' ', 1)[1]}\u001b[0m " if self.output_timestamps else "")
-            + (f"[ {self.MESSAGE_COLORS.get(level, '')}{level}\u001b[0m ] " if level != "INFO" else "")
+            (f"{timestamp.split(' ', 1)[1]} " if self.output_timestamps else "")
+            + (f"[ {level} ] " if level != "INFO" else "")
             + f"{msg}\n"
         )
 

{robotcode_debugger-0.66.1 → robotcode_debugger-0.68.0}/src/robotcode/debugger/launcher/client.py

@@ -4,8 +4,8 @@ import asyncio
 from typing import Any, Optional, Sequence
 
 from robotcode.core.event import event
-from robotcode.core.logging import LoggingDescriptor
 from robotcode.core.types import TcpParams
+from robotcode.core.utils.logging import LoggingDescriptor
 
 from ..dap_types import Event
 from ..protocol import DebugAdapterProtocol

{robotcode_debugger-0.66.1 → robotcode_debugger-0.68.0}/src/robotcode/debugger/launcher/server.py

@@ -7,8 +7,8 @@ import sys
 from pathlib import Path
 from typing import Any, Dict, List, Literal, Optional
 
-from robotcode.core.logging import LoggingDescriptor
 from robotcode.core.types import ServerMode, TcpParams
+from robotcode.core.utils.logging import LoggingDescriptor
 from robotcode.jsonrpc2.protocol import rpc_method
 from robotcode.jsonrpc2.server import JsonRPCServer
 from robotcode.robot.utils import get_robot_version

{robotcode_debugger-0.66.1 → robotcode_debugger-0.68.0}/src/robotcode/debugger/protocol.py

@@ -21,9 +21,9 @@ from typing import (
     Union,
 )
 
-from robotcode.core.dataclasses import as_dict, as_json, from_dict
-from robotcode.core.logging import LoggingDescriptor
+from robotcode.core.utils.dataclasses import as_dict, as_json, from_dict
 from robotcode.core.utils.inspect import ensure_coroutine
+from robotcode.core.utils.logging import LoggingDescriptor
 from robotcode.jsonrpc2.protocol import JsonRPCException, JsonRPCProtocolBase, SendedRequestEntry
 
 from .dap_types import (

{robotcode_debugger-0.66.1 → robotcode_debugger-0.68.0}/src/robotcode/debugger/run.py

@@ -18,13 +18,13 @@ from robotcode.core.async_tools import (
     run_coroutine_from_thread_async,
     run_coroutine_in_thread,
 )
-from robotcode.core.logging import LoggingDescriptor
 from robotcode.core.types import ServerMode, TcpParams
 from robotcode.core.utils.debugpy import (
     enable_debugpy,
     is_debugpy_installed,
     wait_for_debugpy_connected,
 )
+from robotcode.core.utils.logging import LoggingDescriptor
 from robotcode.core.utils.net import find_free_port
 from robotcode.plugin import Application
 
@@ -197,6 +197,7 @@ async def run_debugger(
         Debugger.instance().output_log = output_log
         Debugger.instance().group_output = group_output
         Debugger.instance().output_timestamps = output_timestamps
+        Debugger.instance().colored_output = app.colored
         Debugger.instance().debug = debug
         Debugger.instance().set_main_thread(threading.current_thread())
         Debugger.instance().server_loop = server.loop

{robotcode_debugger-0.66.1 → robotcode_debugger-0.68.0}/src/robotcode/debugger/server.py

@@ -3,8 +3,8 @@ import os
 from typing import Any, Callable, Dict, List, Literal, Optional, Union
 
 from robotcode.core import async_tools
-from robotcode.core.logging import LoggingDescriptor
 from robotcode.core.types import ServerMode, TcpParams
+from robotcode.core.utils.logging import LoggingDescriptor
 from robotcode.jsonrpc2.protocol import rpc_method
 from robotcode.jsonrpc2.server import JsonRPCServer
 

robotcode_debugger-0.66.1/src/robotcode/debugger/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.66.1"