onyx-devtools 0.0.1__py3-none-any.whl

cmd/cherry-pick.go

@@ -0,0 +1,235 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"regexp"
+	"strings"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+// CherryPickOptions holds options for the cherry-pick command
+type CherryPickOptions struct {
+	Releases []string
+}
+
+// NewCherryPickCommand creates a new cherry-pick command
+func NewCherryPickCommand() *cobra.Command {
+	opts := &CherryPickOptions{}
+
+	cmd := &cobra.Command{
+		Use:   "cherry-pick <commit-sha>",
+		Short: "Cherry-pick a commit to a release branch",
+		Long: `Cherry-pick a commit to a release branch and create a PR.
+
+This command will:
+  1. Find the nearest stable version tag (v*.*.* if --release not specified)
+  2. Fetch the corresponding release branch (release/vMAJOR.MINOR)
+  3. Create a hotfix branch with the cherry-picked commit
+  4. Push and create a PR using the GitHub CLI
+  5. Switch back to the original branch
+
+The --release flag can be specified multiple times to cherry-pick to multiple release branches.`,
+		Args: cobra.ExactArgs(1),
+		Run: func(cmd *cobra.Command, args []string) {
+			runCherryPick(cmd, args, opts)
+		},
+	}
+
+	cmd.Flags().StringSliceVar(&opts.Releases, "release", []string{}, "Release version(s) to cherry-pick to (e.g., 1.0, v1.1). 'v' prefix is optional. Can be specified multiple times.")
+
+	return cmd
+}
+
+func runCherryPick(cmd *cobra.Command, args []string, opts *CherryPickOptions) {
+	commitSHA := args[0]
+	log.Debugf("Cherry-picking commit: %s", commitSHA)
+
+	// Save the current branch to switch back later
+	originalBranch, err := getCurrentBranch()
+	if err != nil {
+		log.Fatalf("Failed to get current branch: %v", err)
+	}
+	log.Debugf("Original branch: %s", originalBranch)
+
+	// Get the short SHA for branch naming
+	shortSHA := commitSHA
+	if len(shortSHA) > 8 {
+		shortSHA = shortSHA[:8]
+	}
+
+	// Determine which releases to target
+	var releases []string
+	if len(opts.Releases) > 0 {
+		// Normalize versions to ensure they have 'v' prefix
+		for _, rel := range opts.Releases {
+			releases = append(releases, normalizeVersion(rel))
+		}
+		log.Infof("Using specified release versions: %v", releases)
+	} else {
+		// Find the nearest stable tag
+		version, err := findNearestStableTag(commitSHA)
+		if err != nil {
+			log.Fatalf("Failed to find nearest stable tag: %v", err)
+		}
+		releases = []string{version}
+		log.Infof("Auto-detected release version: %s", version)
+	}
+
+	// Get commit message for PR title
+	commitMsg, err := getCommitMessage(commitSHA)
+	if err != nil {
+		log.Warnf("Failed to get commit message, using default title: %v", err)
+		commitMsg = fmt.Sprintf("Hotfix: cherry-pick %s", shortSHA)
+	}
+
+	// Process each release
+	prURLs := []string{}
+	for _, release := range releases {
+		log.Infof("\n--- Processing release %s ---", release)
+		prURL, err := cherryPickToRelease(commitSHA, shortSHA, release, commitMsg, originalBranch)
+		if err != nil {
+			// Switch back to original branch before exiting on error
+			runGitCommand("checkout", originalBranch)
+			log.Fatalf("Failed to cherry-pick to release %s: %v", release, err)
+		}
+		prURLs = append(prURLs, prURL)
+	}
+
+	// Switch back to the original branch
+	log.Infof("\nSwitching back to original branch: %s", originalBranch)
+	if err := runGitCommand("checkout", originalBranch); err != nil {
+		log.Warnf("Failed to switch back to original branch: %v", err)
+	}
+
+	// Print all PR URLs
+	log.Info("\n=== Summary ===")
+	for i, prURL := range prURLs {
+		log.Infof("PR %d: %s", i+1, prURL)
+	}
+}
+
+// cherryPickToRelease cherry-picks a commit to a specific release branch
+func cherryPickToRelease(commitSHA, shortSHA, version, commitMsg, originalBranch string) (string, error) {
+	releaseBranch := fmt.Sprintf("release/%s", version)
+	hotfixBranch := fmt.Sprintf("hotfix/%s-%s", shortSHA, version)
+
+	// Fetch the release branch
+	log.Infof("Fetching release branch: %s", releaseBranch)
+	if err := runGitCommand("fetch", "origin", releaseBranch); err != nil {
+		return "", fmt.Errorf("failed to fetch release branch %s: %w", releaseBranch, err)
+	}
+
+	// Create the hotfix branch from the release branch
+	log.Infof("Creating hotfix branch: %s", hotfixBranch)
+	if err := runGitCommand("checkout", "-b", hotfixBranch, fmt.Sprintf("origin/%s", releaseBranch)); err != nil {
+		return "", fmt.Errorf("failed to create hotfix branch: %w", err)
+	}
+
+	// Cherry-pick the commit
+	log.Infof("Cherry-picking commit: %s", commitSHA)
+	if err := runGitCommand("cherry-pick", commitSHA); err != nil {
+		return "", fmt.Errorf("failed to cherry-pick commit: %w", err)
+	}
+
+	// Push the hotfix branch
+	log.Infof("Pushing hotfix branch: %s", hotfixBranch)
+	if err := runGitCommand("push", "-u", "origin", hotfixBranch); err != nil {
+		return "", fmt.Errorf("failed to push hotfix branch: %w", err)
+	}
+
+	// Create PR using GitHub CLI
+	log.Info("Creating PR...")
+	prURL, err := createPR(hotfixBranch, releaseBranch, commitMsg, commitSHA)
+	if err != nil {
+		return "", fmt.Errorf("failed to create PR: %w", err)
+	}
+
+	log.Infof("PR created successfully: %s", prURL)
+	return prURL, nil
+}
+
+// getCurrentBranch returns the name of the current git branch
+func getCurrentBranch() (string, error) {
+	cmd := exec.Command("git", "rev-parse", "--abbrev-ref", "HEAD")
+	output, err := cmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("git rev-parse failed: %w", err)
+	}
+	return strings.TrimSpace(string(output)), nil
+}
+
+// normalizeVersion ensures the version has a 'v' prefix
+func normalizeVersion(version string) string {
+	if !strings.HasPrefix(version, "v") {
+		return "v" + version
+	}
+	return version
+}
+
+// findNearestStableTag finds the nearest tag matching v*.*.* pattern and returns major.minor
+func findNearestStableTag(commitSHA string) (string, error) {
+	// Get tags that are ancestors of the commit, sorted by version
+	cmd := exec.Command("git", "describe", "--tags", "--abbrev=0", "--match", "v*.*.*", commitSHA)
+	output, err := cmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("git describe failed: %w", err)
+	}
+
+	tag := strings.TrimSpace(string(output))
+	log.Debugf("Found tag: %s", tag)
+
+	// Extract major.minor with v prefix from tag (e.g., v1.2.3 -> v1.2)
+	re := regexp.MustCompile(`^(v\d+\.\d+)\.\d+`)
+	matches := re.FindStringSubmatch(tag)
+	if len(matches) < 2 {
+		return "", fmt.Errorf("tag %s does not match expected format v*.*.* ", tag)
+	}
+
+	return matches[1], nil
+}
+
+// runGitCommand executes a git command and returns any error
+func runGitCommand(args ...string) error {
+	log.Debugf("Running: git %s", strings.Join(args, " "))
+	cmd := exec.Command("git", args...)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd.Run()
+}
+
+// getCommitMessage gets the first line of a commit message
+func getCommitMessage(commitSHA string) (string, error) {
+	cmd := exec.Command("git", "log", "-1", "--format=%s", commitSHA)
+	output, err := cmd.Output()
+	if err != nil {
+		return "", err
+	}
+	return strings.TrimSpace(string(output)), nil
+}
+
+// createPR creates a pull request using the GitHub CLI
+func createPR(headBranch, baseBranch, title, commitSHA string) (string, error) {
+	body := fmt.Sprintf("Cherry-pick of commit %s to %s branch.", commitSHA, baseBranch)
+
+	cmd := exec.Command("gh", "pr", "create",
+		"--base", baseBranch,
+		"--head", headBranch,
+		"--title", title,
+		"--body", body,
+	)
+
+	output, err := cmd.Output()
+	if err != nil {
+		if exitErr, ok := err.(*exec.ExitError); ok {
+			return "", fmt.Errorf("%w: %s", err, string(exitErr.Stderr))
+		}
+		return "", err
+	}
+
+	prURL := strings.TrimSpace(string(output))
+	return prURL, nil
+}

