Skip to content

Commit 56db4af

Browse files
mtyinmtyin
committed
Fix linter
1 parent d33f867 commit 56db4af

2 files changed

Lines changed: 87 additions & 105 deletions

File tree

‎src/langchain_google_spanner/graph_store.py‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,18 @@
1919
import re
2020
import string
2121
from abc import ABC, abstractmethod
22-
from typing import Any, Dict, Set, Generator, Iterable, List, Mapping, Optional, Tuple, Union
22+
from typing import (
23+
Any,
24+
Dict,
25+
Generator,
26+
Iterable,
27+
List,
28+
Mapping,
29+
Optional,
30+
Set,
31+
Tuple,
32+
Union,
33+
)
2334

2435
from google.cloud import spanner
2536
from google.cloud.spanner_v1 import JsonObject, param_types
@@ -607,8 +618,8 @@ def add_nodes(
607618
self.dynamic_label_expr,
608619
)
609620
assert (
610-
self.dynamic_property_expr ==
611-
ElementSchema.DYNAMIC_PROPERTY_COLUMN_NAME
621+
self.dynamic_property_expr
622+
== ElementSchema.DYNAMIC_PROPERTY_COLUMN_NAME
612623
), "Require dynamic property expression to be %s: got %s" % (
613624
ElementSchema.DYNAMIC_PROPERTY_COLUMN_NAME,
614625
self.dynamic_property_expr,
@@ -670,8 +681,8 @@ def add_edges(
670681
self.dynamic_label_expr,
671682
)
672683
assert (
673-
self.dynamic_property_expr ==
674-
ElementSchema.DYNAMIC_PROPERTY_COLUMN_NAME
684+
self.dynamic_property_expr
685+
== ElementSchema.DYNAMIC_PROPERTY_COLUMN_NAME
675686
), "Require dynamic property expression to be %s: got %s" % (
676687
ElementSchema.DYNAMIC_PROPERTY_COLUMN_NAME,
677688
self.dynamic_property_expr,
@@ -1185,17 +1196,14 @@ def __repr__(self) -> str:
11851196
edge_properties_per_label: Dict[str, Dict] = {}
11861197
edge_patterns_per_label: Dict[str, Set[str]] = {}
11871198
for node in self.nodes.values():
1188-
node_properties_per_label.update(
1189-
node.get_label_and_properties(self))
1199+
node_properties_per_label.update(node.get_label_and_properties(self))
11901200

11911201
for edge in self.edges.values():
1192-
edge_properties_per_label.update(
1193-
edge.get_label_and_properties(self))
1194-
for src_node_label, label, tgt_node_label in edge.get_edge_patterns(
1195-
self):
1202+
edge_properties_per_label.update(edge.get_label_and_properties(self))
1203+
for src_node_label, label, tgt_node_label in edge.get_edge_patterns(self):
11961204
edge_patterns_per_label.setdefault(label, set()).add(
1197-
"(:{}) -[:{}]-> (:{})".format(src_node_label, label,
1198-
tgt_node_label))
1205+
"(:{}) -[:{}]-> (:{})".format(src_node_label, label, tgt_node_label)
1206+
)
11991207
return json.dumps(
12001208
{
12011209
"Name of graph": self.graph_name,

‎tests/integration/test_spanner_graph_store.py‎

Lines changed: 66 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ def random_generators():
102102
+ [random_none, random_json]
103103
)
104104

105+
105106
properties = [
106107
("p{}".format(i), random_val_gen)
107108
for i, random_val_gen in enumerate(random_generators())
@@ -448,68 +449,41 @@ def test_spanner_graph_with_existing_graph(
448449
)
449450
# TOKENLIST-typed properties are ignored.
450451
assert schema["Node properties per node label"]["Node"] == [
451-
{
452-
"name": "id",
453-
"type": "INT64"
454-
},
455-
{
456-
"name": "node_b_id",
457-
"type": "INT64"
458-
},
459-
{
460-
"name": "str",
461-
"type": "STRING"
462-
},
463-
], 'Invalid Node properties'
452+
{"name": "id", "type": "INT64"},
453+
{"name": "node_b_id", "type": "INT64"},
454+
{"name": "str", "type": "STRING"},
455+
], "Invalid Node properties"
464456
assert schema["Node properties per node label"]["NodeA"] == [
465-
{
466-
"name": "id",
467-
"type": "INT64"
468-
},
469-
{
470-
"name": "node_a_id",
471-
"type": "INT64"
472-
},
473-
{
474-
"name": "str",
475-
"type": "STRING"
476-
},
477-
], 'Invalid NodeA properties'
457+
{"name": "id", "type": "INT64"},
458+
{"name": "node_a_id", "type": "INT64"},
459+
{"name": "str", "type": "STRING"},
460+
], "Invalid NodeA properties"
478461
assert schema["Node properties per node label"]["NodeB"] == [
479-
{
480-
"name": "id",
481-
"type": "INT64"
482-
},
483-
{
484-
"name": "node_b_id",
485-
"type": "INT64"
486-
},
487-
{
488-
"name": "str",
489-
"type": "STRING"
490-
},
491-
], 'Invalid NodeB properties'
462+
{"name": "id", "type": "INT64"},
463+
{"name": "node_b_id", "type": "INT64"},
464+
{"name": "str", "type": "STRING"},
465+
], "Invalid NodeB properties"
492466
assert schema["Possible edges per label"]["EdgeAB"] == [
493-
'(:Node) -[:EdgeAB]-> (:Node)',
494-
'(:Node) -[:EdgeAB]-> (:NodeB)',
495-
'(:NodeA) -[:EdgeAB]-> (:Node)',
496-
'(:NodeA) -[:EdgeAB]-> (:NodeB)',
497-
], 'Invalid EdgeAB patterns'
467+
"(:Node) -[:EdgeAB]-> (:Node)",
468+
"(:Node) -[:EdgeAB]-> (:NodeB)",
469+
"(:NodeA) -[:EdgeAB]-> (:Node)",
470+
"(:NodeA) -[:EdgeAB]-> (:NodeB)",
471+
], "Invalid EdgeAB patterns"
498472
assert schema["Possible edges per label"]["EdgeBA"] == [
499-
'(:Node) -[:EdgeBA]-> (:Node)',
500-
'(:Node) -[:EdgeBA]-> (:NodeA)',
501-
'(:NodeB) -[:EdgeBA]-> (:Node)',
502-
'(:NodeB) -[:EdgeBA]-> (:NodeA)',
503-
], 'Invalid EdgeBA patterns'
473+
"(:Node) -[:EdgeBA]-> (:Node)",
474+
"(:Node) -[:EdgeBA]-> (:NodeA)",
475+
"(:NodeB) -[:EdgeBA]-> (:Node)",
476+
"(:NodeB) -[:EdgeBA]-> (:NodeA)",
477+
], "Invalid EdgeBA patterns"
504478
assert schema["Possible edges per label"]["Edge"] == [
505-
'(:Node) -[:Edge]-> (:Node)',
506-
'(:Node) -[:Edge]-> (:NodeA)',
507-
'(:Node) -[:Edge]-> (:NodeB)',
508-
'(:NodeA) -[:Edge]-> (:Node)',
509-
'(:NodeA) -[:Edge]-> (:NodeB)',
510-
'(:NodeB) -[:Edge]-> (:Node)',
511-
'(:NodeB) -[:Edge]-> (:NodeA)',
512-
], 'Invalid Edge patterns'
479+
"(:Node) -[:Edge]-> (:Node)",
480+
"(:Node) -[:Edge]-> (:NodeA)",
481+
"(:Node) -[:Edge]-> (:NodeB)",
482+
"(:NodeA) -[:Edge]-> (:Node)",
483+
"(:NodeA) -[:Edge]-> (:NodeB)",
484+
"(:NodeB) -[:Edge]-> (:Node)",
485+
"(:NodeB) -[:Edge]-> (:NodeA)",
486+
], "Invalid Edge patterns"
513487

