Move options to libs

functions/adoption/main.py

@@ -1,8 +1,9 @@
 import functions_framework
+
 from .libs.validator import Validator
 from .libs.utils import output
 from .libs.queries import list_data
-from .libs.network import respond_cors, respond
+from .libs.network import respond_cors
 
 @functions_framework.http
 def dispatcher(request):

functions/categories/libs/network.py

@@ -0,0 +1,28 @@
+
+"""
+Network
+
+Handles formatting responses to match the tuple pattern required by
+the flask/GCP wrapper for Cloud Functions.
+"""
+
+PREFLIGHT_HEADERS = {
+    "Access-Control-Allow-Origin": "*",
+    "Access-Control-Allow-Methods": "GET",
+    "Access-Control-Allow-Headers": "Content-Type",
+    "Access-Control-Max-Age": "3600",
+  }
+
+HEADERS = {"Access-Control-Allow-Origin": "*", "Content-Type": "application/json"}
+
+def respond_cors():
+  """
+  To be used to return OPTIONS responses to satisfy CORS preflight requests.
+  """
+  return ("", 204, PREFLIGHT_HEADERS)
+
+def respond(data, status=200):
+  """
+  To be used to return responses to satisfy CORS requests.
+  """
+  return (data, status, HEADERS)

functions/categories/main.py

@@ -1,25 +1,15 @@
 import functions_framework
+
 from .libs.validator import Validator
 from .libs.utils import output
 from .libs.queries import list_data
+from .libs.network import respond_cors
 
 @functions_framework.http
 def dispatcher(request):
-  # For more information about CORS and CORS preflight requests, see:
-  # https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request
 
-  # Set CORS headers for the preflight request
   if request.method == "OPTIONS":
