##// END OF EJS Templates
Merge pull request #13433 from kolibril13/magic_argument...
Matthias Bussonnier -
r27442:26054024 merge
parent child Browse files
Show More
@@ -1,278 +1,310 b''
1 1 ''' A decorator-based method of constructing IPython magics with `argparse`
2 2 option handling.
3 3
4 4 New magic functions can be defined like so::
5 5
6 6 from IPython.core.magic_arguments import (argument, magic_arguments,
7 7 parse_argstring)
8 8
9 9 @magic_arguments()
10 10 @argument('-o', '--option', help='An optional argument.')
11 11 @argument('arg', type=int, help='An integer positional argument.')
12 12 def magic_cool(self, arg):
13 13 """ A really cool magic command.
14 14
15 15 """
16 16 args = parse_argstring(magic_cool, arg)
17 17 ...
18 18
19 19 The `@magic_arguments` decorator marks the function as having argparse arguments.
20 20 The `@argument` decorator adds an argument using the same syntax as argparse's
21 21 `add_argument()` method. More sophisticated uses may also require the
22 22 `@argument_group` or `@kwds` decorator to customize the formatting and the
23 23 parsing.
24 24
25 25 Help text for the magic is automatically generated from the docstring and the
26 26 arguments::
27 27
28 28 In[1]: %cool?
29 29 %cool [-o OPTION] arg
30 30
31 31 A really cool magic command.
32 32
33 33 positional arguments:
34 34 arg An integer positional argument.
35 35
36 36 optional arguments:
37 37 -o OPTION, --option OPTION
38 38 An optional argument.
39 39
40 Here is an elaborated example that uses default parameters in `argument` and calls the `args` in the cell magic::
41
42 from IPython.core.magic import register_cell_magic
43 from IPython.core.magic_arguments import (argument, magic_arguments,
44 parse_argstring)
45
46
47 @magic_arguments()
48 @argument(
49 "--option",
50 "-o",
51 help=("Add an option here"),
52 )
53 @argument(
54 "--style",
55 "-s",
56 default="foo",
57 help=("Add some style arguments"),
58 )
59 @register_cell_magic
60 def my_cell_magic(line, cell):
61 args = parse_argstring(my_cell_magic, line)
62 print(f"{args.option=}")
63 print(f"{args.style=}")
64 print(f"{cell=}")
65
66 In a jupyter notebook, this cell magic can be executed like this::
67
68 %%my_cell_magic -o Hello
69 print("bar")
70 i = 42
71
40 72 Inheritance diagram:
41 73
42 74 .. inheritance-diagram:: IPython.core.magic_arguments
43 75 :parts: 3
44 76
45 77 '''
46 78 #-----------------------------------------------------------------------------
47 79 # Copyright (C) 2010-2011, IPython Development Team.
48 80 #
49 81 # Distributed under the terms of the Modified BSD License.
50 82 #
51 83 # The full license is in the file COPYING.txt, distributed with this software.
52 84 #-----------------------------------------------------------------------------
53 85 import argparse
54 86 import re
55 87
56 88 # Our own imports
57 89 from IPython.core.error import UsageError
58 90 from IPython.utils.decorators import undoc
59 91 from IPython.utils.process import arg_split
60 92 from IPython.utils.text import dedent
61 93
62 94 NAME_RE = re.compile(r"[a-zA-Z][a-zA-Z0-9_-]*$")
63 95
64 96 @undoc
65 97 class MagicHelpFormatter(argparse.RawDescriptionHelpFormatter):
66 98 """A HelpFormatter with a couple of changes to meet our needs.
67 99 """
68 100 # Modified to dedent text.
69 101 def _fill_text(self, text, width, indent):
70 102 return argparse.RawDescriptionHelpFormatter._fill_text(self, dedent(text), width, indent)
71 103
72 104 # Modified to wrap argument placeholders in <> where necessary.
73 105 def _format_action_invocation(self, action):
74 106 if not action.option_strings:
75 107 metavar, = self._metavar_formatter(action, action.dest)(1)
76 108 return metavar
77 109
78 110 else:
79 111 parts = []
80 112
81 113 # if the Optional doesn't take a value, format is:
82 114 # -s, --long
83 115 if action.nargs == 0:
84 116 parts.extend(action.option_strings)
85 117
86 118 # if the Optional takes a value, format is:
87 119 # -s ARGS, --long ARGS
88 120 else:
89 121 default = action.dest.upper()
90 122 args_string = self._format_args(action, default)
91 123 # IPYTHON MODIFICATION: If args_string is not a plain name, wrap
92 124 # it in <> so it's valid RST.
93 125 if not NAME_RE.match(args_string):
94 126 args_string = "<%s>" % args_string
95 127 for option_string in action.option_strings:
96 128 parts.append('%s %s' % (option_string, args_string))
97 129
98 130 return ', '.join(parts)
99 131
100 132 # Override the default prefix ('usage') to our % magic escape,
101 133 # in a code block.
102 134 def add_usage(self, usage, actions, groups, prefix="::\n\n %"):
103 135 super(MagicHelpFormatter, self).add_usage(usage, actions, groups, prefix)
104 136
105 137 class MagicArgumentParser(argparse.ArgumentParser):
106 138 """ An ArgumentParser tweaked for use by IPython magics.
107 139 """
108 140 def __init__(self,
109 141 prog=None,
110 142 usage=None,
111 143 description=None,
112 144 epilog=None,
113 145 parents=None,
114 146 formatter_class=MagicHelpFormatter,
115 147 prefix_chars='-',
116 148 argument_default=None,
117 149 conflict_handler='error',
118 150 add_help=False):
119 151 if parents is None:
120 152 parents = []
121 153 super(MagicArgumentParser, self).__init__(prog=prog, usage=usage,
122 154 description=description, epilog=epilog,
123 155 parents=parents, formatter_class=formatter_class,
124 156 prefix_chars=prefix_chars, argument_default=argument_default,
125 157 conflict_handler=conflict_handler, add_help=add_help)
126 158
127 159 def error(self, message):
128 160 """ Raise a catchable error instead of exiting.
129 161 """
130 162 raise UsageError(message)
131 163
132 164 def parse_argstring(self, argstring):
133 165 """ Split a string into an argument list and parse that argument list.
134 166 """
135 167 argv = arg_split(argstring)
136 168 return self.parse_args(argv)
137 169
138 170
139 171 def construct_parser(magic_func):
140 172 """ Construct an argument parser using the function decorations.
141 173 """
142 174 kwds = getattr(magic_func, 'argcmd_kwds', {})
143 175 if 'description' not in kwds:
144 176 kwds['description'] = getattr(magic_func, '__doc__', None)
145 177 arg_name = real_name(magic_func)
146 178 parser = MagicArgumentParser(arg_name, **kwds)
147 179 # Reverse the list of decorators in order to apply them in the
148 180 # order in which they appear in the source.
149 181 group = None
150 182 for deco in magic_func.decorators[::-1]:
151 183 result = deco.add_to_parser(parser, group)
152 184 if result is not None:
153 185 group = result
154 186
155 187 # Replace the magic function's docstring with the full help text.
156 188 magic_func.__doc__ = parser.format_help()
157 189
158 190 return parser
159 191
160 192
161 193 def parse_argstring(magic_func, argstring):
162 194 """ Parse the string of arguments for the given magic function.
163 195 """
164 196 return magic_func.parser.parse_argstring(argstring)
165 197
166 198
167 199 def real_name(magic_func):
168 200 """ Find the real name of the magic.
169 201 """
170 202 magic_name = magic_func.__name__
171 203 if magic_name.startswith('magic_'):
172 204 magic_name = magic_name[len('magic_'):]
173 205 return getattr(magic_func, 'argcmd_name', magic_name)
174 206
175 207
176 208 class ArgDecorator(object):
177 209 """ Base class for decorators to add ArgumentParser information to a method.
178 210 """
179 211
180 212 def __call__(self, func):
181 213 if not getattr(func, 'has_arguments', False):
182 214 func.has_arguments = True
183 215 func.decorators = []
184 216 func.decorators.append(self)
185 217 return func
186 218
187 219 def add_to_parser(self, parser, group):
188 220 """ Add this object's information to the parser, if necessary.
189 221 """
190 222 pass
191 223
192 224
193 225 class magic_arguments(ArgDecorator):
194 226 """ Mark the magic as having argparse arguments and possibly adjust the
195 227 name.
196 228 """
197 229
198 230 def __init__(self, name=None):
199 231 self.name = name
200 232
201 233 def __call__(self, func):
202 234 if not getattr(func, 'has_arguments', False):
203 235 func.has_arguments = True
204 236 func.decorators = []
205 237 if self.name is not None:
206 238 func.argcmd_name = self.name
207 239 # This should be the first decorator in the list of decorators, thus the
208 240 # last to execute. Build the parser.
209 241 func.parser = construct_parser(func)
210 242 return func
211 243
212 244
213 245 class ArgMethodWrapper(ArgDecorator):
214 246
215 247 """
216 248 Base class to define a wrapper for ArgumentParser method.
217 249
218 250 Child class must define either `_method_name` or `add_to_parser`.
219 251
220 252 """
221 253
222 254 _method_name = None
223 255
224 256 def __init__(self, *args, **kwds):
225 257 self.args = args
226 258 self.kwds = kwds
227 259
228 260 def add_to_parser(self, parser, group):
229 261 """ Add this object's information to the parser.
230 262 """
231 263 if group is not None:
232 264 parser = group
233 265 getattr(parser, self._method_name)(*self.args, **self.kwds)
234 266 return None
235 267
236 268
237 269 class argument(ArgMethodWrapper):
238 270 """ Store arguments and keywords to pass to add_argument().
239 271
240 272 Instances also serve to decorate command methods.
241 273 """
242 274 _method_name = 'add_argument'
243 275
244 276
245 277 class defaults(ArgMethodWrapper):
246 278 """ Store arguments and keywords to pass to set_defaults().
247 279
248 280 Instances also serve to decorate command methods.
249 281 """
250 282 _method_name = 'set_defaults'
251 283
252 284
253 285 class argument_group(ArgMethodWrapper):
254 286 """ Store arguments and keywords to pass to add_argument_group().
255 287
256 288 Instances also serve to decorate command methods.
257 289 """
258 290
259 291 def add_to_parser(self, parser, group):
260 292 """ Add this object's information to the parser.
261 293 """
262 294 return parser.add_argument_group(*self.args, **self.kwds)
263 295
264 296
265 297 class kwds(ArgDecorator):
266 298 """ Provide other keywords to the sub-parser constructor.
267 299 """
268 300 def __init__(self, **kwds):
269 301 self.kwds = kwds
270 302
271 303 def __call__(self, func):
272 304 func = super(kwds, self).__call__(func)
273 305 func.argcmd_kwds = self.kwds
274 306 return func
275 307
276 308
277 309 __all__ = ['magic_arguments', 'argument', 'argument_group', 'kwds',
278 310 'parse_argstring']
General Comments 0
You need to be logged in to leave comments. Login now