diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 5d4cd9f..95a269f 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -9,7 +9,7 @@ jobs: steps: - name: Start Redis - uses: supercharge/redis-github-action@1.2.0 + uses: supercharge/redis-github-action@1.5.0 with: redis-version: 6 @@ -21,7 +21,8 @@ jobs: - name: Install dependencies run: | - python -m pip install --upgrade setuptools pip + # python -m pip install --upgrade setuptools pip + python -m pip install --upgrade wheel pip pip install -U -r requirements.txt pip install -U -r dev-requirements.txt diff --git a/requirements.txt b/requirements.txt index ffc0a1a..821b4ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ git+https://github.com/adsabs/ADSMicroserviceUtils.git@v1.2.0 flask-redis==0.4.0 -flask-restful==0.3.8 +itsdangerous==2.0.1 +jinja2==3.0.3 redis==3.3.0 - - +werkzeug==2.0.2 diff --git a/resolverway/views.py b/resolverway/views.py index 9baaf8e..63dc8ff 100644 --- a/resolverway/views.py +++ b/resolverway/views.py @@ -299,6 +299,20 @@ def resolver(bibcode, link_type, url): if url: url = url.lstrip(':') + # if there are any parameters in the path, it is not going to come through + # need to explicitly be grabbed from request.args + # so grab it and appended to the url + # ie https://www.youtube.com/watch?v=NP0yvK2KK7I + # url contains https://www.youtube.com/watch + # request.args contains ImmutableMultiDict([('v', 'NP0yvK2KK7I')]) + params_dict = request.args + if params_dict: + params = '' + for key, value in params_dict.items(): + params += '%s=%s&' % (key, value) + if params: + url = "%s?%s" % (url, params) + return LinkRequest(bibcode, link_type.upper(), url=url).process_request()