mirror of
https://github.com/valitydev/redash.git
synced 2024-11-07 09:28:51 +00:00
246eca1121
* Make core app compatible with Python 3 No backward compatibility with Python 2.7 is kept. This commit mostly contains changes made with 2to3 and manual tweaking when necessary. * Use Python 3.7 as base docker image Since it is not possible to change redash/base:debian to Python 3 without breaking future relases, its Dockerfile is temporarly copied here. * Upgrade some requirements to newest versions Some of the older versions were not compatible with Python 3. * Migrate tests to Python 3 * Build frontend on Python 3 * Make the HMAC sign function compatible with Python 3 In Python 3, HMAC only works with bytes so the strings and the float used in the sign function need to be encoded. Hopefully this is still backward compatible with already generated signatures. * Use assertCountEqual instead of assertItemsEqual The latter is not available in Python 3. See https://bugs.python.org/issue17866 * Remove redundant encoding header for Python 3 modules * Remove redundant string encoding in CLI * Rename list() functions in CLI These functions shadow the builtin list function which is problematic since 2to3 adds a fair amount of calls to the builtin list when it finds dict.keys() and dict.values(). Only the Python function is renamed, from the perspective of the CLI nothing changes. * Replace usage of Exception.message in CLI `message` is not available anymore, instead use the string representation of the exception. * Adapt test handlers to Python 3 * Fix test that relied on dict ordering * Make sure test results are always uploaded (#4215) * Support encoding memoryview to JSON psycopg2 returns `buffer` objects in Python 2.7 and `memoryview` in Python 3. See #3156 * Fix test relying on object address ordering * Decode bytes returned from Redis * Stop using e.message for most exceptions Exception.message is not available in Python 3 anymore, except for some exceptions defined by third-party libraries. * Fix writing XLSX files in Python 3 The buffer for the file should be made of bytes and the actual content written to it strings. Note: I do not know why the diff is so large as it's only a two lines change. Probably a white space or file encoding issue. * Fix test by comparing strings to strings * Fix another exception message unavailable in Python 3 * Fix export to CSV in Python 3 The UnicodeWriter is not used anymore. In Python 3, the interface provided by the CSV module only deals with strings, in and out. The encoding of the output is left to the user, in our case it is given to Flask via `make_response`. * (Python 3) Use Redis' decode_responses=True option (#4232) * Fix test_outdated_queries_works_scheduled_queries_tracker (use utcnow) * Make sure Redis connection uses decoded_responses option * Remove unused imports. * Use Redis' decode_responses option * Remove cases of explicit Redis decoding * Rename helper function and make sure it doesn't apply twice. * Don't add decode_responses to Celery Redis connection URL * Fix displaying error while connecting to SQLite The exception message is always a string in Python 3, so no need to try to decode things. * Fix another missing exception message * Handle JSON encoding for datasources returning bytes SimpleJSON assumes the bytes it receives contain text data, so it tries to UTF-8 encode them. It is sometimes not true, for instance the SQLite datasource returns bytes for BLOB types, which typically do not contain text but truly binary data. This commit disables SimpleJSON auto encoding of bytes to str and instead uses the same method as for memoryviews: generating a hex representation of the data. * Fix Python 3 compatibility with RQ * Revert some changes 2to3 tends to do (#4261) - Revert some changes 2to3 tends to do when it errs on the side of caution regarding dict view objects. - Also fixed some naming issues with one character variables in list comprehensions. - Fix Flask warning. * Upgrade dependencies * Remove useless `iter` added by 2to3 * Fix get_next_path tests (#4280) * Removed setting SERVER_NAME in tests setup to avoid a warning. * Change get_next_path to not return empty string in case of a domain only value. * Fix redirect tests: Since version 0.15 of Werkzeug it uses full path for fixing the location header instead of the root path. * Remove explicit dependency for Werkzeug * Switched pytz and certifi to unbinded versions. * Switch to new library for getting country from IP `python-geoip-geolite2` is not compatible with Python 3, instead use `maxminddb-geolite2` which is very similar as it includes the geolite2 database in the package . * Python 3 RQ modifications (#4281) * show current worker job (alongside with minor cosmetic column tweaks) * avoid loading entire job data for queued jobs * track general RQ queues (default, periodic and schemas) * get all active RQ queues * call get_celery_queues in another place * merge dicts the Python 3 way * extend the result_ttl of refresh_queries to 600 seconds to allow it to continue running periodically even after longer executions * Remove legacy Python flake8 tests
118 lines
3.8 KiB
Python
Executable File
118 lines
3.8 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
"""Copy bundle extension files to the client/app/extension directory"""
|
|
import logging
|
|
import os
|
|
from pathlib import Path
|
|
from shutil import copy
|
|
from collections import OrderedDict as odict
|
|
|
|
from importlib_metadata import entry_points
|
|
from importlib_resources import contents, is_resource, path
|
|
|
|
# Name of the subdirectory
|
|
BUNDLE_DIRECTORY = "bundle"
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
# Make a directory for extensions and set it as an environment variable
|
|
# to be picked up by webpack.
|
|
extensions_relative_path = Path('client', 'app', 'extensions')
|
|
extensions_directory = Path(__file__).parent.parent / extensions_relative_path
|
|
|
|
if not extensions_directory.exists():
|
|
extensions_directory.mkdir()
|
|
os.environ["EXTENSIONS_DIRECTORY"] = str(extensions_relative_path)
|
|
|
|
|
|
def resource_isdir(module, resource):
|
|
"""Whether a given resource is a directory in the given module
|
|
|
|
https://importlib-resources.readthedocs.io/en/latest/migration.html#pkg-resources-resource-isdir
|
|
"""
|
|
try:
|
|
return resource in contents(module) and not is_resource(module, resource)
|
|
except (ImportError, TypeError):
|
|
# module isn't a package, so can't have a subdirectory/-package
|
|
return False
|
|
|
|
|
|
def entry_point_module(entry_point):
|
|
"""Returns the dotted module path for the given entry point"""
|
|
return entry_point.pattern.match(entry_point.value).group("module")
|
|
|
|
|
|
def load_bundles():
|
|
""""Load bundles as defined in Redash extensions.
|
|
|
|
The bundle entry point can be defined as a dotted path to a module
|
|
or a callable, but it won't be called but just used as a means
|
|
to find the files under its file system path.
|
|
|
|
The name of the directory it looks for files in is "bundle".
|
|
|
|
So a Python package with an extension bundle could look like this::
|
|
|
|
my_extensions/
|
|
├── __init__.py
|
|
└── wide_footer
|
|
├── __init__.py
|
|
└── bundle
|
|
├── extension.js
|
|
└── styles.css
|
|
|
|
and would then need to register the bundle with an entry point
|
|
under the "redash.bundles" group, e.g. in your setup.py::
|
|
|
|
setup(
|
|
# ...
|
|
entry_points={
|
|
"redash.bundles": [
|
|
"wide_footer = my_extensions.wide_footer",
|
|
]
|
|
# ...
|
|
},
|
|
# ...
|
|
)
|
|
|
|
"""
|
|
bundles = odict()
|
|
for entry_point in entry_points().get("redash.bundles", []):
|
|
logger.info('Loading Redash bundle "%s".', entry_point.name)
|
|
module = entry_point_module(entry_point)
|
|
# Try to get a list of bundle files
|
|
if not resource_isdir(module, BUNDLE_DIRECTORY):
|
|
logger.error(
|
|
'Redash bundle directory "%s" could not be found.', entry_point.name
|
|
)
|
|
continue
|
|
with path(module, BUNDLE_DIRECTORY) as bundle_dir:
|
|
bundles[entry_point.name] = list(bundle_dir.rglob("*"))
|
|
|
|
return bundles
|
|
|
|
|
|
bundles = load_bundles().items()
|
|
if bundles:
|
|
print('Number of extension bundles found: {}'.format(len(bundles)))
|
|
else:
|
|
print('No extension bundles found.')
|
|
|
|
for bundle_name, paths in bundles:
|
|
# Shortcut in case not paths were found for the bundle
|
|
if not paths:
|
|
print('No paths found for bundle "{}".'.format(bundle_name))
|
|
continue
|
|
|
|
# The destination for the bundle files with the entry point name as the subdirectory
|
|
destination = Path(extensions_directory, bundle_name)
|
|
if not destination.exists():
|
|
destination.mkdir()
|
|
|
|
# Copy the bundle directory from the module to its destination.
|
|
print('Copying "{}" bundle to {}:'.format(bundle_name, destination.resolve()))
|
|
for src_path in paths:
|
|
dest_path = destination / src_path.name
|
|
print(" - {} -> {}".format(src_path, dest_path))
|
|
copy(str(src_path), str(dest_path))
|