dv-flow-mgr 1.0.0.14502079593a1__py3-none-any.whl → 1.0.0.14528489065a1__py3-none-any.whl

dv_flow/mgr/package.py

@@ -24,6 +24,7 @@ import logging
 from typing import Any, ClassVar, Dict, List
 from .fragment_def import FragmentDef
 from .package_def import PackageDef
+from .srcinfo import SrcInfo
 from .task import Task
 
 @dc.dataclass
@@ -37,6 +38,7 @@ class Package(object):
     types : Dict[str,Any] = dc.field(default_factory=dict)
     fragment_def_l : List[FragmentDef] = dc.field(default_factory=list)
     pkg_m : Dict[str, 'Package'] = dc.field(default_factory=dict)
+    srcinfo : SrcInfo = None
     _log : ClassVar = logging.getLogger("Package")
 
     @property
@@ -66,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/package_loader.py

@@ -11,6 +11,7 @@ from .fragment_def import FragmentDef
 from .package_def import PackageDef
 from .package import Package
 from .ext_rgy import ExtRgy
+from .srcinfo import SrcInfo
 from .task import Task
 from .task_def import TaskDef, PassthroughE, ConsumesE, RundirE
 from .task_data import TaskMarker, TaskMarkerLoc, SeverityE
@@ -60,6 +61,7 @@ class LoaderScope(SymbolScope):
             else:
                 path = self.loader.pkg_rgy.findPackagePath(pkg_name)
                 if path is not None:
+                    path = os.path.normpath(path)
                     pkg = self.loader._loadPackage(path)
                     self.loader._pkg_m[pkg_name] = pkg
             if pkg is not None and name in pkg.task_m.keys():
@@ -169,6 +171,7 @@ class PackageLoader(object):
 
     def load(self, root) -> Package:
         self._log.debug("--> load %s" % root)
+        root = os.path.normpath(root)
         ret = self._loadPackage(root, None)
         self._log.debug("<-- load %s" % root)
         return ret
@@ -183,6 +186,7 @@ class PackageLoader(object):
             pp = self.pkg_rgy.findPackagePath(nn)
             if pp is None:
                 raise Exception("Package %s not found" % nn)
+            root = os.path.normpath(pp)
             pp_n = self._loadPackage(pp)
             pkg.pkg_m[pp_n.name] = pp_n
         self._log.debug("<-- load_rgy %s" % name)
@@ -227,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']
@@ -251,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:
@@ -265,28 +279,34 @@ class PackageLoader(object):
 
     def _mkPackage(self, pkg_def : PackageDef, root : str) -> Package:
         self._log.debug("--> _mkPackage %s" % pkg_def.name)
-        pkg = Package(pkg_def, os.path.dirname(root))
-
-        pkg_scope = self.package_scope()
-        if pkg_scope is not None:
-            self._log.debug("Add self (%s) as a subpkg of %s" % (pkg.name, pkg_scope.pkg.name))
-            pkg_scope.pkg.pkg_m[pkg.name] = pkg
+        pkg = Package(
+            pkg_def, 
+            os.path.dirname(root),
+            srcinfo=SrcInfo(file=root))
 
         if pkg.name in self._pkg_m.keys():
-            raise Exception("Duplicate package %s" % pkg.name)
+            epkg = self._pkg_m[pkg.name]
+            if epkg.srcinfo.file != pkg.srcinfo.file:
+                self.error("Package %s already loaded from %s. Duplicate defined in %s" % (
+                    pkg.name, epkg.srcinfo.file, pkg.srcinfo.file))
+        else:
+            pkg_scope = self.package_scope()
+            if pkg_scope is not None:
+                self._log.debug("Add self (%s) as a subpkg of %s" % (pkg.name, pkg_scope.pkg.name))
+                pkg_scope.pkg.pkg_m[pkg.name] = pkg
 
-        self._pkg_m[pkg.name] = pkg
-        self._pkg_s.append(PackageScope(name=pkg.name, pkg=pkg, loader=self._loader_scope))
-        # Imports are loaded first
-        self._loadPackageImports(pkg, pkg_def.imports, pkg.basedir)
+            self._pkg_m[pkg.name] = pkg
+            self._pkg_s.append(PackageScope(name=pkg.name, pkg=pkg, loader=self._loader_scope))
+            # Imports are loaded first
+            self._loadPackageImports(pkg, pkg_def.imports, pkg.basedir)
 
-        taskdefs = pkg_def.tasks.copy()
+            taskdefs = pkg_def.tasks.copy()
 
-        self._loadFragments(pkg, pkg_def.fragments, pkg.basedir, taskdefs)
+            self._loadFragments(pkg, pkg_def.fragments, pkg.basedir, taskdefs)
 
-        self._loadTasks(pkg, taskdefs, pkg.basedir)
+            self._loadTasks(pkg, taskdefs, pkg.basedir)
 
-        self._pkg_s.pop()
+            self._pkg_s.pop()
 
         self._log.debug("<-- _mkPackage %s (%s)" % (pkg_def.name, pkg.name))
         return pkg
@@ -343,6 +363,7 @@ class PackageLoader(object):
             sub_pkg = self._pkg_path_m[imp_path]
         else:
             self._log.info("Loading imported file %s" % imp_path)
+            imp_path = os.path.normpath(imp_path)
             sub_pkg = self._loadPackage(imp_path)
             self._log.info("Loaded imported package %s" % sub_pkg.name)
 
