formatting fixes

Author: Victoria Hall

azure_functions_worker/dispatcher.py

@@ -20,17 +20,16 @@
 
 def get_python_appsetting_state():
     current_vars = config_manager.get_config()
-    python_specific_settings = [
-        PYTHON_ROLLBACK_CWD_PATH,
-        PYTHON_THREADPOOL_THREAD_COUNT,
-        PYTHON_ISOLATE_WORKER_DEPENDENCIES,
-        PYTHON_ENABLE_DEBUG_LOGGING,
-        PYTHON_ENABLE_WORKER_EXTENSIONS,
-        FUNCTIONS_WORKER_SHARED_MEMORY_DATA_TRANSFER_ENABLED,
-        PYTHON_SCRIPT_FILE_NAME,
-        PYTHON_ENABLE_INIT_INDEXING,
-        PYTHON_ENABLE_OPENTELEMETRY,
-    ]
+    python_specific_settings = \
+        [PYTHON_ROLLBACK_CWD_PATH,
+         PYTHON_THREADPOOL_THREAD_COUNT,
+         PYTHON_ISOLATE_WORKER_DEPENDENCIES,
+         PYTHON_ENABLE_DEBUG_LOGGING,
+         PYTHON_ENABLE_WORKER_EXTENSIONS,
+         FUNCTIONS_WORKER_SHARED_MEMORY_DATA_TRANSFER_ENABLED,
+         PYTHON_SCRIPT_FILE_NAME,
+         PYTHON_ENABLE_INIT_INDEXING,
+         PYTHON_ENABLE_OPENTELEMETRY]
 
     app_setting_states = "".join(
         f"{app_setting}: {current_vars[app_setting]} | "
@@ -39,16 +38,14 @@ def get_python_appsetting_state():
     )
 
     # Special case for extensions
-    if "PYTHON_ENABLE_WORKER_EXTENSIONS" not in current_vars:
+    if 'PYTHON_ENABLE_WORKER_EXTENSIONS' not in current_vars:
         if sys.version_info.minor == 9:
-            app_setting_states += (
-                f"{PYTHON_ENABLE_WORKER_EXTENSIONS}: "
-                f"{str(PYTHON_ENABLE_WORKER_EXTENSIONS_DEFAULT_39)}"
-            )
+            app_setting_states += \
+                (f"{PYTHON_ENABLE_WORKER_EXTENSIONS}: "
+                 f"{str(PYTHON_ENABLE_WORKER_EXTENSIONS_DEFAULT_39)}")
         else:
-            app_setting_states += (
-                f"{PYTHON_ENABLE_WORKER_EXTENSIONS}: "
-                f"{str(PYTHON_ENABLE_WORKER_EXTENSIONS_DEFAULT)}"
-            )
+            app_setting_states += \
+                (f"{PYTHON_ENABLE_WORKER_EXTENSIONS}: "
+                 f"{str(PYTHON_ENABLE_WORKER_EXTENSIONS_DEFAULT)}")
 
     return app_setting_states

azure_functions_worker/utils/app_setting_manager.py

@@ -34,24 +34,10 @@ def read_config(self, function_path: str):
         except FileNotFoundError:
             pass
 
-        # updates the config dictionary with the environment variables
-        # this prioritizes set env variables over the config file
-        # env_copy = os.environ
-        # for k, v in env_copy.items():
-        #     self.config_data.update({k.upper(): v})
-
     def set_config(self, function_path: str):
         self.read_config(function_path)
         self.read_environment_variables()
 
-    def config_exists(self) -> bool:
-        if self.config_data is None:
-            self.set_config("")
-        return self.config_data is not None
-
-    def get_config(self) -> dict:
-        return self.config_data
-
     def is_true_like(self, setting: str) -> bool:
         if setting is None:
             return False
@@ -66,11 +52,6 @@ def is_false_like(self, setting: str) -> bool:
 
     def is_envvar_true(self, key: str) -> bool:
         key_upper = key.upper()
-        # special case for PYTHON_ENABLE_DEBUG_LOGGING
-        # This is read by the host and must be set in os.environ
-        if key_upper == "PYTHON_ENABLE_DEBUG_LOGGING":
-            val = os.getenv(key_upper)
-            return self.is_true_like(val)
         if self.config_exists() and not self.config_data.get(key_upper):
             return False
         return self.is_true_like(self.config_data.get(key_upper))
@@ -137,5 +118,13 @@ def clear_config(self):
             self.config_data.clear()
             self.config_data = None
 
+    def config_exists(self) -> bool:
+        if self.config_data is None:
+            self.set_config("")
+        return self.config_data is not None
+
+    def get_config(self) -> dict:
+        return self.config_data
+
 
 config_manager = ConfigManager()

azure_functions_worker/utils/config_manager.py

@@ -72,7 +72,6 @@ def setUpClass(cls):
         cls._patch_environ = patch.dict('os.environ', os_environ)
         cls._patch_environ.start()
         super().setUpClass()
