From 619c391be9682214b44f7707d52fdf279ca5ae45 Mon Sep 17 00:00:00 2001 From: wing328 Date: Mon, 16 Oct 2017 11:48:13 +0800 Subject: [PATCH] update python flask petstore samples --- bin/python-flask-all.sh | 4 ++ ...n2.sh => python-flask-petstore-python2.sh} | 0 ...kConnexion.sh => python-flask-petstore.sh} | 0 .../.swagger-codegen/VERSION | 2 +- .../flaskConnexion-python2/requirements.txt | 2 +- .../swagger_server/models/api_response.py | 2 + .../swagger_server/models/category.py | 2 + .../swagger_server/models/order.py | 2 + .../swagger_server/models/pet.py | 2 + .../swagger_server/models/tag.py | 2 + .../swagger_server/models/user.py | 2 + .../swagger_server/swagger/swagger.yaml | 46 ++++++++++++++++++- .../flaskConnexion/.swagger-codegen/VERSION | 2 +- .../swagger_server/models/api_response.py | 2 + .../swagger_server/models/category.py | 2 + .../swagger_server/models/order.py | 2 + .../swagger_server/models/pet.py | 2 + .../swagger_server/models/tag.py | 2 + .../swagger_server/models/user.py | 2 + .../swagger_server/swagger/swagger.yaml | 46 ++++++++++++++++++- 20 files changed, 119 insertions(+), 7 deletions(-) create mode 100755 bin/python-flask-all.sh rename bin/{flaskConnexion-python2.sh => python-flask-petstore-python2.sh} (100%) rename bin/{flaskConnexion.sh => python-flask-petstore.sh} (100%) diff --git a/bin/python-flask-all.sh b/bin/python-flask-all.sh new file mode 100755 index 00000000000..ed4ca88d286 --- /dev/null +++ b/bin/python-flask-all.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +./bin/python-flask-petstore.sh +./bin/python-flask-petstore-python2.sh diff --git a/bin/flaskConnexion-python2.sh b/bin/python-flask-petstore-python2.sh similarity index 100% rename from bin/flaskConnexion-python2.sh rename to bin/python-flask-petstore-python2.sh diff --git a/bin/flaskConnexion.sh b/bin/python-flask-petstore.sh similarity index 100% rename from bin/flaskConnexion.sh rename to bin/python-flask-petstore.sh diff --git a/samples/server/petstore/flaskConnexion-python2/.swagger-codegen/VERSION b/samples/server/petstore/flaskConnexion-python2/.swagger-codegen/VERSION index 7fea99011a6..f9f7450d135 100644 --- a/samples/server/petstore/flaskConnexion-python2/.swagger-codegen/VERSION +++ b/samples/server/petstore/flaskConnexion-python2/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/flaskConnexion-python2/requirements.txt b/samples/server/petstore/flaskConnexion-python2/requirements.txt index 19b78ffc36d..87876f969e9 100644 --- a/samples/server/petstore/flaskConnexion-python2/requirements.txt +++ b/samples/server/petstore/flaskConnexion-python2/requirements.txt @@ -1,4 +1,4 @@ -connexion == 1.1.9 +connexion == 1.1.15 python_dateutil == 2.6.0 typing == 3.5.2.2 setuptools >= 21.0.0 diff --git a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/api_response.py b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/api_response.py index 0868d2a1049..c1e51033298 100644 --- a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/api_response.py +++ b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/api_response.py @@ -12,6 +12,8 @@ class ApiResponse(Model): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + def __init__(self, code=None, type=None, message=None): """ ApiResponse - a model defined in Swagger diff --git a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/category.py b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/category.py index fd702edf6fe..d465845fe11 100644 --- a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/category.py +++ b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/category.py @@ -12,6 +12,8 @@ class Category(Model): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + def __init__(self, id=None, name=None): """ Category - a model defined in Swagger diff --git a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/order.py b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/order.py index 9574a16fb46..fefe4cb8c5f 100644 --- a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/order.py +++ b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/order.py @@ -12,6 +12,8 @@ class Order(Model): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + def __init__(self, id=None, pet_id=None, quantity=None, ship_date=None, status=None, complete=False): """ Order - a model defined in Swagger diff --git a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/pet.py b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/pet.py index 0ecf301be64..35dac42dc45 100644 --- a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/pet.py +++ b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/pet.py @@ -14,6 +14,8 @@ class Pet(Model): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + def __init__(self, id=None, category=None, name=None, photo_urls=None, tags=None, status=None): """ Pet - a model defined in Swagger diff --git a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/tag.py b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/tag.py index 76b4c15c97e..0933d44d0b1 100644 --- a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/tag.py +++ b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/tag.py @@ -12,6 +12,8 @@ class Tag(Model): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + def __init__(self, id=None, name=None): """ Tag - a model defined in Swagger diff --git a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/user.py b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/user.py index 27f215ef61c..eddf5ef92ef 100644 --- a/samples/server/petstore/flaskConnexion-python2/swagger_server/models/user.py +++ b/samples/server/petstore/flaskConnexion-python2/swagger_server/models/user.py @@ -12,6 +12,8 @@ class User(Model): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + def __init__(self, id=None, username=None, first_name=None, last_name=None, email=None, password=None, phone=None, user_status=None): """ User - a model defined in Swagger diff --git a/samples/server/petstore/flaskConnexion-python2/swagger_server/swagger/swagger.yaml b/samples/server/petstore/flaskConnexion-python2/swagger_server/swagger/swagger.yaml index 92590b31bc1..32000d3c2dc 100644 --- a/samples/server/petstore/flaskConnexion-python2/swagger_server/swagger/swagger.yaml +++ b/samples/server/petstore/flaskConnexion-python2/swagger_server/swagger/swagger.yaml @@ -11,7 +11,7 @@ info: contact: email: "apiteam@swagger.io" license: - name: "Apache 2.0" + name: "Apache-2.0" url: "http://www.apache.org/licenses/LICENSE-2.0.html" host: "petstore.swagger.io" basePath: "/v2" @@ -108,11 +108,11 @@ paths: type: "array" items: type: "string" + default: "available" enum: - "available" - "pending" - "sold" - default: "available" collectionFormat: "csv" responses: 200: @@ -161,6 +161,7 @@ paths: - petstore_auth: - "write:pets" - "read:pets" + deprecated: true x-swagger-router-controller: "swagger_server.controllers.pet_controller" /pet/{petId}: get: @@ -625,6 +626,13 @@ definitions: default: false title: "Pet Order" description: "An order for a pets from the pet store" + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: "2000-01-23T04:56:07.000+00:00" + complete: false + status: "placed" xml: name: "Order" Category: @@ -637,6 +645,9 @@ definitions: type: "string" title: "Pet catehgry" description: "A category for a pet" + example: + name: "name" + id: 6 xml: name: "Category" User: @@ -663,6 +674,15 @@ definitions: description: "User Status" title: "a User" description: "A User who is purchasing from the pet store" + example: + firstName: "firstName" + lastName: "lastName" + password: "password" + userStatus: 6 + phone: "phone" + id: 0 + email: "email" + username: "username" xml: name: "User" Tag: @@ -675,6 +695,9 @@ definitions: type: "string" title: "Pet Tag" description: "A tag for a pet" + example: + name: "name" + id: 1 xml: name: "Tag" Pet: @@ -714,6 +737,21 @@ definitions: - "sold" title: "a Pet" description: "A pet for sale in the pet store" + example: + photoUrls: + - "photoUrls" + - "photoUrls" + name: "doggie" + id: 0 + category: + name: "name" + id: 6 + tags: + - name: "name" + id: 1 + - name: "name" + id: 1 + status: "available" xml: name: "Pet" ApiResponse: @@ -728,6 +766,10 @@ definitions: type: "string" title: "An uploaded response" description: "Describes the result of uploading an image resource" + example: + code: 0 + type: "type" + message: "message" externalDocs: description: "Find out more about Swagger" url: "http://swagger.io" diff --git a/samples/server/petstore/flaskConnexion/.swagger-codegen/VERSION b/samples/server/petstore/flaskConnexion/.swagger-codegen/VERSION index 7fea99011a6..f9f7450d135 100644 --- a/samples/server/petstore/flaskConnexion/.swagger-codegen/VERSION +++ b/samples/server/petstore/flaskConnexion/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/flaskConnexion/swagger_server/models/api_response.py b/samples/server/petstore/flaskConnexion/swagger_server/models/api_response.py index b49738579d6..8b7cecc3398 100644 --- a/samples/server/petstore/flaskConnexion/swagger_server/models/api_response.py +++ b/samples/server/petstore/flaskConnexion/swagger_server/models/api_response.py @@ -12,6 +12,8 @@ class ApiResponse(Model): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + def __init__(self, code: int=None, type: str=None, message: str=None): """ ApiResponse - a model defined in Swagger diff --git a/samples/server/petstore/flaskConnexion/swagger_server/models/category.py b/samples/server/petstore/flaskConnexion/swagger_server/models/category.py index ba381b5792f..42657e8447d 100644 --- a/samples/server/petstore/flaskConnexion/swagger_server/models/category.py +++ b/samples/server/petstore/flaskConnexion/swagger_server/models/category.py @@ -12,6 +12,8 @@ class Category(Model): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + def __init__(self, id: int=None, name: str=None): """ Category - a model defined in Swagger diff --git a/samples/server/petstore/flaskConnexion/swagger_server/models/order.py b/samples/server/petstore/flaskConnexion/swagger_server/models/order.py index 772769084d5..deffb5236b2 100644 --- a/samples/server/petstore/flaskConnexion/swagger_server/models/order.py +++ b/samples/server/petstore/flaskConnexion/swagger_server/models/order.py @@ -12,6 +12,8 @@ class Order(Model): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + def __init__(self, id: int=None, pet_id: int=None, quantity: int=None, ship_date: datetime=None, status: str=None, complete: bool=False): """ Order - a model defined in Swagger diff --git a/samples/server/petstore/flaskConnexion/swagger_server/models/pet.py b/samples/server/petstore/flaskConnexion/swagger_server/models/pet.py index 6594f0f90d2..30173e024fb 100644 --- a/samples/server/petstore/flaskConnexion/swagger_server/models/pet.py +++ b/samples/server/petstore/flaskConnexion/swagger_server/models/pet.py @@ -14,6 +14,8 @@ class Pet(Model): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + def __init__(self, id: int=None, category: Category=None, name: str=None, photo_urls: List[str]=None, tags: List[Tag]=None, status: str=None): """ Pet - a model defined in Swagger diff --git a/samples/server/petstore/flaskConnexion/swagger_server/models/tag.py b/samples/server/petstore/flaskConnexion/swagger_server/models/tag.py index 635ab029eea..9931b7476b1 100644 --- a/samples/server/petstore/flaskConnexion/swagger_server/models/tag.py +++ b/samples/server/petstore/flaskConnexion/swagger_server/models/tag.py @@ -12,6 +12,8 @@ class Tag(Model): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + def __init__(self, id: int=None, name: str=None): """ Tag - a model defined in Swagger diff --git a/samples/server/petstore/flaskConnexion/swagger_server/models/user.py b/samples/server/petstore/flaskConnexion/swagger_server/models/user.py index 08ebe6cf9db..c4ea4d373bc 100644 --- a/samples/server/petstore/flaskConnexion/swagger_server/models/user.py +++ b/samples/server/petstore/flaskConnexion/swagger_server/models/user.py @@ -12,6 +12,8 @@ class User(Model): NOTE: This class is auto generated by the swagger code generator program. Do not edit the class manually. """ + + def __init__(self, id: int=None, username: str=None, first_name: str=None, last_name: str=None, email: str=None, password: str=None, phone: str=None, user_status: int=None): """ User - a model defined in Swagger diff --git a/samples/server/petstore/flaskConnexion/swagger_server/swagger/swagger.yaml b/samples/server/petstore/flaskConnexion/swagger_server/swagger/swagger.yaml index 92590b31bc1..32000d3c2dc 100644 --- a/samples/server/petstore/flaskConnexion/swagger_server/swagger/swagger.yaml +++ b/samples/server/petstore/flaskConnexion/swagger_server/swagger/swagger.yaml @@ -11,7 +11,7 @@ info: contact: email: "apiteam@swagger.io" license: - name: "Apache 2.0" + name: "Apache-2.0" url: "http://www.apache.org/licenses/LICENSE-2.0.html" host: "petstore.swagger.io" basePath: "/v2" @@ -108,11 +108,11 @@ paths: type: "array" items: type: "string" + default: "available" enum: - "available" - "pending" - "sold" - default: "available" collectionFormat: "csv" responses: 200: @@ -161,6 +161,7 @@ paths: - petstore_auth: - "write:pets" - "read:pets" + deprecated: true x-swagger-router-controller: "swagger_server.controllers.pet_controller" /pet/{petId}: get: @@ -625,6 +626,13 @@ definitions: default: false title: "Pet Order" description: "An order for a pets from the pet store" + example: + petId: 6 + quantity: 1 + id: 0 + shipDate: "2000-01-23T04:56:07.000+00:00" + complete: false + status: "placed" xml: name: "Order" Category: @@ -637,6 +645,9 @@ definitions: type: "string" title: "Pet catehgry" description: "A category for a pet" + example: + name: "name" + id: 6 xml: name: "Category" User: @@ -663,6 +674,15 @@ definitions: description: "User Status" title: "a User" description: "A User who is purchasing from the pet store" + example: + firstName: "firstName" + lastName: "lastName" + password: "password" + userStatus: 6 + phone: "phone" + id: 0 + email: "email" + username: "username" xml: name: "User" Tag: @@ -675,6 +695,9 @@ definitions: type: "string" title: "Pet Tag" description: "A tag for a pet" + example: + name: "name" + id: 1 xml: name: "Tag" Pet: @@ -714,6 +737,21 @@ definitions: - "sold" title: "a Pet" description: "A pet for sale in the pet store" + example: + photoUrls: + - "photoUrls" + - "photoUrls" + name: "doggie" + id: 0 + category: + name: "name" + id: 6 + tags: + - name: "name" + id: 1 + - name: "name" + id: 1 + status: "available" xml: name: "Pet" ApiResponse: @@ -728,6 +766,10 @@ definitions: type: "string" title: "An uploaded response" description: "Describes the result of uploading an image resource" + example: + code: 0 + type: "type" + message: "message" externalDocs: description: "Find out more about Swagger" url: "http://swagger.io"