dv-flow-mgr 1.0.0.14504336776a1__tar.gz → 1.0.0.14528489065a1__tar.gz

{dv_flow_mgr-1.0.0.14504336776a1 → dv_flow_mgr-1.0.0.14528489065a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 1.0.0.14504336776a1
+Version: 1.0.0.14528489065a1
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License

{dv_flow_mgr-1.0.0.14504336776a1 → dv_flow_mgr-1.0.0.14528489065a1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dv-flow-mgr"
-version = "1.0.0.14504336776a1"
+version = "1.0.0.14528489065a1"
 dependencies = [
     'jq',
     'pydantic',

{dv_flow_mgr-1.0.0.14504336776a1 → dv_flow_mgr-1.0.0.14528489065a1}/src/dv_flow/mgr/package.py

@@ -68,4 +68,59 @@ class Package(object):
             
     def __hash__(self):
         return id(self)
+    
+    def to_json(self, markers=None) -> dict:
+        """Convert package data to a JSON-compatible dictionary format.
+        
+        Args:
+            markers: Optional list of marker objects, each with 'msg' and 'severity' attributes
+        
+        Returns:
+            dict: Dictionary containing required package data and markers
+        """
+        # Collect all imported packages recursively
+        imports = set()
+        def collect_imports(pkg):
+            for name, p in pkg.pkg_m.items():
+                if name not in imports:
+                    imports.add(name)
+                    collect_imports(p)
+        collect_imports(self)
+        
+        # Get files from fragments
+        files = []
+        for frag in self.fragment_def_l:
+            if frag.srcinfo and frag.srcinfo.file:
+                files.append(frag.srcinfo.file)
 
+        def format_srcinfo(srcinfo):
+            if srcinfo:
+                ret = srcinfo.file
+                if srcinfo.lineno != -1:
+                    ret += ":" + str(srcinfo.lineno)
+                if srcinfo.linepos != -1:
+                    ret += ":" + str(srcinfo.linepos)
+                return ret
+            return None
+        result = {
+            "name": self.name,
+            "file": self.srcinfo.file if self.srcinfo else None,
+            "imports": sorted(list(imports)),
+            "files": files,
+            "markers": [],
+            "tasks": [
+                {
+                    "name": name,
+                    "srcinfo": format_srcinfo(task.srcinfo)
+                }
+                for name, task in self.task_m.items()
+            ]
+        }
+        
+        if markers:
+            result["markers"] = [
+                {"msg": marker.msg, "severity": marker.severity}
+                for marker in markers
+            ]
+            
+        return result

{dv_flow_mgr-1.0.0.14504336776a1 → dv_flow_mgr-1.0.0.14528489065a1}/src/dv_flow/mgr/package_loader.py

@@ -231,15 +231,21 @@ class PackageLoader(object):
 #                    t.fullname = pkg.name + "." + t.name
 
             except pydantic.ValidationError as e:
-                print("Errors: %s" % root)
+#                print("Errors: %s" % root)
                 error_paths = []
                 loc = None
+                loc_s = ""
                 for ee in e.errors():
 #                    print("  Error: %s" % str(ee))
                     obj = doc["package"]
                     loc = None
+                    print("Errors: %s" % str(ee))
                     for el in ee['loc']:
-                        print("el: %s" % str(el))
+#                        print("el: %s" % str(el))
+                        if loc_s != "":
+                            loc_s += "." + str(el)
+                        else:
+                            loc_s = str(el)
                         obj = obj[el]
                         if type(obj) == dict and 'srcinfo' in obj.keys():
                             loc = obj['srcinfo']
@@ -255,7 +261,11 @@ class PackageLoader(object):
                             severity=SeverityE.Error,
                             loc=marker_loc)
                     else:
-                        marker = TaskMarker(msg=ee['msg'])
+                        marker_loc = TaskMarkerLoc(path=root)   
+                        marker = TaskMarker(
+                            msg=("%s (at '%s')" % (ee['msg'], loc_s)),
+                            severity=SeverityE.Error,
+                            loc=marker_loc)
                     self.marker(marker)
 
             if pkg_def is not None:

{dv_flow_mgr-1.0.0.14504336776a1 → dv_flow_mgr-1.0.0.14528489065a1}/src/dv_flow/mgr/util/__main__.py

@@ -1,6 +1,7 @@
 import argparse
 import logging
 from .cmds.cmd_schema import CmdSchema
+from .cmds.cmd_workspace import CmdWorkspace
 
 def get_parser():
     parser = argparse.ArgumentParser(description="dv-flow-mgr.util")
@@ -16,6 +17,10 @@ def get_parser():
                         default="-")
     schema.set_defaults(f=CmdSchema())
 
+    workspace = subparsers.add_parser('workspace', 
+                                      help='Dumps the workspace structure in JSON')
+    workspace.set_defaults(f=CmdWorkspace())
+
     return parser
 
 

dv_flow_mgr-1.0.0.14528489065a1/src/dv_flow/mgr/util/cmds/cmd_workspace.py

@@ -0,0 +1,34 @@
+import json
+import os
+from ...package import Package
+from ...util.util import loadProjPkgDef
+
+class CmdWorkspace(object):
+
+    def __call__(self, args):
+
+        pkg : Package = None
+        markers = None
+
+        if os.path.isfile(os.path.join(os.getcwd(), "flow.dv")):
+            markers = []
+            def marker(m):
+                nonlocal markers
+                print("marker: %s" % str(m))
+                markers.append(m)
+            pkg = loadProjPkgDef(os.getcwd(), marker)
+
+
+        if pkg is None and markers is None:
+            print("{abc}")
+        elif pkg is not None:
+            print(json.dumps(pkg.to_json(markers)))
+        else:
+            result = {}
+            result["markers"] = [
+                {"msg": marker.msg, "severity": str(marker.severity)}
+                for marker in markers
+            ]
+            print(json.dumps(result))
+
+        pass

{dv_flow_mgr-1.0.0.14504336776a1 → dv_flow_mgr-1.0.0.14528489065a1}/src/dv_flow/mgr/util/util.py

@@ -33,7 +33,7 @@ def loadProjPkgDef(path, listener=None):
             with open(os.path.join(dir, "flow.dv")) as f:
                 data = yaml.load(f, Loader=yaml.FullLoader)
                 if "package" in data.keys():
-                    listeners = [listener] if listener is None else []
+                    listeners = [listener] if listener is not None else []
                     ret = PackageLoader(marker_listeners=listeners).load(os.path.join(dir, "flow.dv"))
                     break
         dir = os.path.dirname(dir)

{dv_flow_mgr-1.0.0.14504336776a1 → dv_flow_mgr-1.0.0.14528489065a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 1.0.0.14504336776a1
+Version: 1.0.0.14528489065a1
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License

{dv_flow_mgr-1.0.0.14504336776a1 → dv_flow_mgr-1.0.0.14528489065a1}/src/dv_flow_mgr.egg-info/SOURCES.txt

@@ -91,6 +91,7 @@ src/dv_flow/mgr/util/__main__.py
 src/dv_flow/mgr/util/util.py
 src/dv_flow/mgr/util/cmds/__init__.py
 src/dv_flow/mgr/util/cmds/cmd_schema.py
+src/dv_flow/mgr/util/cmds/cmd_workspace.py
 src/dv_flow_mgr.egg-info/PKG-INFO
 src/dv_flow_mgr.egg-info/SOURCES.txt
 src/dv_flow_mgr.egg-info/dependency_links.txt