-        config_manager.clear_config()
         config_manager.read_environment_variables()
 
     @classmethod

tests/unittests/test_app_setting_manager.py

@@ -176,7 +176,6 @@ async def test_dispatcher_sync_threadpool_set_worker(self):
             await self._check_if_function_is_ok(host)
             await self._assert_workers_threadpool(self._ctrl, host,
                                                   self._allowed_max_workers)
-        os.environ.pop(PYTHON_THREADPOOL_THREAD_COUNT)
 
     async def test_dispatcher_sync_threadpool_invalid_worker_count(self):
         """Test when sync threadpool maximum worker is set to an invalid value,
@@ -197,7 +196,6 @@ async def test_dispatcher_sync_threadpool_invalid_worker_count(self):
                                                       self._default_workers)
             mock_logger.warning.assert_any_call(
                 '%s must be an integer', PYTHON_THREADPOOL_THREAD_COUNT)
-        os.environ.pop(PYTHON_THREADPOOL_THREAD_COUNT)
 
     async def test_dispatcher_sync_threadpool_below_min_setting(self):
         """Test if the sync threadpool will pick up default value when the
@@ -216,7 +214,6 @@ async def test_dispatcher_sync_threadpool_below_min_setting(self):
                 'Reverting to default value for max_workers',
                 PYTHON_THREADPOOL_THREAD_COUNT,
                 PYTHON_THREADPOOL_THREAD_COUNT_MIN)
-            os.environ.pop(PYTHON_THREADPOOL_THREAD_COUNT)
 
     async def test_dispatcher_sync_threadpool_exceed_max_setting(self):
         """Test if the sync threadpool will pick up default max value when the
@@ -233,7 +230,6 @@ async def test_dispatcher_sync_threadpool_exceed_max_setting(self):
                 # Ensure the dispatcher sync threadpool should fallback to max
                 await self._assert_workers_threadpool(self._ctrl, host,
                                                       self._allowed_max_workers)
-        os.environ.pop(PYTHON_THREADPOOL_THREAD_COUNT)
 
     async def test_dispatcher_sync_threadpool_in_placeholder(self):
         """Test if the sync threadpool will pick up app setting in placeholder
@@ -381,7 +377,6 @@ async def test_sync_invocation_request_log_threads(self):
                                  r'\d{2}:\d{2}:\d{2}.\d{6}), '
                                  'sync threadpool max workers: 5'
                                  )
-        os.environ.pop(PYTHON_THREADPOOL_THREAD_COUNT)
 
     async def test_async_invocation_request_log_threads(self):
         with patch('azure_functions_worker.dispatcher.logger') as mock_logger:
@@ -406,7 +401,6 @@ async def test_async_invocation_request_log_threads(self):
                                  r'(\d{4}-\d{2}-\d{2} '
                                  r'\d{2}:\d{2}:\d{2}.\d{6})'
                                  )
-        os.environ.pop(PYTHON_THREADPOOL_THREAD_COUNT)
 
     async def test_sync_invocation_request_log_in_placeholder_threads(self):
         with patch('azure_functions_worker.dispatcher.logger') as mock_logger:
@@ -604,7 +598,6 @@ class TestDispatcherStein(testutils.AsyncTestCase):
     def setUp(self):
         self._ctrl = testutils.start_mockhost(
             script_root=DISPATCHER_STEIN_FUNCTIONS_DIR)
-        config_manager.clear_config()
 
     async def test_dispatcher_functions_metadata_request(self):
         """Test if the functions metadata response will be sent correctly
@@ -736,7 +729,6 @@ async def test_dispatcher_load_modules_dedicated_app(self):
                 "working_directory: , Linux Consumption: False,"
                 " Placeholder: False", logs
             )
-        os.environ.pop("PYTHON_ISOLATE_WORKER_DEPENDENCIES")
 
     async def test_dispatcher_load_modules_con_placeholder_enabled(self):
         """Test modules are loaded in consumption apps with placeholder mode

tests/unittests/test_dispatcher.py

@@ -80,7 +80,6 @@ def setUp(self):
 
     def tearDown(self) -> None:
         os.environ.pop(PYTHON_ENABLE_WORKER_EXTENSIONS)
-
         self.mock_sys_path.stop()
         self.mock_sys_module.stop()
         self.mock_environ.stop()

tests/unittests/test_extension.py

@@ -5,7 +5,6 @@
 import pathlib
 import re
 import typing
-
 from unittest.mock import patch
 
 from tests.utils import testutils

tests/unittests/test_third_party_http_functions.py

@@ -83,7 +83,6 @@ def setUp(self):
         self.mock_environ.start()
         self.mock_sys_module.start()
         self.mock_sys_path.start()
-        config_manager.clear_config()
 
     def tearDown(self):
         self.mock_sys_path.stop()