refactor: update imports and tests for direct starlette/uvicorn dependencies

- Remove async extras from tox.ini since deps are now direct
- Update _http/__init__.py to import StarletteApplication directly
- Remove try/except ImportError for starlette in aio/__init__.py
- Remove error message about installing with [async] extra
- Update test_asgi.py to import starlette directly
- Remove test_import_error_without_starlette from test_aio.py
- Fix test_http.py monkeypatch to work with direct imports

Author: taeold

src/functions_framework/_http/__init__.py

@@ -14,6 +14,7 @@
 
 from flask import Flask
 
+from functions_framework._http.asgi import StarletteApplication
 from functions_framework._http.flask import FlaskApplication
 
 
@@ -35,17 +36,13 @@ def __init__(self, app, debug, **options):
                     self.server_class = FlaskApplication
         else:  # pragma: no cover
             if self.debug:
-                from functions_framework._http.asgi import StarletteApplication
-
                 self.server_class = StarletteApplication
             else:
                 try:
                     from functions_framework._http.gunicorn import UvicornApplication
 
                     self.server_class = UvicornApplication
                 except ImportError as e:
-                    from functions_framework._http.asgi import StarletteApplication
-
                     self.server_class = StarletteApplication
 
     def run(self, host, port):

src/functions_framework/aio/__init__.py

@@ -36,18 +36,12 @@
     MissingSourceException,
 )
 
-try:
-    from starlette.applications import Starlette
-    from starlette.exceptions import HTTPException
-    from starlette.middleware import Middleware
-    from starlette.requests import Request
-    from starlette.responses import JSONResponse, Response
-    from starlette.routing import Route
-except ImportError:
-    raise FunctionsFrameworkException(
-        "Starlette is not installed. Install the framework with the 'async' extra: "
-        "pip install functions-framework[async]"
-    )
+from starlette.applications import Starlette
+from starlette.exceptions import HTTPException
+from starlette.middleware import Middleware
+from starlette.requests import Request
+from starlette.responses import JSONResponse, Response
+from starlette.routing import Route
 
 HTTPResponse = Union[
     Response,  # Functions can return a full Starlette Response object

tests/test_aio.py

@@ -35,27 +35,6 @@
 TEST_FUNCTIONS_DIR = pathlib.Path(__file__).resolve().parent / "test_functions"
 
 
-def test_import_error_without_starlette(monkeypatch):
-    import builtins
-
-    original_import = builtins.__import__
-
-    def mock_import(name, *args, **kwargs):
-        if name.startswith("starlette"):
-            raise ImportError(f"No module named '{name}'")
-        return original_import(name, *args, **kwargs)
-
-    monkeypatch.setattr(builtins, "__import__", mock_import)
-
-    # Remove the module from sys.modules to force re-import
-    if "functions_framework.aio" in sys.modules:
-        del sys.modules["functions_framework.aio"]
-
-    with pytest.raises(exceptions.FunctionsFrameworkException) as excinfo:
-        import functions_framework.aio
-
-    assert "Starlette is not installed" in str(excinfo.value)
-    assert "pip install functions-framework[async]" in str(excinfo.value)
 
 
 def test_invalid_function_definition_missing_function_file():

tests/test_asgi.py

@@ -19,11 +19,7 @@
 import pytest
 
 import functions_framework._http
-
-try:
-    from starlette.applications import Starlette
-except ImportError:
-    pass
+from starlette.applications import Starlette
 
 
 def test_httpserver_detects_asgi_app():

tests/test_http.py

@@ -154,9 +154,9 @@ def test_httpserver_asgi(monkeypatch, debug, uvicorn_missing, expected):
     }
     options = {"a": pretend.stub(), "b": pretend.stub()}
 
-    from functions_framework._http import asgi
+    import functions_framework._http
 
-    monkeypatch.setattr(asgi, "StarletteApplication", server_classes["starlette"])
+    monkeypatch.setattr(functions_framework._http, "StarletteApplication", server_classes["starlette"])
 
     if uvicorn_missing or platform.system() == "Windows":
         monkeypatch.setitem(sys.modules, "functions_framework._http.gunicorn", None)

tox.ini

@@ -29,8 +29,6 @@ deps =
     pytest-cov
     pytest-integration
     pretend
-extras =
-    async
 setenv =
     PYTESTARGS = --cov=functions_framework --cov-branch --cov-report term-missing --cov-fail-under=100
     # Python 3.7: Use .coveragerc-py37 to exclude aio module from coverage since it requires Python 3.8+ (Starlette dependency)
@@ -48,8 +46,6 @@ deps =
     isort
     mypy
     build
-extras =
-    async
 commands =
     black --check src tests conftest.py --exclude tests/test_functions/background_load_error/main.py
     isort -c src tests conftest.py