From a5a35db41bf707401810563e5f5b10a0b14c6d8b Mon Sep 17 00:00:00 2001 From: cvriehl <_> Date: Tue, 31 Oct 2023 16:46:05 +0000 Subject: [PATCH 1/3] Committing changes for API exercise 1 --- application/app_v1.py | 2 +- application/app_v2.py | 2 +- application/app_v3.py | 2 +- application/app_v4.py | 2 +- application/app_v5.py | 2 +- application/app_v6.py | 2 +- application/requirements.txt | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/application/app_v1.py b/application/app_v1.py index 05873c0..fe99b8b 100644 --- a/application/app_v1.py +++ b/application/app_v1.py @@ -4,7 +4,7 @@ # Import modules from flask import Flask -from flask_restplus import Api, Resource +from flask_restx import Api, Resource # Define the application as a Flask app with the name defined by __name__ (i.e. the name of the current module) # Most tutorials define application as "app", but I have had issues with this when it comes to deployment, diff --git a/application/app_v2.py b/application/app_v2.py index 295ea58..d8f196a 100644 --- a/application/app_v2.py +++ b/application/app_v2.py @@ -4,7 +4,7 @@ # Import modules from flask import Flask -from flask_restplus import Api, Resource +from flask_restx import Api, Resource # Define the application as a Flask app with the name defined by __name__ (i.e. the name of the current module) # Most tutorials define application as "app", but I have had issues with this when it comes to deployment, diff --git a/application/app_v3.py b/application/app_v3.py index 6f53ff9..318f24b 100644 --- a/application/app_v3.py +++ b/application/app_v3.py @@ -4,7 +4,7 @@ # Import modules from flask import Flask -from flask_restplus import Api, Resource +from flask_restx import Api, Resource import _____ # Define the application as a Flask app with the name defined by __name__ (i.e. the name of the current module) diff --git a/application/app_v4.py b/application/app_v4.py index 08d1c9d..f73b998 100644 --- a/application/app_v4.py +++ b/application/app_v4.py @@ -4,7 +4,7 @@ # Import modules from flask import Flask, make_response -from flask_restplus import Api, Resource +from flask_restx import Api, Resource import requests from dicttoxml import dicttoxml diff --git a/application/app_v5.py b/application/app_v5.py index 5a012f9..2154df2 100644 --- a/application/app_v5.py +++ b/application/app_v5.py @@ -4,7 +4,7 @@ # Import modules from flask import Flask, make_response -from flask_restplus import Api, Resource, reqparse +from flask_restx import Api, Resource, reqparse import requests from dicttoxml import dicttoxml diff --git a/application/app_v6.py b/application/app_v6.py index 1aee5d4..e8bf7a8 100644 --- a/application/app_v6.py +++ b/application/app_v6.py @@ -4,7 +4,7 @@ # Import modules from flask import Flask, make_response, request -from flask_restplus import Api, Resource, reqparse, fields, abort +from flask_restx import Api, Resource, reqparse, fields, abort import requests from requests.exceptions import ConnectionError from dicttoxml import dicttoxml diff --git a/application/requirements.txt b/application/requirements.txt index 52cb3eb..462534c 100644 --- a/application/requirements.txt +++ b/application/requirements.txt @@ -1,3 +1,3 @@ -flask==1.1.1 -flask_restplus -Werkzeug==0.16.1 \ No newline at end of file +flask==3.0.0 +flask-restx==1.1.0 +Werkzeug==3.0.1 \ No newline at end of file From 622234f78f18a0b72111d2aa03f6d1c8d5dfd4d7 Mon Sep 17 00:00:00 2001 From: cvriehl <_> Date: Tue, 31 Oct 2023 17:22:33 +0000 Subject: [PATCH 2/3] Committing addition file changes --- application/rest_api/endpoints/__init__.py | 2 +- application/rest_api/endpoints/hello.py | 2 +- application/rest_api/endpoints/name.py | 2 +- application/rest_api/endpoints/request_parser.py | 2 +- application/rest_api/endpoints/variantvalidator_endpoints.py | 2 +- environment.yml | 3 +++ rest_variantValidator/app.py | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 environment.yml diff --git a/application/rest_api/endpoints/__init__.py b/application/rest_api/endpoints/__init__.py index 57c47a6..b445e4b 100644 --- a/application/rest_api/endpoints/__init__.py +++ b/application/rest_api/endpoints/__init__.py @@ -1,4 +1,4 @@ -from flask_restplus import Api +from flask_restx import Api from .hello import api as ns_hello from .name import api as ns_name diff --git a/application/rest_api/endpoints/hello.py b/application/rest_api/endpoints/hello.py index 4a79197..9c225f9 100644 --- a/application/rest_api/endpoints/hello.py +++ b/application/rest_api/endpoints/hello.py @@ -1,4 +1,4 @@ -from flask_restplus import Namespace, Resource +from flask_restx import Namespace, Resource from . import request_parser from . import representations diff --git a/application/rest_api/endpoints/name.py b/application/rest_api/endpoints/name.py index 78ebf08..6ef9f84 100644 --- a/application/rest_api/endpoints/name.py +++ b/application/rest_api/endpoints/name.py @@ -1,4 +1,4 @@ -from flask_restplus import Namespace, Resource +from flask_restx import Namespace, Resource from . import request_parser from . import representations diff --git a/application/rest_api/endpoints/request_parser.py b/application/rest_api/endpoints/request_parser.py index 6656ae7..2c2832f 100644 --- a/application/rest_api/endpoints/request_parser.py +++ b/application/rest_api/endpoints/request_parser.py @@ -1,4 +1,4 @@ -from flask_restplus import reqparse +from flask_restx import reqparse # Create a RequestParser object to identify specific content-type requests in HTTP URLs diff --git a/application/rest_api/endpoints/variantvalidator_endpoints.py b/application/rest_api/endpoints/variantvalidator_endpoints.py index 511480a..c51fdd6 100644 --- a/application/rest_api/endpoints/variantvalidator_endpoints.py +++ b/application/rest_api/endpoints/variantvalidator_endpoints.py @@ -1,4 +1,4 @@ -from flask_restplus import Namespace, Resource +from flask_restx import Namespace, Resource from . import request_parser from . import representations import requests diff --git a/environment.yml b/environment.yml new file mode 100644 index 0000000..59378a2 --- /dev/null +++ b/environment.yml @@ -0,0 +1,3 @@ +name: cr_env +dependencies: + - python==3.11.5 diff --git a/rest_variantValidator/app.py b/rest_variantValidator/app.py index 41c5ed5..8d05105 100644 --- a/rest_variantValidator/app.py +++ b/rest_variantValidator/app.py @@ -7,7 +7,7 @@ # IMPORT FLASK MODULES from flask import Flask ,request, jsonify, abort, url_for, g, send_file, redirect, Blueprint #, session, g, redirect, , abort, render_template, flash, make_response, abort -from flask_restful import Resource, Api, reqparse, abort, fields, marshal_with +from flask_restx import Resource, Api, reqparse, abort, fields, marshal_with from vv_flask_restful_swagger import swagger from flask_log import Logging from flask_mail import Mail, Message From 10fdd317c4de90ddd906f84bd1a07c61da69bfb4 Mon Sep 17 00:00:00 2001 From: cvriehl <_> Date: Tue, 31 Oct 2023 17:35:37 +0000 Subject: [PATCH 3/3] Updated requirements.txt with correct versions --- application/requirements.txt | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/application/requirements.txt b/application/requirements.txt index 462534c..28a588b 100644 --- a/application/requirements.txt +++ b/application/requirements.txt @@ -1,3 +1,17 @@ -flask==3.0.0 -flask-restx==1.1.0 -Werkzeug==3.0.1 \ No newline at end of file +aniso8601==9.0.1 +attrs==23.1.0 +click==8.1.7 +Flask +flask-restx +itsdangerous==2.1.2 +Jinja2==3.1.2 +jsonschema==4.19.1 +jsonschema-specifications==2023.7.1 +MarkupSafe==2.1.3 +pytz==2023.3.post1 +referencing==0.30.2 +rpds-py==0.10.6 +six==1.16.0 +Werkzeug==2.3.3 +requests +dicttoxml \ No newline at end of file