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: regions proto and cli option #430

Merged
merged 6 commits into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from 4 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
15 changes: 12 additions & 3 deletions projects/fal/src/fal/cli/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def _apps_table(apps: list[AliasInfo]):
table.add_column("Startup Timeout")
table.add_column("Machine Type")
table.add_column("Active Workers")
table.add_column("Regions")

for app in apps:
table.add_row(
Expand All @@ -37,6 +38,7 @@ def _apps_table(apps: list[AliasInfo]):
str(app.startup_timeout),
" ".join(app.machine_types),
str(app.active_runners),
" ".join(app.valid_regions),
)

return table
Expand Down Expand Up @@ -129,6 +131,7 @@ def _scale(args):
and args.request_timeout is None
and args.startup_timeout is None
and args.machine_types is None
and args.regions is None
):
args.console.log("No parameters for update were provided, ignoring.")
return
Expand All @@ -142,6 +145,7 @@ def _scale(args):
request_timeout=args.request_timeout,
startup_timeout=args.startup_timeout,
machine_types=args.machine_types,
valid_regions=args.regions,
)
table = _apps_table([alias_info])

Expand Down Expand Up @@ -191,11 +195,16 @@ def _add_scale_parser(subparsers, parents):
help="Startup timeout (seconds).",
)
parser.add_argument(
"--machine-type",
"--machine-types",
type=str,
action="append",
nargs="+",
dest="machine_types",
help="Machine type.",
help="Machine type (pass several items to set multiple).",
)
parser.add_argument(
"--regions",
nargs="+",
help="Valid regions (pass several items to set multiple).",
)
parser.set_defaults(func=_scale)

Expand Down
7 changes: 5 additions & 2 deletions projects/fal/src/fal/sdk.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ class AliasInfo:
machine_types: list[str]
request_timeout: int
startup_timeout: int
valid_regions: list[str]


@dataclass
Expand Down Expand Up @@ -347,9 +348,10 @@ def _from_grpc_alias_info(message: isolate_proto.AliasInfo) -> AliasInfo:
max_multiplexing=message.max_multiplexing,
active_runners=message.active_runners,
min_concurrency=message.min_concurrency,
machine_types=message.machine_types,
machine_types=list(message.machine_types),
request_timeout=message.request_timeout,
startup_timeout=message.startup_timeout,
valid_regions=list(message.valid_regions),
)


Expand Down Expand Up @@ -582,9 +584,9 @@ def update_application(
min_concurrency: int | None = None,
request_timeout: int | None = None,
startup_timeout: int | None = None,
valid_regions: list[str] | None = None,
machine_types: list[str] | None = None,
) -> AliasInfo:
print(machine_types)
request = isolate_proto.UpdateApplicationRequest(
application_name=application_name,
keep_alive=keep_alive,
Expand All @@ -593,6 +595,7 @@ def update_application(
min_concurrency=min_concurrency,
request_timeout=request_timeout,
startup_timeout=startup_timeout,
valid_regions=valid_regions,
machine_types=machine_types,
)
res: isolate_proto.UpdateApplicationResult = self.stub.UpdateApplication(
Expand Down
2 changes: 2 additions & 0 deletions projects/isolate_proto/src/isolate_proto/controller.proto
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ message ApplicationInfo {
repeated string machine_types = 8;
optional int32 request_timeout = 9;
optional int32 startup_timeout = 10;
repeated string valid_regions = 11;
}

message ListApplicationsResult {
Expand Down Expand Up @@ -285,6 +286,7 @@ message AliasInfo {
repeated string machine_types = 9;
optional int32 request_timeout = 10;
optional int32 startup_timeout = 11;
repeated string valid_regions = 12;
}

message SetSecretRequest {
Expand Down
Loading
Loading