siliconcompiler 0.32.1__py3-none-any.whl → 0.32.3__py3-none-any.whl

siliconcompiler/utils/logging.py

@@ -1,34 +1,78 @@
 import logging
 import sys
+from siliconcompiler.flowgraph import _get_flowgraph_nodes
+from siliconcompiler.remote import client
+from siliconcompiler import utils
 
 
-class LoggerFormatter(logging.Formatter):
-    def __init__(self, log_formatprefix, level_fmt, message_fmt):
-        self.__formats = {}
+class SCBlankLoggerFormatter(logging.Formatter):
+    def __init__(self):
+        super().__init__("%(message)s")
 
-        self.add_format(None, log_formatprefix + level_fmt, message_fmt)
-        for level in [logging.DEBUG,
-                      logging.INFO,
-                      logging.WARNING,
-                      logging.ERROR,
-                      logging.CRITICAL]:
-            self.add_format(level, log_formatprefix + level_fmt, message_fmt)
 
-    def format(self, record):
-        log_fmt = self.__formats.get(record.levelno)
-        if not log_fmt:
-            log_fmt = self.__formats.get(None)
-        formatter = logging.Formatter(log_fmt)
-        return formatter.format(record)
+class SCDebugLoggerFormatter(logging.Formatter):
+    def __init__(self):
+        super().__init__(
+            "| %(levelname)-8s | %(filename)-20s : %(funcName)-10s | %(lineno)-4s | %(message)s")
+
+
+class SCDebugInRunLoggerFormatter(logging.Formatter):
+    def __init__(self, chip, jobname, step, index):
+        super().__init__(
+            SCInRunLoggerFormatter.configureFormat(
+                "| %(levelname)-8s | %(filename)-20s : %(funcName)-10s | %(lineno)-4s |"
+                " {} | {} | {} | %(message)s",
+                chip, step, index))
+
+
+class SCLoggerFormatter(logging.Formatter):
+    def __init__(self):
+        super().__init__("| %(levelname)-8s | %(message)s")
+
+
+class SCInRunLoggerFormatter(logging.Formatter):
+    def __init__(self, chip, jobname, step, index):
+        super().__init__(
+            SCInRunLoggerFormatter.configureFormat(
+                "| %(levelname)-8s | {} | {} | {} | %(message)s",
+                chip, step, index))
+
+    @staticmethod
+    def configureFormat(fmt, chip, step, index):
+        max_width = 20
 
-    def add_format(self, level, level_format, message_format):
-        if level == logging.CRITICAL:
-            self.__formats[level] = level_format + message_format
+        flow = chip.get('option', 'flow')
+        if flow:
+            nodes_to_run = _get_flowgraph_nodes(chip, flow=flow)
         else:
-            self.__formats[level] = level_format + " " + message_format
+            nodes_to_run = []
 
+        # Figure out how wide to make step and index fields
+        max_step_len = 1
+        max_index_len = 1
 
