siliconcompiler 0.34.2__py3-none-any.whl → 0.34.3__py3-none-any.whl

siliconcompiler/schema/parametervalue.py

@@ -93,6 +93,15 @@ class NodeListValue:
 
         return [self.__base.get(field=field)]
 
+    def gettcl(self):
+        """
+        Returns the tcl representation for the value
+
+        Args:
+            field (str): name of schema field.
+        """
+        return NodeType.to_tcl(self.get(), self.type)
+
     def set(self, value, field='value'):
         """
         Sets the value in a specific field and ensures it has been normalized.
@@ -154,6 +163,16 @@ class NodeListValue:
         """
         return self.__base.fields
 
+    @property
+    def has_value(self):
+        """
+        Returns true if this node has a value.
+        """
+        if self.__values:
+            return True
+        else:
+            return False
+
     @property
     def values(self):
         '''
@@ -265,6 +284,15 @@ class NodeSetValue:
             return set(vals)
         return vals
 
+    def gettcl(self):
+        """
+        Returns the tcl representation for the value
+
+        Args:
+            field (str): name of schema field.
+        """
+        return NodeType.to_tcl(self.get(ordered=True), [self.__base.type])
+
     def set(self, value, field='value'):
         value = NodeType.normalize(value, [self.__base.type])
 
@@ -326,6 +354,16 @@ class NodeSetValue:
                 modified.append(val)
         return tuple(modified)
 
+    @property
+    def has_value(self):
+        """
+        Returns true if this node has a value.
+        """
+        if self.__values:
+            return True
+        else:
+            return False
+
     @property
     def fields(self):
         """
@@ -434,6 +472,15 @@ class NodeValue:
             return self.__signature
         raise ValueError(f"{field} is not a valid field")
 
+    def gettcl(self):
+        """
+        Returns the tcl representation for the value
+
+        Args:
+            field (str): name of schema field.
+        """
+        return NodeType.to_tcl(self.get(), self.__type)
+
     def set(self, value, field='value'):
         """
         Sets the value in a specific field and ensures it has been normalized.
@@ -459,6 +506,19 @@ class NodeValue:
         """
         raise ValueError(f"cannot add to {field} field")
 
+    @property
+    def has_value(self):
+        """
+        Returns true if this node has a value.
+        """
+        if isinstance(self.__type, (set, tuple, list)):
+            return bool(self.__value)
+
+        if self.__value is not None:
+            return True
+        else:
+            return False
+
     @property
     def fields(self):
         """

siliconcompiler/schema/safeschema.py

@@ -4,6 +4,8 @@
 # SC dependencies outside of its directory, since it may be used by tool drivers
 # that have isolated Python environments.
 
+from typing import Dict, Tuple
+
 from .parameter import Parameter
 from .baseschema import BaseSchema
 
@@ -15,16 +17,27 @@ class SafeSchema(BaseSchema):
     '''
 
     @staticmethod
-    def __is_dict_leaf(manifest, keypath, version):
+    def __is_dict_leaf(manifest: Dict, keypath: Tuple[str], version: str) -> Parameter:
         try:
             return Parameter.from_dict(manifest, keypath, version)
         except:  # noqa E722
             return None
 
-    def _from_dict(self, manifest, keypath, version=None):
+    @classmethod
+    def _getdict_type(cls) -> str:
+        """
+        Returns the meta data for getdict
+        """
+
+        return "SafeSchema"
+
+    def _from_dict(self, manifest: Dict, keypath: Tuple[str], version: str = None) -> None:
         if not isinstance(manifest, dict):
             return
 
+        if "__meta__" in manifest:
+            del manifest["__meta__"]
+
         for key, data in manifest.items():
             obj = SafeSchema.__is_dict_leaf(data, keypath + [key], version)
             if not obj:
@@ -35,3 +48,13 @@ class SafeSchema(BaseSchema):
                 self._BaseSchema__default = obj
             else:
                 self._BaseSchema__manifest[key] = obj
+
+    @classmethod
+    def from_manifest(cls, filepath: str = None, cfg: Dict = None) -> "SafeSchema":
+        if filepath:
+            cfg = BaseSchema._read_manifest(filepath)
+
+        if cfg and "__meta__" in cfg:
+            del cfg["__meta__"]
+
+        return super().from_manifest(filepath=None, cfg=cfg)

siliconcompiler/schema/schema_cfg.py

@@ -3,7 +3,7 @@
 from . import EditableSchema, Parameter, Scope, PerNode
 from .utils import trim
 
-SCHEMA_VERSION = '0.51.4'
+SCHEMA_VERSION = '0.51.5'
 
 
 #############################################################################
@@ -208,8 +208,8 @@ def schema_schematic(cfg):
 # FPGA
 ###############################################################################
 def schema_fpga(cfg):
-    from siliconcompiler.fpga import FPGASchema
-    cfg.insert("fpga", FPGASchema())
+    from siliconcompiler.fpga import FPGASchemaTmp
+    cfg.insert("fpga", FPGASchemaTmp())
     return cfg
 
 
@@ -217,8 +217,8 @@ def schema_fpga(cfg):
 # PDK
 ###############################################################################
 def schema_pdk(cfg):
-    from siliconcompiler.pdk import PDKSchema
-    cfg.insert("pdk", "default", PDKSchema(None))
+    from siliconcompiler.pdk import PDKSchemaTmp
+    cfg.insert("pdk", "default", PDKSchemaTmp())
     return cfg
 
 

siliconcompiler/schema/utils.py

@@ -7,7 +7,7 @@
 import sys
 
 
-def trim(docstring):
+def trim(docstring: str) -> str:
     '''
     Helper function for cleaning up indentation of docstring.
 
@@ -42,7 +42,7 @@ def trim(docstring):
     return '\n'.join(trimmed)
 
 
-def translate_loglevel(level):
+def translate_loglevel(level: str) -> str:
     if level == "quiet":
         level = "error"
     return level.upper()

siliconcompiler/schema_obj.py

@@ -7,7 +7,7 @@
 from siliconcompiler.schema import BaseSchema
 from siliconcompiler.schema import SafeSchema
 from siliconcompiler.schema import EditableSchema
-from siliconcompiler.schema import CommandLineSchema
+from siliconcompiler.cmdlineschema import CommandLineSchemaTmp
 from siliconcompiler.schema import Parameter
 
 from siliconcompiler.schema.schema_cfg import schema_cfg
@@ -38,8 +38,16 @@ class Schema(BaseSchema):
 
         return super()._from_dict(manifest, keypath, version=version)
 
+    @classmethod
+    def _getdict_type(cls) -> str:
+        """
+        Returns the meta data for getdict
+        """
 
-class SchemaTmp(Schema, CommandLineSchema):
+        return Schema.__name__
+
+
+class SchemaTmp(Schema, CommandLineSchemaTmp):
     """Object for storing and accessing configuration values corresponding to
     the SiliconCompiler schema.
 
@@ -113,9 +121,18 @@ class SchemaTmp(Schema, CommandLineSchema):
             EditableSchema(self).insert("history", job, blank)
             return blank
 
+    @classmethod
+    def _getdict_type(cls) -> str:
+        """
+        Returns the meta data for getdict
+        """
+
+        return SchemaTmp.__name__
+
 
 ##############################################################################
 # Main routine
 if __name__ == "__main__":
     import json
-    print(json.dumps(SchemaTmp().getdict(), indent=4, sort_keys=True))
+    from siliconcompiler import Schema
+    print(json.dumps(Schema().getdict(), indent=4, sort_keys=True))