Compare commits
1 Commits
step35/91-
...
step35/111
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
832b23286b |
@@ -180,6 +180,89 @@ def to_mermaid(graph: dict) -> str:
|
||||
return "\n".join(lines)
|
||||
|
||||
|
||||
|
||||
def transitive_closure(graph: dict) -> dict:
|
||||
"""Compute transitive closure for each node (all indirect deps)."""
|
||||
closure = {}
|
||||
# Build adjacency list
|
||||
adj = {node: set(data.get("dependencies", [])) for node, data in graph.items()}
|
||||
all_nodes = set(adj.keys()) | set().union(*adj.values())
|
||||
|
||||
for node in all_nodes:
|
||||
visited = set()
|
||||
stack = list(adj.get(node, set()))
|
||||
while stack:
|
||||
current = stack.pop()
|
||||
if current not in visited:
|
||||
visited.add(current)
|
||||
stack.extend(adj.get(current, set()))
|
||||
# Remove self-reference: a node's transitive deps should not include itself
|
||||
visited.discard(node)
|
||||
closure[node] = visited
|
||||
|
||||
return closure
|
||||
|
||||
|
||||
def find_deep_chains(graph: dict) -> list[list[str]]:
|
||||
"""Find the longest simple paths in the dependency graph (ignoring cycles)."""
|
||||
from collections import defaultdict
|
||||
|
||||
adj = {node: list(data.get("dependencies", [])) for node, data in graph.items()}
|
||||
deepest = []
|
||||
max_len = 0
|
||||
|
||||
def dfs(node: str, path: list, visited: set):
|
||||
nonlocal deepest, max_len
|
||||
# Stop if we hit a cycle (node already in path)
|
||||
if node in path:
|
||||
return
|
||||
new_path = path + [node]
|
||||
if node not in adj or not adj[node]:
|
||||
# leaf
|
||||
if len(new_path) > max_len:
|
||||
max_len = len(new_path)
|
||||
deepest = [new_path.copy()]
|
||||
elif len(new_path) == max_len:
|
||||
deepest.append(new_path.copy())
|
||||
else:
|
||||
for neighbor in adj[node]:
|
||||
dfs(neighbor, new_path.copy(), visited | {node})
|
||||
|
||||
for start in graph:
|
||||
dfs(start, [], set())
|
||||
|
||||
return deepest
|
||||
|
||||
|
||||
def format_transitive_markdown(closure: dict) -> str:
|
||||
"""Render transitive closure as a markdown table."""
|
||||
lines = ["# Transitive Dependencies\n\n"]
|
||||
lines.append("| Node | Transitive Dependencies | Count |\n")
|
||||
lines.append("|------|------------------------|-------|\n")
|
||||
for node in sorted(closure.keys()):
|
||||
deps = closure[node]
|
||||
deps_str = ", ".join(sorted(deps)) if deps else "(none)"
|
||||
lines.append(f"| {node} | {deps_str} | {len(deps)} |\n")
|
||||
return "".join(lines)
|
||||
|
||||
|
||||
def format_deep_chains_markdown(chains: list[list[str]]) -> str:
|
||||
"""Render longest dependency chains as a markdown list."""
|
||||
lines = ["# Deepest Dependency Chains\n\n"]
|
||||
if not chains:
|
||||
lines.append("No chains found.\n")
|
||||
return "".join(lines)
|
||||
max_len = max(len(c) for c in chains)
|
||||
lines.append(f"*Longest chain length:* {max_len}\n\n")
|
||||
for i, chain in enumerate(sorted(chains, key=lambda c: (-len(c), " -> ".join(c))), 1):
|
||||
lines.append(f"**Chain {i}** ({len(chain)} nodes)\n\n")
|
||||
indent = " "
|
||||
for j, node in enumerate(chain):
|
||||
arrow = " → " if j < len(chain)-1 else " • "
|
||||
lines.append(f"{indent}{arrow}{node}\n")
|
||||
lines.append("\n")
|
||||
return "".join(lines)
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(description="Build cross-repo dependency graph")
|
||||
parser.add_argument("repos_dir", nargs="?", help="Directory containing repos")
|
||||
@@ -228,13 +311,20 @@ def main():
|
||||
elif args.format == "mermaid":
|
||||
output = to_mermaid(results)
|
||||
else:
|
||||
# Compute transitive and deep chains
|
||||
closure = transitive_closure(results)
|
||||
deep_chains = find_deep_chains(results)
|
||||
output = json.dumps({
|
||||
"repos": results,
|
||||
"cycles": cycles,
|
||||
"transitive": {node: sorted(deps) for node, deps in closure.items()},
|
||||
"deep_chains": [chain for chain in deep_chains if len(chain) > 1],
|
||||
"summary": {
|
||||
"total_repos": len(results),
|
||||
"total_deps": sum(len(r["dependencies"]) for r in results.values()),
|
||||
"cycles_found": len(cycles),
|
||||
"transitive_pairs": sum(len(deps) for deps in closure.values()),
|
||||
"longest_chain_length": max((len(c) for c in deep_chains), default=0),
|
||||
}
|
||||
}, indent=2)
|
||||
|
||||
|
||||
@@ -22,95 +22,114 @@ import sys
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
|
||||
from session_reader import extract_conversation, read_session
|
||||
|
||||
|
||||
def compute_hash(text: str) -> str:
|
||||
"""Content hash for deduplication."""
|
||||
return hashlib.sha256(text.encode()).hexdigest()[:16]
|
||||
|
||||
|
||||
def extract_pairs_from_conversation(conversation: list, session_id: str, model: str,
|
||||
min_ratio: float = 1.5,
|
||||
def extract_pairs_from_session(session_data: dict, min_ratio: float = 1.5,
|
||||
min_response_words: int = 20) -> list:
|
||||
"""Extract terse→rich pairs from a normalized conversation."""
|
||||
"""Extract terse→rich pairs from a single session object."""
|
||||
pairs = []
|
||||
conversations = session_data.get("conversations", [])
|
||||
session_id = session_data.get("id", "unknown")
|
||||
model = session_data.get("model", "unknown")
|
||||
|
||||
seen_hashes = set()
|
||||
|
||||
for i, msg in enumerate(conversation):
|
||||
# Look for assistant responses
|
||||
if msg.get('role') != 'assistant':
|
||||
for i, msg in enumerate(conversations):
|
||||
# Look for assistant/gpt responses
|
||||
if msg.get("from") not in ("gpt", "assistant"):
|
||||
continue
|
||||
|
||||
response_text = msg.get('content', '')
|
||||
response_text = msg.get("value", "")
|
||||
if not response_text or len(response_text.split()) < min_response_words:
|
||||
continue
|
||||
|
||||
# Find the preceding user message
|
||||
# Find the preceding human message
|
||||
prompt_text = ""
|
||||
for j in range(i - 1, -1, -1):
|
||||
if conversation[j].get('role') == 'user':
|
||||
prompt_text = conversation[j].get('content', '')
|
||||
if conversations[j].get("from") == "human":
|
||||
prompt_text = conversations[j].get("value", "")
|
||||
break
|
||||
|
||||
if not prompt_text:
|
||||
continue
|
||||
|
||||
# Filter: skip tool results, system messages embedded as human
|
||||
if prompt_text.startswith('{') and 'output' in prompt_text[:100]:
|
||||
continue
|
||||
if prompt_text.startswith('# SOUL.md') or prompt_text.startswith('You are'):
|
||||
continue
|
||||
if prompt_text.startswith("{") and "output" in prompt_text[:100]:
|
||||
continue # likely a tool result
|
||||
if prompt_text.startswith("# SOUL.md") or prompt_text.startswith("You are"):
|
||||
continue # system prompt leak
|
||||
|
||||
# Quality filters
|
||||
prompt_words = len(prompt_text.split())
|
||||
response_words = len(response_text.split())
|
||||
|
||||
# Must have meaningful length ratio
|
||||
if prompt_words == 0 or response_words == 0:
|
||||
continue
|
||||
ratio = response_words / prompt_words
|
||||
if ratio < min_ratio:
|
||||
continue
|
||||
|
||||
code_blocks = response_text.count('```')
|
||||
if code_blocks >= 4 and len(response_text.replace('```', '').strip()) < 50:
|
||||
# Skip responses that are mostly code
|
||||
code_blocks = response_text.count("```")
|
||||
if code_blocks >= 4 and len(response_text.replace("```", "").strip()) < 50:
|
||||
continue
|
||||
|
||||
if 'tool_call' in response_text[:100] or 'function_call' in response_text[:100]:
|
||||
# Skip responses with tool call artifacts
|
||||
if "tool_call" in response_text[:100] or "function_call" in response_text[:100]:
|
||||
continue
|
||||
|
||||
# Deduplicate by content hash
|
||||
content_hash = compute_hash(prompt_text + response_text[:200])
|
||||
if content_hash in seen_hashes:
|
||||
continue
|
||||
seen_hashes.add(content_hash)
|
||||
|
||||
# Clean up response: remove markdown headers if too many
|
||||
clean_response = response_text
|
||||
|
||||
pairs.append({
|
||||
'terse': prompt_text.strip(),
|
||||
'rich': clean_response.strip(),
|
||||
'source': session_id,
|
||||
'model': model,
|
||||
'prompt_words': prompt_words,
|
||||
'response_words': response_words,
|
||||
'ratio': round(ratio, 2),
|
||||
"terse": prompt_text.strip(),
|
||||
"rich": clean_response.strip(),
|
||||
"source": session_id,
|
||||
"model": model,
|
||||
"prompt_words": prompt_words,
|
||||
"response_words": response_words,
|
||||
"ratio": round(ratio, 2),
|
||||
})
|
||||
|
||||
return pairs
|
||||
|
||||
|
||||
def extract_from_jsonl_file(filepath: str, **kwargs) -> list:
|
||||
"""Extract pairs from a session JSONL file."""
|
||||
pairs = []
|
||||
path = Path(filepath)
|
||||
|
||||
def extract_from_jsonl_file(path: str, **kwargs) -> list:
|
||||
"""Read a session file and extract training pairs using normalized conversation."""
|
||||
session_messages = read_session(path)
|
||||
if not session_messages:
|
||||
return []
|
||||
conversation = extract_conversation(session_messages)
|
||||
# Derive session_id and model from first real message metadata
|
||||
first_msg = next((m for m in session_messages if m.get('role') or m.get('from')), {})
|
||||
session_id = first_msg.get('meta_session_id', Path(path).name)
|
||||
model = first_msg.get('model', 'unknown')
|
||||
return extract_pairs_from_conversation(conversation, session_id, model, **kwargs)
|
||||
if not path.exists():
|
||||
print(f"Warning: {filepath} not found", file=sys.stderr)
|
||||
return pairs
|
||||
|
||||
content = path.read_text()
|
||||
lines = content.strip().split("\n")
|
||||
|
||||
for line in lines:
|
||||
line = line.strip()
|
||||
if not line:
|
||||
continue
|
||||
try:
|
||||
session = json.loads(line)
|
||||
except json.JSONDecodeError:
|
||||
continue
|
||||
|
||||
session_pairs = extract_pairs_from_session(session, **kwargs)
|
||||
pairs.extend(session_pairs)
|
||||
|
||||
return pairs
|
||||
|
||||
|
||||
def deduplicate_pairs(pairs: list) -> list:
|
||||
|
||||
155
scripts/test_dependency_graph.py
Normal file
155
scripts/test_dependency_graph.py
Normal file
@@ -0,0 +1,155 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Tests for dependency_graph.py — transitive closure and deep chain detection."""
|
||||
|
||||
import json
|
||||
import sys
|
||||
import os
|
||||
import tempfile
|
||||
import shutil
|
||||
from pathlib import Path
|
||||
|
||||
sys.path.insert(0, os.path.dirname(__file__) or ".")
|
||||
|
||||
import importlib.util
|
||||
spec = importlib.util.spec_from_file_location(
|
||||
"dg", os.path.join(os.path.dirname(__file__) or ".", "dependency_graph.py")
|
||||
)
|
||||
mod = importlib.util.module_from_spec(spec)
|
||||
spec.loader.exec_module(mod)
|
||||
|
||||
transitive_closure = mod.transitive_closure
|
||||
find_deep_chains = mod.find_deep_chains
|
||||
detect_cycles = mod.detect_cycles
|
||||
|
||||
|
||||
def make_graph(edges: dict[str, list[str]]) -> dict:
|
||||
"""Build graph dict in expected format: {repo: {"dependencies": [...]}}."""
|
||||
return {
|
||||
node: {"dependencies": sorted(deps), "files_scanned": 1}
|
||||
for node, deps in edges.items()
|
||||
}
|
||||
|
||||
|
||||
def test_transitive_closure_simple_chain():
|
||||
graph = make_graph({
|
||||
"A": ["B"],
|
||||
"B": ["C"],
|
||||
"C": [],
|
||||
})
|
||||
closure = transitive_closure(graph)
|
||||
assert closure["A"] == {"B", "C"}
|
||||
assert closure["B"] == {"C"}
|
||||
assert closure["C"] == set()
|
||||
print("✅ Simple chain transitive closure")
|
||||
|
||||
|
||||
def test_transitive_closure_diamond():
|
||||
graph = make_graph({
|
||||
"A": ["B", "C"],
|
||||
"B": ["D"],
|
||||
"C": ["D"],
|
||||
"D": [],
|
||||
})
|
||||
closure = transitive_closure(graph)
|
||||
assert closure["A"] == {"B", "C", "D"}
|
||||
assert closure["B"] == {"D"}
|
||||
assert closure["C"] == {"D"}
|
||||
assert closure["D"] == set()
|
||||
print("✅ Diamond closure")
|
||||
|
||||
|
||||
def test_transitive_closure_with_cycle():
|
||||
graph = make_graph({
|
||||
"A": ["B"],
|
||||
"B": ["C"],
|
||||
"C": ["A"], # cycle
|
||||
})
|
||||
closure = transitive_closure(graph)
|
||||
assert closure["A"] == {"B", "C"}
|
||||
assert closure["B"] == {"C", "A"}
|
||||
assert closure["C"] == {"A", "B"}
|
||||
print("✅ Cycle in transitive closure")
|
||||
|
||||
|
||||
def test_find_deep_chains_simple():
|
||||
graph = make_graph({
|
||||
"A": ["B"],
|
||||
"B": ["C"],
|
||||
"C": [],
|
||||
})
|
||||
chains = find_deep_chains(graph)
|
||||
chains_sorted = sorted(chains, key=len, reverse=True)
|
||||
assert len(chains_sorted) == 1
|
||||
assert chains_sorted[0] == ["A", "B", "C"]
|
||||
print("✅ Simple deep chain")
|
||||
|
||||
|
||||
def test_find_deep_chains_multiple():
|
||||
graph = make_graph({
|
||||
"A": ["B", "C"],
|
||||
"B": ["D"],
|
||||
"C": ["E"],
|
||||
"D": [],
|
||||
"E": [],
|
||||
})
|
||||
chains = find_deep_chains(graph)
|
||||
lengths = [len(c) for c in chains]
|
||||
assert max(lengths) == 3
|
||||
print("✅ Multiple chains detected")
|
||||
|
||||
|
||||
def test_find_deep_chains_with_cycle_does_not_infinite_loop():
|
||||
graph = make_graph({
|
||||
"A": ["B"],
|
||||
"B": ["C"],
|
||||
"C": ["A"],
|
||||
})
|
||||
chains = find_deep_chains(graph)
|
||||
print(f"✅ Cycle handled: found {len(chains)} chains")
|
||||
|
||||
|
||||
def test_empty_graph():
|
||||
graph = {}
|
||||
assert transitive_closure(graph) == {}
|
||||
assert find_deep_chains(graph) == []
|
||||
print("✅ Empty graph handled")
|
||||
|
||||
|
||||
def test_detect_cycles_shorthand():
|
||||
graph = make_graph({
|
||||
"A": ["B"],
|
||||
"B": ["C"],
|
||||
"C": ["A"],
|
||||
})
|
||||
cycles = detect_cycles(graph)
|
||||
assert len(cycles) == 1
|
||||
assert set(cycles[0]) == {"A", "B", "C"}
|
||||
print("✅ Cycle detection works")
|
||||
|
||||
|
||||
def test_chain_length_reporting():
|
||||
graph = make_graph({
|
||||
"root": ["a", "b"],
|
||||
"a": ["c"],
|
||||
"b": ["d"],
|
||||
"c": ["e"],
|
||||
"d": [],
|
||||
"e": [],
|
||||
})
|
||||
chains = find_deep_chains(graph)
|
||||
max_len = max(len(c) for c in chains)
|
||||
assert max_len == 4
|
||||
print(f"✅ Longest chain length: {max_len}")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_transitive_closure_simple_chain()
|
||||
test_transitive_closure_diamond()
|
||||
test_transitive_closure_with_cycle()
|
||||
test_find_deep_chains_simple()
|
||||
test_find_deep_chains_multiple()
|
||||
test_find_deep_chains_with_cycle_does_not_infinite_loop()
|
||||
test_empty_graph()
|
||||
test_detect_cycles_shorthand()
|
||||
test_chain_length_reporting()
|
||||
print("\n✅ All dependency graph tests passed")
|
||||
@@ -1,118 +0,0 @@
|
||||
"""
|
||||
Tests for session_pair_harvester — training pair extraction from sessions.
|
||||
"""
|
||||
|
||||
import json
|
||||
import tempfile
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
|
||||
import sys
|
||||
from pathlib import Path
|
||||
sys.path.insert(0, str(Path(__file__).parent.parent / "scripts"))
|
||||
from session_pair_harvester import (
|
||||
extract_pairs_from_conversation,
|
||||
extract_from_jsonl_file,
|
||||
deduplicate_pairs,
|
||||
compute_hash,
|
||||
)
|
||||
|
||||
|
||||
class TestSessionPairHarvester(unittest.TestCase):
|
||||
def test_compute_hash_consistent(self):
|
||||
h1 = compute_hash("hello world")
|
||||
h2 = compute_hash("hello world")
|
||||
self.assertEqual(h1, h2)
|
||||
self.assertEqual(len(h1), 16)
|
||||
|
||||
def test_extract_simple_qa_pair(self):
|
||||
"""A simple user→assistant exchange produces one pair."""
|
||||
conversation = [
|
||||
{"role": "user", "content": "What is the capital of France?"},
|
||||
{"role": "assistant", "content": "The capital of France is Paris. It is a major European city renowned for its art, fashion, gastronomy, cultural heritage, and historical significance. The city attracts millions of tourists annually."},
|
||||
]
|
||||
pairs = extract_pairs_from_conversation(conversation, "test_session", "test-model")
|
||||
self.assertEqual(len(pairs), 1)
|
||||
self.assertEqual(pairs[0]["terse"], "What is the capital of France?")
|
||||
self.assertIn("Paris", pairs[0]["rich"])
|
||||
self.assertEqual(pairs[0]["source"], "test_session")
|
||||
|
||||
def test_min_ratio_filter(self):
|
||||
"""Very short responses are filtered out."""
|
||||
conversation = [
|
||||
{"role": "user", "content": "Yes"},
|
||||
{"role": "assistant", "content": "No."},
|
||||
]
|
||||
# Default min_ratio = 1.5, min_words = 20 for response
|
||||
pairs = extract_pairs_from_conversation(conversation, "s", "m", min_response_words=3)
|
||||
self.assertEqual(len(pairs), 0)
|
||||
|
||||
def test_min_words_filter(self):
|
||||
"""Assistant responses below min word count are skipped."""
|
||||
conversation = [
|
||||
{"role": "user", "content": "Explain the project architecture in detail"},
|
||||
{"role": "assistant", "content": "OK."},
|
||||
]
|
||||
pairs = extract_pairs_from_conversation(conversation, "s", "m", min_response_words=5)
|
||||
self.assertEqual(len(pairs), 0)
|
||||
|
||||
def test_skip_non_assistant_messages(self):
|
||||
"""System and tool messages are ignored."""
|
||||
conversation = [
|
||||
{"role": "system", "content": "You are a helpful assistant."},
|
||||
{"role": "user", "content": "Hello"},
|
||||
{"role": "assistant", "content": "Hi there! How can I help you today?"},
|
||||
]
|
||||
pairs = extract_pairs_from_conversation(conversation, "s", "m", min_response_words=3)
|
||||
self.assertEqual(len(pairs), 1)
|
||||
self.assertEqual(pairs[0]["terse"], "Hello")
|
||||
|
||||
def test_multiple_pairs_from_one_session(self):
|
||||
"""A conversation with several Q&A turns yields multiple pairs."""
|
||||
conversation = [
|
||||
{"role": "user", "content": "First question?"},
|
||||
{"role": "assistant", "content": "Here is a detailed and comprehensive answer that thoroughly explores multiple aspects of the subject. It provides background context and practical implications for the reader."},
|
||||
{"role": "user", "content": "Second?"},
|
||||
{"role": "assistant", "content": "Another comprehensive response with detailed examples. This includes practical code blocks and thorough explanations to ensure deep understanding of the topic at hand."},
|
||||
]
|
||||
pairs = extract_pairs_from_conversation(conversation, "s", "m", min_ratio=1.0)
|
||||
self.assertEqual(len(pairs), 2)
|
||||
|
||||
def test_deduplication_removes_duplicates(self):
|
||||
"""Identical pairs across sessions are deduplicated."""
|
||||
pairs = [
|
||||
{"terse": "q1", "rich": "a1", "source": "s1", "model": "m"},
|
||||
{"terse": "q1", "rich": "a1", "source": "s2", "model": "m"},
|
||||
{"terse": "q2", "rich": "a2", "source": "s1", "model": "m"},
|
||||
]
|
||||
unique = deduplicate_pairs(pairs)
|
||||
self.assertEqual(len(unique), 2)
|
||||
sources = {p["source"] for p in unique}
|
||||
# First unique pair can be from either s1 or s2
|
||||
self.assertIn("s1", sources)
|
||||
|
||||
def test_integration_with_test_sessions(self):
|
||||
"""Harvester finds pairs in real test session files."""
|
||||
repo_root = Path(__file__).parent.parent
|
||||
test_sessions_dir = repo_root / "test_sessions"
|
||||
if not test_sessions_dir.exists():
|
||||
self.skipTest("test_sessions not found")
|
||||
|
||||
pairs = []
|
||||
for jsonl_file in sorted(test_sessions_dir.glob("*.jsonl")):
|
||||
pairs.extend(extract_from_jsonl_file(str(jsonl_file)))
|
||||
|
||||
self.assertGreater(len(pairs), 0, "Should extract at least one pair from test_sessions")
|
||||
for p in pairs:
|
||||
self.assertIn("terse", p)
|
||||
self.assertIn("rich", p)
|
||||
self.assertIn("source", p)
|
||||
self.assertIn("model", p)
|
||||
# Verify content exists
|
||||
self.assertGreater(len(p["terse"]), 0)
|
||||
self.assertGreater(len(p["rich"]), 0)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user