-class ColorStreamFormatter(LoggerFormatter):
+        if chip.get('option', 'remote'):
+            nodes_to_run.append((client.remote_step_name, '0'))
+        for future_step, future_index in nodes_to_run:
+            max_step_len = max(len(future_step), max_step_len)
+            max_index_len = max(len(future_index), max_index_len)
+        max_step_len = min(max_step_len, max_width)
+        max_index_len = min(max_index_len, max_width)
+
+        jobname = chip.get('option', 'jobname')
+
+        if step is None:
+            step = '-' * max(max_step_len // 4, 1)
+        if index is None:
+            index = '-' * max(max_index_len // 4, 1)
+
+        return fmt.format(
+            utils.truncate_text(jobname, max_width),
+            f'{utils.truncate_text(step, max_step_len): <{max_step_len}}',
+            f'{utils.truncate_text(index, max_step_len): >{max_index_len}}')
+
+
+class SCColorLoggerFormatter(logging.Formatter):
     '''
     Apply color to stream logger
     '''
@@ -38,24 +82,34 @@ class ColorStreamFormatter(LoggerFormatter):
     bold_red = u"\u001b[31;1m"
     reset = u"\u001b[0m"
 
-    def __init__(self, log_formatprefix, level_fmt, message_fmt):
-        super().__init__(log_formatprefix, level_fmt, message_fmt)
+    def __init__(self, root_formatter):
+        super().__init__()
 
-        # Replace with colors
-        for level, color in [(logging.DEBUG, ColorStreamFormatter.blue),
-                             (logging.WARNING, ColorStreamFormatter.yellow),
-                             (logging.ERROR, ColorStreamFormatter.red),
-                             (logging.CRITICAL, ColorStreamFormatter.bold_red)]:
-            if color:
-                fmt = log_formatprefix + color + level_fmt + ColorStreamFormatter.reset
-            else:
-                fmt = log_formatprefix + level_fmt
+        self.__create_color_format(root_formatter._style._fmt)
+
+    def __create_color_format(self, fmt):
+        self.__formatters = {
+            None: logging.Formatter(fmt)
+        }
+
+        for level, color in [(logging.DEBUG, SCColorLoggerFormatter.blue),
+                             (logging.WARNING, SCColorLoggerFormatter.yellow),
+                             (logging.ERROR, SCColorLoggerFormatter.red),
+                             (logging.CRITICAL, SCColorLoggerFormatter.bold_red)]:
+            self.__formatters[level] = logging.Formatter(
+                fmt.replace('%(levelname)-8s',
+                            color + '%(levelname)-8s' + SCColorLoggerFormatter.reset))
+
+    def format(self, record):
+        log_fmt = self.__formatters.get(record.levelno)
+        if not log_fmt:
+            log_fmt = self.__formatters.get(None)
 
-            self.add_format(level, fmt, message_fmt)
+        return log_fmt.format(record)
 
     @staticmethod
     def supports_color(handler):
-        if not isinstance(handler, logging.StreamHandler):
+        if type(handler) is not logging.StreamHandler:
             return False
 
         supported_platform = sys.platform != 'win32'

{siliconcompiler-0.32.1.dist-info → siliconcompiler-0.32.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: siliconcompiler
-Version: 0.32.1
+Version: 0.32.3
 Summary: A compiler framework that automates translation from source code to silicon.
 Author-email: Andreas Olofsson <andreas.d.olofsson@gmail.com>
 License: Apache License 2.0
@@ -26,7 +26,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp==3.10.11; python_version <= "3.8"
-Requires-Dist: aiohttp==3.11.13; python_version >= "3.9"
+Requires-Dist: aiohttp==3.11.16; python_version >= "3.9"
 Requires-Dist: requests==2.32.3
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: pandas>=1.1.5
@@ -45,27 +45,30 @@ Requires-Dist: fasteners==0.19
 Requires-Dist: fastjsonschema==2.21.1
 Requires-Dist: docker==7.1.0
 Requires-Dist: importlib_metadata; python_version < "3.10"
-Requires-Dist: orjson==3.10.15
+Requires-Dist: orjson==3.10.15; python_version <= "3.8"
+Requires-Dist: orjson==3.10.16; python_version >= "3.9"
 Requires-Dist: pyslang==8.0.0
 Requires-Dist: streamlit==1.40.1; python_version <= "3.8"
-Requires-Dist: streamlit==1.43.1; python_version >= "3.9" and python_full_version != "3.9.7"
+Requires-Dist: streamlit==1.44.1; python_version >= "3.9" and python_full_version != "3.9.7"
 Requires-Dist: streamlit_agraph==0.0.45; python_full_version != "3.9.7"
 Requires-Dist: streamlit-antd-components==0.3.2; python_full_version != "3.9.7"
 Requires-Dist: streamlit_javascript==0.1.5; python_full_version != "3.9.7"
 Requires-Dist: streamlit-autorefresh==1.0.1; python_full_version != "3.9.7"
+Requires-Dist: rich==13.9.4
 Provides-Extra: test
 Requires-Dist: pytest==8.3.5; extra == "test"
 Requires-Dist: pytest-xdist==3.6.1; extra == "test"
 Requires-Dist: pytest-timeout==2.3.1; extra == "test"
 Requires-Dist: pytest-asyncio==0.24.0; python_version <= "3.8" and extra == "test"
-Requires-Dist: pytest-asyncio==0.25.3; python_version >= "3.9" and extra == "test"
+Requires-Dist: pytest-asyncio==0.26.0; python_version >= "3.9" and extra == "test"
 Requires-Dist: pytest-cov==5.0.0; python_version <= "3.8" and extra == "test"
-Requires-Dist: pytest-cov==6.0.0; python_version >= "3.9" and extra == "test"
-Requires-Dist: responses==0.25.6; extra == "test"
+Requires-Dist: pytest-cov==6.1.1; python_version >= "3.9" and extra == "test"
+Requires-Dist: responses==0.25.7; extra == "test"
 Requires-Dist: PyVirtualDisplay==3.0; extra == "test"
+Requires-Dist: logiklib==0.1.0; extra == "test"
 Provides-Extra: lint
-Requires-Dist: flake8==7.1.2; extra == "lint"
-Requires-Dist: tclint==0.5.3; extra == "lint"
+Requires-Dist: flake8==7.2.0; extra == "lint"
+Requires-Dist: tclint==0.5.4; extra == "lint"
 Requires-Dist: codespell==2.4.1; extra == "lint"
 Provides-Extra: docs
 Requires-Dist: Sphinx==8.2.3; extra == "docs"
@@ -76,6 +79,7 @@ Provides-Extra: profile
 Requires-Dist: gprof2dot==2024.6.6; extra == "profile"
 Provides-Extra: optimizer
 Requires-Dist: google-vizier[jax]==0.1.21; python_version >= "3.10" and extra == "optimizer"
+Dynamic: license-file
 
 ![SiliconCompiler](https://raw.githubusercontent.com/siliconcompiler/siliconcompiler/main/docs/_static/sc_logo_with_text.png)