cmd/root.go

@@ -0,0 +1,48 @@
+package cmd
+
+import (
+	"fmt"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/cobra"
+)
+
+var (
+	Version string
+	Commit  string
+)
+
+// RootOptions holds options for the root command
+type RootOptions struct {
+	Debug bool
+}
+
+// NewRootCommand creates the root command
+func NewRootCommand() *cobra.Command {
+	opts := &RootOptions{}
+
+	cmd := &cobra.Command{
+		Use:   "ods ",
+		Short: "Developer utilities for working on onyx.app",
+		Run:   rootCmd,
+		PersistentPreRun: func(cmd *cobra.Command, args []string) {
+			if opts.Debug {
+				log.SetLevel(log.DebugLevel)
+			} else {
+				log.SetLevel(log.InfoLevel)
+			}
+		},
+		Version: fmt.Sprintf("%s\ncommit %s", Version, Commit),
+	}
+
+	cmd.PersistentFlags().BoolVar(&opts.Debug, "debug", false, "run in debug mode")
+
+	// Add subcommands
+	cmd.AddCommand(NewCherryPickCommand())
+
+	return cmd
+}
+
+func rootCmd(cmd *cobra.Command, args []string) {
+	log.Debug("Debug log in rootCmd")
+}

go.mod

@@ -0,0 +1,14 @@
+module github.com/onyx-dot-app/onyx/tools/ods
+
+go 1.25.0
+
+require (
+	github.com/sirupsen/logrus v1.9.3
+	github.com/spf13/cobra v1.10.1
+)
+
+require (
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.9 // indirect
+	golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
+)

