fix: do not store handler in function

Author: cyclimse

scw_serverless/cli.py

@@ -4,9 +4,9 @@
 
 import click
 from scaleway import ScalewayException
-from scaleway_functions_python import local
 
-from scw_serverless import deployment, loader, logger
+import scw_serverless
+from scw_serverless import app, deployment, loader, local_app, logger
 from scw_serverless.dependencies_manager import DependenciesManager
 from scw_serverless.gateway.gateway_manager import GatewayManager
 
@@ -167,23 +167,10 @@ def deploy(
     help="Run Flask in debug mode.",
 )
 def dev(file: Path, port: int, debug: bool) -> None:
-    """Run functions locally with Serverless Offline."""
-
-    app_instance = loader.load_app_instance(file.resolve())
-
-    server = local.LocalFunctionServer()
-
-    for function in app_instance.functions:
-        relative_url, http_methods = None, None
-        if function.gateway_route:
-            relative_url = function.gateway_route.relative_url
-            http_methods = [
-                method.value for method in function.gateway_route.http_methods or []
-            ]
-        path = relative_url or ("/" + function.name)
-        logging.info("Serving function %s on %s", function.name, path)
-        server.add_handler(
-            function.handler, relative_url=relative_url, http_methods=http_methods
-        )
-
-    server.serve(port=port, debug=debug)
+    """Run functions locally with Serverless Local Testing."""
+    app.Serverless = local_app.ServerlessLocal
+    scw_serverless.Serverless = local_app.ServerlessLocal
+    app_instance = cast(
+        local_app.ServerlessLocal, loader.load_app_instance(file.resolve())
+    )
+    app_instance.local_server.serve(port=port, debug=debug)

scw_serverless/config/function.py

@@ -57,7 +57,6 @@ class Function:
     """Representation of a Scaleway function."""
 
     name: str
-    handler: Callable
     handler_path: str
     environment_variables: Optional[dict[str, str]] = None
     min_scale: Optional[int] = None
@@ -86,7 +85,6 @@ def from_handler(
             gateway_route = GatewayRoute(url, http_methods=args.get("http_methods"))
         return Function(
             name=to_valid_function_name(handler.__name__),
-            handler=handler,
             handler_path=module_to_path(handler.__module__) + "." + handler.__name__,
             environment_variables=args.get("env"),
             min_scale=args.get("min_scale"),

scw_serverless/deployment/api_wrapper.py

@@ -89,7 +89,7 @@ def create_function(
             max_scale=function.max_scale,
             memory_limit=function.memory_limit,
             timeout=function.timeout,
-            handler=function.handler,
+            handler=function.handler_path,
             description=function.description,
             secret_environment_variables=self._get_secrets_from_dict(
                 function.secret_environment_variables
@@ -110,7 +110,7 @@ def update_function(
             max_scale=function.max_scale,
             memory_limit=function.memory_limit,
             timeout=function.timeout,
-            handler=function.handler,
+            handler=function.handler_path,
             description=function.description,
             secret_environment_variables=self._get_secrets_from_dict(
                 function.secret_environment_variables

scw_serverless/local_app.py

@@ -0,0 +1,47 @@
+from typing import Any, Callable
+
+from scaleway_functions_python import local
+
+from scw_serverless.app import Serverless
+from scw_serverless.config.function import FunctionKwargs
+
+try:
+    from typing import Unpack
+except ImportError:
+    from typing_extensions import Unpack
+# pylint: disable=wrong-import-position # Conditional import considered a statement
+
+
+class ServerlessLocal(Serverless):
+    """Serverless class that is used when testing locally.
+
+    Crate a local testing framework server and inject the handlers to it.
+    """
+
+    def __init__(
+        self,
+        service_name: str,
+        env: dict[str, Any] | None = None,
+        secret: dict[str, Any] | None = None,
+    ):
+        super().__init__(service_name, env, secret)
+        self.local_server = local.LocalFunctionServer()
+
+    def func(
+        self,
+        **kwargs: "Unpack[FunctionKwargs]",
+    ) -> Callable:
+        decorator = super().func(**kwargs)
+
+        def _decorator(handler: Callable):
+            decorator(handler)
+            http_methods = None
+            if methods := kwargs.get("http_methods"):
+                http_methods = [method.value for method in methods]
+            self.local_server.add_handler(
+                handler=handler,
+                relative_url=kwargs.get("relative_url"),
+                http_methods=http_methods,
+            )
+
+        return _decorator

tests/test_deployment/test_deployment_manager.py

@@ -54,7 +54,6 @@ def test_scaleway_api_backend_deploy_function(mocked_responses: responses.Reques
     function = Function(
         name="test-function",
         handler_path="handler",
-        handler=lambda event, context: "test",
     )
     backend = get_test_backend()
     backend.app_instance.functions = [function]
@@ -139,7 +138,6 @@ def test_scaleway_api_backend_deploy_function_with_trigger(
     function = Function(
         name="test-function-with-trigger",
         handler_path="handler",
-        handler=lambda event, context: "test",
         triggers=[trigger],
     )
 

tests/test_gateway/test_gateway_manager.py

@@ -42,7 +42,6 @@ def test_gateway_manager_update_routes(
 ):
     function = Function(
         name="test-function",
-        handler=lambda event, context: "test",
         handler_path="handler",
         gateway_route=GatewayRoute(
             relative_url="/hello", http_methods=[HTTPMethod.GET]