feat(python): now generated python code passes flake8 --max-line-length 120 check

Fix #29

Author: php-coder

examples/python/routes.py

@@ -6,20 +6,21 @@
 
 router = APIRouter()
 
+
 async def db_connection():
     return psycopg2.connect(
-        database = os.getenv('DB_NAME'),
-        user = os.getenv('DB_USER'),
-        password = os.getenv('DB_PASSWORD'),
-        host = os.getenv('DB_HOST', 'localhost'),
-        port = 5432)
+        database=os.getenv('DB_NAME'),
+        user=os.getenv('DB_USER'),
+        password=os.getenv('DB_PASSWORD'),
+        host=os.getenv('DB_HOST', 'localhost'),
+        port=5432)
 
 
 @router.get('/v1/categories/count')
-def get_v1_categories_count(conn = Depends(db_connection)):
+def get_v1_categories_count(conn=Depends(db_connection)):
     try:
         with conn:
-            with conn.cursor(cursor_factory = psycopg2.extras.RealDictCursor) as cur:
+            with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur:
                 cur.execute("SELECT COUNT(*) AS counter FROM categories")
                 result = cur.fetchone()
                 if result is None:
@@ -28,11 +29,12 @@ def get_v1_categories_count(conn = Depends(db_connection)):
     finally:
         conn.close()
 
+
 @router.get('/v1/categories/stat')
-def get_v1_categories_stat(conn = Depends(db_connection)):
+def get_v1_categories_stat(conn=Depends(db_connection)):
     try:
         with conn:
-            with conn.cursor(cursor_factory = psycopg2.extras.DictCursor) as cur:
+            with conn.cursor(cursor_factory=psycopg2.extras.DictCursor) as cur:
                 result = {}
                 cur.execute("SELECT COUNT(*) FROM categories")
                 result['total'] = cur.fetchone()[0]
@@ -46,31 +48,33 @@ def get_v1_categories_stat(conn = Depends(db_connection)):
     finally:
         conn.close()
 
+
 @router.get('/v1/collections/{collectionId}/categories/count')
-def get_v1_collections_collection_id_categories_count(collectionId, conn = Depends(db_connection)):
+def get_v1_collections_collection_id_categories_count(collectionId, conn=Depends(db_connection)):
     try:
         with conn:
-            with conn.cursor(cursor_factory = psycopg2.extras.RealDictCursor) as cur:
+            with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur:
                 cur.execute(
                     """
                     SELECT COUNT(DISTINCT s.category_id) AS counter
                       FROM collections_series cs
                       JOIN series s
                         ON s.id = cs.series_id
                      WHERE cs.collection_id = %(collectionId)s
-                    """, { "collectionId": collectionId })
+                    """, {"collectionId": collectionId})
                 result = cur.fetchone()
                 if result is None:
                     raise HTTPException(status_code=404)
                 return result
     finally:
         conn.close()
 
+
 @router.get('/v1/categories')
-def get_list_v1_categories(limit, conn = Depends(db_connection)):
+def get_list_v1_categories(limit, conn=Depends(db_connection)):
     try:
         with conn:
-            with conn.cursor(cursor_factory = psycopg2.extras.RealDictCursor) as cur:
+            with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur:
                 cur.execute(
                     """
                     SELECT id
@@ -79,20 +83,22 @@ def get_list_v1_categories(limit, conn = Depends(db_connection)):
                          , slug
                      FROM categories
                     LIMIT %(limit)s
-                    """, { "limit": limit })
+                    """, {"limit": limit})
                 return cur.fetchall()
     finally:
         conn.close()
 
+
 @router.post('/v1/categories')
 def post_v1_categories():
     pass
 
+
 @router.get('/v1/categories/{categoryId}')
-def get_v1_categories_category_id(categoryId, conn = Depends(db_connection)):
+def get_v1_categories_category_id(categoryId, conn=Depends(db_connection)):
     try:
         with conn:
