bump connexion

Author: previ

coderbot/main.py

@@ -8,7 +8,9 @@
 import picamera
 import connexion
 
-from flask_cors import CORS
+from connexion.options import SwaggerUIOptions
+from connexion.middleware import MiddlewarePosition
+from starlette.middleware.cors import CORSMiddleware
 
 from camera import Camera
 from motion import Motion
@@ -22,29 +24,27 @@
 # Logging configuration
 logger = logging.getLogger()
 logger.setLevel(os.environ.get("LOGLEVEL", "INFO"))
-# sh = logging.StreamHandler()
-# formatter = logging.Formatter('%(message)s')
-# sh.setFormatter(formatter)
-# logger.addHandler(sh)
 
 ## (Connexion) Flask app configuration
 
 # Serve a custom version of the swagger ui (Jinja2 templates) based on the default one
 #  from the folder 'swagger-ui'. Clone the 'swagger-ui' repository inside the backend folder
-options = {"swagger_ui": False}
-connexionApp = connexion.App(__name__, options=options)
-
-# Connexion wraps FlaskApp, so app becomes connexionApp.app
-app = connexionApp.app
-# Access-Control-Allow-Origin
-CORS(app)
-app.debug = False
+wagger_ui_options = SwaggerUIOptions(swagger_ui=True)
+app = connexion.App(__name__, swagger_ui_options=swagger_ui_options)
+app.add_middleware(
+    CORSMiddleware,
+    position=MiddlewarePosition.BEFORE_EXCEPTION,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
 app.prog_engine = ProgramEngine.get_instance()
 
 ## New API and web application
 
 # API v1 is defined in v1.yml and its methods are in api.py
-connexionApp.add_api('v1.yml')
+app.add_api('v1.yml')
 
 def button_pushed():
     if app.bot_config.get('button_func') == "startstop":
@@ -97,7 +97,7 @@ def run_server():
 
         remove_doreset_file()
 
-        app.run(host="0.0.0.0", port=5000, debug=False, use_reloader=False, threaded=True)
+        app.run(host="0.0.0.0", port=5000)
     finally:
         if cam:
             cam.exit()

docker/stub/requirements.txt

@@ -1,9 +1,6 @@
 # API framework
-connexion==2.14.2
-Flask==2.2.5
-Flask-Cors==3.0.10
+connexion[uvicorn,flask,swagger-ui]==3.0.5
 tinydb==4.8.0
-Werkzeug==2.2.3
 
 # Misc utils
 setuptools==69.2.0

docker/stub/start.sh

@@ -2,4 +2,4 @@
 
 export PYTHONPATH=./stub:./test:./coderbot
 cd /coderbot
-python3 coderbot/main.py
+python3 coderbot/main.py & python3 wifi/main.py 

requirements.txt

@@ -1,9 +1,6 @@
 # API framework
-connexion==2.14.2
-Flask==2.2.5
-Flask-Cors==3.0.10
+connexion[uvicorn,flask,swagger-ui]==3.0.5
 tinydb==4.8.0
-Werkzeug==2.2.3
 
 # Misc utils
 setuptools==69.2.0

stub/wifi/api.py

@@ -0,0 +1,19 @@
+import logging
+
+def list_access_points():
+    return {"ssids": [{"ssid": "my_wifi"}]}
+
+def connection_status():
+    return {"wifi": "true", "internet": "true"}
+
+def connect():
+    return "ok"
+
+def forget():
+    return "ok"
+
+def sset_hotspot_ssid():
+    return "ok"
+
+def set_hotspot_password():
+    return "ok"

stub/wifi/main.py

@@ -0,0 +1,35 @@
+#!/usr/bin/python
+
+import os
+import logging
+import logging.handlers
+import connexion
+from connexion.middleware import MiddlewarePosition
+from starlette.middleware.cors import CORSMiddleware
+
+# Logging configuration
+logger = logging.getLogger()
+logger.setLevel(os.environ.get("LOGLEVEL", "INFO"))
+
+## (Connexion) Flask app configuration
+
+# Serve a custom version of the swagger ui (Jinja2 templates) based on the default one
+#  from the folder 'swagger-ui'. Clone the 'swagger-ui' repository inside the backend folder
+
+app = connexion.App(__name__)
+app.add_middleware(
+    CORSMiddleware,
+    position=MiddlewarePosition.BEFORE_EXCEPTION,
+    allow_origins=["*"],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
+
+## New API and web application
+
+# API v1 is defined in v1.yml and its methods are in api.py
+app.add_api('v1.yml')
+
+if __name__ == "__main__":
+    app.run(host="0.0.0.0", port=9090)

stub/wifi/openapi.yaml

@@ -0,0 +1,64 @@
+openapi: "3.0.0"
+info:
+  version: "1.0"
+  title: OpenAPI 3.0 definition of WiFi API
+
+servers:
+  - url: http://coderbot.local/v1
+
+# Paths supported by the server application
+paths:
+  /list_access_points:
+    get:
+      operationId: "api.list_access_points"
+      summary: "list Access Points"
+      responses:
+        200:
+          description: "ok"
+      tags:
+        - Wifi
+  /connection_status:
+    get:
+      operationId: "api.connection_status"
+      summary: "connection Status"
+      responses:
+        200:
+          description: "ok"
+      tags:
+        - Wifi
+  /connect:
+    post:
+      operationId: "api.connect"
+      summary: "connect"
+      responses:
+        200:
+          description: "ok"
+      tags:
+        - Wifi
+  /forget:
+    post:
+      operationId: "api.forget"
+      summary: "forget"
+      responses:
+        200:
+          description: "ok"
+      tags:
+        - Wifi
+  /sset_hotspot_ssid:
+    post:
+      operationId: "api.sset_hotspot_ssid"
+      summary: "sset_hotspot_ssid"
+      responses:
+        200:
+          description: "ok"
+      tags:
+        - Wifi
+  /set_hotspot_password:
+    post:
+      operationId: "api.set_hotspot_password"
+      summary: "set_hotspot_password"
+      responses:
+        200:
+          description: "ok"
+      tags:
+        - Wifi