Remove azure namespace (#506)

Author: maiqbal11

.flake8

@@ -2,6 +2,6 @@
 ignore = W503,E402,E731
 exclude =
     .git, __pycache__, build, dist, .eggs, .github, .local, docs/,
-    Samples, azure/functions_worker/protos/,
-    azure/functions_worker/typing_inspect.py,
+    Samples, azure_functions_worker/protos/,
+    azure_functions_worker/typing_inspect.py,
     tests/unittests/test_typing_inspect.py

azure/__init__.py

@@ -1,4 +1,4 @@
-from azure.functions_worker import main
+from azure_functions_worker import main
 
 if __name__ == '__main__':
     main.main()

azure/functions_worker/protos/_src/src/proto/google/protobuf/duration.proto

@@ -11,6 +11,7 @@
 import os
 import sys
 import importlib
+import inspect
 
 import grpc
 import pkg_resources
@@ -366,6 +367,11 @@ async def _handle__function_environment_reload_request(self, req):
 
             func_env_reload_request = req.function_environment_reload_request
 
+            # Import before clearing path cache so that the default
+            # azure.functions modules is available in sys.modules for
+            # customer use
+            import azure.functions # NoQA
+
             sys.path_importer_cache.clear()
 
             os.environ.clear()
@@ -376,7 +382,23 @@ async def _handle__function_environment_reload_request(self, req):
                 os.environ[var] = env_vars[var]
 
             # Reload azure namespace for customer's libraries
-            importlib.reload(sys.modules['azure'])
+            try:
+                logger.info('Reloading azure module')
+                importlib.reload(sys.modules['azure'])
+            except Exception as ex:
+                logger.info('Unable to reload azure: \n{}'.format(ex))
+            logger.info('Reloaded azure module')
+
+            # Reload azure.functions to give user package precedence
+            logger.info('Reloading azure.functions module at %s',
+                        inspect.getfile(sys.modules['azure.functions']))
+            try:
+                importlib.reload(sys.modules['azure.functions'])
+                logger.info('Reloaded azure.functions module now at %s',
+                            inspect.getfile(sys.modules['azure.functions']))
+            except Exception as ex:
+                logger.info('Unable to reload azure.functions. '
+                            'Using default. Exception:\n{}'.format(ex))
 
             success_response = protos.FunctionEnvironmentReloadResponse(
                 result=protos.StatusResult(
@@ -453,7 +475,7 @@ def gen(resp_queue):
 class AsyncLoggingHandler(logging.Handler):
 
     def emit(self, record):
-        if not record.name.startswith('azure.functions_worker'):
+        if not record.name.startswith('azure_functions_worker'):
             # Skip worker system logs
             msg = self.format(record)
             Dispatcher.current._on_logging(record, msg)

azure/functions_worker/__init__.py renamed to azure_functions_worker/__init__.py

@@ -3,8 +3,8 @@
 import sys
 
 
-logger = logging.getLogger('azure.functions_worker')
-error_logger = logging.getLogger('azure.functions_worker_errors')
+logger = logging.getLogger('azure_functions_worker')
+error_logger = logging.getLogger('azure_functions_worker_errors')
 
 
 def setup(log_level, log_destination):

azure/functions_worker/__main__.py renamed to azure_functions_worker/__main__.py

@@ -34,7 +34,7 @@
 from . import protos
 
 
-PROJECT_ROOT = pathlib.Path(__file__).parent.parent.parent
+PROJECT_ROOT = pathlib.Path(__file__).parent.parent
 TESTS_ROOT = PROJECT_ROOT / 'tests'
 E2E_TESTS_FOLDER = pathlib.Path('endtoend')
 E2E_TESTS_ROOT = TESTS_ROOT / E2E_TESTS_FOLDER

azure/functions_worker/aio_compat.py renamed to azure_functions_worker/aio_compat.py

@@ -1,4 +1,4 @@
-from azure.functions_worker import main
+from azure_functions_worker import main
 
 if __name__ == '__main__':
     main.main()

azure/functions_worker/bindings/__init__.py renamed to azure_functions_worker/bindings/__init__.py

@@ -13,11 +13,11 @@ warn_return_any = True
 disallow_subclassing_any = False
 ignore_missing_imports = True
 
-[mypy-azure.functions_worker.aio_compat]
+[mypy-azure_functions_worker.aio_compat]
 ignore_errors = True
 
-[mypy-azure.functions_worker.protos.*]
+[mypy-azure_functions_worker.protos.*]
 ignore_errors = True
 
-[mypy-azure.functions_worker.typing_inspect]
+[mypy-azure_functions_worker.typing_inspect]
 ignore_errors = True

azure/functions_worker/bindings/context.py renamed to azure_functions_worker/bindings/context.py

@@ -71,12 +71,12 @@ class BuildGRPC:
     def _gen_grpc(self):
         root = pathlib.Path(os.path.abspath(os.path.dirname(__file__)))
 
-        proto_root_dir = root / 'azure' / 'functions_worker' / 'protos'
+        proto_root_dir = root / 'azure_functions_worker' / 'protos'
         proto_src_dir = proto_root_dir / '_src' / 'src' / 'proto'
         staging_root_dir = root / 'build' / 'protos'
-        staging_dir = (staging_root_dir / 'azure'
-                       / 'functions_worker' / 'protos')
-        build_dir = staging_dir / 'azure' / 'functions_worker' / 'protos'
+        staging_dir = (staging_root_dir
+                       / 'azure_functions_worker' / 'protos')
+        build_dir = staging_dir / 'azure_functions_worker' / 'protos'
 
         if os.path.exists(build_dir):
             shutil.rmtree(build_dir)
@@ -85,11 +85,11 @@ def _gen_grpc(self):
 
         subprocess.run([
             sys.executable, '-m', 'grpc_tools.protoc',
-            '-I', os.sep.join(('azure', 'functions_worker', 'protos')),
+            '-I', os.sep.join(('azure_functions_worker', 'protos')),
             '--python_out', str(staging_root_dir),
             '--grpc_python_out', str(staging_root_dir),
-            os.sep.join(('azure', 'functions_worker', 'protos',
-                         'azure', 'functions_worker', 'protos',
+            os.sep.join(('azure_functions_worker', 'protos',
+                         'azure_functions_worker', 'protos',
                          'FunctionRpc.proto')),
         ], check=True, stdout=sys.stdout, stderr=sys.stderr,
             cwd=staging_root_dir)
@@ -216,9 +216,9 @@ def run(self):
         'Development Status :: 4 - Beta',
     ],
     license='MIT',
-    packages=['azure.functions_worker',
-              'azure.functions_worker.protos',
-              'azure.functions_worker.bindings'],
+    packages=['azure_functions_worker',
+              'azure_functions_worker.protos',
+              'azure_functions_worker.bindings'],
     setup_requires=[
         'grpcio~=1.20.1',
         'grpcio-tools~=1.20.1',

azure/functions_worker/bindings/datumdef.py renamed to azure_functions_worker/bindings/datumdef.py

@@ -1,6 +1,6 @@
 import time
 
-from azure.functions_worker import testutils
+from azure_functions_worker import testutils
 
 
 class TestBlobFunctions(testutils.WebHostTestCase):

azure/functions_worker/bindings/generic.py renamed to azure_functions_worker/bindings/generic.py

@@ -1,7 +1,7 @@
 import json
 import time
 
-from azure.functions_worker import testutils
+from azure_functions_worker import testutils
 
 
 class TestCosmosDBFunctions(testutils.WebHostTestCase):

azure/functions_worker/bindings/meta.py renamed to azure_functions_worker/bindings/meta.py

@@ -3,7 +3,7 @@
 import unittest
 import uuid
 
-from azure.functions_worker import testutils
+from azure_functions_worker import testutils
 
 
 class TestEventGridFunctions(testutils.WebHostTestCase):

azure/functions_worker/bindings/out.py renamed to azure_functions_worker/bindings/out.py

@@ -1,7 +1,7 @@
 import json
 import time
 
-from azure.functions_worker import testutils
+from azure_functions_worker import testutils
 
 
 class TestEventHubFunctions(testutils.WebHostTestCase):

azure/functions_worker/constants.py renamed to azure_functions_worker/constants.py

@@ -1,6 +1,6 @@
 import time
 
-from azure.functions_worker import testutils
+from azure_functions_worker import testutils
 
 
 class TestQueueFunctions(testutils.WebHostTestCase):

azure/functions_worker/dispatcher.py renamed to azure_functions_worker/dispatcher.py

@@ -1,7 +1,7 @@
 import json
 import time
 
-from azure.functions_worker import testutils
+from azure_functions_worker import testutils
 
 
 class TestServiceBusFunctions(testutils.WebHostTestCase):

azure/functions_worker/functions.py renamed to azure_functions_worker/functions.py

@@ -2,7 +2,7 @@
 import pathlib
 import time
 
-from azure.functions_worker import testutils
+from azure_functions_worker import testutils
 
 
 class TestTableFunctions(testutils.WebHostTestCase):

azure/functions_worker/loader.py renamed to azure_functions_worker/loader.py

@@ -3,8 +3,8 @@
 import shutil
 import asyncio
 
-from azure.functions_worker import protos
-from azure.functions_worker import testutils
+from azure_functions_worker import protos
+from azure_functions_worker import testutils
 
 
 async def vertify_nested_namespace_import():

azure/functions_worker/logging.py renamed to azure_functions_worker/logging.py

@@ -3,8 +3,8 @@
 import shutil
 import asyncio
 
-from azure.functions_worker import protos
-from azure.functions_worker import testutils
+from azure_functions_worker import protos
+from azure_functions_worker import testutils
 
 
 async def verify_path_imports():

azure/functions_worker/main.py renamed to azure_functions_worker/main.py

@@ -1,5 +1,5 @@
-from azure.functions_worker import protos
-from azure.functions_worker import testutils
+from azure_functions_worker import protos
+from azure_functions_worker import testutils
 
 
 class TestMockHost(testutils.AsyncTestCase):

azure/functions_worker/protos/.gitignore renamed to azure_functions_worker/protos/.gitignore

@@ -16,7 +16,7 @@ def test_mypy(self):
 
         try:
             subprocess.run(
-                [sys.executable, '-m', 'mypy', '-m', 'azure.functions_worker'],
+                [sys.executable, '-m', 'mypy', '-m', 'azure_functions_worker'],
                 check=True,
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,

azure/functions_worker/protos/__init__.py renamed to azure_functions_worker/protos/__init__.py

@@ -3,7 +3,7 @@
 import filecmp
 import os
 
-from azure.functions_worker import testutils
+from azure_functions_worker import testutils
 
 
 class TestHttpFunctions(testutils.WebHostTestCase):