Skip to content

Commit de77728

Browse files
committed
format knext code with black
1 parent f0005e2 commit de77728

File tree

26 files changed

+766
-469
lines changed

26 files changed

+766
-469
lines changed

knext/builder/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def write_graph(self, sub_graph: dict, operation: str, lead_to_builder: bool):
3131
sub_graph=sub_graph,
3232
operation=operation,
3333
enable_lead_to=lead_to_builder,
34-
token="openspg@8380255d4e49_"
34+
token="openspg@8380255d4e49_",
3535
)
3636
self._rest_client.builder_job_writer_graph_post(writer_graph_request=request)
3737

knext/builder/rest/models/writer_graph_request.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,25 @@ class WriterGraphRequest(object):
4848
"operation": "str",
4949
"sub_graph": "object",
5050
"enable_lead_to": "bool",
51-
"token": "str"
51+
"token": "str",
5252
}
5353

5454
attribute_map = {
5555
"project_id": "projectId",
5656
"operation": "operation",
5757
"sub_graph": "subGraph",
5858
"enable_lead_to": "enableLeadTo",
59-
"token": "token"
59+
"token": "token",
6060
}
6161

6262
def __init__(
63-
self,
64-
project_id=None,
65-
operation=None,
66-
sub_graph=None,
67-
enable_lead_to=None,
68-
token=None,
69-
local_vars_configuration=None,
63+
self,
64+
project_id=None,
65+
operation=None,
66+
sub_graph=None,
67+
enable_lead_to=None,
68+
token=None,
69+
local_vars_configuration=None,
7070
): # noqa: E501
7171
"""WriterGraphRequest - a model defined in OpenAPI""" # noqa: E501
7272
if local_vars_configuration is None:

knext/command/sub_command/project.py

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
pass
4040

4141
yaml = YAML()
42-
yaml.default_flow_style = False
42+
yaml.default_flow_style = False
4343
yaml.indent(mapping=2, sequence=4, offset=2)
4444

4545
logger = logging.getLogger(__name__)
@@ -104,13 +104,13 @@ def _recover_project(prj_path: str):
104104
sys.exit()
105105
client = ProjectClient(host_addr=env.host_addr, project_id=env.project_id)
106106
project = client.get(namespace=namespace) or client.create(
107-
name=project_name,
108-
desc=desc,
109-
namespace=namespace,
110-
config=env._config,
111-
visibility=env.project_config.get("visibility", "PRIVATE"),
112-
tag=env.project_config.get("tag", "LOCAL"),
113-
userNo=env.project_config.get("userNo", "openspg")
107+
name=project_name,
108+
desc=desc,
109+
namespace=namespace,
110+
config=env._config,
111+
visibility=env.project_config.get("visibility", "PRIVATE"),
112+
tag=env.project_config.get("tag", "LOCAL"),
113+
userNo=env.project_config.get("userNo", "openspg"),
114114
)
115115

116116
env._config["project"]["id"] = project.id
@@ -177,12 +177,14 @@ def create_project(
177177

178178
if host_addr:
179179
client = ProjectClient(host_addr=host_addr)
180-
project = client.create(name=name,
181-
namespace=namespace,
182-
config=config,
183-
visibility=env.project_config.get("visibility", "PRIVATE"),
184-
tag=env.project_config.get("tag", "LOCAL"),
185-
userNo=env.project_config.get("userNo", "openspg"))
180+
project = client.create(
181+
name=name,
182+
namespace=namespace,
183+
config=config,
184+
visibility=env.project_config.get("visibility", "PRIVATE"),
185+
tag=env.project_config.get("tag", "LOCAL"),
186+
userNo=env.project_config.get("userNo", "openspg"),
187+
)
186188

187189
if project and project.id:
188190
project_id = project.id
@@ -230,12 +232,14 @@ def restore_project(host_addr, proj_path):
230232
if not project_wanted:
231233
if host_addr:
232234
client = ProjectClient(host_addr=host_addr)
233-
project = client.create(name=env.name,
234-
namespace=env.namespace,
235-
config=env._config,
236-
visibility=env.project_config.get("visibility", "PRIVATE"),
237-
tag=env.project_config.get("tag", "LOCAL"),
238-
userNo=env.project_config.get("userNo", "openspg"))
235+
project = client.create(
236+
name=env.name,
237+
namespace=env.namespace,
238+
config=env._config,
239+
visibility=env.project_config.get("visibility", "PRIVATE"),
240+
tag=env.project_config.get("tag", "LOCAL"),
241+
userNo=env.project_config.get("userNo", "openspg"),
242+
)
239243
project_id = project.id
240244
else:
241245
project_id = project_wanted.id
@@ -267,17 +271,23 @@ def update_project(proj_path):
267271
sys.exit()
268272

269273
logger.info(f"project id: {env.id}")
270-
client.update(id=env.id, namespace=env.namespace, config=env._config, visibility=env.project_config.get("visibility", "PRIVATE"), tag=env.project_config.get("tag", "LOCAL"), userNo=env.project_config.get("userNo", "openspg"))
274+
client.update(
275+
id=env.id,
276+
namespace=env.namespace,
277+
config=env._config,
278+
visibility=env.project_config.get("visibility", "PRIVATE"),
279+
tag=env.project_config.get("tag", "LOCAL"),
280+
userNo=env.project_config.get("userNo", "openspg"),
281+
)
271282
click.secho(
272283
f"Project [{env.name}] with namespace [{env.namespace}] was successfully updated from [{proj_path}].",
273284
fg="bright_green",
274285
)
275286

287+
276288
@click.option("--host_addr", help="Address of spg server.", default=DEFAULT_HOST_ADDR)
277289
def list_project(host_addr):
278-
client = ProjectClient(
279-
host_addr=host_addr
280-
)
290+
client = ProjectClient(host_addr=host_addr)
281291
projects = client.get_all()
282292

283293
headers = ["Project Name", "Project ID"]

knext/command/sub_command/schema.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ def commit_schema():
3232
)
3333

