Addressed comments

Author: gavin-aguiar

azure_functions_worker/dispatcher.py

@@ -12,6 +12,7 @@
 import queue
 import sys
 import threading
+from _ctypes_test import func
 from asyncio import BaseEventLoop
 from logging import LogRecord
 from typing import List, Optional
@@ -318,10 +319,10 @@ async def _handle__functions_metadata_request(self, request):
             if indexed_functions:
                 indexed_function_logs: List[str] = []
                 for func in indexed_functions:
-                    function_log = \
-                        f"Function Name: {func.get_function_name()} " \
-                        "Function Binding: " \
-                        f"{[(binding.type, binding.name) for binding in func.get_bindings()]}"  # NoQA
+                    function_log = "Function Name: {}, Function Binding: {}" \
+                        .format(func.get_function_name(),
+                                 [(binding.type, binding.name) for binding in
+                         func.get_bindings()]) 
                     indexed_function_logs.append(function_log)
 
                 logger.info(
@@ -332,8 +333,8 @@ async def _handle__functions_metadata_request(self, request):
                     self._functions,
                     indexed_functions)
             else:
-                logger.warning("No functions indexed. Please refer to the "
-                               "documentation.")
+                logger.warning("No functions indexed. Please refer to "
+                               "aka.ms/pythonprogrammingmodel for more info.")
 
             return protos.StreamingMessage(
                 request_id=request.request_id,

azure_functions_worker/loader.py

@@ -21,6 +21,11 @@
 _DEFAULT_SCRIPT_FILENAME = '__init__.py'
 _DEFAULT_ENTRY_POINT = 'main'
 
+PKGS_PATH = pathlib.Path("site/wwwroot/.python_packages")
+home = pathlib.Path.home()
+pkgs_path = os.path.join(home, PKGS_PATH)
+
+
 _submodule_dirs = []
 
 
@@ -89,8 +94,9 @@ def process_indexed_function(functions_registry: functions.Registry,
     message=f'Please check the requirements.txt file for the missing module. '
             f'For more info, please refer the troubleshooting'
             f' guide: {MODULE_NOT_FOUND_TS_URL} ',
-    debug_logs=f'Sys Path: {sys.path}, Sys Module: {sys.modules}'
-)
+    debug_logs='Error in load_function. '
+               f'Sys Path: {sys.path}, Sys Module: {sys.modules},'
+               f'python-packages Path exists: {os.path.exists(pkgs_path)}')
 def load_function(name: str, directory: str, script_file: str,
                   entry_point: Optional[str]):
     dir_path = pathlib.Path(directory)
@@ -139,7 +145,9 @@ def load_function(name: str, directory: str, script_file: str,
 @attach_message_to_exception(
     expt_type=ImportError,
     message=f'Troubleshooting Guide: {MODULE_NOT_FOUND_TS_URL}',
-    debug_logs=f'Sys Path: {sys.path}, Sys Module: {sys.modules}')
+    debug_logs='Error in index_function_app. '
+               f'Sys Path: {sys.path}, Sys Module: {sys.modules},'
+               f'python-packages Path exists: {os.path.exists(pkgs_path)}')
 def index_function_app(function_path: str):
     module_name = pathlib.Path(function_path).stem
     imported_module = importlib.import_module(module_name)

azure_functions_worker/utils/wrappers.py

@@ -18,9 +18,7 @@ def call(*args, **kwargs):
             if flag_default and not is_envvar_false(flag):
                 return func(*args, **kwargs)
             return default
-
         return call
-
     return decorate
 
 
@@ -34,9 +32,7 @@ def call(*args, **kwargs):
             if flag_default and not is_envvar_false(flag):
                 return default
             return func(*args, **kwargs)
-
         return call
-
     return decorate
 
 
@@ -50,7 +46,5 @@ def call(*args, **kwargs):
                 if debug_logs is not None:
                     logger.error(debug_logs)
                 raise extend_exception_message(e, message)
-
         return call
-
     return decorate

tests/endtoend/test_sql_functions.py

@@ -1,10 +1,12 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 import json
+from unittest import skip
 
 from azure_functions_worker import testutils
 
 
+@skip("Unskip when azure functions with SQL is released.")
 class TestSqlFunctions(testutils.WebHostTestCase):
 
     @classmethod