##// END OF EJS Templates
Merge pull request #2340 from JanSchulz/client-clear-cache...
Merge pull request #2340 from JanSchulz/client-clear-cache Initial Code to reduce parallel.Client caching adds: client.purge_local_results client.purge_hub_results client.purge_results (does both above) client.purge_everything (includes history, etc.)

File last commit:

r9017:1d350efb
r9153:9d021a36 merge
Show More
rmagic.py
623 lines | 19.5 KiB | text/x-python | PythonLexer
Jonathan Taylor
first commit of rmagic
r7214 # -*- coding: utf-8 -*-
"""
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 ======
Rmagic
======
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 Magic command interface for interactive work with R via rpy2
Usage
=====
``%R``
{R_DOC}
``%Rpush``
{RPUSH_DOC}
``%Rpull``
{RPULL_DOC}
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 ``%Rget``
{RGET_DOC}
Jonathan Taylor
first commit of rmagic
r7214 """
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 #-----------------------------------------------------------------------------
# Copyright (C) 2012 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
Jonathan Taylor
first commit of rmagic
r7214 import sys
import tempfile
from glob import glob
from shutil import rmtree
from getopt import getopt
# numpy and rpy2 imports
import numpy as np
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217
import rpy2.rinterface as ri
Jonathan Taylor
first commit of rmagic
r7214 import rpy2.robjects as ro
from rpy2.robjects.numpy2ri import numpy2ri
ro.conversion.py2ri = numpy2ri
# IPython imports
from IPython.core.displaypub import publish_display_data
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217 from IPython.core.magic import (Magics, magics_class, cell_magic, line_magic,
Guy Haskin Fernald
Added functionality to %R and %octave magics so that -i first looks in local...
r8262 line_cell_magic, needs_local_scope)
Jonathan Taylor
first commit of rmagic
r7214 from IPython.testing.skipdoctest import skip_doctest
from IPython.core.magic_arguments import (
argument, magic_arguments, parse_argstring
)
Thomas Kluyver
Make Rmagic exceptions behave properly in Python 3
r7318 from IPython.utils.py3compat import str_to_unicode, unicode_to_str, PY3
Fernando Perez
add caching and better return value control
r7227
Thomas Kluyver
Rename RMagicError to RInterpreterError
r7327 class RInterpreterError(ri.RRuntimeError):
Thomas Kluyver
Make Rmagic exceptions behave properly in Python 3
r7318 """An error when running R code in a %%R magic cell."""
def __init__(self, line, err, stdout):
self.line = line
self.err = err.rstrip()
self.stdout = stdout.rstrip()
def __unicode__(self):
Thomas Kluyver
Rename RMagicError to RInterpreterError
r7327 s = 'Failed to parse and evaluate line %r.\nR error message: %r' % \
Thomas Kluyver
Make Rmagic exceptions behave properly in Python 3
r7318 (self.line, self.err)
if self.stdout and (self.stdout != self.err):
s += '\nR stdout:\n' + self.stdout
return s
if PY3:
__str__ = __unicode__
else:
def __str__(self):
return unicode_to_str(unicode(self), 'utf-8')
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 def Rconverter(Robj, dataframe=False):
Jonathan Taylor
fixed Rconverter a little to catch return values from %R
r7267 """
Convert an object in R's namespace to one suitable
for ipython's namespace.
For a data.frame, it tries to return a structured array.
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 It first checks for colnames, then names.
If all are NULL, it returns np.asarray(Robj), else
it tries to construct a recarray
Jonathan Taylor
fixed Rconverter a little to catch return values from %R
r7267
Parameters
----------
Robj: an R object returned from rpy2
"""
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 is_data_frame = ro.r('is.data.frame')
colnames = ro.r('colnames')
rownames = ro.r('rownames') # with pandas, these could be used for the index
names = ro.r('names')
if dataframe:
as_data_frame = ro.r('as.data.frame')
cols = colnames(Robj)
_names = names(Robj)
if cols != ri.NULL:
Robj = as_data_frame(Robj)
names = tuple(np.array(cols))
elif _names != ri.NULL:
names = tuple(np.array(_names))
else: # failed to find names
return np.asarray(Robj)
Robj = np.rec.fromarrays(Robj, names = names)
return np.asarray(Robj)
Jonathan Taylor
fixed Rconverter a little to catch return values from %R
r7267
Jonathan Taylor
first commit of rmagic
r7214 @magics_class
class RMagics(Magics):
Jonathan Taylor
docstrings for class and __init__
r7236 """A set of magics useful for interactive work with R via rpy2.
"""
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
fixed Rconverter a little to catch return values from %R
r7267 def __init__(self, shell, Rconverter=Rconverter,
Fernando Perez
add caching and better return value control
r7227 pyconverter=np.asarray,
cache_display_data=False):
Jonathan Taylor
docstrings for class and __init__
r7236 """
Parameters
----------
shell : IPython shell
pyconverter : callable
To be called on values in ipython namespace before
assigning to variables in rpy2.
cache_display_data : bool
If True, the published results of the final call to R are
cached in the variable 'display_cache'.
"""
Jonathan Taylor
first commit of rmagic
r7214 super(RMagics, self).__init__(shell)
Fernando Perez
add caching and better return value control
r7227 self.cache_display_data = cache_display_data
Jonathan Taylor
first commit of rmagic
r7214
self.r = ro.R()
Jonathan Taylor
fixed Rconverter a little to catch return values from %R
r7267
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 self.Rstdout_cache = []
Jonathan Taylor
first commit of rmagic
r7214 self.pyconverter = pyconverter
Jonathan Taylor
fixed Rconverter a little to catch return values from %R
r7267 self.Rconverter = Rconverter
Jonathan Taylor
first commit of rmagic
r7214
def eval(self, line):
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 '''
Parse and evaluate a line with rpy2.
Returns the output to R's stdout() connection
and the value of eval(parse(line)).
'''
Fernando Perez
add caching and better return value control
r7227 old_writeconsole = ri.get_writeconsole()
ri.set_writeconsole(self.write_console)
Jonathan Taylor
first commit of rmagic
r7214 try:
Fernando Perez
add caching and better return value control
r7227 value = ri.baseenv['eval'](ri.parse(line))
Jonathan Taylor
fixing bug in raising exception
r7237 except (ri.RRuntimeError, ValueError) as exception:
Jonathan Taylor
included flushed message in exception handling
r7281 warning_or_other_msg = self.flush() # otherwise next return seems to have copy of error
Thomas Kluyver
Rename RMagicError to RInterpreterError
r7327 raise RInterpreterError(line, str_to_unicode(str(exception)), warning_or_other_msg)
Fernando Perez
add caching and better return value control
r7227 text_output = self.flush()
ri.set_writeconsole(old_writeconsole)
return text_output, value
Jonathan Taylor
first commit of rmagic
r7214
def write_console(self, output):
'''
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 A hook to capture R's stdout in a cache.
Jonathan Taylor
first commit of rmagic
r7214 '''
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 self.Rstdout_cache.append(output)
Jonathan Taylor
first commit of rmagic
r7214
def flush(self):
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 '''
Flush R's stdout cache to a string, returning the string.
'''
value = ''.join([str_to_unicode(s, 'utf-8') for s in self.Rstdout_cache])
self.Rstdout_cache = []
Jonathan Taylor
first commit of rmagic
r7214 return value
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 @skip_doctest
Robert McGibbon
Fix issue #2550
r8956 @needs_local_scope
Jonathan Taylor
first commit of rmagic
r7214 @line_magic
Robert McGibbon
Fix issue #2550
r8956 def Rpush(self, line, local_ns=None):
Jonathan Taylor
first commit of rmagic
r7214 '''
A line-level magic for R that pushes
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 variables from python to rpy2. The line should be made up
of whitespace separated variable names in the IPython
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 namespace::
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 In [7]: import numpy as np
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 In [8]: X = np.array([4.5,6.3,7.9])
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 In [9]: X.mean()
Out[9]: 6.2333333333333343
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 In [10]: %Rpush X
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 In [11]: %R mean(X)
Out[11]: array([ 6.23333333])
Jonathan Taylor
first commit of rmagic
r7214
'''
Robert McGibbon
Fix issue #2550
r8956 if local_ns is None:
local_ns = {}
Jonathan Taylor
first commit of rmagic
r7214
inputs = line.split(' ')
for input in inputs:
Robert McGibbon
Fix issue #2550
r8956 try:
val = local_ns[input]
except KeyError:
Robert McGibbon
More informative name error
r8959 try:
val = self.shell.user_ns[input]
except KeyError:
# reraise the KeyError as a NameError so that it looks like
# the standard python behavior when you use an unnamed
# variable
raise NameError("name '%s' is not defined" % input)
Robert McGibbon
Fix issue #2550
r8956 self.r.assign(input, self.pyconverter(val))
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 @skip_doctest
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 @magic_arguments()
@argument(
'-d', '--as_dataframe', action='store_true',
default=False,
help='Convert objects to data.frames before returning to ipython.'
)
@argument(
'outputs',
nargs='*',
)
Jonathan Taylor
first commit of rmagic
r7214 @line_magic
def Rpull(self, line):
'''
Jonathan Taylor
small docstring fix
r7219 A line-level magic for R that pulls
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 variables from python to rpy2::
In [18]: _ = %R x = c(3,4,6.7); y = c(4,6,7); z = c('a',3,4)
In [19]: %Rpull x y z
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 In [20]: x
Out[20]: array([ 3. , 4. , 6.7])
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 In [21]: y
Out[21]: array([ 4., 6., 7.])
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 In [22]: z
Out[22]:
array(['a', '3', '4'],
dtype='|S1')
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 If --as_dataframe, then each object is returned as a structured array
after first passed through "as.data.frame" in R before
being calling self.Rconverter.
This is useful when a structured array is desired as output, or
when the object in R has mixed data types.
See the %%R docstring for more examples.
Jonathan Taylor
first commit of rmagic
r7214 Notes
-----
Beware that R names can have '.' so this is not fool proof.
To avoid this, don't name your R objects with '.'s...
'''
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 args = parse_argstring(self.Rpull, line)
outputs = args.outputs
Jonathan Taylor
first commit of rmagic
r7214 for output in outputs:
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 self.shell.push({output:self.Rconverter(self.r(output),dataframe=args.as_dataframe)})
@skip_doctest
@magic_arguments()
@argument(
'-d', '--as_dataframe', action='store_true',
default=False,
help='Convert objects to data.frames before returning to ipython.'
)
@argument(
'output',
nargs=1,
type=str,
)
@line_magic
def Rget(self, line):
'''
Return an object from rpy2, possibly as a structured array (if possible).
Similar to Rpull except only one argument is accepted and the value is
returned rather than pushed to self.shell.user_ns::
In [3]: dtype=[('x', '<i4'), ('y', '<f8'), ('z', '|S1')]
In [4]: datapy = np.array([(1, 2.9, 'a'), (2, 3.5, 'b'), (3, 2.1, 'c'), (4, 5, 'e')], dtype=dtype)
In [5]: %R -i datapy
In [6]: %Rget datapy
Out[6]:
array([['1', '2', '3', '4'],
['2', '3', '2', '5'],
['a', 'b', 'c', 'e']],
dtype='|S1')
In [7]: %Rget -d datapy
Out[7]:
array([(1, 2.9, 'a'), (2, 3.5, 'b'), (3, 2.1, 'c'), (4, 5.0, 'e')],
dtype=[('x', '<i4'), ('y', '<f8'), ('z', '|S1')])
'''
args = parse_argstring(self.Rget, line)
output = args.output
return self.Rconverter(self.r(output[0]),dataframe=args.as_dataframe)
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 @skip_doctest
Jonathan Taylor
first commit of rmagic
r7214 @magic_arguments()
@argument(
'-i', '--input', action='append',
help='Names of input variable from shell.user_ns to be assigned to R variables of the same names after calling self.pyconverter. Multiple names can be passed separated only by commas with no whitespace.'
)
@argument(
'-o', '--output', action='append',
help='Names of variables to be pushed from rpy2 to shell.user_ns after executing cell body and applying self.Rconverter. Multiple names can be passed separated only by commas with no whitespace.'
)
@argument(
'-w', '--width', type=int,
help='Width of png plotting device sent as an argument to *png* in R.'
)
@argument(
'-h', '--height', type=int,
help='Height of png plotting device sent as an argument to *png* in R.'
)
@argument(
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 '-d', '--dataframe', action='append',
help='Convert these objects to data.frames and return as structured arrays.'
)
@argument(
Donald Curtis
Fix units / res args for *png* plotting device....
r8805 '-u', '--units', type=unicode, choices=["px", "in", "cm", "mm"],
Jonathan Taylor
first commit of rmagic
r7214 help='Units of png plotting device sent as an argument to *png* in R. One of ["px", "in", "cm", "mm"].'
)
@argument(
Donald Curtis
Fix units / res args for *png* plotting device....
r8805 '-r', '--res', type=int,
help='Resolution of png plotting device sent as an argument to *png* in R. Defaults to 72 if *units* is one of ["in", "cm", "mm"].'
)
@argument(
Jonathan Taylor
first commit of rmagic
r7214 '-p', '--pointsize', type=int,
help='Pointsize of png plotting device sent as an argument to *png* in R.'
)
@argument(
'-b', '--bg',
help='Background of png plotting device sent as an argument to *png* in R.'
)
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217 @argument(
Fernando Perez
add caching and better return value control
r7227 '-n', '--noreturn',
help='Force the magic to not return anything.',
action='store_true',
default=False
)
@argument(
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217 'code',
nargs='*',
)
Guy Haskin Fernald
Added functionality to %R and %octave magics so that -i first looks in local...
r8262 @needs_local_scope
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217 @line_cell_magic
Guy Haskin Fernald
Added functionality to %R and %octave magics so that -i first looks in local...
r8262 def R(self, line, cell=None, local_ns=None):
Jonathan Taylor
first commit of rmagic
r7214 '''
Jonathan Taylor
reworking docstring
r7221 Execute code in R, and pull some of the results back into the Python namespace.
In line mode, this will evaluate an expression and convert the returned value to a Python object.
The return value is determined by rpy2's behaviour of returning the result of evaluating the
Jonathan Taylor
editing the docstring
r7277 final line.
Multiple R lines can be executed by joining them with semicolons::
Jonathan Taylor
reworking docstring
r7221
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 In [9]: %R X=c(1,4,5,7); sd(X); mean(X)
Out[9]: array([ 4.25])
Jonathan Taylor
reworking docstring
r7221
As a cell, this will run a block of R code, without bringing anything back by default::
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 In [10]: %%R
....: Y = c(2,4,3,9)
....: print(summary(lm(Y~X)))
....:
Jonathan Taylor
reworking docstring
r7221
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 Call:
lm(formula = Y ~ X)
Jonathan Taylor
reworking docstring
r7221
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 Residuals:
1 2 3 4
0.88 -0.24 -2.28 1.64
Jonathan Taylor
reworking docstring
r7221
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 Coefficients:
Estimate Std. Error t value Pr(>|t|)
(Intercept) 0.0800 2.3000 0.035 0.975
X 1.0400 0.4822 2.157 0.164
Jonathan Taylor
reworking docstring
r7221
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 Residual standard error: 2.088 on 2 degrees of freedom
Multiple R-squared: 0.6993,Adjusted R-squared: 0.549
F-statistic: 4.651 on 1 and 2 DF, p-value: 0.1638
Jonathan Taylor
reworking docstring
r7221
In the notebook, plots are published as the output of the cell.
%R plot(X, Y)
will create a scatter plot of X bs Y.
If cell is not None and line has some R code, it is prepended to
the R code in cell.
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 Objects can be passed back and forth between rpy2 and python via the -i -o flags in line::
Jonathan Taylor
reworking docstring
r7221
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 In [14]: Z = np.array([1,4,5,10])
Jonathan Taylor
reworking docstring
r7221
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 In [15]: %R -i Z mean(Z)
Out[15]: array([ 5.])
Jonathan Taylor
reworking docstring
r7221
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 In [16]: %R -o W W=Z*mean(Z)
Out[16]: array([ 5., 20., 25., 50.])
Jonathan Taylor
reworking docstring
r7221
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 In [17]: W
Out[17]: array([ 5., 20., 25., 50.])
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 The return value is determined by these rules:
* If the cell is not None, the magic returns None.
* If the cell evaluates as False, the resulting value is returned
unless the final line prints something to the console, in
which case None is returned.
* If the final line results in a NULL value when evaluated
Fernando Perez
add caching and better return value control
r7227 by rpy2, then None is returned.
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217
Jonathan Taylor
editing the docstring
r7277 * No attempt is made to convert the final value to a structured array.
Use the --dataframe flag or %Rget to push / return a structured array.
Jonathan Taylor
adding a comment about trailing semicolons
r7285 * If the -n flag is present, there is no return value.
* A trailing ';' will also result in no return value as the last
value in the line is an empty string.
Jonathan Taylor
editing the docstring
r7277 The --dataframe argument will attempt to return structured arrays.
This is useful for dataframes with
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 mixed data types. Note also that for a data.frame,
if it is returned as an ndarray, it is transposed::
In [18]: dtype=[('x', '<i4'), ('y', '<f8'), ('z', '|S1')]
In [19]: datapy = np.array([(1, 2.9, 'a'), (2, 3.5, 'b'), (3, 2.1, 'c'), (4, 5, 'e')], dtype=dtype)
In [20]: %%R -o datar
datar = datapy
....:
In [21]: datar
Out[21]:
array([['1', '2', '3', '4'],
['2', '3', '2', '5'],
['a', 'b', 'c', 'e']],
dtype='|S1')
In [22]: %%R -d datar
datar = datapy
....:
In [23]: datar
Out[23]:
array([(1, 2.9, 'a'), (2, 3.5, 'b'), (3, 2.1, 'c'), (4, 5.0, 'e')],
dtype=[('x', '<i4'), ('y', '<f8'), ('z', '|S1')])
Jonathan Taylor
editing the docstring
r7277 The --dataframe argument first tries colnames, then names.
If both are NULL, it returns an ndarray (i.e. unstructured)::
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276
In [1]: %R mydata=c(4,6,8.3); NULL
In [2]: %R -d mydata
In [3]: mydata
Out[3]: array([ 4. , 6. , 8.3])
In [4]: %R names(mydata) = c('a','b','c'); NULL
In [5]: %R -d mydata
In [6]: mydata
Out[6]:
array((4.0, 6.0, 8.3),
dtype=[('a', '<f8'), ('b', '<f8'), ('c', '<f8')])
In [7]: %R -o mydata
In [8]: mydata
Out[8]: array([ 4. , 6. , 8.3])
Jonathan Taylor
first commit of rmagic
r7214 '''
args = parse_argstring(self.R, line)
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217 # arguments 'code' in line are prepended to
# the cell lines
Guy Haskin Fernald
Added functionality to %R and %octave magics so that -i first looks in local...
r8262
if cell is None:
Jonathan Taylor
fixing bug in logic for returning values, also fixing bug by joining all code arguments to %%R to form a complete string for rpy2 to evaluate
r7220 code = ''
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217 return_output = True
Fernando Perez
add caching and better return value control
r7227 line_mode = True
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217 else:
Jonathan Taylor
fixing bug in logic for returning values, also fixing bug by joining all code arguments to %%R to form a complete string for rpy2 to evaluate
r7220 code = cell
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217 return_output = False
Fernando Perez
add caching and better return value control
r7227 line_mode = False
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217
Jonathan Taylor
fixing bug in logic for returning values, also fixing bug by joining all code arguments to %%R to form a complete string for rpy2 to evaluate
r7220 code = ' '.join(args.code) + code
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217
Guy Haskin Fernald
Added functionality to %R and %octave magics so that -i first looks in local...
r8262 # if there is no local namespace then default to an empty dict
if local_ns is None:
local_ns = {}
Jonathan Taylor
first commit of rmagic
r7214 if args.input:
for input in ','.join(args.input).split(','):
Guy Haskin Fernald
Added functionality to %R and %octave magics so that -i first looks in local...
r8262 try:
val = local_ns[input]
except KeyError:
Robert McGibbon
More informative name error
r8959 try:
val = self.shell.user_ns[input]
except KeyError:
raise NameError("name '%s' is not defined" % input)
Guy Haskin Fernald
Added functionality to %R and %octave magics so that -i first looks in local...
r8262 self.r.assign(input, self.pyconverter(val))
Jonathan Taylor
first commit of rmagic
r7214
Donald Curtis
Fix units / res args for *png* plotting device....
r8805 if getattr(args, 'units') is not None:
if args.units != "px" and getattr(args, 'res') is None:
args.res = 72
args.units = '"%s"' % args.units
png_argdict = dict([(n, getattr(args, n)) for n in ['units', 'res', 'height', 'width', 'bg', 'pointsize']])
Jonathan Taylor
first commit of rmagic
r7214 png_args = ','.join(['%s=%s' % (o,v) for o, v in png_argdict.items() if v is not None])
# execute the R code in a temporary directory
tmpd = tempfile.mkdtemp()
Benedikt Sauer
Fixed rmagic on Windows....
r8771 self.r('png("%s/Rplots%%03d.png",%s)' % (tmpd.replace('\\', '/'), png_args))
Fernando Perez
add caching and better return value control
r7227
Fernando Perez
Define missing variable
r7233 text_output = ''
Fernando Perez
add caching and better return value control
r7227 if line_mode:
for line in code.split(';'):
text_result, result = self.eval(line)
text_output += text_result
if text_result:
# the last line printed something to the console so we won't return it
return_output = False
else:
text_result, result = self.eval(code)
text_output += text_result
Jonathan Taylor
first commit of rmagic
r7214 self.r('dev.off()')
# read out all the saved .png files
Jonathan Taylor
reworking docstring
r7221 images = [open(imgfile, 'rb').read() for imgfile in glob("%s/Rplots*png" % tmpd)]
Jonathan Taylor
first commit of rmagic
r7214
# now publish the images
# mimicking IPython/zmq/pylab/backend_inline.py
fmt = 'png'
mimetypes = { 'png' : 'image/png', 'svg' : 'image/svg+xml' }
mime = mimetypes[fmt]
# publish the printed R objects, if any
Fernando Perez
add caching and better return value control
r7227
display_data = []
if text_output:
display_data.append(('RMagic.R', {'text/plain':text_output}))
Jonathan Taylor
first commit of rmagic
r7214
# flush text streams before sending figures, helps a little with output
for image in images:
# synchronization in the console (though it's a bandaid, not a real sln)
sys.stdout.flush(); sys.stderr.flush()
Fernando Perez
add caching and better return value control
r7227 display_data.append(('RMagic.R', {mime: image}))
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
added use cases for rpush/rpull, tried fixing indents for examples in R docstring
r7225 # kill the temporary directory
rmtree(tmpd)
Jonathan Taylor
first commit of rmagic
r7214 # try to turn every output into a numpy array
# this means that output are assumed to be castable
# as numpy arrays
if args.output:
for output in ','.join(args.output).split(','):
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 self.shell.push({output:self.Rconverter(self.r(output), dataframe=False)})
if args.dataframe:
for output in ','.join(args.dataframe).split(','):
self.shell.push({output:self.Rconverter(self.r(output), dataframe=True)})
Jonathan Taylor
first commit of rmagic
r7214
Fernando Perez
add caching and better return value control
r7227 for tag, disp_d in display_data:
publish_display_data(tag, disp_d)
# this will keep a reference to the display_data
# which might be useful to other objects who happen to use
# this method
Jonathan Taylor
first commit of rmagic
r7214
Fernando Perez
add caching and better return value control
r7227 if self.cache_display_data:
self.display_cache = display_data
Jonathan Taylor
removed %Rinline, %R has been converted to line_cell_magic
r7217
Fernando Perez
add caching and better return value control
r7227 # if in line mode and return_output, return the result as an ndarray
if return_output and not args.noreturn:
if result != ri.NULL:
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 return self.Rconverter(result, dataframe=False)
Jonathan Taylor
first commit of rmagic
r7214
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 __doc__ = __doc__.format(
R_DOC = ' '*8 + RMagics.R.__doc__,
RPUSH_DOC = ' '*8 + RMagics.Rpush.__doc__,
Jonathan Taylor
bug in __doc__, flushing error message from RMagic's stdout cache
r7279 RPULL_DOC = ' '*8 + RMagics.Rpull.__doc__,
Jonathan Taylor
added Rget, and options to try to return strucutred array
r7276 RGET_DOC = ' '*8 + RMagics.Rget.__doc__
Jonathan Taylor
adding file for automodule generation, improving docstrings for Rmagic
r7235 )
Jonathan Taylor
first commit of rmagic
r7214 def load_ipython_extension(ip):
"""Load the extension in IPython."""
Thomas Kluyver
Extensions no longer responsible for checking if they are already loaded
r8552 ip.register_magics(RMagics)
Thomas Kluyver
Reset readline delimiters after loading rmagic....
r9017 # Initialising rpy2 interferes with readline. Since, at this point, we've
# probably just loaded rpy2, we reset the delimiters. See issue gh-2759.
if ip.has_readline:
ip.readline.set_completer_delims(ip.readline_delims)