Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(App): support app_auth #263

Merged
merged 1 commit into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion projects/fal/src/fal/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import time
import typing
from contextlib import asynccontextmanager, contextmanager
from typing import Any, Callable, ClassVar, TypeVar
from typing import Any, Callable, ClassVar, Literal, TypeVar

import httpx
from fastapi import FastAPI
Expand Down Expand Up @@ -152,6 +152,7 @@ class App(fal.api.BaseServable):
"keep_alive": 60,
}
app_name: ClassVar[str]
app_auth: ClassVar[Literal["private", "public"]] = "private"

def __init_subclass__(cls, **kwargs):
app_name = kwargs.pop("name", None) or _to_fal_app_name(cls.__name__)
Expand Down
6 changes: 3 additions & 3 deletions projects/fal/src/fal/cli/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,18 @@ def _deploy(args):

user = _get_user()
host = FalServerlessHost(args.host)
isolated_function, app_name = load_function_from(
isolated_function, app_name, app_auth = load_function_from(
host,
file_path,
func_name,
)
app_name = args.app_name or app_name
app_auth = args.auth or app_auth or "private"
app_id = host.register(
func=isolated_function.func,
options=isolated_function.options,
application_name=app_name,
application_auth_mode=args.auth,
application_auth_mode=app_auth,
metadata=isolated_function.options.host.get("metadata", {}),
)

Expand Down Expand Up @@ -151,7 +152,6 @@ def valid_auth_option(option):
parser.add_argument(
"--auth",
type=valid_auth_option,
default="private",
help="Application authentication mode (private, public).",
)
parser.set_defaults(func=_deploy)
2 changes: 1 addition & 1 deletion projects/fal/src/fal/cli/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def _run(args):
from fal.utils import load_function_from

host = FalServerlessHost(args.host)
isolated_function, _ = load_function_from(host, *args.func_ref)
isolated_function, _, _ = load_function_from(host, *args.func_ref)
# let our exc handlers handle UserFunctionException
isolated_function.reraise = False
isolated_function()
Expand Down
12 changes: 8 additions & 4 deletions projects/fal/src/fal/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ def load_function_from(
host: FalServerlessHost,
file_path: str,
function_name: str | None = None,
) -> tuple[IsolatedFunction, str | None]:
) -> tuple[IsolatedFunction, str | None, str | None]:
import runpy

module = runpy.run_path(file_path)
if function_name is None:
fal_objects = {
obj.app_name: obj_name
obj_name: obj
for obj_name, obj in module.items()
if isinstance(obj, type)
and issubclass(obj, fal.App)
Expand All @@ -30,9 +30,12 @@ def load_function_from(
"Please specify the name of the app."
)

[(app_name, function_name)] = fal_objects.items()
[(function_name, obj)] = fal_objects.items()
app_name = obj.app_name
app_auth = obj.app_auth
else:
app_name = None
app_auth = None

if function_name not in module:
raise FalServerlessError(f"Function '{function_name}' not found in module")
Expand All @@ -44,10 +47,11 @@ def load_function_from(
target = module[function_name]
if isinstance(target, type) and issubclass(target, App):
app_name = target.app_name
app_auth = target.app_auth
target = wrap_app(target, host=host)

if not isinstance(target, IsolatedFunction):
raise FalServerlessError(
f"Function '{function_name}' is not a fal.function or a fal.App"
)
return target, app_name
return target, app_name, app_auth
Loading