-            with conn.cursor(cursor_factory = psycopg2.extras.RealDictCursor) as cur:
+            with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur:
                 cur.execute(
                     """
                     SELECT id
@@ -101,19 +107,20 @@ def get_v1_categories_category_id(categoryId, conn = Depends(db_connection)):
                          , slug
                       FROM categories
                      WHERE id = %(categoryId)s
-                    """, { "categoryId": categoryId })
+                    """, {"categoryId": categoryId})
                 result = cur.fetchone()
                 if result is None:
                     raise HTTPException(status_code=404)
                 return result
     finally:
         conn.close()
 
+
 @router.put('/v1/categories/{categoryId}')
 def put_v1_categories_category_id():
     pass
 
+
 @router.delete('/v1/categories/{categoryId}')
 def delete_v1_categories_category_id():
     pass
-

src/templates/routes.py.ejs

@@ -6,14 +6,14 @@ from fastapi import APIRouter, Depends, HTTPException
 
 router = APIRouter()
 
+
 async def db_connection():
     return psycopg2.connect(
-        database = os.getenv('DB_NAME'),
-        user = os.getenv('DB_USER'),
-        password = os.getenv('DB_PASSWORD'),
-        host = os.getenv('DB_HOST', 'localhost'),
-        port = 5432)
-
+        database=os.getenv('DB_NAME'),
+        user=os.getenv('DB_USER'),
+        password=os.getenv('DB_PASSWORD'),
+        host=os.getenv('DB_HOST', 'localhost'),
+        port=5432)
 <%
 // { "get", "/v1/categories/:categoryId" } => "get_v1_categories_category_id"
 function generate_method_name(method, path) {
@@ -57,7 +57,7 @@ endpoints.forEach(function(endpoint) {
 
         // LATER: add support for aggregated_queries (#17)
         const argsFromQuery = method.query ? extractParamsFromQuery(method.query).map(stipOurPrefixes) : []
-        const methodArgs = Array.from(new Set([...argsFromPath, ...argsFromQuery, 'conn = Depends(db_connection)']))
+        const methodArgs = Array.from(new Set([...argsFromPath, ...argsFromQuery, 'conn=Depends(db_connection)']))
 
         const queriesWithNames = []
         if (method.query) {
@@ -75,21 +75,22 @@ endpoints.forEach(function(endpoint) {
                 const params = extractParamsFromQuery(query);
                 const formattedParams = params.length > 0
                     // [ "p.categoryId" ] => [ '"categoryId": categoryId' ]
-                    ? ', { ' + params.map(param => param.substring(2)).map(param => `"${param}": ${param}`).join(', ') + ' }'
+                    ? ', {' + params.map(param => param.substring(2)).map(param => `"${param}": ${param}`).join(', ') + '}'
                     : ''
                 queries.push({ [name]: { sql : sql, formattedParams: formattedParams }})
             }
         })
 
         if (hasGetOne || hasGetMany) {
 %>
+
 @router.get('<%- path %>')
 def <%- pythonMethodName %>(<%- methodArgs.join(', ') %>):
     try:
         with conn:
 <%          if (hasGetOne) {
                 if (queries.length > 1) { /* we can omit cursor_factory but in this case we might get an unused import  */-%>
-            with conn.cursor(cursor_factory = psycopg2.extras.DictCursor) as cur:
+            with conn.cursor(cursor_factory=psycopg2.extras.DictCursor) as cur:
                 result = {}
 <%                  queries.forEach(queryInfo => {
                         for (const [name, query] of Object.entries(queryInfo)) {
@@ -104,7 +105,7 @@ def <%- pythonMethodName %>(<%- methodArgs.join(', ') %>):
                 } else {
                     const query = queries[0].result
 -%>
-            with conn.cursor(cursor_factory = psycopg2.extras.RealDictCursor) as cur:
+            with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur:
                 cur.execute(<%- query.sql %><%- query.formattedParams %>)
                 result = cur.fetchone()
                 if result is None:
@@ -114,7 +115,7 @@ def <%- pythonMethodName %>(<%- methodArgs.join(', ') %>):
             } else {
                 const query = queries[0].result
 -%>
-            with conn.cursor(cursor_factory = psycopg2.extras.RealDictCursor) as cur:
+            with conn.cursor(cursor_factory=psycopg2.extras.RealDictCursor) as cur:
                 cur.execute(<%- query.sql %><%- query.formattedParams %>)
                 return cur.fetchall()
 <%
@@ -126,6 +127,7 @@ def <%- pythonMethodName %>(<%- methodArgs.join(', ') %>):
         }
         if (method.name === 'post') {
 %>
+
 @router.post('<%- path %>')
 def <%- pythonMethodName %>():
     pass
@@ -134,6 +136,7 @@ def <%- pythonMethodName %>():
         }
         if (method.name === 'put') {
 %>
+
 @router.put('<%- path %>')
 def <%- pythonMethodName %>():
     pass
@@ -142,6 +145,7 @@ def <%- pythonMethodName %>():
         }
         if (method.name === 'delete') {
 %>
+
 @router.delete('<%- path %>')
 def <%- pythonMethodName %>():
     pass
@@ -150,4 +154,4 @@ def <%- pythonMethodName %>():
         }
     })
 })
-%>
+%>