Merge branch 'hallvictoria/config_file' of https://github.com/Azure/azure-functions-python-worker into hallvictoria/config_file

Author: Victoria Hall

azure_functions_worker/dispatcher.py

@@ -24,6 +24,7 @@
 from .bindings.shared_memory_data_transfer import SharedMemoryManager
 from .constants import (
     APPLICATIONINSIGHTS_CONNECTION_STRING,
+    HTTP_URI,
     METADATA_PROPERTIES_WORKER_INDEXED,
     PYTHON_AZURE_MONITOR_LOGGER_NAME,
     PYTHON_AZURE_MONITOR_LOGGER_NAME_DEFAULT,
@@ -38,8 +39,7 @@
     PYTHON_THREADPOOL_THREAD_COUNT_DEFAULT,
     PYTHON_THREADPOOL_THREAD_COUNT_MAX_37,
     PYTHON_THREADPOOL_THREAD_COUNT_MIN,
-    REQUIRES_ROUTE_PARAMETERS,
-    HTTP_URI
+    REQUIRES_ROUTE_PARAMETERS
 )
 from .extension import ExtensionManager
 from .http_v2 import (
@@ -976,7 +976,7 @@ def tp_max_workers_validator(value: str) -> bool:
 
         # Starting Python 3.9, worker won't be putting a limit on the
         # max_workers count in the created threadpool.
-        default_value = None if sys.version_info.minor == 9 \
+        default_value = None if sys.version_info.minor >= 9 \
             else f'{PYTHON_THREADPOOL_THREAD_COUNT_DEFAULT}'
 
         max_workers = config_manager.get_app_setting(

azure_functions_worker/version.py

@@ -1,4 +1,4 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-VERSION = '4.31.0'
+VERSION = '4.32.0'

tests/unittests/test_dispatcher.py

@@ -14,13 +14,15 @@
 
 from azure_functions_worker import protos
 from azure_functions_worker.constants import (
+    HTTP_URI,
     METADATA_PROPERTIES_WORKER_INDEXED,
     PYTHON_ENABLE_DEBUG_LOGGING,
     PYTHON_ENABLE_INIT_INDEXING,
     PYTHON_THREADPOOL_THREAD_COUNT,
     PYTHON_THREADPOOL_THREAD_COUNT_DEFAULT,
     PYTHON_THREADPOOL_THREAD_COUNT_MAX_37,
-    PYTHON_THREADPOOL_THREAD_COUNT_MIN, HTTP_URI, REQUIRES_ROUTE_PARAMETERS,
+    PYTHON_THREADPOOL_THREAD_COUNT_MIN,
+    REQUIRES_ROUTE_PARAMETERS
 )
 from azure_functions_worker.dispatcher import Dispatcher, ContextEnabledTask
 from azure_functions_worker.utils.config_manager import config_manager
@@ -552,15 +554,15 @@ async def test_dispatcher_sync_threadpool_in_placeholder_above_max(self):
                  "as the default passed is None, the cpu_count determines the "
                  "number of max_workers and we cannot mock the os.cpu_count() "
                  "in the concurrent.futures.ThreadPoolExecutor")
-class TestThreadPoolSettingsPython39(TestThreadPoolSettingsPython38):
+class TestThreadPoolSettingsPython39(TestThreadPoolSettingsPython37):
     def setUp(self, version=SysVersionInfo(3, 9, 0, 'final', 0)):
         super(TestThreadPoolSettingsPython39, self).setUp(version)
-
         self.mock_os_cpu = patch(
             'os.cpu_count', return_value=2)
         # 6 - based on 2 cores - min(32, (os.cpu_count() or 1) + 4) - 2 + 4
         self._default_workers: Optional[int] = 6
         self.mock_os_cpu.start()
+        self._allowed_max_workers: int = self._over_max_workers
 
     def tearDown(self):
         self.mock_os_cpu.stop()
@@ -572,11 +574,19 @@ def tearDown(self):
                  "as the default passed is None, the cpu_count determines the "
                  "number of max_workers and we cannot mock the os.cpu_count() "
                  "in the concurrent.futures.ThreadPoolExecutor")
-class TestThreadPoolSettingsPython310(TestThreadPoolSettingsPython39):
+class TestThreadPoolSettingsPython310(TestThreadPoolSettingsPython37):
     def setUp(self, version=SysVersionInfo(3, 10, 0, 'final', 0)):
         super(TestThreadPoolSettingsPython310, self).setUp(version)
+        self._allowed_max_workers: int = self._over_max_workers
+        self.mock_os_cpu = patch(
+            'os.cpu_count', return_value=2)
+        # 6 - based on 2 cores - min(32, (os.cpu_count() or 1) + 4) - 2 + 4
+        self._default_workers: Optional[int] = 6
+        self.mock_os_cpu.start()
+        self._allowed_max_workers: int = self._over_max_workers
 
     def tearDown(self):
+        self.mock_os_cpu.stop()
         super(TestThreadPoolSettingsPython310, self).tearDown()
 
 
@@ -585,12 +595,41 @@ def tearDown(self):
                  "as the default passed is None, the cpu_count determines the "
                  "number of max_workers and we cannot mock the os.cpu_count() "
                  "in the concurrent.futures.ThreadPoolExecutor")
-class TestThreadPoolSettingsPython311(TestThreadPoolSettingsPython310):
+class TestThreadPoolSettingsPython311(TestThreadPoolSettingsPython37):
     def setUp(self, version=SysVersionInfo(3, 11, 0, 'final', 0)):
         super(TestThreadPoolSettingsPython311, self).setUp(version)
+        self._allowed_max_workers: int = self._over_max_workers
+        self.mock_os_cpu = patch(
+            'os.cpu_count', return_value=2)
+        # 6 - based on 2 cores - min(32, (os.cpu_count() or 1) + 4) - 2 + 4
+        self._default_workers: Optional[int] = 6
+        self.mock_os_cpu.start()
+        self._allowed_max_workers: int = self._over_max_workers
 
     def tearDown(self):
-        super(TestThreadPoolSettingsPython310, self).tearDown()
+        self.mock_os_cpu.stop()
+        super(TestThreadPoolSettingsPython311, self).tearDown()
+
+
+@unittest.skipIf(sys.version_info.minor != 12,
+                 "Run the tests only for Python 3.12. In other platforms, "
+                 "as the default passed is None, the cpu_count determines the "
+                 "number of max_workers and we cannot mock the os.cpu_count() "
+                 "in the concurrent.futures.ThreadPoolExecutor")
+class TestThreadPoolSettingsPython312(TestThreadPoolSettingsPython37):
+    def setUp(self, version=SysVersionInfo(3, 12, 0, 'final', 0)):
+        super(TestThreadPoolSettingsPython312, self).setUp(version)
+        self._allowed_max_workers: int = self._over_max_workers
+        self.mock_os_cpu = patch(
+            'os.cpu_count', return_value=2)
+        # 6 - based on 2 cores - min(32, (os.cpu_count() or 1) + 4) - 2 + 4
+        self._default_workers: Optional[int] = 6
+        self.mock_os_cpu.start()
+        self._allowed_max_workers: int = self._over_max_workers
+
+    def tearDown(self):
+        self.mock_os_cpu.stop()
+        super(TestThreadPoolSettingsPython312, self).tearDown()
 
 
 class TestDispatcherStein(testutils.AsyncTestCase):