Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ internal static partial class CreateLlmModelsByModelIdDeploymentsCommandApiComma
{
Description = @"Weight configurations for BDN model weight distribution",
};

private static Option<global::Baseten.EgressRestrictionsV1?> EgressRestrictions { get; } = new(
name: @"--egress-restrictions")
{
Description = @"Restricts this deployment's egress to the specified FQDNs and IP addresses; an empty block allows none. Requires the organization to have egress restrictions enabled.",
};
private static readonly UpdateAutoscalingSettingsV1OptionSet AutoscalingSettingsOptions = UpdateAutoscalingSettingsV1OptionSet.Create(@"autoscaling-settings");
private static Option<string?> Input { get; } = new(@"--input")
{
Expand Down Expand Up @@ -119,7 +125,8 @@ public static Command Create(string? commandName = null)
command.Options.Add(ModelMetadata);
command.Options.Add(AdditionalAutoscalingConfig);
command.Options.Add(Metadata);
command.Options.Add(Weights); command.Options.Add(AutoscalingSettingsOptions.MinReplica);
command.Options.Add(Weights);
command.Options.Add(EgressRestrictions); command.Options.Add(AutoscalingSettingsOptions.MinReplica);
command.Options.Add(AutoscalingSettingsOptions.MaxReplica);
command.Options.Add(AutoscalingSettingsOptions.AutoscalingWindow);
command.Options.Add(AutoscalingSettingsOptions.ScaleDownDelay);
Expand Down Expand Up @@ -162,6 +169,7 @@ await CliRuntime.RunAsync(async () =>
var additionalAutoscalingConfig = CliRuntime.WasSpecified(parseResult, AdditionalAutoscalingConfig) ? parseResult.GetValue(AdditionalAutoscalingConfig) : (__requestBase is { } __AdditionalAutoscalingConfigBaseValue ? __AdditionalAutoscalingConfigBaseValue.AdditionalAutoscalingConfig : default);
var metadata = CliRuntime.WasSpecified(parseResult, Metadata) ? parseResult.GetValue(Metadata) : (__requestBase is { } __MetadataBaseValue ? __MetadataBaseValue.Metadata : default);
var weights = CliRuntime.WasSpecified(parseResult, Weights) ? parseResult.GetValue(Weights) : (__requestBase is { } __WeightsBaseValue ? __WeightsBaseValue.Weights : default);
var egressRestrictions = CliRuntime.WasSpecified(parseResult, EgressRestrictions) ? parseResult.GetValue(EgressRestrictions) : (__requestBase is { } __EgressRestrictionsBaseValue ? __EgressRestrictionsBaseValue.EgressRestrictions : default);

var __AutoscalingSettingsBase = __requestBase is { } __AutoscalingSettingsBaseValue ? __AutoscalingSettingsBaseValue.AutoscalingSettings : default; var autoscalingSettingsMinReplica = CliRuntime.WasSpecified(parseResult, AutoscalingSettingsOptions.MinReplica) ? parseResult.GetValue(AutoscalingSettingsOptions.MinReplica) : (__AutoscalingSettingsBase is { } __AutoscalingSettingsminReplicaBaseValue ? __AutoscalingSettingsminReplicaBaseValue.MinReplica : default);
var autoscalingSettingsMaxReplica = CliRuntime.WasSpecified(parseResult, AutoscalingSettingsOptions.MaxReplica) ? parseResult.GetValue(AutoscalingSettingsOptions.MaxReplica) : (__AutoscalingSettingsBase is { } __AutoscalingSettingsmaxReplicaBaseValue ? __AutoscalingSettingsmaxReplicaBaseValue.MaxReplica : default);
Expand Down Expand Up @@ -201,6 +209,7 @@ await CliRuntime.RunAsync(async () =>
additionalAutoscalingConfig: additionalAutoscalingConfig,
metadata: metadata,
weights: weights,
egressRestrictions: egressRestrictions,
autoscalingSettings: autoscalingSettings,
cancellationToken: cancellationToken).ConfigureAwait(false);

Expand Down
13 changes: 11 additions & 2 deletions src/cli/Baseten.CLI/Commands/CreateLlmModelsCommandApiCommand.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ internal static partial class CreateLlmModelsCommandApiCommand
{
Description = @"Weight configurations for BDN model weight distribution",
};

private static Option<global::Baseten.EgressRestrictionsV1?> EgressRestrictions { get; } = new(
name: @"--egress-restrictions")
{
Description = @"Restricts this deployment's egress to the specified FQDNs and IP addresses; an empty block allows none. Requires the organization to have egress restrictions enabled.",
};
private static readonly CreateLLMModelRequestV1OptionSet CreateLLMModelRequestV1OptionSetOptions = CreateLLMModelRequestV1OptionSet.Create();

private static readonly UpdateAutoscalingSettingsV1OptionSet AutoscalingSettingsOptions = UpdateAutoscalingSettingsV1OptionSet.Create(@"autoscaling-settings");
Expand Down Expand Up @@ -107,7 +113,8 @@ public static Command Create(string? commandName = null)
command.Options.Add(ModelMetadata);
command.Options.Add(AdditionalAutoscalingConfig);
command.Options.Add(Metadata);
command.Options.Add(Weights); command.Options.Add(CreateLLMModelRequestV1OptionSetOptions.Region);
command.Options.Add(Weights);
command.Options.Add(EgressRestrictions); command.Options.Add(CreateLLMModelRequestV1OptionSetOptions.Region);
command.Options.Add(CreateLLMModelRequestV1OptionSetOptions.LlmVersion); command.Options.Add(AutoscalingSettingsOptions.MinReplica);
command.Options.Add(AutoscalingSettingsOptions.MaxReplica);
command.Options.Add(AutoscalingSettingsOptions.AutoscalingWindow);
Expand Down Expand Up @@ -148,7 +155,8 @@ await CliRuntime.RunAsync(async () =>
var modelMetadata = CliRuntime.WasSpecified(parseResult, ModelMetadata) ? parseResult.GetValue(ModelMetadata) : (__requestBase is { } __ModelMetadataBaseValue ? __ModelMetadataBaseValue.ModelMetadata : default);
var additionalAutoscalingConfig = CliRuntime.WasSpecified(parseResult, AdditionalAutoscalingConfig) ? parseResult.GetValue(AdditionalAutoscalingConfig) : (__requestBase is { } __AdditionalAutoscalingConfigBaseValue ? __AdditionalAutoscalingConfigBaseValue.AdditionalAutoscalingConfig : default);
var metadata = CliRuntime.WasSpecified(parseResult, Metadata) ? parseResult.GetValue(Metadata) : (__requestBase is { } __MetadataBaseValue ? __MetadataBaseValue.Metadata : default);
var weights = CliRuntime.WasSpecified(parseResult, Weights) ? parseResult.GetValue(Weights) : (__requestBase is { } __WeightsBaseValue ? __WeightsBaseValue.Weights : default); var region = CliRuntime.WasSpecified(parseResult, CreateLLMModelRequestV1OptionSetOptions.Region) ? parseResult.GetValue(CreateLLMModelRequestV1OptionSetOptions.Region) : (__requestBase is { } __RegionBaseValue ? __RegionBaseValue.Region : default);
var weights = CliRuntime.WasSpecified(parseResult, Weights) ? parseResult.GetValue(Weights) : (__requestBase is { } __WeightsBaseValue ? __WeightsBaseValue.Weights : default);
var egressRestrictions = CliRuntime.WasSpecified(parseResult, EgressRestrictions) ? parseResult.GetValue(EgressRestrictions) : (__requestBase is { } __EgressRestrictionsBaseValue ? __EgressRestrictionsBaseValue.EgressRestrictions : default); var region = CliRuntime.WasSpecified(parseResult, CreateLLMModelRequestV1OptionSetOptions.Region) ? parseResult.GetValue(CreateLLMModelRequestV1OptionSetOptions.Region) : (__requestBase is { } __RegionBaseValue ? __RegionBaseValue.Region : default);
var llmVersion = CliRuntime.WasSpecified(parseResult, CreateLLMModelRequestV1OptionSetOptions.LlmVersion) ? parseResult.GetValue(CreateLLMModelRequestV1OptionSetOptions.LlmVersion) : (__requestBase is { } __LlmVersionBaseValue ? __LlmVersionBaseValue.LlmVersion : default);

var __AutoscalingSettingsBase = __requestBase is { } __AutoscalingSettingsBaseValue ? __AutoscalingSettingsBaseValue.AutoscalingSettings : default; var autoscalingSettingsMinReplica = CliRuntime.WasSpecified(parseResult, AutoscalingSettingsOptions.MinReplica) ? parseResult.GetValue(AutoscalingSettingsOptions.MinReplica) : (__AutoscalingSettingsBase is { } __AutoscalingSettingsminReplicaBaseValue ? __AutoscalingSettingsminReplicaBaseValue.MinReplica : default);
Expand Down Expand Up @@ -187,6 +195,7 @@ await CliRuntime.RunAsync(async () =>
additionalAutoscalingConfig: additionalAutoscalingConfig,
metadata: metadata,
weights: weights,
egressRestrictions: egressRestrictions,
region: region,
llmVersion: llmVersion,
autoscalingSettings: autoscalingSettings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ internal sealed record CreateLoopsRunRequestV1OptionSet(
Option<int?> Replicas,
Option<string?> Path,
Option<string?> ReuseFromRunId,
Option<string?> ReuseFromSessionId)
Option<string?> ReuseFromSessionId,
Option<int?> SamplerNumReplicas)
{
public static CreateLoopsRunRequestV1OptionSet Create(string? prefix = null)
{
Expand Down Expand Up @@ -73,6 +74,10 @@ public static CreateLoopsRunRequestV1OptionSet Create(string? prefix = null)
ReuseFromSessionId: new Option<string?>($"--{normalizedPrefix}reuse-from-session-id")
{
Description = @"Optional ID of a prior Loops session whose trainer and/or sampler should be reused for this run. Deprecated in favor of reuse_from_run_id.",
},
SamplerNumReplicas: new Option<int?>($"--{normalizedPrefix}sampler-num-replicas")
{
Description = @"Number of replicas the run's sampler runs, applied as both its minimum and maximum. Must be at least 1. If omitted, a new sampler uses the platform defaults and a sampler reused from an earlier run keeps its settings. A run that already has a sampler keeps it unchanged. When the run ends, its sampler is scaled down.",
}
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public static Command Create(string? commandName = null)
command.Options.Add(CreateLoopsRunRequestV1OptionSetOptions.Path);
command.Options.Add(CreateLoopsRunRequestV1OptionSetOptions.ReuseFromRunId);
command.Options.Add(CreateLoopsRunRequestV1OptionSetOptions.ReuseFromSessionId);
command.Options.Add(CreateLoopsRunRequestV1OptionSetOptions.SamplerNumReplicas);
command.Options.Add(Input);
command.Options.Add(RequestJson);
command.Options.Add(RequestFile);
Expand Down Expand Up @@ -99,6 +100,7 @@ await CliRuntime.RunAsync(async () =>
var path = CliRuntime.WasSpecified(parseResult, CreateLoopsRunRequestV1OptionSetOptions.Path) ? parseResult.GetValue(CreateLoopsRunRequestV1OptionSetOptions.Path) : (__requestBase is { } __PathBaseValue ? __PathBaseValue.Path : default);
var reuseFromRunId = CliRuntime.WasSpecified(parseResult, CreateLoopsRunRequestV1OptionSetOptions.ReuseFromRunId) ? parseResult.GetValue(CreateLoopsRunRequestV1OptionSetOptions.ReuseFromRunId) : (__requestBase is { } __ReuseFromRunIdBaseValue ? __ReuseFromRunIdBaseValue.ReuseFromRunId : default);
var reuseFromSessionId = CliRuntime.WasSpecified(parseResult, CreateLoopsRunRequestV1OptionSetOptions.ReuseFromSessionId) ? parseResult.GetValue(CreateLoopsRunRequestV1OptionSetOptions.ReuseFromSessionId) : (__requestBase is { } __ReuseFromSessionIdBaseValue ? __ReuseFromSessionIdBaseValue.ReuseFromSessionId : default);
var samplerNumReplicas = CliRuntime.WasSpecified(parseResult, CreateLoopsRunRequestV1OptionSetOptions.SamplerNumReplicas) ? parseResult.GetValue(CreateLoopsRunRequestV1OptionSetOptions.SamplerNumReplicas) : (__requestBase is { } __SamplerNumReplicasBaseValue ? __SamplerNumReplicasBaseValue.SamplerNumReplicas : default);
using var client = await CliRuntime.CreateClientAsync(parseResult, cancellationToken).ConfigureAwait(false);


Expand All @@ -115,6 +117,7 @@ await CliRuntime.RunAsync(async () =>
path: path,
reuseFromRunId: reuseFromRunId,
reuseFromSessionId: reuseFromSessionId,
samplerNumReplicas: samplerNumReplicas,
cancellationToken: cancellationToken).ConfigureAwait(false);


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ internal sealed record CreateLoopsSamplerRequestV1OptionSet(
Option<string?> RunId,
Option<int?> MaxSeqLength,
Option<string?> ModelPath,
Option<string?> ReuseFromSessionId)
Option<string?> ReuseFromSessionId,
Option<int?> NumReplicas)
{
public static CreateLoopsSamplerRequestV1OptionSet Create(string? prefix = null)
{
Expand Down Expand Up @@ -42,6 +43,10 @@ public static CreateLoopsSamplerRequestV1OptionSet Create(string? prefix = null)
ReuseFromSessionId: new Option<string?>($"--{normalizedPrefix}reuse-from-session-id")
{
Description = @"Optional ID of a prior Loops session to reuse a trainer and/or sampler from. Deprecated.",
},
NumReplicas: new Option<int?>($"--{normalizedPrefix}num-replicas")
{
Description = @"Number of replicas the sampler runs, applied as both its minimum and maximum. Must be at least 1. If omitted, a new sampler uses the platform defaults and a paired sampler reused from an earlier run keeps its settings. A run that already has a sampler keeps it unchanged, and when a run ends, its sampler is scaled down.",
}
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ public static Command Create(string? commandName = null)
command.Options.Add(CreateLoopsSamplerRequestV1OptionSetOptions.MaxSeqLength);
command.Options.Add(CreateLoopsSamplerRequestV1OptionSetOptions.ModelPath);
command.Options.Add(CreateLoopsSamplerRequestV1OptionSetOptions.ReuseFromSessionId);
command.Options.Add(CreateLoopsSamplerRequestV1OptionSetOptions.NumReplicas);
command.Options.Add(Input);
command.Options.Add(RequestJson);
command.Options.Add(RequestFile);
Expand Down Expand Up @@ -93,6 +94,7 @@ await CliRuntime.RunAsync(async () =>
var maxSeqLength = CliRuntime.WasSpecified(parseResult, CreateLoopsSamplerRequestV1OptionSetOptions.MaxSeqLength) ? parseResult.GetValue(CreateLoopsSamplerRequestV1OptionSetOptions.MaxSeqLength) : (__requestBase is { } __MaxSeqLengthBaseValue ? __MaxSeqLengthBaseValue.MaxSeqLength : default);
var modelPath = CliRuntime.WasSpecified(parseResult, CreateLoopsSamplerRequestV1OptionSetOptions.ModelPath) ? parseResult.GetValue(CreateLoopsSamplerRequestV1OptionSetOptions.ModelPath) : (__requestBase is { } __ModelPathBaseValue ? __ModelPathBaseValue.ModelPath : default);
var reuseFromSessionId = CliRuntime.WasSpecified(parseResult, CreateLoopsSamplerRequestV1OptionSetOptions.ReuseFromSessionId) ? parseResult.GetValue(CreateLoopsSamplerRequestV1OptionSetOptions.ReuseFromSessionId) : (__requestBase is { } __ReuseFromSessionIdBaseValue ? __ReuseFromSessionIdBaseValue.ReuseFromSessionId : default);
var numReplicas = CliRuntime.WasSpecified(parseResult, CreateLoopsSamplerRequestV1OptionSetOptions.NumReplicas) ? parseResult.GetValue(CreateLoopsSamplerRequestV1OptionSetOptions.NumReplicas) : (__requestBase is { } __NumReplicasBaseValue ? __NumReplicasBaseValue.NumReplicas : default);
using var client = await CliRuntime.CreateClientAsync(parseResult, cancellationToken).ConfigureAwait(false);


Expand All @@ -104,6 +106,7 @@ await CliRuntime.RunAsync(async () =>
maxSeqLength: maxSeqLength,
modelPath: modelPath,
reuseFromSessionId: reuseFromSessionId,
numReplicas: numReplicas,
cancellationToken: cancellationToken).ConfigureAwait(false);


Expand Down
Loading
Loading