mirror of
https://github.com/onyx-dot-app/onyx.git
synced 2026-10-23 11:53:08 -05:00
## Description
Make ODS reuse shared development infrastructure by default, with
`--isolated` for separate datasets.
- Use the same service specifications and launchers for `stack`, `web
dev`, and `backend` commands. Remove the duplicate `stack
--frontend-only` option.
- Enforce project ownership across checkouts and resolve database
commands to the actual managed database.
- Stop services before pending migrations, preserve them when already at
head, and reject manual migrations beneath managed services.
- Harden startup cancellation, shutdown grace, descendant cleanup,
terminal input, and frontend API validation. Preserve Windows foreground
commands.
- Consolidate environment helpers, protect symlinked environment files,
propagate restore errors, and update help and documentation.
This PR contains only ODS and its development-stack skill. It does not
include the plugins implementation.
## How Has This Been Tested?
- Targeted command and regression tests using fake tools and disposable
Git repositories.
- Race tests for runtime targeting, ownership, migration ordering,
process cleanup, and terminal input.
- `go vet ./...`, pre-commit checks, native builds, and Windows
cross-builds.
- The full Go suite was run. Its remaining failures are the existing
macOS devcontainer SSH-mount fixture expectations in
`TestDevcontainerCommands` and `TestRunDevRebuild`.
No real database migrations, restores, or development-stack restarts
ran. Native Windows execution remains untested.
## Additional Options
- [ ] [Optional] Please cherry-pick this PR to the latest release
version.
- [x] [Optional] Override Linear Check
<!-- This is an auto-generated description by cubic. -->
---
## Summary by cubic
ODS now shares development infrastructure across worktrees by default,
with `--isolated` for separate datasets. `stack`, `web dev`, and
`backend` use the same service specs and launchers, and the duplicate
`stack --frontend-only` option is removed.
- Direct launches run the same dependency-prepare step as stack startup,
so `backend` and `web dev` work with fresh or stale Python environments.
- A stopped preview discards its former project state before retargeting
to another API owner.
- Enforces project ownership across checkouts and resolves database
commands to the managed database. New tests reject conflicting targets
before any mutation.
- Stops services before pending migrations, preserves them when already
at head, and rejects manual migrations beneath managed services.
Migration probe failures fail closed.
- Hardens startup cancellation, shutdown grace, and descendant cleanup;
ODS keeps the terminal foreground group so Ctrl-C still honors shutdown
timeouts, and tmux pane identifiers no longer change service identity.
- Database passwords reach tools through the child environment only,
never in process arguments; Windows foreground commands are preserved.
- Consolidates environment helpers, protects symlinked env files,
propagates restore errors, and refreshes help and documentation. Test
commits exercise the new migration-target and preview-launch paths.
<sup>Written for commit 14500cb051.
Summary will update on new commits.</sup>
<a
href="https://cubic.dev/pr/onyx-dot-app/onyx/pull/16246?utm_source=github"
target="_blank" rel="noopener noreferrer"
data-no-image-dialog="true"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://www.cubic.dev/buttons/review-in-cubic-dark.svg"><source
media="(prefers-color-scheme: light)"
srcset="https://www.cubic.dev/buttons/review-in-cubic-light.svg"><img
alt="View guided diff"
src="https://www.cubic.dev/buttons/review-in-cubic-light.svg"></picture></a>
<a
href="https://www.cubic.dev/action/auto-fix/pr/onyx-dot-app/onyx/16246?returnTo=https%3A%2F%2Fgithub.com%2Fonyx-dot-app%2Fonyx%2Fpull%2F16246&source=description"
target="_blank" rel="noopener noreferrer"
data-no-image-dialog="true"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://www.cubic.dev/buttons/turn-on-auto-fix-dark.svg"><source
media="(prefers-color-scheme: light)"
srcset="https://www.cubic.dev/buttons/turn-on-auto-fix-light.svg"><img
alt="Turn on auto-fix"
src="https://www.cubic.dev/buttons/turn-on-auto-fix-light.svg"></picture></a>
<!-- End of auto-generated description by cubic. -->
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **New Features**
* Added the global `--isolated` option for separate development stacks;
shared infrastructure is the default, with clearer project ownership and
status information.
* Added `ods web dev` previews that can use a healthy managed API on
macOS and Linux, plus foreground startup on Windows.
* Expanded command guidance for development workflows, database
targeting, and dump formats.
* **Bug Fixes**
* Pending migrations now stop managed application services first;
healthy services remain running when no migrations are needed.
* Database operations verify project ownership and target selection
before making changes. Restore errors now fail the command, SQL restores
stop on errors, and temporary files are cleaned up after failures.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
195 lines
5.7 KiB
Go
195 lines
5.7 KiB
Go
package cmd
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"runtime"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
"github.com/spf13/cobra"
|
|
|
|
"github.com/onyx-dot-app/onyx/tools/ods/internal/devstack"
|
|
"github.com/onyx-dot-app/onyx/tools/ods/internal/paths"
|
|
)
|
|
|
|
// devLicenseEnv names the variable that holds the license internal developers
|
|
// seed to unlock paid features. With no license in the database the backend
|
|
// runs as Community.
|
|
const devLicenseEnv = "ONYX_DEV_LICENSE"
|
|
|
|
// NewBackendCommand creates the parent "backend" command with subcommands for
|
|
// running backend services.
|
|
func NewBackendCommand() *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "backend",
|
|
Short: "Run backend services (api, model-server)",
|
|
Long: `Run backend services with environment from .vscode/.env.
|
|
|
|
On first run, copies .vscode/env_template.txt to .vscode/.env if the
|
|
.env file does not already exist.
|
|
|
|
Paid features need a license in the database. When ONYX_DEV_LICENSE is set, in
|
|
the shell or in .vscode/.env, "backend api" seeds it before the server starts.
|
|
With no license in the database the backend runs as Community Edition.
|
|
|
|
Available subcommands:
|
|
api Start the FastAPI backend server
|
|
model-server Start the model server`,
|
|
}
|
|
|
|
cmd.AddCommand(newBackendAPICommand())
|
|
cmd.AddCommand(newBackendModelServerCommand())
|
|
|
|
return cmd
|
|
}
|
|
|
|
func newBackendAPICommand() *cobra.Command {
|
|
var port string
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "api",
|
|
Short: "Start the backend API server (uvicorn with hot-reload)",
|
|
Long: `Start the backend API server using uvicorn with hot-reload.
|
|
|
|
Examples:
|
|
ods backend api
|
|
ods backend api --port 9090`,
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
if err := runBackendService("api", port, args...); err != nil {
|
|
exitBackendService(err)
|
|
}
|
|
},
|
|
}
|
|
|
|
cmd.Flags().StringVar(&port, "port", "", "Port to listen on (default: saved project port, otherwise 8080)")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func newBackendModelServerCommand() *cobra.Command {
|
|
var port string
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "model-server",
|
|
Aliases: []string{"model_server"},
|
|
Short: "Start the model server (uvicorn with hot-reload)",
|
|
Long: `Start the model server using uvicorn with hot-reload.
|
|
|
|
Examples:
|
|
ods backend model-server
|
|
ods backend model-server --port 9001`,
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
if err := runBackendService("model", port, args...); err != nil {
|
|
exitBackendService(err)
|
|
}
|
|
},
|
|
}
|
|
|
|
cmd.Flags().StringVar(&port, "port", "", "Port to listen on (default: saved project port, otherwise 9000)")
|
|
|
|
return cmd
|
|
}
|
|
|
|
// exitBackendService ends the process after a command's child process fails. A
|
|
// child that ran and exited passes its exit code through, so the stderr it
|
|
// already printed is not repeated.
|
|
func exitBackendService(err error) {
|
|
var exitErr *exec.ExitError
|
|
if errors.As(err, &exitErr) {
|
|
if code := exitErr.ExitCode(); code != -1 {
|
|
os.Exit(code)
|
|
}
|
|
}
|
|
log.Fatal(err)
|
|
}
|
|
|
|
func runBackendService(name, port string, args ...string) error {
|
|
for _, arg := range args {
|
|
if arg == "--port" || strings.HasPrefix(arg, "--port=") || arg == "-p" {
|
|
return fatalErrorf("Set the backend port with --port before the -- separator")
|
|
}
|
|
}
|
|
root, err := paths.GitRoot()
|
|
if err != nil {
|
|
return fatalErrorf("Failed to find git root: %v", err)
|
|
}
|
|
|
|
preferred := 0
|
|
if port != "" {
|
|
preferred, err = strconv.Atoi(port)
|
|
if err != nil || preferred < 1 || preferred > 65535 {
|
|
return fatalErrorf("Invalid port %q", port)
|
|
}
|
|
}
|
|
if _, _, err := devstack.PrepareEnvFiles(root); err != nil {
|
|
return err
|
|
}
|
|
target, err := resolveRuntimeTarget()
|
|
if err != nil {
|
|
return fmt.Errorf("resolve backend target: %v", err)
|
|
}
|
|
launch, err := devstack.LoadLaunch(filepath.Join(root, ".vscode", "launch.json"))
|
|
if err != nil {
|
|
return fmt.Errorf("load backend launch configuration: %v", err)
|
|
}
|
|
options := devstack.ServiceOptions{
|
|
PreferredPort: preferred, Args: args,
|
|
BeforeStart: func(ctx context.Context, sp devstack.Spec) error {
|
|
if err := runInDir(ctx, root, "uv", "sync", "--frozen"); err != nil {
|
|
if ctx.Err() != nil {
|
|
return ctx.Err()
|
|
}
|
|
return fatalErrorf("Failed to sync Python dependencies: %v", err)
|
|
}
|
|
return prepareAPIService(ctx, sp)
|
|
},
|
|
IO: devstack.ServiceIO{Stdin: os.Stdin, Stdout: os.Stdout, Stderr: os.Stderr},
|
|
LockWait: 30 * time.Second, StopTimeout: 20 * time.Second,
|
|
}
|
|
if runtime.GOOS == "windows" {
|
|
return devstack.RunForegroundService(context.Background(), target, launch, name, options)
|
|
}
|
|
if err := stackForTarget(target).RunService(context.Background(), target, launch, name, options); err != nil {
|
|
return fatalErrorf("Failed to run %s: %w", name, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func prepareAPIService(ctx context.Context, sp devstack.Spec) error {
|
|
if sp.Slug != "api" {
|
|
return nil
|
|
}
|
|
return seedDevLicense(ctx, sp.Dir, sp.Env)
|
|
}
|
|
|
|
// seedDevLicense installs the dev license so paid features unlock. It does
|
|
// nothing when the variable is unset or empty. Multi-tenant mode takes its
|
|
// tier from the control plane, and the seed has no tenant to write to.
|
|
func seedDevLicense(ctx context.Context, backendDir string, env []string) error {
|
|
if devstack.EnvValue(env, devLicenseEnv) == "" {
|
|
return nil
|
|
}
|
|
if strings.EqualFold(devstack.EnvValue(env, "MULTI_TENANT"), "true") {
|
|
log.Infof("Not seeding the dev license from %s in multi-tenant mode", devLicenseEnv)
|
|
return nil
|
|
}
|
|
|
|
log.Infof("Seeding the dev license from %s...", devLicenseEnv)
|
|
seedCmd := exec.CommandContext(ctx, "uv", "run", "python", "-m", "scripts.seed_dev_license")
|
|
seedCmd.Dir = backendDir
|
|
seedCmd.Stdout = os.Stdout
|
|
seedCmd.Stderr = os.Stderr
|
|
seedCmd.Env = env
|
|
if err := seedCmd.Run(); err != nil {
|
|
return fatalErrorf("Failed to seed the dev license: %v", err)
|
|
}
|
|
return nil
|
|
}
|