ephys-link 2.0.0b1__py3-none-any.whl → 2.0.0b2__py3-none-any.whl

ephys_link/__about__.py

@@ -1 +1 @@
-__version__ = "2.0.0b1"
+__version__ = "2.0.0b2"

ephys_link/back_end/platform_handler.py

@@ -71,7 +71,7 @@ class PlatformHandler:
                 return FakeBindings()
             case _:
                 error_message = f'Platform type "{platform_type}" not recognized.'
-                self._console.labeled_error_print("PLATFORM", error_message)
+                self._console.critical_print(error_message)
                 raise ValueError(error_message)
 
     # Ephys Link metadata.
@@ -185,7 +185,7 @@ class PlatformHandler:
             # Disallow setting manipulator position while inside the brain.
             if request.manipulator_id in self._inside_brain:
                 error_message = 'Can not move manipulator while inside the brain. Set the depth ("set_depth") instead.'
-                self._console.error_print(error_message)
+                self._console.error_print("Set Position", error_message)
                 return PositionalResponse(error=error_message)
 
             # Move to the new position.
@@ -209,7 +209,7 @@ class PlatformHandler:
                         f" position on axis {list(Vector4.model_fields.keys())[index]}."
                         f"Requested: {request.position}, got: {final_unified_position}."
                     )
-                    self._console.error_print(error_message)
+                    self._console.error_print("Set Position", error_message)
                     return PositionalResponse(error=error_message)
         except Exception as e:
             self._console.exception_error_print("Set Position", e)

ephys_link/back_end/server.py

@@ -75,7 +75,7 @@ class Server:
     # Helper functions.
     def _malformed_request_response(self, request: str, data: tuple[tuple[Any], ...]) -> str:
         """Return a response for a malformed request."""
