Skip to content

Commit 42f2f0c

Browse files
authored
Remove unused options from %load (#662)
* Remove --periodic-commit option from %load * update changelog
1 parent d97aef4 commit 42f2f0c

File tree

2 files changed

+5
-27
lines changed

2 files changed

+5
-27
lines changed

ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Starting with v1.31.6, this file will contain a record of major features and upd
44

55
## Upcoming
66

7+
- Removed unused options from `%load`([Link to PR](https://github.com/aws/graph-notebook/pull/662))
8+
79
## Release 4.5.1 (July 31, 2024)
810

911
- Added `%create_graph_snapshot` line magic ([Link to PR](https://github.com/aws/graph-notebook/pull/653))

src/graph_notebook/magics/graph_magic.py

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@
155155
RDF_LOAD_FORMATS = [FORMAT_NTRIPLE, FORMAT_NQUADS, FORMAT_RDFXML, FORMAT_TURTLE]
156156
BASE_URI_FORMATS = [FORMAT_RDFXML, FORMAT_TURTLE]
157157
DEFAULT_LOAD_CONCURRENCY = 1
158-
DEFAULT_LOAD_PERIODIC_COMMIT = 0
159158

160159
MEDIA_TYPE_SPARQL_JSON = "application/sparql-results+json"
161160
MEDIA_TYPE_SPARQL_XML = "application/sparql-results+xml"
@@ -1962,7 +1961,6 @@ def load(self, line='', local_ns: dict = None):
19621961
parser.add_argument('-d', '--dependencies', action='append', default=[])
19631962
parser.add_argument('-e', '--no-edge-ids', action='store_true', default=False)
19641963
parser.add_argument('-c', '--concurrency', type=int, default=1)
1965-
parser.add_argument('-pc', '--periodic-commit', type=int, default=0)
19661964
parser.add_argument('--named-graph-uri', type=str, default=DEFAULT_NAMEDGRAPH_URI,
19671965
help='The default graph for all RDF formats when no graph is specified. '
19681966
'Default is http://aws.amazon.com/neptune/vocab/v01/DefaultNamedGraph.')
@@ -2005,11 +2003,9 @@ def load(self, line='', local_ns: dict = None):
20052003
named_graph_hbox_visibility = 'none'
20062004
base_uri_hbox_visibility = 'none'
20072005
concurrency_hbox_visibility = 'none'
2008-
periodic_commit_hbox_visibility = 'none'
20092006

20102007
if load_type == 'incremental':
20112008
concurrency_hbox_visibility = 'flex'
2012-
periodic_commit_hbox_visibility = 'flex'
20132009
else:
20142010
if source_format.value.lower() == FORMAT_CSV:
20152011
gremlin_parser_options_hbox_visibility = 'flex'
@@ -2111,16 +2107,6 @@ def load(self, line='', local_ns: dict = None):
21112107
width=widget_width)
21122108
)
21132109

2114-
periodic_commit = widgets.BoundedIntText(
2115-
value=args.periodic_commit,
2116-
placeholder=0,
2117-
min=0,
2118-
max=1000000,
2119-
disabled=False,
2120-
layout=widgets.Layout(display=periodic_commit_hbox_visibility,
2121-
width=widget_width)
2122-
)
2123-
21242110
poll_status = widgets.Dropdown(
21252111
options=['TRUE', 'FALSE'],
21262112
value=str(not args.nopoll).upper(),
@@ -2230,13 +2216,6 @@ def load(self, line='', local_ns: dict = None):
22302216

22312217
concurrency_hbox = widgets.HBox([concurrency_hbox_label, concurrency])
22322218

2233-
periodic_commit_hbox_label = widgets.Label('Periodic Commit:',
2234-
layout=widgets.Layout(width=label_width,
2235-
display=periodic_commit_hbox_visibility,
2236-
justify_content="flex-end"))
2237-
2238-
periodic_commit_hbox = widgets.HBox([periodic_commit_hbox_label, periodic_commit])
2239-
22402219
poll_status_label = widgets.Label('Poll Load Status:',
22412220
layout=widgets.Layout(width=label_width,
22422221
display="flex",
@@ -2291,7 +2270,7 @@ def update_parserconfig_options(change):
22912270

22922271
basic_load_boxes = [source_hbox, source_format_hbox, region_hbox, fail_hbox]
22932272
# load arguments for Analytics incremental load
2294-
incremental_load_boxes = [concurrency_hbox, periodic_commit_hbox]
2273+
incremental_load_boxes = [concurrency_hbox]
22952274
# load arguments for Neptune bulk load
22962275
bulk_load_boxes = [arn_hbox, mode_hbox, parallelism_hbox, cardinality_hbox,
22972276
queue_hbox, dep_hbox, ids_hbox, allow_empty_strings_hbox,
@@ -2314,7 +2293,6 @@ def on_button_clicked(b):
23142293
base_uri_hbox.children = (base_uri_hbox_label, base_uri,)
23152294
dep_hbox.children = (dep_hbox_label, dependencies,)
23162295
concurrency_hbox.children = (concurrency_hbox_label, concurrency,)
2317-
periodic_commit_hbox.children = (periodic_commit_hbox_label, periodic_commit,)
23182296

23192297
validated = True
23202298
validation_label_style = DescriptionStyle(color='red')
@@ -2361,8 +2339,7 @@ def on_button_clicked(b):
23612339
incremental_load_kwargs = {
23622340
'source': source.value,
23632341
'format': source_format.value,
2364-
'concurrency': concurrency.value,
2365-
'periodicCommit': periodic_commit.value
2342+
'concurrency': concurrency.value
23662343
}
23672344
kwargs.update(incremental_load_kwargs)
23682345
else:
@@ -2406,7 +2383,6 @@ def on_button_clicked(b):
24062383
named_graph_uri_hbox.close()
24072384
base_uri_hbox.close()
24082385
concurrency_hbox.close()
2409-
periodic_commit_hbox.close()
24102386
button.close()
24112387

24122388
load_submit_status_output = widgets.Output()
@@ -2424,7 +2400,7 @@ def on_button_clicked(b):
24242400
else '"' + value + '"'
24252401
next_param = param + ': ' + value_substr
24262402
load_oc_params += next_param
2427-
if param == 'periodicCommit':
2403+
if param == 'concurrency':
24282404
load_oc_params += '}'
24292405
else:
24302406
load_oc_params += ', '

0 commit comments

Comments
 (0)