修改配置编辑不了的问题
This commit is contained in:
1 parent
22b504e53e
commit
2a2f78c81e
42 files changed
+1082
-178
No files matched your search
@@ -79,14 +79,6 @@ func New(options Options) (*App, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if config.Backend == postgres.BackendPostgres && options.ProviderRegistry == nil {
|
||||
if err := validateProductionProviderConfiguration(getenv); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if allowUnconfiguredProviders(getenv) {
|
||||
log.Printf("WARNING: %s is enabled; the Go API will start with unconfigured providers, and generation/quote requests will remain unavailable until credentials are added and the process is restarted", "ZHINIAN_ALLOW_UNCONFIGURED_PROVIDERS")
|
||||
}
|
||||
}
|
||||
database, err := postgres.Open(ctx, config)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -245,6 +237,9 @@ func New(options Options) (*App, error) {
|
||||
|
||||
billingService := billing.NewService(billingStore, nil).SetEnabled(strings.TrimSpace(getenv("ZHINIAN_BILLING_REQUIRED")) != "0")
|
||||
runtimeSettings := defaultSettingsService(getenv)
|
||||
if config.Backend == postgres.BackendPostgres {
|
||||
runtimeSettings = databaseSettingsService(getenv, database.Store)
|
||||
}
|
||||
billingAccounts := settingsBillingAccountStore{service: runtimeSettings}
|
||||
templateService := templates.NewService(templateCatalog, nil, nil)
|
||||
logService := options.Logs
|
||||
@@ -258,26 +253,20 @@ func New(options Options) (*App, error) {
|
||||
miscHandler, err := httpapi.NewMiscHandler(httpapi.MiscDependencies{
|
||||
Platform: platformAuthorizer, Templates: templateService, PromptAssembler: prompt.Assemble,
|
||||
Settings: runtimeSettings, Logs: logService, Public: publicAuthenticator,
|
||||
Capabilities: capabilitySummary(getenv), PublicOrigin: publicBaseURL,
|
||||
Capabilities: runtimeCapabilitySummary(getenv, runtimeSettings), PublicOrigin: publicBaseURL,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
providerRegistry := options.ProviderRegistry
|
||||
if providerRegistry == nil {
|
||||
providerRegistry = buildProviderRegistry(getenv)
|
||||
}
|
||||
var unavailableProviders map[string]string
|
||||
if config.Backend == postgres.BackendPostgres {
|
||||
unavailableProviders = providerUnavailableMessages(getenv)
|
||||
var providerResolver jobs.ProviderResolver
|
||||
if options.ProviderRegistry != nil {
|
||||
providerResolver = options.ProviderRegistry
|
||||
} else {
|
||||
providerResolver = newRuntimeProviderResolver(getenv, runtimeSettings)
|
||||
}
|
||||
jobService := jobs.NewService(jobStore, nil)
|
||||
jobBuilder := jobs.ProviderJobBuilder{
|
||||
ImageProvider: imageProvider(getenv), VideoProvider: videoProvider(getenv),
|
||||
ImageModel: imageModel(getenv), VideoModel: videoModel(getenv), ImageEngine: imageEngine(getenv), VideoEngine: videoEngine(getenv),
|
||||
ImageEngines: providerImageTargets(getenv), VideoEngines: providerVideoTargets(getenv), UnavailableProviders: unavailableProviders, NewID: applicationJobID,
|
||||
}
|
||||
jobBuilder := runtimeProviderJobBuilder{fallback: getenv, settings: runtimeSettings, enforceAvailability: config.Backend == postgres.BackendPostgres}
|
||||
usageService := usage.Service{
|
||||
Repository: usageRepository,
|
||||
OrganizationOptions: usage.OrganizationOptionSourceFunc(func(ctx context.Context, requester usage.Requester) ([]usage.Option, error) {
|
||||
@@ -306,7 +295,7 @@ func New(options Options) (*App, error) {
|
||||
}
|
||||
webhookBridge := orchestration.NewWebhookBridge(webhook.NewDeliverer(webhookSender, getenv("ZHINIAN_WEBHOOK_SECRET"), nil))
|
||||
outputs := orchestration.NewAssetOutputRegistrar(assetService, orchestration.ResolveProviderOutputURLs)
|
||||
providerProcessor := jobs.ProviderProcessor{Providers: providerRegistry, Store: jobStore}
|
||||
providerProcessor := jobs.ProviderProcessor{Providers: providerResolver, Store: jobStore}
|
||||
settlementProcessor := orchestration.NewSettlementProcessor(providerProcessor, ledger, settlementState, nil)
|
||||
processor := orchestration.NewOutputRegisteringProcessor(settlementProcessor, outputs, jobState)
|
||||
artifacts := orchestration.NewAssetArtifacts(assetService)
|
||||
@@ -330,7 +319,7 @@ func New(options Options) (*App, error) {
|
||||
workerLoop.Start(ctx)
|
||||
}
|
||||
|
||||
foundation := httpapi.NewHandler(readiness, httpapi.WithHealthDetails(runtimeHealthDetails(getenv)))
|
||||
foundation := httpapi.NewHandler(readiness, httpapi.WithHealthDetailsProvider(runtimeHealthDetailsProvider(getenv, runtimeSettings)))
|
||||
mux := http.NewServeMux()
|
||||
mux.Handle("/api/auth/me", authMe)
|
||||
mux.Handle("/api/auth/password", authPassword)
|
||||
|
||||
Reference in new issue
Block a user