Skip to content

Updated chart-studio logic to not overwrite files when filename not p… #1648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonmmease merged 1 commit into from
Jul 1, 2019
Merged

Updated chart-studio logic to not overwrite files when filename not p… #1648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 9 additions & 19 deletions packages/python/chart-studio/chart_studio/plotly/plotly.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
__all__ = None

DEFAULT_PLOT_OPTIONS = {
"filename": "plot from API",
"world_readable": files.FILE_CONTENT[files.CONFIG_FILE]["world_readable"],
"auto_open": files.FILE_CONTENT[files.CONFIG_FILE]["auto_open"],
"validate": True,
Expand Down Expand Up @@ -97,7 +96,9 @@ def _plot_option_logic(plot_options_from_args):
user_plot_options.update(session_options)
user_plot_options.update(plot_options_from_args)
user_plot_options = {
k: v for k, v in user_plot_options.items() if k in default_plot_options
k: v
for k, v in user_plot_options.items()
if k in default_plot_options or k == "filename"
}

return user_plot_options
Expand Down Expand Up @@ -240,7 +241,7 @@ def plot(figure_or_data, validate=True, **plot_options):
filename = paths[-1]

# Create parent directory
if parent_path != "":
if parent_path:
file_ops.ensure_dirs(parent_path)
payload["parent_path"] = parent_path

Expand Down Expand Up @@ -1065,6 +1066,8 @@ def upload(
if meta is not None:
grid_json["metadata"] = meta

payload = {"data": grid_json, "world_readable": world_readable}

# Make a folder path
if filename:
if filename[-1] == "/":
Expand All @@ -1076,23 +1079,10 @@ def upload(

if parent_path != "":
file_ops.ensure_dirs(parent_path)
else:
# Create anonymous grid name
hash_val = hash(json.dumps(grid_json, sort_keys=True))
id = base64.urlsafe_b64encode(str(hash_val).encode("utf8"))
id_str = id.decode(encoding="utf8").replace("=", "")
filename = "grid_" + id_str
# filename = 'grid_' + str(hash_val)
parent_path = ""

payload = {
"filename": filename,
"data": grid_json,
"world_readable": world_readable,
}

if parent_path != "":
payload["parent_path"] = parent_path
payload["filename"] = filename
if parent_path:
payload["parent_path"] = parent_path

file_info = _create_or_overwrite_grid(payload)

Expand Down