@@ -701,10 +722,10 @@ class PackageLoader(object):
     
     def error(self, msg, loc=None):
         if loc is not None:
-            marker = TaskMarker(msg=msg, severity=TaskMarker.SeverityE.Error,
+            marker = TaskMarker(msg=msg, severity=SeverityE.Error,
                                 loc=loc)
         else:
-            marker = TaskMarker(msg=msg, severity=TaskMarker.SeverityE.Error)
+            marker = TaskMarker(msg=msg, severity=SeverityE.Error)
         self.marker(marker)
 
     def marker(self, marker):

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/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/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.14502079593a1.dist-info → dv_flow_mgr-1.0.0.14528489065a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 1.0.0.14502079593a1
+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.14502079593a1.dist-info → dv_flow_mgr-1.0.0.14528489065a1.dist-info}/RECORD

@@ -15,10 +15,10 @@ dv_flow/mgr/listener_list.py,sha256=BfqvEO2AyJvyc4ClU-hPgDPqWSlqvSdG-yaFEHvUrMc,
 dv_flow/mgr/need_def.py,sha256=X52FJnhukwFsGCkIM-W6apZEdxqS5Gmm-rRO-TS83aU,173
 dv_flow/mgr/null_callable.py,sha256=x6hlJ9EL6xFLSGFgd14eXbxSWxsUGF56jpbLhERjPtg,243
 dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
-dv_flow/mgr/package.py,sha256=PvOuNfuy-SlaiMDzT5SU48OlPJrhS9vpNCgX06KNyTo,2336
+dv_flow/mgr/package.py,sha256=11R-bkr9q8eKXET9t7MstCo4s_fKLROp3lzCka08vzg,4252
 dv_flow/mgr/package_def.py,sha256=-UyeFb_0Sj16RtS2vxtIxTfl-oW7adJjM1I3ZSjcRpc,5729
 dv_flow/mgr/package_import_spec.py,sha256=aZMpnS9a5NFY76_pYXEuO3-Mkc_xFzy73fdrUe_54Dc,1760
-dv_flow/mgr/package_loader.py,sha256=2qZ9jrqJJ_ChNb8bIwpuFpxW1qHrmZ3LoKoRc3MYsy0,25380
+dv_flow/mgr/package_loader.py,sha256=7k85_5Q6fvj0Q6dIiEuXWJPrg6Cs55qtzvvDjIO5lHA,26348
 dv_flow/mgr/param.py,sha256=kkxMRGf6mPjSZJsjgLKH2vJL62Sn0ZESvjBLkEYOp20,1386
 dv_flow/mgr/param_def.py,sha256=hOBBRLiXJ5DakXkhrLCBAQ9GPlgq-QS52r0aflmIgbg,1832
 dv_flow/mgr/param_ref_eval.py,sha256=5yH37oIX6f2qmk7GfRgNT5qZx0jm3CJFgB9lLDZZ1yQ,1981
@@ -62,13 +62,14 @@ dv_flow/mgr/std/flow.dv,sha256=YXcbELBExqcQirSKQJ_yt6JlxyaOphP-EL09zXppaAs,4164
 dv_flow/mgr/std/message.py,sha256=0JHLErg8whqMLAasG1fumZ2O7R7WNWeNQ9ibJaLDpVY,1029
 dv_flow/mgr/std/task_null.py,sha256=dw6LXBXVwth6gLPeduDvlz5znAhcVpDH8r1DticD-0w,1041
 dv_flow/mgr/util/__init__.py,sha256=6uuA6z5cKS2hcjJw6YyEM2M79g6OpXb6tZF_Gku-AGU,22
-dv_flow/mgr/util/__main__.py,sha256=F0LXpCDpYTPalSo0dc1h_qZkip5v1AZYYh-vcYbh5s0,983
-dv_flow/mgr/util/util.py,sha256=cBNt3JJ0PGLlUQFTtBLi12i2j_9gNgSBtKdwS3VfF5Y,1566
+dv_flow/mgr/util/__main__.py,sha256=ioXQ-IMZctzYysJM4RswuPWNSRxtPxzEcG5hutp3Cd4,1210
+dv_flow/mgr/util/util.py,sha256=moHKw_je5pU2ZCfSuFVyiBznFL5q2etTLf70cgCDJ0o,1570
 dv_flow/mgr/util/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/util/cmds/cmd_schema.py,sha256=IJzZdxCSEgIQ79LpYiM7UqJ9RJ-7yraqmBN2XVgAgXA,1752
-dv_flow_mgr-1.0.0.14502079593a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.0.0.14502079593a1.dist-info/METADATA,sha256=TgIMi-Dm8e9VfinDzIARWuEZiN7vIijuWbAYAjdeL-E,13336
-dv_flow_mgr-1.0.0.14502079593a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-dv_flow_mgr-1.0.0.14502079593a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.0.0.14502079593a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.0.0.14502079593a1.dist-info/RECORD,,
+dv_flow/mgr/util/cmds/cmd_workspace.py,sha256=egmaIXpe5L-TePwmcfisfrG6tdiTUWSjqa9Za5WChVs,890
+dv_flow_mgr-1.0.0.14528489065a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.0.0.14528489065a1.dist-info/METADATA,sha256=MTnLotpOD2Jsur0qkaPp62A8K-VVPce112cD4XcSEj4,13336
+dv_flow_mgr-1.0.0.14528489065a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+dv_flow_mgr-1.0.0.14528489065a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.0.0.14528489065a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.0.0.14528489065a1.dist-info/RECORD,,