514488
@pytest.mark.parametrize("use_flexible_schema", [False, True])
515489
def test_spanner_graph_schema_representation(
@@ -528,10 +502,9 @@ def test_spanner_graph_schema_representation(
528502
type="Node1{}".format(suffix),
529503
properties={"j1": random_string()},
530504
)
531-
edge = Relationship(source=node0,
532-
target=node1,
533-
type="Links",
534-
properties={"j": random_json()})
505+
edge = Relationship(
506+
source=node0, target=node1, type="Links", properties={"j": random_json()}
507+
)
535508

536509
doc = GraphDocument(
537510
nodes=[node0, node1],
@@ -543,40 +516,41 @@ def test_spanner_graph_schema_representation(
543516
)
544517
graph.add_graph_documents([doc])
545518
schema = json.loads(graph.get_schema)
546-
node0_json_fields = sorted([
547-
p['name']
548-
for p in schema["Node properties per node label"][node0.type]
549-
])
550-
node1_json_fields = sorted([
551-
p['name']
552-
for p in schema["Node properties per node label"][node1.type]
553-
])
554-
edge_json_fields = sorted([
555-
p['name']
556-
for edge in schema["Edge properties per edge label"].values()
557-
for p in edge
558-
])
559-
edge_patterns = sorted([
560-
pattern
561-
for edge in schema["Possible edges per label"].values()
562-
for pattern in edge
563-
])
564-
if use_flexible_schema:
565-
assert node0_json_fields == ['id', 'j0', 'label', 'properties']
566-
assert node1_json_fields == ['id', 'j1', 'label', 'properties']
567-
assert edge_json_fields == [
568-
'id', 'j', 'label', 'properties', 'target_id'
519+
node0_json_fields = sorted(
520+
[p["name"] for p in schema["Node properties per node label"][node0.type]]
521+
)
522+
node1_json_fields = sorted(
523+
[p["name"] for p in schema["Node properties per node label"][node1.type]]
524+
)
525+
edge_json_fields = sorted(
526+
[
527+
p["name"]
528+
for edge in schema["Edge properties per edge label"].values()
529+
for p in edge
569530
]
531+
)
532+
edge_patterns = sorted(
533+
[
534+
pattern
535+
for edge in schema["Possible edges per label"].values()
536+
for pattern in edge
537+
]
538+
)
539+
if use_flexible_schema:
540+
assert node0_json_fields == ["id", "j0", "label", "properties"]
541+
assert node1_json_fields == ["id", "j1", "label", "properties"]
542+
assert edge_json_fields == ["id", "j", "label", "properties", "target_id"]
570543
assert edge_patterns == [
571-
'(:{src}) -[:{edge}]-> (:{dst})'.format(src=node0.type,
572-
edge=edge.type,
573-
dst=node1.type)
544+
"(:{src}) -[:{edge}]-> (:{dst})".format(
545+
src=node0.type, edge=edge.type, dst=node1.type
546+
)
574547
]
575548
else:
576-
assert node0_json_fields == ['id', 'j0']
577-
assert node1_json_fields == ['id', 'j1']
578-
assert edge_json_fields == ['id', 'j', 'target_id']
549+
assert node0_json_fields == ["id", "j0"]
550+
assert node1_json_fields == ["id", "j1"]
551+
assert edge_json_fields == ["id", "j", "target_id"]
579552
assert edge_patterns == [
580-
'(:{src}) -[:{src}_{edge}_{dst}]-> (:{dst})'.format(
581-
src=node0.type, edge=edge.type, dst=node1.type)
553+
"(:{src}) -[:{src}_{edge}_{dst}]-> (:{dst})".format(
554+
src=node0.type, edge=edge.type, dst=node1.type
555+
)
582556
]

0 commit comments

Comments
 (0)