style: apply black and isort formatting

- Format code with black for consistent style
- Sort imports with isort for better organization
- All linting checks now pass

Author: taeold

pyproject.toml

@@ -64,6 +64,8 @@ functions_framework = ["py.typed"]
 
 [dependency-groups]
 dev = [
+    "black>=23.3.0",
+    "isort>=5.11.5",
     "pretend>=1.0.9",
     "pytest>=7.4.4",
     "pytest-asyncio>=0.21.2",

src/functions_framework/_http/__init__.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from flask import Flask
+
 from functions_framework._http.flask import FlaskApplication
 
 

src/functions_framework/aio/__init__.py

@@ -61,9 +61,11 @@ async def _crash_handler(request, exc):
     # Log the exception
     logger = logging.getLogger()
     tb_lines = traceback.format_exception(type(exc), exc, exc.__traceback__)
-    tb_text = ''.join(tb_lines)
-    error_msg = f"Exception on {request.url.path} [{request.method}]\n{tb_text}".rstrip()
-    
+    tb_text = "".join(tb_lines)
+    error_msg = (
+        f"Exception on {request.url.path} [{request.method}]\n{tb_text}".rstrip()
+    )
+
     # Context should still be available since we don't reset on exception
     if _enable_execution_id_logging():
         # Output as JSON so LoggingHandlerAddExecutionId can process it
@@ -72,10 +74,11 @@ async def _crash_handler(request, exc):
     else:
         # Execution ID logging not enabled, log plain text
         logger.error(error_msg)
-    
+
     headers = {_FUNCTION_STATUS_HEADER_FIELD: _CRASH}
     return Response("Internal Server Error", status_code=500, headers=headers)
 
+
 CloudEventFunction = Callable[[CloudEvent], Union[None, Awaitable[None]]]
 HTTPFunction = Callable[[Request], Union[HTTPResponse, Awaitable[HTTPResponse]]]
 
@@ -163,7 +166,7 @@ async def handler(request):
             raise HTTPException(
                 400, detail=f"Bad Request: Got CloudEvent exception: {repr(e)}"
             )
-        
+
         if is_async:
             await function(event)
         else:
@@ -189,19 +192,21 @@ def _enable_execution_id_logging():
 
 def _configure_app_execution_id_logging():
     # Logging needs to be configured before app logger is accessed
-    import logging.config
     import logging
-    
+    import logging.config
+
     # Configure root logger to use our custom handler
     root_logger = logging.getLogger()
     root_logger.setLevel(logging.INFO)
-    
+
     # Remove existing handlers
     for handler in root_logger.handlers[:]:
         root_logger.removeHandler(handler)
-    
+
     # Add our custom handler that adds execution ID
-    handler = logging.StreamHandler(execution_id.LoggingHandlerAddExecutionId(sys.stderr))
+    handler = logging.StreamHandler(
+        execution_id.LoggingHandlerAddExecutionId(sys.stderr)
+    )
     handler.setLevel(logging.NOTSET)
     root_logger.addHandler(handler)
 
@@ -227,11 +232,11 @@ def create_asgi_app(target=None, source=None, signature_type=None):
         )
 
     source_module, spec = _function_registry.load_function_module(source)
-    
+
     enable_id_logging = _enable_execution_id_logging()
     if enable_id_logging:
         _configure_app_execution_id_logging()
-    
+
     spec.loader.exec_module(source_module)
     function = _function_registry.get_user_function(source, source_module, target)
     signature_type = _function_registry.get_func_signature_type(target, signature_type)
@@ -259,7 +264,9 @@ def create_asgi_app(target=None, source=None, signature_type=None):
             )
         )
     elif signature_type == _function_registry.CLOUDEVENT_SIGNATURE_TYPE:
-        cloudevent_handler = _cloudevent_func_wrapper(function, is_async, enable_id_logging)
+        cloudevent_handler = _cloudevent_func_wrapper(
+            function, is_async, enable_id_logging
+        )
         routes.append(
             Route("/{path:path}", endpoint=cloudevent_handler, methods=["POST"])
         )
@@ -282,10 +289,10 @@ def create_asgi_app(target=None, source=None, signature_type=None):
         Exception: _crash_handler,
     }
     app = Starlette(routes=routes, exception_handlers=exception_handlers)
-    
+
     # Apply ASGI middleware for execution ID
     app = execution_id.AsgiMiddleware(app)
-    
+
     return app
 
 

src/functions_framework/execution_id.py

