Mercurial > p > roundup > code
view roundup/dist/command/build_scripts.py @ 5710:0b79bfcb3312
Add support for making an idempotent POST. This allows retrying a POST
that was interrupted. It involves creating a post once only (poe) url
/rest/data/<class>/@poe/<random_token>. This url acts the same as a
post to /rest/data/<class>. However once the @poe url is used, it
can't be used for a second POST.
To make these changes:
1) Take the body of post_collection into a new post_collection_inner
function. Have post_collection call post_collection_inner.
2) Add a handler for POST to rest/data/class/@poe. This will return a
unique POE url. By default the url expires after 30 minutes. The
POE random token is only good for a specific user and is stored in
the session db.
3) Add a handler for POST to rest/data/<class>/@poe/<random token>.
The random token generated in 2 is validated for proper class (if
token is not generic) and proper user and must not have expired.
If everything is valid, call post_collection_inner to process the
input and generate the new entry.
To make recognition of 2 stable (so it's not confused with
rest/data/<:class_name>/<:item_id>), removed @ from
Routing::url_to_regex.
The current Routing.execute method stops on the first regular
expression to match the URL. Since item_id doesn't accept a POST, I
was getting 405 bad method sometimes. My guess is the order of the
regular expressions is not stable, so sometime I would get the right
regexp for /data/<class>/@poe and sometime I would get the one for
/data/<class>/<item_id>. By removing the @ from the url_to_regexp,
there was no way for the item_id case to match @poe.
There are alternate fixes we may need to look at. If a regexp matches
but the method does not, return to the regexp matching loop in
execute() looking for another match. Only once every possible match
has failed should the code return a 405 method failure.
Another fix is to implement a more sophisticated mechanism so that
@Routing.route("/data/<:class_name>/<:item_id>/<:attr_name>", 'PATCH')
has different regexps for matching <:class_name> <:item_id> and
<:attr_name>. Currently the regexp specified by url_to_regex is used
for every component.
Other fixes:
Made failure to find any props in props_from_args return an empty
dict rather than throwing an unhandled error.
Make __init__ for SimulateFieldStorageFromJson handle an empty json
doc. Useful for POSTing to rest/data/class/@poe with an empty
document.
Testing:
added testPostPOE to test/rest_common.py that I think covers
all the code that was added.
Documentation:
Add doc to rest.txt in the "Client API" section titled: Safely
Re-sending POST". Move existing section "Adding new rest endpoints" in
"Client API" to a new second level section called "Programming the
REST API". Also a minor change to the simple rest client moving the
header setting to continuation lines rather than showing one long
line.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Sun, 14 Apr 2019 21:07:11 -0400 |
| parents | 12baa5b9b597 |
| children |
line wrap: on
line source
# # Copyright (C) 2009 Stefan Seefeld # All rights reserved. # For license terms see the file COPYING.txt. # from distutils.command.build_scripts import build_scripts as base from distutils import log import sys, os, string class build_scripts(base): """ Overload the build_scripts command and create the scripts from scratch, depending on the target platform. You have to define the name of your package in an inherited class (due to the delayed instantiation of command classes in distutils, this cannot be passed to __init__). The scripts are created in an uniform scheme: they start the run() function in the module <packagename>.scripts.<mangled_scriptname> The mangling of script names replaces '-' and '/' characters with '-' and '.', so that they are valid module paths. If the target platform is win32, create .bat files instead of *nix shell scripts. Target platform is set to "win32" if main command is 'bdist_wininst' or if the command is 'bdist' and it has the list of formats (from command line or config file) and the first item on that list is wininst. Otherwise target platform is set to current (build) platform. """ package_name = 'roundup' def initialize_options(self): base.initialize_options(self) self.script_preamble = None self.target_platform = None self.python_executable = None def finalize_options(self): base.finalize_options(self) cmdopt=self.distribution.command_options # find the target platform if self.target_platform: # TODO? allow explicit setting from command line target = self.target_platform if "bdist_wininst" in cmdopt: target = "win32" elif "formats" in cmdopt.get("bdist", {}): formats = cmdopt["bdist"]["formats"][1].split(",") if formats[0] == "wininst": target = "win32" else: target = sys.platform if len(formats) > 1: self.warn( "Scripts are built for %s only (requested formats: %s)" % (target, ",".join(formats))) else: # default to current platform target = sys.platform self.target_platform = target # for native builds, use current python executable path; # for cross-platform builds, use default executable name if self.python_executable: # TODO? allow command-line option pass if target == sys.platform: self.python_executable = os.path.normpath(sys.executable) else: self.python_executable = "python" # for windows builds, add ".bat" extension if target == "win32": # *nix-like scripts may be useful also on win32 (cygwin) # to build both script versions, use: #self.scripts = list(self.scripts) + [script + ".bat" # for script in self.scripts] self.scripts = [script + ".bat" for script in self.scripts] # tweak python path for installations outside main python library if "prefix" in cmdopt.get("install", {}): prefix = os.path.expanduser(cmdopt['install']['prefix'][1]) version = '%d.%d'%sys.version_info[:2] self.script_preamble = """ import sys sys.path.insert(1, "%s/lib/python%s/site-packages") """%(prefix, version) else: self.script_preamble = '' def copy_scripts(self): """ Create each script listed in 'self.scripts' """ try: # Python 3. maketrans = str.maketrans except AttributeError: # Python 2. maketrans = string.maketrans to_module = maketrans('-/', '_.') self.mkpath(self.build_dir) for script in self.scripts: outfile = os.path.join(self.build_dir, os.path.basename(script)) #if not self.force and not newer(script, outfile): # self.announce("not copying %s (up-to-date)" % script) # continue if self.dry_run: log.info("would create %s" % outfile) continue module = os.path.splitext(os.path.basename(script))[0] module = module.translate(to_module) script_vars = { 'python': self.python_executable, 'package': self.package_name, 'module': module, 'prefix': self.script_preamble, } log.info("writing %s" % outfile) file = open(outfile, 'w') try: # could just check self.target_platform, # but looking at the script extension # makes it possible to build both *nix-like # and windows-like scripts on win32. # may be useful for cygwin. if os.path.splitext(outfile)[1] == ".bat": file.write('@echo off\n' 'if NOT "%%_4ver%%" == "" "%(python)s" -c "from %(package)s.scripts.%(module)s import run; run()" %%$\n' 'if "%%_4ver%%" == "" "%(python)s" -c "from %(package)s.scripts.%(module)s import run; run()" %%*\n' % script_vars) else: file.write('#! %(python)s\n%(prefix)s' 'from %(package)s.scripts.%(module)s import run\n' 'run()\n' % script_vars) finally: file.close() os.chmod(outfile, 0o755)
