Skip to content

File creation fix #79

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
merged 2 commits into from
Nov 22, 2017
Merged

File creation fix #79

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f7eb47
Revert "notebook: fix file saving"
jirikuncar Nov 22, 2017
070114e
notebook: handle file creation error
jirikuncar Nov 22, 2017
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
16 changes: 13 additions & 3 deletions renga/notebook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ def _section_resolver(obj, path):
return obj[path], None

sections = {'inputs': _section_resolver, 'outputs': _section_resolver}
assert path in sections
return getattr(obj, path), sections[path]


Expand All @@ -220,7 +219,6 @@ def _section_resolver(obj, path): # pragma: no cover
'buckets': _buckets_resolver,
'current_context': _current_context_resolver
}
assert path in sections
return getattr(obj, path), sections[path]


Expand Down Expand Up @@ -278,7 +276,7 @@ def exists(self, path):
try:
self._resolve_path(path)
return True
except (KeyError, ValueError):
except (AttributeError, KeyError, ValueError):
return False

def get(self, path, content=True, type=None, format=None):
Expand Down Expand Up @@ -310,8 +308,20 @@ def save(self, model, path):

if model['type'] == 'notebook':
nb = nbformat.from_dict(model['content'])

items = path.strip('/').split('/')
resource = self._resolve_path('/'.join(items[:-1]))

if not hasattr(resource._obj, 'files'):
raise web.HTTPError(
403, "Notebook can only be created in a bucket.")

new_file = resource._obj.files.create(items[-1])
path = (resource / str(new_file.id))._path

self.check_and_sign(nb, path)
self._save_notebook(path, nb)

elif model['type'] == 'file':
self._save_file(path, model['content'], model.get('format'))
elif model['type'] == 'directory':
Expand Down