py-flow-mapper 0.1.0b6.dev0__tar.gz → 0.1.0b7.dev0__tar.gz

{py_flow_mapper-0.1.0b6.dev0/src/py_flow_mapper.egg-info → py_flow_mapper-0.1.0b7.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-flow-mapper
-Version: 0.1.0b6.dev0
+Version: 0.1.0b7.dev0
 Summary: Python project analyzer and visualization tool
 Home-page: https://github.com/ArunKoundinya/py-flow-mapper
 Author: Arun Koundinya Parasa

{py_flow_mapper-0.1.0b6.dev0 → py_flow_mapper-0.1.0b7.dev0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="py-flow-mapper",
-    version="0.1.0b6.dev",
+    version="0.1.0b7.dev",
     author="Arun Koundinya Parasa",
     author_email="parasa.arunkoundinya@gmail.com",
     description="Python project analyzer and visualization tool",

{py_flow_mapper-0.1.0b6.dev0 → py_flow_mapper-0.1.0b7.dev0}/src/py_flow_mapper/__init__.py

@@ -2,7 +2,7 @@
 PyFlowMapper - A Python project analyzer and visualization tool.
 """
 
-__version__ = "0.1.0b6.dev"
+__version__ = "0.1.0b7.dev"
 __author__ = "Arun Koundinya Parasa"
 __description__ = "Analyze Python projects and generate dependency graphs"
 __github__ = "https://github.com/ArunKoundinya/py-flow-mapper"

{py_flow_mapper-0.1.0b6.dev0 → py_flow_mapper-0.1.0b7.dev0}/src/py_flow_mapper/analyzer.py

@@ -521,21 +521,24 @@ class DataFlowAnalyzer(ast.NodeVisitor):
         
     def visit_Assign(self, node):
         """Track assignments of function return values."""
-        if node.targets and isinstance(node.targets[0], ast.Name):
+        # Get the variable name being assigned to
+        if isinstance(node.targets[0], ast.Name):
             var_name = node.targets[0].id
-
+            
+            # Check if the value is a function call
             if isinstance(node.value, ast.Call):
                 call_info = self._extract_call_info(node.value)
                 if call_info:
-                    func_name = call_info["func_name"]
-
-                    if func_name not in self.calls:
-                        self.calls.append(func_name)
-                    self.return_assignments.setdefault(var_name, []).append(func_name)
-
+                    self.calls.append(call_info['func_name'])
+                    if var_name not in self.return_assignments:
+                        self.return_assignments[var_name] = []
+                    self.return_assignments[var_name].append(call_info['func_name'])
+            
+            # Check if the value is a Name (could be a variable holding a return value)
             elif isinstance(node.value, ast.Name):
+                # Track variable assignments for data flow
                 pass
-
+        
         self.generic_visit(node)
     
     def visit_Call(self, node):

{py_flow_mapper-0.1.0b6.dev0 → py_flow_mapper-0.1.0b7.dev0}/src/py_flow_mapper/mermaid_generator.py

@@ -71,16 +71,23 @@ class MermaidGenerator:
                 return ""
             return ",".join(sorted(set(cleaned)))
         
+        current_module_ctx = ""
 
-        def module_import_mapping(mod: str) -> dict:
-            return (modules.get(mod, {}) or {}).get("import_mapping", {}) or {}
+        def module_import_mapping() -> dict:
+            return (modules.get(current_module_ctx, {}) or {}).get("import_mapping", {}) or {}
 
-        def external_root_name(call_name: str, current_module: str) -> str:
+        def external_root_name(call_name: str) -> str:
             if not call_name:
                 return ""
+
             root = call_name.split(".")[0]
-            imp_map = module_import_mapping(current_module)
+
+            # module-specific import mapping (from analyzer)
+            imp_map = module_import_mapping() or {}
+
+            # merge common aliases (module imports override defaults)
             merged_map = {**COMMON_ALIAS_MAP, **imp_map}
+
             return merged_map.get(root, root)
 
         # Keep the graph clean: ignore common builtins + attribute-noise
@@ -92,74 +99,52 @@ class MermaidGenerator:
             "Path",
         }
 
-        def keep_external(call_name: str, current_module: str) -> bool:
+        def keep_external(call_name: str) -> bool:
             if not call_name:
                 return False
 
             base = short_label(call_name)
 
-            root = external_root_name(call_name, current_module)
+            # forced external always wins
+            root = external_root_name(call_name)
             if root and root in self.force_external:
                 return True
             if base in self.force_external:
                 return True
 
-            imp_map = module_import_mapping(current_module)
+            # ✅ NEW: module-specific import mapping
+            imp_map = module_import_mapping() or {}
             if base in imp_map:
                 mapped = imp_map[base]
                 mapped_module = ".".join(mapped.split(".")[:-1])
+
                 if mapped_module in modules:
                     return False
+
                 return True
 
+            # internal class => NOT external
             if base in internal_classes:
                 return False
 
             if base in NOISY_EXTERNAL:
                 return False
 
+            # dotted calls like obj.method: too noisy at this level
             if "." in call_name:
                 return False
 
+            # keep CamelCase (tool-ish classes / constructors)
             return is_camel_case(base)
 
         def resolve_internal(call: str, current_module: str) -> str:
-            call = call or ""
-
-            # 1) existing resolver
+            # First try your normal resolver
             target = self._find_function_full_name(call, current_module)
             if target and target in internal_funcs:
                 return target
 
-            imp_map = module_import_mapping(current_module)
-
-            # 2) If call is a bare name imported via "from X import name"
-            # import_mapping might contain:  name -> "pkg.mod.name"
-            if call in imp_map:
-                mapped = imp_map[call]
-                if mapped in internal_funcs:
-                    return mapped
-                # if mapped is "pkg.mod.name", try resolving it (or its tail)
-                target = self._find_function_full_name(mapped, current_module)
-                if target and target in internal_funcs:
-                    return target
-
-            # 3) If call is "alias.something", rewrite alias using import_mapping
-            # import_mapping might contain: alias -> "pkg.mod"
-            if "." in call:
-                root, rest = call.split(".", 1)
-                if root in imp_map:
-                    mapped_root = imp_map[root]
-                    # If mapping is to a specific object like "pkg.mod.func",
-                    # treat it as root too (best-effort)
-                    candidate = f"{mapped_root}.{rest}"
-                    if candidate in internal_funcs:
-                        return candidate
-                    target = self._find_function_full_name(candidate, current_module)
-                    if target and target in internal_funcs:
-                        return target
-
-                # 4) your existing "obj.method" heuristic
+            # ✅ NEW: if call is like "obj.method", try to map by method name
+            if "." in (call or ""):
                 method = call.split(".")[-1]
                 matches = [k for k in internal_funcs if k.endswith("." + method)]
                 if len(matches) == 1:
@@ -189,7 +174,7 @@ class MermaidGenerator:
 
                 info = function_map.get(fn_key, {})
                 current_module = info.get("module", "") or ""
-                #current_module_ctx = current_module
+                current_module_ctx = current_module
                 for c in (info.get("calls") or []):
                     target = self._find_function_full_name(c, current_module)
                     if target and target in function_map:
@@ -225,15 +210,15 @@ class MermaidGenerator:
 
         for _, info in function_map.items():
             current_module = info.get("module", "") or ""
-            #current_module_ctx = current_module
+            current_module_ctx = current_module
 
             # prefer call_arguments keys
             call_args = info.get("call_arguments", {}) or {}
             for callee in call_args.keys():
                 if resolve_internal(callee, current_module):
                     continue
-                if keep_external(callee, current_module):
-                    external_nodes.add(external_root_name(callee, current_module) or callee)
+                if keep_external(callee):
+                    external_nodes.add(external_root_name(callee) or callee)
 
             # scan raw calls for Done + missed externals
             for callee in (info.get("calls") or []):
@@ -242,8 +227,8 @@ class MermaidGenerator:
 
                 if resolve_internal(callee, current_module):
                     continue
-                if keep_external(callee, current_module):
-                    external_nodes.add(external_root_name(callee, current_module) or callee)
+                if keep_external(callee):
+                    external_nodes.add(external_root_name(callee) or callee)
 
         if external_nodes or uses_done:
             lines.append("    subgraph External [External]")
@@ -262,7 +247,7 @@ class MermaidGenerator:
 
             info = function_map[caller]
             current_module = info.get("module", "") or ""
-            #current_module_ctx = current_module
+            current_module_ctx = current_module
             src = nid(caller)
 
             call_args = info.get("call_arguments", {}) or {}
@@ -289,8 +274,8 @@ class MermaidGenerator:
                     else:
                         lines.append(f"    {src} --> {nid(target_internal)}")
                 else:
-                    if keep_external(callee, current_module):
-                        ext = external_root_name(callee, current_module) or callee
+                    if keep_external(callee):
+                        ext = external_root_name(callee) or callee
                         edge_key = (src, nid("ext:" + callee), label)
                         if edge_key in seen:
                             continue
@@ -309,7 +294,7 @@ class MermaidGenerator:
             info = function_map[fn]
             dst = nid(fn)
             current_module = info.get("module", "") or ""
-            #current_module_ctx = current_module
+            current_module_ctx = current_module
 
             return_assignments = info.get("return_assignments", {}) or {}
             for var_name, producers in return_assignments.items():
@@ -318,20 +303,20 @@ class MermaidGenerator:
                     if internal_p:
                         lines.append(f"    {nid(internal_p)} -.->|{var_name}| {dst}")
                     else:
-                        if keep_external(p, current_module):
-                            ext = external_root_name(p,current_module) or p
+                        if keep_external(p):
+                            ext = external_root_name(p) or p
                             lines.append(f"    {nid('ext:' + ext)} -.->|{var_name}| {dst}")
 
         # ---------- pipeline heuristic: external tool A -> external tool B ----------
         for _, info in function_map.items():
             current_module = info.get("module", "") or ""
-            #current_module_ctx = current_module
+            current_module_ctx = current_module
             calls = info.get("calls") or []
             call_args = info.get("call_arguments") or {}
 
             meaningful = []
             for c in calls:
-                if c and keep_external(c,current_module) and not resolve_internal(c, current_module):
+                if c and keep_external(c) and not resolve_internal(c, current_module):
                     if c not in meaningful:
                         meaningful.append(c)
 
@@ -340,7 +325,7 @@ class MermaidGenerator:
 
             fileish_callee = None
             for callee, args in call_args.items():
-                if keep_external(callee, current_module) and any(is_fileish_arg(a) for a in (args or []) if isinstance(a, str)):
+                if keep_external(callee) and any(is_fileish_arg(a) for a in (args or []) if isinstance(a, str)):
                     fileish_callee = callee
                     break
 
@@ -353,8 +338,8 @@ class MermaidGenerator:
 
             vars_passed = call_args.get(fileish_callee, []) or []
             label = normalize_vars(vars_passed) or "value"
-            prod_ext = external_root_name(producer,current_module) or producer
-            file_ext = external_root_name(fileish_callee,current_module) or fileish_callee
+            prod_ext = external_root_name(producer) or producer
+            file_ext = external_root_name(fileish_callee) or fileish_callee
             lines.append(f"    {nid('ext:' + prod_ext)} -->|{label}| {nid('ext:' + file_ext)}")
 
         # ---------- Done edge ----------

{py_flow_mapper-0.1.0b6.dev0 → py_flow_mapper-0.1.0b7.dev0/src/py_flow_mapper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-flow-mapper
-Version: 0.1.0b6.dev0
+Version: 0.1.0b7.dev0
 Summary: Python project analyzer and visualization tool
 Home-page: https://github.com/ArunKoundinya/py-flow-mapper
 Author: Arun Koundinya Parasa