-      # Allows GET requests from any origin with the Content-Type
-      # header and caches preflight response for an 3600s
-      headers = {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "GET",
-          "Access-Control-Allow-Headers": "Content-Type",
-          "Access-Control-Max-Age": "3600",
-      }
-
-      return ("", 204, headers)
+    return respond_cors()
 
   headers = {
      "Access-Control-Allow-Origin": "*",

functions/cwvtech/libs/network.py

@@ -0,0 +1,28 @@
+
+"""
+Network
+
+Handles formatting responses to match the tuple pattern required by
+the flask/GCP wrapper for Cloud Functions.
+"""
+
+PREFLIGHT_HEADERS = {
+    "Access-Control-Allow-Origin": "*",
+    "Access-Control-Allow-Methods": "GET",
+    "Access-Control-Allow-Headers": "Content-Type",
+    "Access-Control-Max-Age": "3600",
+  }
+
+HEADERS = {"Access-Control-Allow-Origin": "*", "Content-Type": "application/json"}
+
+def respond_cors():
+  """
+  To be used to return OPTIONS responses to satisfy CORS preflight requests.
+  """
+  return ("", 204, PREFLIGHT_HEADERS)
+
+def respond(data, status=200):
+  """
+  To be used to return responses to satisfy CORS requests.
+  """
+  return (data, status, HEADERS)

functions/cwvtech/main.py

@@ -1,27 +1,16 @@
 import functions_framework
+
 from .libs.validator import Validator
 from .libs.utils import output
 from .libs.queries import list_data
+from .libs.network import respond_cors
 
 @functions_framework.http
 def dispatcher(request):
-  # For more information about CORS and CORS preflight requests, see:
-  # https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request
-
-  # Set CORS headers for the preflight request
+
   if request.method == "OPTIONS":
-      # Allows GET requests from any origin with the Content-Type
-      # header and caches preflight response for an 3600s
-      headers = {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "GET",
-          "Access-Control-Allow-Headers": "Content-Type",
-          "Access-Control-Max-Age": "3600",
-      }
-
-      return ("", 204, headers)
-
-  # Set CORS headers for the main request
+    return respond_cors()
+
   headers = {
      "Access-Control-Allow-Origin": "*",
      "cache-control": "public, max-age=21600"

functions/geos/libs/network.py

@@ -0,0 +1,28 @@
+
+"""
+Network
+
+Handles formatting responses to match the tuple pattern required by
+the flask/GCP wrapper for Cloud Functions.
+"""
+
+PREFLIGHT_HEADERS = {
+    "Access-Control-Allow-Origin": "*",
+    "Access-Control-Allow-Methods": "GET",
+    "Access-Control-Allow-Headers": "Content-Type",
+    "Access-Control-Max-Age": "3600",
+  }
+
+HEADERS = {"Access-Control-Allow-Origin": "*", "Content-Type": "application/json"}
+
+def respond_cors():
+  """
+  To be used to return OPTIONS responses to satisfy CORS preflight requests.
+  """
+  return ("", 204, PREFLIGHT_HEADERS)
+
+def respond(data, status=200):
+  """
+  To be used to return responses to satisfy CORS requests.
+  """
+  return (data, status, HEADERS)

functions/geos/main.py

@@ -3,26 +3,14 @@
 from .libs.utils import output
 from .libs.utils import ( COUNTRIES )
 from .libs.result import Result
+from .libs.network import respond_cors
 
 @functions_framework.http
 def dispatcher(request):
-  # For more information about CORS and CORS preflight requests, see:
-  # https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request
-
-  # Set CORS headers for the preflight request
+
   if request.method == "OPTIONS":
-      # Allows GET requests from any origin with the Content-Type
-      # header and caches preflight response for an 3600s
-      headers = {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "GET",
-          "Access-Control-Allow-Headers": "Content-Type",
-          "Access-Control-Max-Age": "3600",
-      }
-
-      return ("", 204, headers)
-
-  # Set CORS headers for the main request
+    return respond_cors()
+
   headers = {
      "Access-Control-Allow-Origin": "*",
      "cache-control": "public, max-age=21600"

functions/lighthouse/libs/network.py

@@ -0,0 +1,28 @@
+
+"""
+Network
+
+Handles formatting responses to match the tuple pattern required by
+the flask/GCP wrapper for Cloud Functions.
+"""
+
+PREFLIGHT_HEADERS = {
+    "Access-Control-Allow-Origin": "*",
+    "Access-Control-Allow-Methods": "GET",
+    "Access-Control-Allow-Headers": "Content-Type",
+    "Access-Control-Max-Age": "3600",
+  }
+
+HEADERS = {"Access-Control-Allow-Origin": "*", "Content-Type": "application/json"}
+
+def respond_cors():
+  """
+  To be used to return OPTIONS responses to satisfy CORS preflight requests.
+  """
+  return ("", 204, PREFLIGHT_HEADERS)
+
+def respond(data, status=200):
+  """
+  To be used to return responses to satisfy CORS requests.
+  """
+  return (data, status, HEADERS)

functions/lighthouse/main.py

@@ -1,27 +1,16 @@
 import functions_framework
+
 from .libs.validator import Validator
 from .libs.utils import output
 from .libs.queries import list_data
+from .libs.network import respond_cors
 
 @functions_framework.http
 def dispatcher(request):
-  # For more information about CORS and CORS preflight requests, see:
-  # https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request
-
-  # Set CORS headers for the preflight request
+
   if request.method == "OPTIONS":
-      # Allows GET requests from any origin with the Content-Type
-      # header and caches preflight response for an 3600s
-      headers = {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "GET",
-          "Access-Control-Allow-Headers": "Content-Type",
-          "Access-Control-Max-Age": "3600",
-      }
-
-      return ("", 204, headers)
-
-  # Set CORS headers for the main request
+    return respond_cors()
+
   headers = {
      "Access-Control-Allow-Origin": "*",
      "cache-control": "public, max-age=21600"

functions/page-weight/libs/network.py

@@ -0,0 +1,28 @@
+
+"""
+Network
+
+Handles formatting responses to match the tuple pattern required by
+the flask/GCP wrapper for Cloud Functions.
+"""
+
+PREFLIGHT_HEADERS = {
+    "Access-Control-Allow-Origin": "*",
+    "Access-Control-Allow-Methods": "GET",
+    "Access-Control-Allow-Headers": "Content-Type",
+    "Access-Control-Max-Age": "3600",
+  }
+
+HEADERS = {"Access-Control-Allow-Origin": "*", "Content-Type": "application/json"}
+
+def respond_cors():
+  """
+  To be used to return OPTIONS responses to satisfy CORS preflight requests.
+  """
+  return ("", 204, PREFLIGHT_HEADERS)
+
+def respond(data, status=200):
+  """
+  To be used to return responses to satisfy CORS requests.
+  """
+  return (data, status, HEADERS)

functions/page-weight/main.py

@@ -1,27 +1,16 @@
 import functions_framework
+
 from .libs.validator import Validator
 from .libs.utils import output
 from .libs.queries import list_data
+from .libs.network import respond_cors
 
 @functions_framework.http
 def dispatcher(request):
-  # For more information about CORS and CORS preflight requests, see:
-  # https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request
-
-  # Set CORS headers for the preflight request
+
   if request.method == "OPTIONS":
-      # Allows GET requests from any origin with the Content-Type
-      # header and caches preflight response for an 3600s
-      headers = {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "GET",
-          "Access-Control-Allow-Headers": "Content-Type",
-          "Access-Control-Max-Age": "3600",
-      }
-
-      return ("", 204, headers)
-
-  # Set CORS headers for the main request
+    return respond_cors()
+
   headers = {
      "Access-Control-Allow-Origin": "*",
      "cache-control": "public, max-age=21600"

functions/ranks/libs/network.py

@@ -0,0 +1,28 @@
+
+"""
+Network
+
+Handles formatting responses to match the tuple pattern required by
+the flask/GCP wrapper for Cloud Functions.
+"""
+
+PREFLIGHT_HEADERS = {
+    "Access-Control-Allow-Origin": "*",
+    "Access-Control-Allow-Methods": "GET",
+    "Access-Control-Allow-Headers": "Content-Type",
+    "Access-Control-Max-Age": "3600",
+  }
+
+HEADERS = {"Access-Control-Allow-Origin": "*", "Content-Type": "application/json"}
+
+def respond_cors():
+  """
+  To be used to return OPTIONS responses to satisfy CORS preflight requests.
+  """
+  return ("", 204, PREFLIGHT_HEADERS)
+
+def respond(data, status=200):
+  """
+  To be used to return responses to satisfy CORS requests.
+  """
+  return (data, status, HEADERS)

functions/ranks/main.py

@@ -3,26 +3,14 @@
 from .libs.utils import output
 from .libs.utils import ( RANKS )
 from .libs.result import Result
+from .libs.network import respond_cors
 
 @functions_framework.http
 def dispatcher(request):
-  # For more information about CORS and CORS preflight requests, see:
-  # https://developer.mozilla.org/en-US/docs/Glossary/Preflight_request
-
-  # Set CORS headers for the preflight request
+
   if request.method == "OPTIONS":
-      # Allows GET requests from any origin with the Content-Type
-      # header and caches preflight response for an 3600s
-      headers = {
-          "Access-Control-Allow-Origin": "*",
-          "Access-Control-Allow-Methods": "GET",
-          "Access-Control-Allow-Headers": "Content-Type",
-          "Access-Control-Max-Age": "3600",
-      }
-
-      return ("", 204, headers)
-
-  # Set CORS headers for the main request
+    return respond_cors()
+
   headers = {
      "Access-Control-Allow-Origin": "*",
      "cache-control": "public, max-age=21600"