Execute the source module w/in the app context (#76)

* Add failing test * Execute the source module w/in the app context * Update changelog

Author: di

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Execute the source module w/in the app context ([#76])
 
 ## [2.0.0] - 2020-07-01
 ### Added
@@ -84,6 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [1.0.1]: https://github.com/GoogleCloudPlatform/functions-framework-python/releases/tag/v1.0.1
 [1.0.0]: https://github.com/GoogleCloudPlatform/functions-framework-python/releases/tag/v1.0.0
 
+[#76]: https://github.com/GoogleCloudPlatform/functions-framework-python/pull/76
 [#66]: https://github.com/GoogleCloudPlatform/functions-framework-python/pull/66
 [#61]: https://github.com/GoogleCloudPlatform/functions-framework-python/pull/61
 [#56]: https://github.com/GoogleCloudPlatform/functions-framework-python/pull/56

src/functions_framework/__init__.py

@@ -225,12 +225,14 @@ def create_app(target=None, source=None, signature_type=None):
  # 4. Add the module to sys.modules
  sys.modules[name] = source_module
 
- # 5. Execute the module
- spec.loader.exec_module(source_module)
-
+ # 5. Create the application
  app = flask.Flask(target, template_folder=template_folder)
  app.config["MAX_CONTENT_LENGTH"] = MAX_CONTENT_LENGTH
 
+ # 6. Execute the module, within the application context
+ with app.app_context():
+ spec.loader.exec_module(source_module)
+
  # Extract the target function from the source file
  try:
  function = getattr(source_module, target)

tests/test_functions.py

@@ -308,3 +308,13 @@ def test_class_in_main_is_in_right_module():
  resp = client.get("/")
 
  assert resp.status_code == 200
+
+
+def test_flask_current_app_is_available():
+ source = TEST_FUNCTIONS_DIR / "flask_current_app" / "main.py"
+ target = "function"
+
+ client = create_app(target, source).test_client()
+ resp = client.get("/")
+
+ assert resp.status_code == 200

tests/test_functions/flask_current_app/main.py

@@ -0,0 +1,24 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Test that flask.current_app is importable and usable outside the function"""
+
+from flask import current_app
+
+with current_app.app_context():
+ pass
+
+
+def function(request):
+ return "OK"