3434
if Path(schema_file).exists():
35-
ml = SPGSchemaMarkLang(schema_file, host_addr=env.host_addr, project_id=env.project_id)
35+
ml = SPGSchemaMarkLang(
36+
schema_file, host_addr=env.host_addr, project_id=env.project_id
37+
)
3638
else:
3739
ml = None
3840
index_managers = KAGIndexManager.list_available()
@@ -49,7 +51,12 @@ def commit_schema():
4951
if not schema_str:
5052
continue
5153
schema_str = f"namespace {env.namespace}\n" + schema_str
52-
cur_index_ml = SPGSchemaMarkLang(filename="", script_data_str=schema_str, host_addr=env.host_addr, project_id=env.project_id)
54+
cur_index_ml = SPGSchemaMarkLang(
55+
filename="",
56+
script_data_str=schema_str,
57+
host_addr=env.host_addr,
58+
project_id=env.project_id,
59+
)
5360
if index_ml is None:
5461
index_ml = cur_index_ml
5562
else:

knext/common/env.py

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from typing import Union, Optional
2020

2121
yaml = YAML()
22-
yaml.default_flow_style = False
22+
yaml.default_flow_style = False
2323
yaml.indent(mapping=2, sequence=4, offset=2)
2424
logger = logging.getLogger(__name__)
2525

@@ -36,9 +36,11 @@ def __new__(cls):
3636
try:
3737
log_config = cls._instance.config.get("log", {})
3838
value = log_config.get("level", "INFO")
39-
logging.basicConfig(level=logging.getLevelName(value),
40-
format='%(asctime)s - %(levelname)s - %(name)s - %(message)s',
41-
datefmt='%Y-%m-%d %H:%M:%S')
39+
logging.basicConfig(
40+
level=logging.getLevelName(value),
41+
format="%(asctime)s - %(levelname)s - %(name)s - %(message)s",
42+
datefmt="%Y-%m-%d %H:%M:%S",
43+
)
4244
except:
4345
logger.info("logger info not set")
4446
return cls._instance
@@ -47,13 +49,13 @@ def __new__(cls):
4749
def config(self):
4850

4951
closest_config = self._closest_config()
50-
if not hasattr(self, '_config_path') or self._config_path != closest_config:
52+
if not hasattr(self, "_config_path") or self._config_path != closest_config:
5153
self._config_path = closest_config
5254
self._config = self.get_config()
53-
55+
5456
if self._config is None:
5557
self._config = self.get_config()
56-
58+
5759
return self._config
5860

5961
@property
@@ -63,7 +65,7 @@ def project_path(self):
6365

6466
@property
6567
def config_path(self):
66-
if not hasattr(self, '_config_path') or self._config_path is None:
68+
if not hasattr(self, "_config_path") or self._config_path is None:
6769
self._config_path = self._closest_config()
6870
return self._config_path
6971

