-
Notifications
You must be signed in to change notification settings - Fork 445
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.
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
Enormous refactor of Livyclientlib #184
Merged
msftristew
merged 11 commits into
jupyter-incubator:master
from
msftristew:livyclientlibrefactor
Mar 11, 2016
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
138e0c1
Add command.py file
rickystewart d249f62
Merge branch 'typo' into livyclientlibrefactor
rickystewart d5bd76a
All tests now pass
rickystewart 92f57a8
Use int, not string, for session ID's
rickystewart 21d6d29
Fixing magics & kernels to use new Livyclientlib API's
rickystewart 0eb849f
Add tests for livyreliablehttpclient
rickystewart c21f818
I think this works for Python 3?
rickystewart 40aa435
Add new configuration for waiting for Livy session to start. Wait for…
rickystewart 429a466
Change example_config for new configurations
rickystewart 3462fab
Remove default_chart_type config which is dead code. Renaming some va…
rickystewart c68a1c1
Old typo
rickystewart File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
import textwrap | ||
|
||
from remotespark.utils.guid import ObjectWithGuid | ||
from remotespark.utils.log import Log | ||
|
||
|
||
class Command(ObjectWithGuid): | ||
def __init__(self, code): | ||
super(Command, self).__init__() | ||
self.code = textwrap.dedent(code) | ||
self.logger = Log("Command") | ||
|
||
def __eq__(self, other): | ||
return self.code == other.code | ||
|
||
def __ne__(self, other): | ||
return not self == other | ||
|
||
def execute(self, session): | ||
session.wait_for_idle() | ||
data = {"code": self.code} | ||
response = session.http_client.post_statement(session.id, data) | ||
statement_id = response['id'] | ||
return self._get_statement_output(session, statement_id) | ||
|
||
def _get_statement_output(self, session, statement_id): | ||
statement_running = True | ||
out = "" | ||
while statement_running: | ||
statement = session.http_client.get_statement(session.id, statement_id) | ||
status = statement["state"] | ||
|
||
self.logger.debug("Status of statement {} is {}.".format(statement_id, status)) | ||
|
||
if status == "running": | ||
session.sleep() | ||
else: | ||
statement_running = False | ||
|
||
statement_output = statement["output"] | ||
if statement_output["status"] == "ok": | ||
out = (True, statement_output["data"]["text/plain"]) | ||
elif statement_output["status"] == "error": | ||
out = (False, | ||
statement_output["evalue"] + "\n" + "".join(statement_output["traceback"])) | ||
else: | ||
raise ValueError("Unknown output status: '{}'".format(statement_output["status"])) | ||
|
||
return out |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is the motivation behind implementing eq and ne?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I use this in the unit tests so that I can easily do assertions -- for example,
thing.assert_called_with(Command('blah'))