@@ -41,7 +41,7 @@
 logger = logging.getLogger(__name__)
 
 # Context variable for async execution context
-execution_context_var = contextvars.ContextVar('execution_context', default=None)
+execution_context_var = contextvars.ContextVar("execution_context", default=None)
 
 
 class ExecutionContext:
@@ -82,14 +82,14 @@ def _generate_execution_id():
 def _extract_context_from_headers(headers):
     """Extract execution context from request headers."""
     execution_id = headers.get(EXECUTION_ID_REQUEST_HEADER)
-    
+
     # Try to get span ID from trace context header
     trace_context = re.match(
         _TRACE_CONTEXT_REGEX_PATTERN,
         headers.get(TRACE_CONTEXT_REQUEST_HEADER, ""),
     )
     span_id = trace_context.group("span_id") if trace_context else None
-    
+
     return ExecutionContext(execution_id, span_id)
 
 
@@ -118,31 +118,33 @@ async def __call__(self, scope, receive, send):
             trace_context_header = b"x-cloud-trace-context"
             execution_id = None
             trace_context = None
-            
+
             for name, value in scope.get("headers", []):
                 if name.lower() == execution_id_header:
                     execution_id = value.decode("latin-1")
                 elif name.lower() == trace_context_header:
                     trace_context = value.decode("latin-1")
-            
+
             if not execution_id:
                 execution_id = _generate_execution_id()
                 # Add the execution ID to headers
                 new_headers = list(scope.get("headers", []))
-                new_headers.append((execution_id_header, execution_id.encode("latin-1")))
+                new_headers.append(
+                    (execution_id_header, execution_id.encode("latin-1"))
+                )
                 scope["headers"] = new_headers
-            
+
             # Store execution context in ASGI scope for recovery in case of context loss
             # Parse trace context to extract span ID
             span_id = None
             if trace_context:
                 trace_match = re.match(_TRACE_CONTEXT_REGEX_PATTERN, trace_context)
                 if trace_match:
                     span_id = trace_match.group("span_id")
-            
+
             # Store in scope for potential recovery
             scope["execution_context"] = ExecutionContext(execution_id, span_id)
-        
+
         await self.app(scope, receive, send)  # pragma: no cover
 
 
@@ -167,7 +169,7 @@ def wrapper(*args, **kwargs):
 
             with stderr_redirect, stdout_redirect:
                 result = view_function(*args, **kwargs)
-                
+
                 # Context cleanup happens automatically via Flask's request context
                 # No need to manually clean up flask.g
                 return result
@@ -195,38 +197,38 @@ def decorator(view_function):
         async def async_wrapper(request, *args, **kwargs):
             # Extract execution context from headers
             context = _extract_context_from_headers(request.headers)
-            
+
             # Set context using contextvars
             token = execution_context_var.set(context)
-            
+
             with stderr_redirect, stdout_redirect:
                 # Handle both sync and async functions
                 if inspect.iscoroutinefunction(view_function):
                     result = await view_function(request, *args, **kwargs)
                 else:
                     result = view_function(request, *args, **kwargs)  # pragma: no cover
-                
+
                 # Only reset context on successful completion
                 # On exception, leave context available for exception handlers
                 execution_context_var.reset(token)
                 return result
-        
+
         @functools.wraps(view_function)
         def sync_wrapper(request, *args, **kwargs):  # pragma: no cover
             # For sync functions, we still need to set up the context
             context = _extract_context_from_headers(request.headers)
-            
+
             # Set context using contextvars
             token = execution_context_var.set(context)
-            
+
             with stderr_redirect, stdout_redirect:
                 result = view_function(request, *args, **kwargs)
-                
+
                 # Only reset context on successful completion
                 # On exception, leave context available for exception handlers
                 execution_context_var.reset(token)
                 return result
-        
+
         # Return appropriate wrapper based on whether the function is async
         if inspect.iscoroutinefunction(view_function):
             return async_wrapper

tests/test_execution_id.py

@@ -223,10 +223,11 @@ def view_func():
     monkeypatch.setattr(
         execution_id, "_generate_execution_id", lambda: TEST_EXECUTION_ID
     )
+
     # Use a simple object instead of Mock to properly test attribute assignment
     class MockG:
         pass
-    
+
     mock_g = MockG()
     monkeypatch.setattr(execution_id.flask, "g", mock_g)
     monkeypatch.setattr(execution_id.flask, "has_request_context", lambda: True)