diff --git a/contrib/graph/graph.py b/contrib/graph/graph.py
index e174ff5026..92736480eb 100644
--- a/contrib/graph/graph.py
+++ b/contrib/graph/graph.py
@@ -1,4 +1,5 @@
from __future__ import print_function
+
# Copyright 2014-2016 OpenMarket Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,9 +59,9 @@ def make_graph(pdus, room, filename_prefix):
name = make_name(pdu.get("pdu_id"), pdu.get("origin"))
pdu_map[name] = pdu
- t = datetime.datetime.fromtimestamp(
- float(pdu["ts"]) / 1000
- ).strftime('%Y-%m-%d %H:%M:%S,%f')
+ t = datetime.datetime.fromtimestamp(float(pdu["ts"]) / 1000).strftime(
+ "%Y-%m-%d %H:%M:%S,%f"
+ )
label = (
"<"
@@ -80,11 +81,7 @@ def make_graph(pdus, room, filename_prefix):
"depth": pdu.get("depth"),
}
- node = pydot.Node(
- name=name,
- label=label,
- color=color_map[pdu.get("origin")]
- )
+ node = pydot.Node(name=name, label=label, color=color_map[pdu.get("origin")])
node_map[name] = node
graph.add_node(node)
@@ -108,14 +105,13 @@ def make_graph(pdus, room, filename_prefix):
if prev_state_name in node_map:
state_edge = pydot.Edge(
- node_map[start_name], node_map[prev_state_name],
- style='dotted'
+ node_map[start_name], node_map[prev_state_name], style="dotted"
)
graph.add_edge(state_edge)
- graph.write('%s.dot' % filename_prefix, format='raw', prog='dot')
-# graph.write_png("%s.png" % filename_prefix, prog='dot')
- graph.write_svg("%s.svg" % filename_prefix, prog='dot')
+ graph.write("%s.dot" % filename_prefix, format="raw", prog="dot")
+ # graph.write_png("%s.png" % filename_prefix, prog='dot')
+ graph.write_svg("%s.svg" % filename_prefix, prog="dot")
def get_pdus(host, room):
@@ -131,15 +127,14 @@ def get_pdus(host, room):
if __name__ == "__main__":
parser = argparse.ArgumentParser(
description="Generate a PDU graph for a given room by talking "
- "to the given homeserver to get the list of PDUs. \n"
- "Requires pydot."
+ "to the given homeserver to get the list of PDUs. \n"
+ "Requires pydot."
)
parser.add_argument(
- "-p", "--prefix", dest="prefix",
- help="String to prefix output files with"
+ "-p", "--prefix", dest="prefix", help="String to prefix output files with"
)
- parser.add_argument('host')
- parser.add_argument('room')
+ parser.add_argument("host")
+ parser.add_argument("room")
args = parser.parse_args()
diff --git a/contrib/graph/graph2.py b/contrib/graph/graph2.py
index 1ccad65728..9db8725eee 100644
--- a/contrib/graph/graph2.py
+++ b/contrib/graph/graph2.py
@@ -36,10 +36,7 @@ def make_graph(db_name, room_id, file_prefix, limit):
args = [room_id]
if limit:
- sql += (
- " ORDER BY topological_ordering DESC, stream_ordering DESC "
- "LIMIT ?"
- )
+ sql += " ORDER BY topological_ordering DESC, stream_ordering DESC " "LIMIT ?"
args.append(limit)
@@ -56,9 +53,8 @@ def make_graph(db_name, room_id, file_prefix, limit):
for event in events:
c = conn.execute(
- "SELECT state_group FROM event_to_state_groups "
- "WHERE event_id = ?",
- (event.event_id,)
+ "SELECT state_group FROM event_to_state_groups " "WHERE event_id = ?",
+ (event.event_id,),
)
res = c.fetchone()
@@ -69,7 +65,7 @@ def make_graph(db_name, room_id, file_prefix, limit):
t = datetime.datetime.fromtimestamp(
float(event.origin_server_ts) / 1000
- ).strftime('%Y-%m-%d %H:%M:%S,%f')
+ ).strftime("%Y-%m-%d %H:%M:%S,%f")
content = json.dumps(unfreeze(event.get_dict()["content"]))
@@ -93,10 +89,7 @@ def make_graph(db_name, room_id, file_prefix, limit):
"state_group": state_group,
}
- node = pydot.Node(
- name=event.event_id,
- label=label,
- )
+ node = pydot.Node(name=event.event_id, label=label)
node_map[event.event_id] = node
graph.add_node(node)
@@ -106,10 +99,7 @@ def make_graph(db_name, room_id, file_prefix, limit):
try:
end_node = node_map[prev_id]
except:
- end_node = pydot.Node(
- name=prev_id,
- label="<<b>%s</b>>" % (prev_id,),
- )
+ end_node = pydot.Node(name=prev_id, label="<<b>%s</b>>" % (prev_id,))
node_map[prev_id] = end_node
graph.add_node(end_node)
@@ -121,36 +111,33 @@ def make_graph(db_name, room_id, file_prefix, limit):
if len(event_ids) <= 1:
continue
- cluster = pydot.Cluster(
- str(group),
- label="<State Group: %s>" % (str(group),)
- )
+ cluster = pydot.Cluster(str(group), label="<State Group: %s>" % (str(group),))
for event_id in event_ids:
cluster.add_node(node_map[event_id])
graph.add_subgraph(cluster)
- graph.write('%s.dot' % file_prefix, format='raw', prog='dot')
- graph.write_svg("%s.svg" % file_prefix, prog='dot')
+ graph.write("%s.dot" % file_prefix, format="raw", prog="dot")
+ graph.write_svg("%s.svg" % file_prefix, prog="dot")
+
if __name__ == "__main__":
parser = argparse.ArgumentParser(
description="Generate a PDU graph for a given room by talking "
- "to the given homeserver to get the list of PDUs. \n"
- "Requires pydot."
+ "to the given homeserver to get the list of PDUs. \n"
+ "Requires pydot."
)
parser.add_argument(
- "-p", "--prefix", dest="prefix",
+ "-p",
+ "--prefix",
+ dest="prefix",
help="String to prefix output files with",
- default="graph_output"
- )
- parser.add_argument(
- "-l", "--limit",
- help="Only retrieve the last N events.",
+ default="graph_output",
)
- parser.add_argument('db')
- parser.add_argument('room')
+ parser.add_argument("-l", "--limit", help="Only retrieve the last N events.")
+ parser.add_argument("db")
+ parser.add_argument("room")
args = parser.parse_args()
diff --git a/contrib/graph/graph3.py b/contrib/graph/graph3.py
index fe1dc81e90..7f9e5374a6 100644
--- a/contrib/graph/graph3.py
+++ b/contrib/graph/graph3.py
@@ -1,4 +1,5 @@
from __future__ import print_function
+
# Copyright 2016 OpenMarket Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,7 +43,7 @@ def make_graph(file_name, room_id, file_prefix, limit):
print("Sorted events")
if limit:
- events = events[-int(limit):]
+ events = events[-int(limit) :]
node_map = {}
@@ -51,7 +52,7 @@ def make_graph(file_name, room_id, file_prefix, limit):
for event in events:
t = datetime.datetime.fromtimestamp(
float(event.origin_server_ts) / 1000
- ).strftime('%Y-%m-%d %H:%M:%S,%f')
+ ).strftime("%Y-%m-%d %H:%M:%S,%f")
content = json.dumps(unfreeze(event.get_dict()["content"]), indent=4)
content = content.replace("\n", "<br/>\n")
@@ -67,9 +68,10 @@ def make_graph(file_name, room_id, file_prefix, limit):
value = json.dumps(value)
content.append(
- "<b>%s</b>: %s," % (
- cgi.escape(key, quote=True).encode("ascii", 'xmlcharrefreplace'),
- cgi.escape(value, quote=True).encode("ascii", 'xmlcharrefreplace'),
+ "<b>%s</b>: %s,"
+ % (
+ cgi.escape(key, quote=True).encode("ascii", "xmlcharrefreplace"),
+ cgi.escape(value, quote=True).encode("ascii", "xmlcharrefreplace"),
)
)
@@ -95,10 +97,7 @@ def make_graph(file_name, room_id, file_prefix, limit):
"depth": event.depth,
}
- node = pydot.Node(
- name=event.event_id,
- label=label,
- )
+ node = pydot.Node(name=event.event_id, label=label)
node_map[event.event_id] = node
graph.add_node(node)
@@ -110,10 +109,7 @@ def make_graph(file_name, room_id, file_prefix, limit):
try:
end_node = node_map[prev_id]
except:
- end_node = pydot.Node(
- name=prev_id,
- label="<<b>%s</b>>" % (prev_id,),
- )
+ end_node = pydot.Node(name=prev_id, label="<<b>%s</b>>" % (prev_id,))
node_map[prev_id] = end_node
graph.add_node(end_node)
@@ -123,31 +119,31 @@ def make_graph(file_name, room_id, file_prefix, limit):
print("Created edges")
- graph.write('%s.dot' % file_prefix, format='raw', prog='dot')
+ graph.write("%s.dot" % file_prefix, format="raw", prog="dot")
print("Created Dot")
- graph.write_svg("%s.svg" % file_prefix, prog='dot')
+ graph.write_svg("%s.svg" % file_prefix, prog="dot")
print("Created svg")
+
if __name__ == "__main__":
parser = argparse.ArgumentParser(
description="Generate a PDU graph for a given room by reading "
- "from a file with line deliminated events. \n"
- "Requires pydot."
+ "from a file with line deliminated events. \n"
+ "Requires pydot."
)
parser.add_argument(
- "-p", "--prefix", dest="prefix",
+ "-p",
+ "--prefix",
+ dest="prefix",
help="String to prefix output files with",
- default="graph_output"
- )
- parser.add_argument(
- "-l", "--limit",
- help="Only retrieve the last N events.",
+ default="graph_output",
)
- parser.add_argument('event_file')
- parser.add_argument('room')
+ parser.add_argument("-l", "--limit", help="Only retrieve the last N events.")
+ parser.add_argument("event_file")
+ parser.add_argument("room")
args = parser.parse_args()
|
