[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

gplugins/hdl21/__init__.py

@@ -1,2 +1,2 @@
 from .netlist import *
-from .sky130 import *
+from .sky130 import *

gplugins/hdl21/netlist.py

@@ -1,13 +1,14 @@
 """
 This module provides functions to generate a raw netlist semi-compatible with gdsfactory from a hdl21 module object.
 """
-import yaml
+
 import hdl21 as h
+import yaml
 
 __all__ = [
-    'ParsedProtoVLSIR',
-    'generate_raw_netlist_dict_from_module',
-    'generate_raw_yaml_from_module'
+    "ParsedProtoVLSIR",
+    "generate_raw_netlist_dict_from_module",
+    "generate_raw_yaml_from_module",
 ]
 
 ParsedProtoVLSIR = dict
@@ -63,44 +64,46 @@ def _parse_connections(proto_dict: ParsedProtoVLSIR) -> dict:
     connections = {}
 
     # Extract the instances and their connections
-    for module in proto_dict.get('modules', []):
-        for instance in module.get('instances', []):
-            instance_name = instance['name']
-            for connection in instance.get('connections', []):
-                portname = connection['portname']
-                target_signal = connection['target'][0]['sig']
+    for module in proto_dict.get("modules", []):
+        for instance in module.get("instances", []):
+            instance_name = instance["name"]
+            for connection in instance.get("connections", []):
+                portname = connection["portname"]
+                target_signal = connection["target"][0]["sig"]
                 connection_key = f"{instance_name},{portname}"
                 # Find the target instance and port
-                target_instance_port = _find_target_instance_port(proto_dict, target_signal, instance_name)
+                target_instance_port = _find_target_instance_port(
+                    proto_dict, target_signal, instance_name
+                )
                 if target_instance_port:
                     connections[connection_key] = target_instance_port
 
     return connections
 
 
-def _find_target_instance_port(proto_dict: ParsedProtoVLSIR,
-                               target_signal,
-                               current_instance_name):
+def _find_target_instance_port(
+    proto_dict: ParsedProtoVLSIR, target_signal, current_instance_name
+):
     """
     Find the target instance and port of the target signal in the proto_dict.
     """
     # Search in the same module
-    for module in proto_dict.get('modules', []):
-        for instance in module.get('instances', []):
-            if instance['name'] == current_instance_name:
+    for module in proto_dict.get("modules", []):
+        for instance in module.get("instances", []):
+            if instance["name"] == current_instance_name:
                 continue
-            for connection in instance.get('connections', []):
-                if connection['target'][0]['sig'] == target_signal:
+            for connection in instance.get("connections", []):
+                if connection["target"][0]["sig"] == target_signal:
                     return f"{instance['name']},{connection['portname']}"
     # Search in external modules
-    for ext_module in proto_dict.get('ext_modules', []):
-        for port in ext_module.get('ports', []):
-            if port['signal'] == target_signal:
-                for instance in module.get('instances', []):
-                    if instance['name'] == current_instance_name:
+    for ext_module in proto_dict.get("ext_modules", []):
+        for port in ext_module.get("ports", []):
+            if port["signal"] == target_signal:
+                for instance in module.get("instances", []):
+                    if instance["name"] == current_instance_name:
                         continue
-                    for connection in instance.get('connections', []):
-                        if connection['target'][0]['sig'] == target_signal:
+                    for connection in instance.get("connections", []):
+                        if connection["target"][0]["sig"] == target_signal:
                             return f"{instance['name']},{connection['portname']}"
 
     return None
@@ -113,9 +116,9 @@ def _generate_top_level_connections(proto_dict: ParsedProtoVLSIR):
     top_level_connections = {}
 
     # Iterate over the top-level module ports
-    for module in proto_dict.get('modules', []):
-        for port in module.get('ports', []):
-            port_signal = port['signal']
+    for module in proto_dict.get("modules", []):
+        for port in module.get("ports", []):
+            port_signal = port["signal"]
             connection = _find_port_connection(proto_dict, port_signal)
             if connection:
                 top_level_connections[port_signal] = connection
@@ -128,11 +131,11 @@ def _find_port_connection(proto_dict: ParsedProtoVLSIR, port_signal):
     Find the connection of the port signal in the proto_dict.
     """
     # Search within the module instances
-    for module in proto_dict.get('modules', []):
-        for instance in module.get('instances', []):
-            instance_name = instance['name']
-            for connection in instance.get('connections', []):
-                if connection['target'][0]['sig'] == port_signal:
+    for module in proto_dict.get("modules", []):
+        for instance in module.get("instances", []):
+            instance_name = instance["name"]
+            for connection in instance.get("connections", []):
+                if connection["target"][0]["sig"] == port_signal:
                     return f"{instance_name},{connection['portname']}"
     return None
 
@@ -143,27 +146,27 @@ def _extract_instance_parameters(proto_dict: ParsedProtoVLSIR):
     """
     instance_parameters = {}
 
-    for module in proto_dict.get('modules', []):
-        for instance in module.get('instances', []):
-            instance_name = instance['name']
+    for module in proto_dict.get("modules", []):
+        for instance in module.get("instances", []):
+            instance_name = instance["name"]
             instance_info = {
-                'component': _extract_component_name(instance),
-                'info': {},
-                'settings': {}
+                "component": _extract_component_name(instance),
+                "info": {},
+                "settings": {},
             }
 
             # Extract parameters into the settings
-            for parameter in instance.get('parameters', []):
-                param_name = parameter['name']
-                param_value = _extract_parameter_value(parameter['value'])
-                instance_info['settings'][param_name] = param_value
+            for parameter in instance.get("parameters", []):
+                param_name = parameter["name"]
+                param_value = _extract_parameter_value(parameter["value"])
+                instance_info["settings"][param_name] = param_value
 
             # Extract connections and add to settings
-            instance_info['settings']['ports'] = {}
-            for connection in instance.get('connections', []):
-                portname = connection['portname']
-                target_signal = connection['target'][0]['sig']
-                instance_info['settings']['ports'][portname] = target_signal
+            instance_info["settings"]["ports"] = {}
+            for connection in instance.get("connections", []):
+                portname = connection["portname"]
+                target_signal = connection["target"][0]["sig"]
+                instance_info["settings"]["ports"][portname] = target_signal
 
             instance_parameters[instance_name] = instance_info
 
@@ -174,23 +177,23 @@ def _extract_component_name(instance):
     """
     Extract the component name from the instance.
     """
-    external_modules = instance.get('module', [])
+    external_modules = instance.get("module", [])
     if external_modules:
-        domain = external_modules[0].get('external', [{}])[0].get('domain', '')
-        name = external_modules[0].get('external', [{}])[0].get('name', '')
+        domain = external_modules[0].get("external", [{}])[0].get("domain", "")
+        name = external_modules[0].get("external", [{}])[0].get("name", "")
         return f"{name}"
-    return 'unknown_component'
+    return "unknown_component"
 
 
 def _extract_parameter_value(value):
     """
     Extract the parameter value from the value dictionary.
     """
-    if value and 'literal' in value[0]:
-        return value[0]['literal']
-    elif value and 'prefixed' in value[0]:
-        prefix = value[0]['prefixed'][0].get('prefix', '')
-        int64_value = value[0]['prefixed'][0].get('int64_value', '')
+    if value and "literal" in value[0]:
+        return value[0]["literal"]
+    elif value and "prefixed" in value[0]:
+        prefix = value[0]["prefixed"][0].get("prefix", "")
+        int64_value = value[0]["prefixed"][0].get("int64_value", "")
         return f"{prefix}_{int64_value}"
     return None
 
@@ -199,25 +202,20 @@ def _generate_raw_netlist_dict_from_proto_dict(proto_dict: ParsedProtoVLSIR):
     """
     Generate a raw netlist dictionary from the proto_dict.
     """
-    raw_netlist_dict = {
-        'name': '',
-        'instances': {},
-        'connections': {},
-        'ports': {}
-    }
+    raw_netlist_dict = {"name": "", "instances": {}, "connections": {}, "ports": {}}
 
     # Extract the top-level module name
-    if proto_dict.get('modules'):
-        raw_netlist_dict['name'] = proto_dict['modules'][0].get('name', '')
+    if proto_dict.get("modules"):
+        raw_netlist_dict["name"] = proto_dict["modules"][0].get("name", "")
 
     # Generate instances information
-    raw_netlist_dict['instances'] = _extract_instance_parameters(proto_dict)
+    raw_netlist_dict["instances"] = _extract_instance_parameters(proto_dict)
 
     # Generate connections
-    raw_netlist_dict['connections'] = _parse_connections(proto_dict)
+    raw_netlist_dict["connections"] = _parse_connections(proto_dict)
 
     # Generate top-level connections
-    raw_netlist_dict['ports'] = _generate_top_level_connections(proto_dict)
+    raw_netlist_dict["ports"] = _generate_top_level_connections(proto_dict)
 
     return raw_netlist_dict
 

gplugins/hdl21/sky130.py

@@ -1,35 +1,37 @@
-import sky130
+from collections.abc import Callable
+
 import hdl21 as h
-from typing import Callable, Optional
+import sky130
+
 from ..schematic_editor import SchematicEditor
-from .netlist import _parse_module_to_proto_dict, _generate_raw_netlist_dict_from_proto_dict
+from .netlist import (
+    _generate_raw_netlist_dict_from_proto_dict,
+    _parse_module_to_proto_dict,
+)
 
-__all__ = [
-    'hdl21_module_to_schematic_editor',
-    "find_most_relevant_gds",
-    "filter_port"
-]
+__all__ = ["hdl21_module_to_schematic_editor", "find_most_relevant_gds", "filter_port"]
 
 from difflib import get_close_matches
 
 custom_mapping_dict = {
     "sky130_fd_pr__nfet_01v8": "sky130_fd_pr__rf_nfet_01v8_aM02W1p65L0p15",
-    "sky130_fd_pr__pfet_01v8": "sky130_fd_pr__rf_pfet_01v8_mcM04W3p00L0p15"
+    "sky130_fd_pr__pfet_01v8": "sky130_fd_pr__rf_pfet_01v8_mcM04W3p00L0p15",
 }
 
 
-def find_most_relevant_gds(component_name,
-                           component_dict=sky130.cells,
-                           custom_mapping=None):
-
+def find_most_relevant_gds(
+    component_name, component_dict=sky130.cells, custom_mapping=None
+):
     if custom_mapping is None:
         custom_mapping = custom_mapping_dict
 
     if component_name in custom_mapping.keys():
         print(f"Mapping for {component_name}: {custom_mapping[component_name]}")
         return custom_mapping[component_name]
 
-    all_components = [name for name in component_dict.keys() if "rf_test_coil" not in name]
+    all_components = [
+        name for name in component_dict.keys() if "rf_test_coil" not in name
+    ]
     closest_matches = get_close_matches(component_name, all_components, n=1, cutoff=0.1)
     print(f"Closest matches for {component_name}: {closest_matches}")
     return closest_matches[0] if closest_matches else component_name
@@ -49,11 +51,12 @@ def filter_port(port):
         return port
 
 
-def hdl21_module_to_schematic_editor(module: h.module,
-                                     yaml_schematic_file_name: str,
-                                     spice_gds_mapping_method: Optional[Callable] = find_most_relevant_gds,
-                                     port_filter_method: Callable = filter_port
-                                     ) -> SchematicEditor:
+def hdl21_module_to_schematic_editor(
+    module: h.module,
+    yaml_schematic_file_name: str,
+    spice_gds_mapping_method: Callable | None = find_most_relevant_gds,
+    port_filter_method: Callable = filter_port,
+) -> SchematicEditor:
     """
     Constructs a SchematicEditor instance from a hdl21 module object.
 
@@ -75,13 +78,17 @@ def hdl21_module_to_schematic_editor(module: h.module,
         if spice_gds_mapping_method is None:
             gds_component_name_i = instance_i["component"]
         else:
-            gds_component_name_i = spice_gds_mapping_method(instance_i["component"], sky130.cells)
+            gds_component_name_i = spice_gds_mapping_method(
+                instance_i["component"], sky130.cells
+            )
         se.add_instance(
             instance_name=instance_name_i,
             component=sky130.cells[gds_component_name_i](),
         )
 
-    for connection_source_i, connection_target_i in raw_netlist_dict["connections"].items():
+    for connection_source_i, connection_target_i in raw_netlist_dict[
+        "connections"
+    ].items():
         source_instance, source_port = connection_source_i.split(",")
         target_instance, target_port = connection_target_i.split(",")
         source_port = port_filter_method(source_port)