@@ -77,7 +79,7 @@ def id(self):
7779
id = self.project_config.get("id", None)
7880
if id is None:
7981
logger.warning("can not find id in project config")
80-
if os.getenv("KAG_PROJECT_ID",None):
82+
if os.getenv("KAG_PROJECT_ID", None):
8183
return os.getenv("KAG_PROJECT_ID")
8284
else:
8385
raise Exception(
@@ -137,11 +139,16 @@ def _closest_config(
137139
return ""
138140
path = Path(path).resolve()
139141
cfg_files = list(path.glob("*.yaml"))
140-
cfg_file = next((f for f in cfg_files if f.name == "kag_config.yaml"), cfg_files[0] if cfg_files else None)
142+
cfg_file = next(
143+
(f for f in cfg_files if f.name == "kag_config.yaml"),
144+
cfg_files[0] if cfg_files else None,
145+
)
141146
if cfg_file and cfg_file.exists():
142147
return str(cfg_file)
143148
if path.parent == path:
144-
raise FileNotFoundError("No kag_config.yaml file found in current directory or any parent directories")
149+
raise FileNotFoundError(
150+
"No kag_config.yaml file found in current directory or any parent directories"
151+
)
145152
return self._closest_config(path.parent, path)
146153

147154
def dump(self, path=None, **kwargs):

knext/graph/client.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ def calculate_pagerank_scores(self, target_vertex_type, start_nodes: List[Dict])
5050
such as failures in running `run_pagerank_igraph_chunk`, are logged.
5151
"""
5252
ppr_start_nodes = [
53-
GetPageRankScoresRequestStartNodes(id=node.get("id",node["name"]), type=node["type"])
53+
GetPageRankScoresRequestStartNodes(
54+
id=node.get("id", node["name"]), type=node["type"]
55+
)
5456
for node in start_nodes
5557
]
5658
req = GetPageRankScoresRequest(
@@ -67,7 +69,7 @@ def write_graph(self, sub_graph: dict, operation: str, lead_to_builder: bool):
6769
sub_graph=sub_graph,
6870
operation=operation,
6971
enable_lead_to=lead_to_builder,
70-
token="openspg@8380255d4e49_"
72+
token="openspg@8380255d4e49_",
7173
)
7274
self._rest_client.graph_writer_graph_post(writer_graph_request=request)
7375

knext/graph/rest/models/writer_graph_request.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,25 @@ class WriterGraphRequest(object):
4848
"operation": "str",
4949
"sub_graph": "object",
5050
"enable_lead_to": "bool",
51-
"token": "str"
51+
"token": "str",
5252
}
5353

5454
attribute_map = {
5555
"project_id": "projectId",
5656
"operation": "operation",
5757
"sub_graph": "subGraph",
5858
"enable_lead_to": "enableLeadTo",
59-
"token": "token"
59+
"token": "token",
6060
}
6161

6262
def __init__(
63-
self,
64-
project_id=None,
65-
operation=None,
66-
sub_graph=None,
67-
enable_lead_to=None,
68-
token=None,
69-
local_vars_configuration=None,
63+
self,
64+
project_id=None,
65+
operation=None,
66+
sub_graph=None,
67+
enable_lead_to=None,
68+
token=None,
69+
local_vars_configuration=None,
7070
): # noqa: E501
7171
"""WriterGraphRequest - a model defined in OpenAPI""" # noqa: E501
7272
if local_vars_configuration is None:

knext/project/client.py

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,14 @@ def create(self, name: str, namespace: str, config: str, **kwargs):
7676
desc = kwargs.get("desc", None)
7777
userNo = kwargs.get("userNo", "openspg")
7878
project_create_request = rest.ProjectCreateRequest(
79-
name=name, desc=desc, namespace=namespace, config=config, auto_schema=auto_schema, visibility=visibility,
80-
tag=tag, userNo=userNo
79+
name=name,
80+
desc=desc,
81+
namespace=namespace,
82+
config=config,
83+
auto_schema=auto_schema,
84+
visibility=visibility,
85+
tag=tag,
86+
userNo=userNo,
8187
)
8288

8389
project = self._rest_client.project_create_post(
@@ -88,8 +94,14 @@ def create(self, name: str, namespace: str, config: str, **kwargs):
8894
def update(self, id, namespace, config, visibility=None, tag=None, userNo=None):
8995
if not self._rest_client:
9096
raise Exception("Please set KAG_PROJECT_HOST_ADDR and KAG_PROJECT_ID")
91-
project_create_request = rest.ProjectCreateRequest(id=id, name=namespace, config=config, visibility=visibility,
92-
tag=tag, userNo=userNo)
97+
project_create_request = rest.ProjectCreateRequest(
98+
id=id,
99+
name=namespace,
100+
config=config,
101+
visibility=visibility,
102+
tag=tag,
103+
userNo=userNo,
104+
)
93105
project = self._rest_client.project_update_post(
94106
project_create_request=project_create_request
95107
)

0 commit comments

Comments
 (0)