From 65fba9c5f94ad5b690f4e8084eb3da4006a57619 Mon Sep 17 00:00:00 2001 From: golnazads <28757512+golnazads@users.noreply.github.com> Date: Tue, 6 Jun 2023 14:47:41 -0400 Subject: [PATCH 1/9] fixed path when it contains params --- resolverway/views.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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() From cd0845bf9afdef2568a25ef176a8f67537bc6e3f Mon Sep 17 00:00:00 2001 From: golnazads <28757512+golnazads@users.noreply.github.com> Date: Tue, 6 Jun 2023 14:49:35 -0400 Subject: [PATCH 2/9] commented upgrade tools --- .github/workflows/python_actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 5d4cd9f..4c422fd 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: | - python -m pip install --upgrade setuptools pip + # python -m pip install --upgrade setuptools pip pip install -U -r requirements.txt pip install -U -r dev-requirements.txt From df4a69f1cfed6802bb3ad69fe50431da2a472ff4 Mon Sep 17 00:00:00 2001 From: golnazads <28757512+golnazads@users.noreply.github.com> Date: Tue, 6 Jun 2023 14:58:28 -0400 Subject: [PATCH 3/9] ConcurrentLogHandler issue --- .github/workflows/python_actions.yml | 3 ++- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 4c422fd..39b4c5e 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,6 +21,7 @@ jobs: - name: Install dependencies run: | + python -m pip install --upgrade pip # python -m pip install --upgrade setuptools pip pip install -U -r requirements.txt pip install -U -r dev-requirements.txt diff --git a/requirements.txt b/requirements.txt index ffc0a1a..d8495d7 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 redis==3.3.0 From 4efa706898397204757226cb878c9c5c79fd4ba8 Mon Sep 17 00:00:00 2001 From: golnazads <28757512+golnazads@users.noreply.github.com> Date: Tue, 6 Jun 2023 15:02:07 -0400 Subject: [PATCH 4/9] ConcurrentLogHandler issue --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index d8495d7..d3bc98f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ git+https://github.com/adsabs/ADSMicroserviceUtils.git@v1.2.0 flask-redis==0.4.0 itsdangerous==2.0.1 +jinja2==3.0.3 redis==3.3.0 From cf1ca164f8d27ce58eef855a576814099baadc30 Mon Sep 17 00:00:00 2001 From: golnazads <28757512+golnazads@users.noreply.github.com> Date: Tue, 6 Jun 2023 15:03:26 -0400 Subject: [PATCH 5/9] ConcurrentLogHandler issue --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index d3bc98f..3b7084d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,6 @@ flask-redis==0.4.0 itsdangerous==2.0.1 jinja2==3.0.3 redis==3.3.0 +werkzeug==2.0.2 From fdd99eb69b48d60929db9844e9f8b7b9f6023a4b Mon Sep 17 00:00:00 2001 From: golnazads <28757512+golnazads@users.noreply.github.com> Date: Tue, 6 Jun 2023 15:06:07 -0400 Subject: [PATCH 6/9] ConcurrentLogHandler issue --- .github/workflows/python_actions.yml | 2 +- requirements.txt | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/python_actions.yml b/.github/workflows/python_actions.yml index 39b4c5e..95a269f 100644 --- a/.github/workflows/python_actions.yml +++ b/.github/workflows/python_actions.yml @@ -21,8 +21,8 @@ jobs: - name: Install dependencies run: | - python -m pip install --upgrade 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 3b7084d..1901ee8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,5 @@ git+https://github.com/adsabs/ADSMicroserviceUtils.git@v1.2.0 flask-redis==0.4.0 -itsdangerous==2.0.1 -jinja2==3.0.3 redis==3.3.0 -werkzeug==2.0.2 From 62d54e103fd235d63333389ebd251d093e6f3f6a Mon Sep 17 00:00:00 2001 From: golnazads <28757512+golnazads@users.noreply.github.com> Date: Tue, 6 Jun 2023 15:08:26 -0400 Subject: [PATCH 7/9] jinja2 upgrade --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 1901ee8..0111506 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ git+https://github.com/adsabs/ADSMicroserviceUtils.git@v1.2.0 flask-redis==0.4.0 +jinja2==3.0.3 redis==3.3.0 From 5aac6e93e346461bfc382ef27d556b83b15b768e Mon Sep 17 00:00:00 2001 From: golnazads <28757512+golnazads@users.noreply.github.com> Date: Tue, 6 Jun 2023 15:09:54 -0400 Subject: [PATCH 8/9] added itsdangerous --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 0111506..d3bc98f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ git+https://github.com/adsabs/ADSMicroserviceUtils.git@v1.2.0 flask-redis==0.4.0 +itsdangerous==2.0.1 jinja2==3.0.3 redis==3.3.0 From ea6087677ce351d16d822b71a5d781ace8140244 Mon Sep 17 00:00:00 2001 From: golnazads <28757512+golnazads@users.noreply.github.com> Date: Tue, 6 Jun 2023 15:11:46 -0400 Subject: [PATCH 9/9] added werkzeug --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index d3bc98f..821b4ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,4 @@ flask-redis==0.4.0 itsdangerous==2.0.1 jinja2==3.0.3 redis==3.3.0 - - +werkzeug==2.0.2