go.sum

@@ -0,0 +1,24 @@
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
+github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
+github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/onyx-dot-app/onyx/tools/ods/cmd"
+)
+
+var (
+	version = "dev"
+	commit  = "none"
+)
+
+func main() {
+	// Set the version in the cmd package
+	cmd.Version = version
+	cmd.Commit = commit
+
+	rootCmd := cmd.NewRootCommand()
+
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
+		os.Exit(2)
+	}
+}

onyx_devtools-0.0.1.dist-info/METADATA

@@ -0,0 +1,46 @@
+Metadata-Version: 2.4
+Name: onyx-devtools
+Version: 0.0.1
+Summary: Developer utilities for working on onyx.app
+Project-URL: Repository, https://github.com/onyx-dot-app/onyx
+Author-email: Onyx AI <founders@onyx.app>
+License: Copyright (c) 2023-present DanswerAI, Inc.
+        
+        Portions of this software are licensed as follows:
+        
+        - All content that resides under "ee" directories of this repository, if that directory exists, is licensed under the license defined in "backend/ee/LICENSE". Specifically all content under "backend/ee" and "web/src/app/ee" is licensed under the license defined in "backend/ee/LICENSE".
+        - All third party components incorporated into the Onyx Software are licensed under the original license provided by the owner of the applicable component.
+        - Content outside of the above mentioned directories or restrictions above is available under the "MIT Expat" license as defined below.
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+Keywords: cli,devtools,onyx,tooling,tools
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Go
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
+
+# Onyx Developer Script
+
+`ods` is [onyx.app](https://github.com/onyx-dot-app/onyx)'s devtools utility script.
+
+## Installation
+
+Build from source or install via the Python package.
+

onyx_devtools-0.0.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+go.mod,sha256=GPbxLNTCEDWbk2yqzPOhOVVdAdf7H_qSkVMBBUzV3lE,315
+go.sum,sha256=mX46HcsYoWumvF-HizNUmnKMcO680dlGAVUjJKl2dNg,2152
+main.go,sha256=7wEKb_3eC34OzWLOF3CFJ8ruCTntCcOpBSbj8lxnqtY,368
+cmd/cherry-pick.go,sha256=L-E_MsNenJF-s4Nmg-nnYX4i3UyYHtigx0MrV9fxYZg,7468
+cmd/root.go,sha256=5xOskFDSRhoK_rqB4MRFySH_-cdgSULdOSCGL690rSs,922
+onyx_devtools-0.0.1.data/scripts/ods,sha256=K3rhRtouNNd6iYYEUWrKKZd5VpiFQLMEh2AYxiE2ytY,2695460
+onyx_devtools-0.0.1.dist-info/METADATA,sha256=VmReZgA8v0tU2dQP0pvjYBZAYhd-6ga1HJfit95Zd1Y,2539
+onyx_devtools-0.0.1.dist-info/WHEEL,sha256=kSJeMi9O0SUGxjx2EApEegNDQjzBxdRttB3CsW2Gfgw,88
+onyx_devtools-0.0.1.dist-info/RECORD,,

onyx_devtools-0.0.1.dist-info/WHEEL

@@ -0,0 +1,4 @@
+Wheel-Version: 1.0
+Generator: hatchling 1.28.0
+Root-Is-Purelib: false
+Tag: py3-none-any