-        self._console.labeled_error_print("MALFORMED REQUEST", f"{request}: {data}")
+        self._console.error_print("MALFORMED REQUEST", f"{request}: {data}")
         return dumps({"error": "Malformed request."})
 
     async def _run_if_data_available(
@@ -127,7 +127,9 @@ class Server:
             self._console.info_print("CONNECTION GRANTED", sid)
             return True
 
-        self._console.error_print(f"CONNECTION REFUSED to {sid}. Client {self._client_sid} already connected.")
+        self._console.error_print(
+            "CONNECTION REFUSED", f"Cannot connect {sid} as {self._client_sid} is already connected."
+        )
         return False
 
     async def disconnect(self, sid: str) -> None:
@@ -142,7 +144,7 @@ class Server:
         if self._client_sid == sid:
             self._client_sid = ""
         else:
-            self._console.error_print(f"Client {sid} disconnected without being connected.")
+            self._console.error_print("DISCONNECTION", f"Client {sid} disconnected without being connected.")
 
     # noinspection PyTypeChecker
     async def platform_event_handler(self, event: str, *args: tuple[Any]) -> str:
@@ -196,5 +198,5 @@ class Server:
             case "stop_all":
                 return await self._platform_handler.stop_all()
             case _:
-                self._console.error_print(f"Unknown event: {event}.")
+                self._console.error_print("EVENT", f"Unknown event: {event}.")
                 return dumps({"error": "Unknown event."})

ephys_link/bindings/ump_4_bindings.py

@@ -10,7 +10,6 @@ from vbl_aquarium.models.unity import Vector3, Vector4
 
 from ephys_link.util.base_bindings import BaseBindings
 from ephys_link.util.common import RESOURCES_PATH, array_to_vector4, mm_to_um, mmps_to_umps, um_to_mm, vector4_to_array
-from ephys_link.util.console import Console
 
 
 class Ump4Bindings(BaseBindings):
@@ -24,7 +23,6 @@ class Ump4Bindings(BaseBindings):
         self._ump = UMP.get_ump()
         if self._ump is None:
             error_message = "Unable to connect to uMp"
-            Console.error_print(error_message)
             raise ValueError(error_message)
 
     async def get_manipulators(self) -> list[str]:

ephys_link/util/common.py

@@ -9,7 +9,6 @@ from requests import get
 from vbl_aquarium.models.unity import Vector4
 
 from ephys_link.__about__ import __version__
-from ephys_link.util.console import Console
 
 # Ephys Link ASCII.
 ASCII = r"""
@@ -47,8 +46,8 @@ def check_for_updates() -> None:
     response = get("https://api.github.com/repos/VirtualBrainLab/ephys-link/tags", timeout=10)
     latest_version = response.json()[0]["name"]
     if parse(latest_version) > parse(__version__):
-        Console.info_print("Update available", latest_version)
-        Console.info_print("", "Download at: https://github.com/VirtualBrainLab/ephys-link/releases/latest")
+        print(f"Update available: {latest_version} !")
+        print("Download at: https://github.com/VirtualBrainLab/ephys-link/releases/latest")
 
 
 # Unit conversions

ephys_link/util/console.py

@@ -6,12 +6,10 @@ Configure the console to print error and debug messages.
 Usage: Create a Console object and call the appropriate method to print messages.
 """
 
-from traceback import print_exc
+from logging import DEBUG, ERROR, INFO, basicConfig, getLogger
 
-from colorama import Back, Fore, Style, init
-
-# Constants.
-TAB_BLOCK = "\t\t"
+from rich.logging import RichHandler
+from rich.traceback import install
 
 
 class Console:
@@ -21,34 +19,59 @@ class Console:
         :param enable_debug: Enable debug mode.
         :type enable_debug: bool
         """
-        self._enable_debug = enable_debug
-
         # Repeat message fields.
-        self._last_message = ""
-        self._repeat_counter = 1
+        self._last_message = (0, "", "")
+        self._repeat_counter = 0
 
-        # Initialize colorama.
-        init(autoreset=True)
+        # Config logger.
+        basicConfig(
+            level=DEBUG if enable_debug else INFO,
+            format="%(message)s",
+            datefmt="[%I:%M:%S %p]",
+            handlers=[RichHandler(rich_tracebacks=True)],
+        )
+        self._log = getLogger("rich")
 
-    @staticmethod
-    def error_print(msg: str) -> None:
-        """Print an error message to the console.
+        # Install Rich traceback.
+        install()
 
-        :param msg: Error message to print.
+    def debug_print(self, label: str, msg: str) -> None:
+        """Print a debug message to the console.
+
+        :param label: Label for the debug message.
+        :type label: str
+        :param msg: Debug message to print.
         :type msg: str
         """
-        print(f"\n{Back.RED}{Style.BRIGHT} ERROR {Style.RESET_ALL}{TAB_BLOCK}{Fore.RED}{msg}")
+        self._repeatable_log(DEBUG, f"[b green]{label}", f"[green]{msg}")
 
-    @staticmethod
-    def labeled_error_print(label: str, msg: str) -> None:
-        """Print an error message with a label to the console.
+    def info_print(self, label: str, msg: str) -> None:
+        """Print info to console.
+
+        :param label: Label for the message.
+        :type label: str
+        :param msg: Message to print.
+        :type msg: str
+        """
+        self._repeatable_log(INFO, f"[b blue]{label}", msg)
+
+    def error_print(self, label: str, msg: str) -> None:
+        """Print an error message to the console.
 
         :param label: Label for the error message.
         :type label: str
         :param msg: Error message to print.
         :type msg: str
         """
-        print(f"\n{Back.RED}{Style.BRIGHT} ERROR {label} {Style.RESET_ALL}{TAB_BLOCK}{Fore.RED}{msg}")
+        self._repeatable_log(ERROR, f"[b red]{label}", f"[red]{msg}")
+
+    def critical_print(self, msg: str) -> None:
+        """Print a critical message to the console.
+
+        :param msg: Critical message to print.
+        :type msg: str
+        """
+        self._log.critical(f"[b i red]{msg}", extra={"markup": True})
 
     @staticmethod
     def pretty_exception(exception: Exception) -> str:
@@ -61,8 +84,7 @@ class Console:
         """
         return f"{type(exception).__name__}: {exception}"
 
-    @staticmethod
-    def exception_error_print(label: str, exception: Exception) -> None:
+    def exception_error_print(self, label: str, exception: Exception) -> None:
         """Print an error message with exception details to the console.
 
         :param label: Label for the error message.
@@ -70,43 +92,42 @@ class Console:
         :param exception: Exception to print.
         :type exception: Exception
         """
-        Console.labeled_error_print(label, Console.pretty_exception(exception))
-        print_exc()
-
-    def debug_print(self, label: str, msg: str) -> None:
-        """Print a debug message to the console.
-
-        :param label: Label for the debug message.
-        :type label: str
-        :param msg: Debug message to print.
-        :type msg: str
-        """
-        if self._enable_debug:
-            self._repeat_print(f"{Back.BLUE}{Style.BRIGHT} DEBUG {label} {Style.RESET_ALL}{TAB_BLOCK}{Fore.BLUE}{msg}")
+        self._log.exception(
+            f"[b magenta]{label}:[/] [magenta]{Console.pretty_exception(exception)}", extra={"markup": True}
+        )
 
-    @staticmethod
-    def info_print(label: str, msg: str) -> None:
-        """Print info to console.
+    # Helper methods.
+    def _repeatable_log(self, log_type: int, label: str, message: str) -> None:
+        """Add a row to the output table.
 
+        :param log_type: Type of log.
+        :type log_type: int
         :param label: Label for the message.
         :type label: str
-        :param msg: Message to print.
-        :type msg: str
+        :param message: Message.
+        :type message: str
         """
-        print(f"\n{Back.GREEN}{Style.BRIGHT} {label} {Style.RESET_ALL}{TAB_BLOCK}{Fore.GREEN}{msg}")
-
-    # Helper methods.
-    def _repeat_print(self, msg: str) -> None:
-        """Print a message to the console with repeat counter.
 
-        :param msg: Message to print.
-        :type msg: str
-        """
-        if msg == self._last_message:
+        # Compute if this is a repeated message.
+        message_set = (log_type, label, message)
+        if message_set == self._last_message:
+            # Handle repeat.
             self._repeat_counter += 1
-        else:
-            self._repeat_counter = 1
-            self._last_message = msg
-            print()
 
-        print(f"\r{msg}{f" (x{self._repeat_counter})" if self._repeat_counter > 1 else ""}", end="")
+            # Add an ellipsis row for first repeat.
+            if self._repeat_counter == 1:
+                self._log.log(log_type, "...")
+        else:
+            # Handle novel message.
+            if self._repeat_counter > 0:
+                # Complete previous repeat.
+                self._log.log(
+                    self._last_message[0],
+                    f"{self._last_message[1]}:[/] {self._last_message[2]}[/] x {self._repeat_counter}",
+                    extra={"markup": True},
+                )
+                self._repeat_counter = 0
+
+            # Log new message.
+            self._log.log(log_type, f"{label}:[/] {message}", extra={"markup": True})
+            self._last_message = message_set

{ephys_link-2.0.0b1.dist-info → ephys_link-2.0.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ephys-link
-Version: 2.0.0b1
+Version: 2.0.0b2
 Summary: A Python Socket.IO server that allows any Socket.IO-compliant application to communicate with manipulators used in electrophysiology experiments.
 Project-URL: Documentation, https://virtualbrainlab.org/ephys_link/installation_and_use.html
 Project-URL: Issues, https://github.com/VirtualBrainLab/ephys-link/issues
@@ -33,6 +33,7 @@ Requires-Dist: pyserial==3.5
 Requires-Dist: python-socketio[asyncio-client]==5.11.3
 Requires-Dist: pythonnet==3.0.3
 Requires-Dist: requests==2.32.3
+Requires-Dist: rich==13.7.1
 Requires-Dist: sensapex==1.400.1
 Requires-Dist: vbl-aquarium==0.0.19
 Description-Content-Type: text/markdown

{ephys_link-2.0.0b1.dist-info → ephys_link-2.0.0b2.dist-info}/RECORD

@@ -1,12 +1,12 @@
-ephys_link/__about__.py,sha256=QUUi7DnZ0lfA8ZZUdMrPNiqXewCSfYtIqTvB6q6NnGQ,25
+ephys_link/__about__.py,sha256=hCxVb1QEtE7vuKzDSJMrBKv-IroPOVT1d4aqMkNa-5c,25
 ephys_link/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ephys_link/__main__.py,sha256=pu7QLmS_30qWpgzeibMVD5FsVhICiK0wi7QkzX6F0qU,1373
 ephys_link/back_end/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ephys_link/back_end/platform_handler.py,sha256=5GfyLz8rX8VYypuT9JJokV12mnyUksriFOzRgp6H4W8,12939
-ephys_link/back_end/server.py,sha256=WP5NLJnIKtkVImdRgtZKxWEghd17FjsmpuczYpoFs3Q,7965
+ephys_link/back_end/platform_handler.py,sha256=KKJd2qEV4eYsxaAviR9I2PyesdmILmJTjlk3mFGogUs,12954
+ephys_link/back_end/server.py,sha256=TMg0jgTt5Dqw7T7rHvs4ZcswrSKgD2IHAJc1kEUUfsw,8020
 ephys_link/bindings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ephys_link/bindings/fake_bindings.py,sha256=_ZpXx4whztbO5jNGNqwoJFdqhIIbZ0VMx4mHkMge1r0,1726
-ephys_link/bindings/ump_4_bindings.py,sha256=1V_bQzq7xVX1qGxbK11nxX7X3L3cfh9RTdhbVJwBKg8,4651
+ephys_link/bindings/ump_4_bindings.py,sha256=-qyDL8JAw7R1H_HZgPgyZDfiu3RDEaE0Uzhb8rNbXtg,4558
 ephys_link/front_end/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ephys_link/front_end/cli.py,sha256=KJBSWqdz4T5z0Zor1tJSHTJKZeMcHAJf5gXXu38wQPU,3105
 ephys_link/front_end/gui.py,sha256=_gE6zFhFnzHPSyYd9MBvfK5xmDZHsUXcETDHzH66QzU,7518
@@ -16,10 +16,10 @@ ephys_link/resources/SiUSBXp.dll,sha256=187zlclZNNezCkU1o1CbICRAmKWJxbh8ahP6L6wo
 ephys_link/resources/libum.dll,sha256=YaD4dwiSNohx-XxHjx2eQWPOBEVvUIXARvx37e_yqNw,316316
 ephys_link/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ephys_link/util/base_bindings.py,sha256=FNqhB7kJf2n9g4wYHEBbQ2wEiZscR5sKCnIEZ6yujgE,4808
-ephys_link/util/common.py,sha256=IgmTpXRU2z7jfYV2zB4RGgjV34IaYa2s3TYpzKZkpao,3519
-ephys_link/util/console.py,sha256=kD4LLehdA1xLiGwdvjt5KxImDSyDkcoC2CQVOxTv8T4,3560
-ephys_link-2.0.0b1.dist-info/METADATA,sha256=j_XqMK_IK955IOE0ikj_JhqschZGCOKpgMiWdGzTrQQ,7975
-ephys_link-2.0.0b1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-ephys_link-2.0.0b1.dist-info/entry_points.txt,sha256=o8wV3AdnJ9o47vg9ymKxPNVq9pMdPq8UZHE_iyAJx-k,124
-ephys_link-2.0.0b1.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-ephys_link-2.0.0b1.dist-info/RECORD,,
+ephys_link/util/common.py,sha256=FCfqX5DP_hyYy4MycwxhjZ9AVq27DpENIggGVC8LHHg,3449
+ephys_link/util/console.py,sha256=RTlGtIpruw2ommshICinOyxdTEAiovXu9bUJNeGc64I,4444
+ephys_link-2.0.0b2.dist-info/METADATA,sha256=WdN_6MVw6XiGqUx4WKDeYSLA61jDCdxJ1mKG319ol5g,8003
+ephys_link-2.0.0b2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+ephys_link-2.0.0b2.dist-info/entry_points.txt,sha256=o8wV3AdnJ9o47vg9ymKxPNVq9pMdPq8UZHE_iyAJx-k,124
+ephys_link-2.0.0b2.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+ephys_link-2.0.0b2.dist-info/RECORD,,