nginx-lens 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

commands/graph.py

@@ -3,6 +3,7 @@ from rich.console import Console
 from parser.nginx_parser import parse_nginx_config
 from exporter.graph import tree_to_dot, tree_to_mermaid
 from rich.text import Text
+import os
 
 app = typer.Typer()
 console = Console()
@@ -28,9 +29,8 @@ def graph(
     # Для каждого server/location строим маршрут
     def walk(d, chain, upstreams):
         if d.get('block') == 'server':
-            srv = d.get('arg','') or '[no arg]'
             for sub in d.get('directives', []):
-                walk(sub, chain + [('server', srv)], upstreams)
+                walk(sub, chain + [('server', None)], upstreams)
         elif d.get('block') == 'location':
             loc = d.get('arg','')
             for sub in d.get('directives', []):
@@ -65,6 +65,7 @@ def graph(
     if not routes:
         console.print("[yellow]Не найдено ни одного маршрута[/yellow]")
         return
+    main_file = os.path.abspath(config_path)
     # Красивый вывод
     seen = set()
     for route in routes:
@@ -78,25 +79,44 @@ def graph(
         # Получаем label для server
         server_val = route[0][1]
         server_block = None
-        # Найти сам блок server по arg
         for d in tree.directives:
-            if d.get('block') == 'server' and (d.get('arg','') == server_val or (not d.get('arg') and (server_val == '[no arg]' or not server_val))):
+            if d.get('block') == 'server':
                 server_block = d
                 break
-        label = get_server_label(server_block) if server_block else (server_val or 'default')
+        label = get_server_label(server_block) if server_block else 'default'
+        server_file = server_block.get('__file__') if server_block else None
         t.append(f"[", style="white")
         t.append(f"server: {label}", style="bold blue")
+        if server_file and os.path.abspath(server_file) != main_file:
+            t.append(f" ({server_file})", style="grey50")
         t.append("]", style="white")
         for i, (typ, val) in enumerate(route[1:]):
+            block = None
+            if typ == 'location' and server_block:
+                # Найти location-блок внутри server
+                for sub in server_block.get('directives', []):
+                    if sub.get('block') == 'location' and sub.get('arg') == val:
+                        block = sub
+                        break
+            elif typ == 'upstream':
+                # Найти upstream-блок
+                for d in tree.directives:
+                    if d.get('upstream') == val:
+                        block = d
+                        break
             if typ == 'location':
                 t.append(f" -> [", style="white")
                 t.append(f"location: {val}", style="yellow")
+                if block and block.get('__file__') and os.path.abspath(block['__file__']) != main_file:
+                    t.append(f" ({block['__file__']})", style="grey50")
                 t.append("]", style="white")
             elif typ == 'proxy_pass':
                 t.append(f" -> proxy_pass: {val}", style="green")
             elif typ == 'upstream':
                 t.append(f" -> [", style="white")
                 t.append(f"upstream: {val}", style="magenta")
+                if block and block.get('__file__') and os.path.abspath(block['__file__']) != main_file:
+                    t.append(f" ({block['__file__']})", style="grey50")
                 t.append("]", style="white")
             elif typ == 'upstream_server':
                 t.append(f" -> [", style="white")

commands/route.py

@@ -46,11 +46,19 @@ def route(
             location = res['location']
             proxy_pass = res['proxy_pass']
             text = f"[bold]Config:[/bold] {conf}\n"
-            text += f"[bold]Server:[/bold] {server.get('arg','') or '[no arg]'}\n"
+            if server:
+                text += f"[bold]Server:[/bold] {server.get('arg','') or '[no arg]'}"
+                if server.get('__file__'):
+                    text += f" ([dim]{server.get('__file__')}[/dim])"
+                text += "\n"
             if location:
-                text += f"[bold]Location:[/bold] {location.get('arg','')}\n"
+                text += f"[bold]Location:[/bold] {location.get('arg','')}"
+                if location.get('__file__'):
+                    text += f" ([dim]{location.get('__file__')}[/dim])"
+                text += "\n"
             if proxy_pass:
                 text += f"[bold]proxy_pass:[/bold] {proxy_pass}\n"
             console.print(Panel(text, title="Route", style="green"))
             return
-    console.print(Panel(f"Ни один ваш конфиг в /etc/nginx не обрабатывает этот URL", style="red")) 
+    search_dir = os.path.dirname(configs[0]) if configs else '/etc/nginx'
+    console.print(Panel(f"Маршрут для {url} не найден ни в одном .conf в {search_dir}", style="yellow")) 

{nginx_lens-0.1.7.dist-info → nginx_lens-0.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nginx-lens
-Version: 0.1.7
+Version: 0.1.9
 Summary: CLI-инструмент для анализа, визуализации и диагностики конфигураций Nginx
 Author: Daniil Astrouski
 Author-email: shelovesuastra@gmail.com

{nginx_lens-0.1.7.dist-info → nginx_lens-0.1.9.dist-info}/RECORD

@@ -14,24 +14,24 @@ commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 commands/analyze.py,sha256=W6begSgXNjgKJGoGeguR3WKgHPLkClWXxxpDcqvsJdc,8343
 commands/cli.py,sha256=9HwDJ-po5al0ceb4Wkyw5F2wzqxbJTo0CbHQ2AQ8obo,722
 commands/diff.py,sha256=C7gRIWh6DNWHzjiQBPVTn-rZ40m2KCY75Zd6Q4URJIE,2076
-commands/graph.py,sha256=8CnpKqVx9yUpDMcjDX-kN_SqUrS9dFqCUTrsalm-iMg,4967
+commands/graph.py,sha256=xB6KjXBkLmm5gII3e-5BMRGO7WeTwc7EFxRGzYgnme4,5947
 commands/health.py,sha256=SuD2gOeMf9ZaoUfeqx1Nip0xQDBkDus6z872Fhw2Z9w,1682
 commands/include.py,sha256=5PTYG5C00-AlWfIgpQXLq9E7C9yTFSv7HrZkM5ogDps,2224
 commands/logs.py,sha256=RkPUdIpbO9dOVL56lemreYRuAjMjcqqMxRCKOFv2gC4,3691
-commands/route.py,sha256=DfevWTwJfup1Ifmd99pYeuRteFNaldkAvISV8hC5a-c,2650
+commands/route.py,sha256=GzpHUqOwDOzhWlKcNf177Vq4OB6g--_8npZXPMDRNGg,3034
 commands/syntax.py,sha256=ZWFdaL8LVv9S694wlk2aV3HJKb0OSKjw3wNgTlNvFR8,3418
 commands/tree.py,sha256=mDfx0Aeg1EDQSYQoJ2nJIkSd_uP7ZR7pEqy7Cw3clQ0,2161
 exporter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 exporter/graph.py,sha256=WYUrqUgCaK6KihgxAcRHaQn4oMo6b7ybC8yb_36ZIsA,3995
 exporter/html.py,sha256=uquEM-WvBt2aV9GshgaI3UVhYd8sD0QQ-OmuNtvYUdU,798
 exporter/markdown.py,sha256=_0mXQIhurGEZ0dO-eq9DbsuKNrgEDIblgtL3DAgYNo8,724
-nginx_lens-0.1.7.dist-info/licenses/LICENSE,sha256=g8QXKdvZZC56rU8E12vIeYF6R4jeTWOsblOnYAda3K4,1073
+nginx_lens-0.1.9.dist-info/licenses/LICENSE,sha256=g8QXKdvZZC56rU8E12vIeYF6R4jeTWOsblOnYAda3K4,1073
 parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-parser/nginx_parser.py,sha256=JqZ3clNy4Nf-bmbsx_rJUL7EgRoB79b87eEu_isMeqg,3577
+parser/nginx_parser.py,sha256=Sa9FtGAkvTqNzoehBvgLUWPJHLLIZYWH9ugSHW50X8s,3699
 upstream_checker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 upstream_checker/checker.py,sha256=9-6CMUTN7gXUACP8EwX722QogfujZyV-WWWUeM3a79k,455
-nginx_lens-0.1.7.dist-info/METADATA,sha256=eN2OiSpnQpDN8kRzVdynuAwJamWiMme1UlIr-cXvfC4,520
-nginx_lens-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nginx_lens-0.1.7.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
-nginx_lens-0.1.7.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
-nginx_lens-0.1.7.dist-info/RECORD,,
+nginx_lens-0.1.9.dist-info/METADATA,sha256=QzOKmE5929PAk0mSjFEH7xVF2DXXQxdGq-eAsaZSxfw,520
+nginx_lens-0.1.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nginx_lens-0.1.9.dist-info/entry_points.txt,sha256=qEcecjSyLqcJjbIVlNlTpqAhPqDyaujUV5ZcBTAr3po,48
+nginx_lens-0.1.9.dist-info/top_level.txt,sha256=mxLJO4rZg0rbixVGhplF3fUNFs8vxDIL25ronZNvRy4,51
+nginx_lens-0.1.9.dist-info/RECORD,,

parser/nginx_parser.py

@@ -14,7 +14,7 @@ class NginxConfigTree:
 def _strip_comments(line: str) -> str:
     return line.split('#', 1)[0].strip()
 
-def _parse_block(lines, base_dir) -> (List[Any], Dict[str, List[str]]):
+def _parse_block(lines, base_dir, source_file=None) -> (List[Any], Dict[str, List[str]]):
     directives = []
     upstreams = {}
     i = 0
@@ -29,7 +29,7 @@ def _parse_block(lines, base_dir) -> (List[Any], Dict[str, List[str]]):
             for inc_path in glob.glob(pattern):
                 with open(inc_path) as f:
                     inc_lines = f.readlines()
-                inc_directives, inc_upstreams = _parse_block(inc_lines, os.path.dirname(inc_path))
+                inc_directives, inc_upstreams = _parse_block(inc_lines, os.path.dirname(inc_path), inc_path)
                 directives.extend(inc_directives)
                 for k, v in inc_upstreams.items():
                     upstreams.setdefault(k, []).extend(v)
@@ -56,7 +56,7 @@ def _parse_block(lines, base_dir) -> (List[Any], Dict[str, List[str]]):
                 if m_srv:
                     servers.append(m_srv.group(1).strip())
             upstreams[name] = servers
-            directives.append({'upstream': name, 'servers': servers})
+            directives.append({'upstream': name, 'servers': servers, '__file__': source_file})
             continue
         # Блоки (например, server, http, location)
         m = re.match(r'(\S+)\s*(\S+)?\s*{', line)
@@ -75,15 +75,15 @@ def _parse_block(lines, base_dir) -> (List[Any], Dict[str, List[str]]):
                 if depth > 0:
                     block_lines.append(l)
                 i += 1
-            sub_directives, sub_upstreams = _parse_block(block_lines, base_dir)
-            directives.append({'block': block_name, 'arg': block_arg, 'directives': sub_directives})
+            sub_directives, sub_upstreams = _parse_block(block_lines, base_dir, source_file)
+            directives.append({'block': block_name, 'arg': block_arg, 'directives': sub_directives, '__file__': source_file})
             for k, v in sub_upstreams.items():
                 upstreams.setdefault(k, []).extend(v)
             continue
         # Обычная директива
         m = re.match(r'(\S+)\s+([^;]+);', line)
         if m:
-            directives.append({'directive': m.group(1), 'args': m.group(2)})
+            directives.append({'directive': m.group(1), 'args': m.group(2), '__file__': source_file})
         i += 1
     return directives, upstreams
 
@@ -91,5 +91,5 @@ def parse_nginx_config(path: str) -> NginxConfigTree:
     base_dir = os.path.dirname(os.path.abspath(path))
     with open(path) as f:
         lines = f.readlines()
-    directives, upstreams = _parse_block(lines, base_dir)
+    directives, upstreams = _parse_block(lines, base_dir, path)
     return NginxConfigTree(directives, upstreams)