Update bufmod from main

private/buf/cmd/buf/buf.go

@@ -26,6 +26,7 @@ import (
 	"github.com/bufbuild/buf/private/buf/cmd/buf/command/alpha/package/goversion"
 	"github.com/bufbuild/buf/private/buf/cmd/buf/command/alpha/package/mavenversion"
 	"github.com/bufbuild/buf/private/buf/cmd/buf/command/alpha/package/npmversion"
+	"github.com/bufbuild/buf/private/buf/cmd/buf/command/alpha/package/pythonversion"
 	"github.com/bufbuild/buf/private/buf/cmd/buf/command/alpha/package/swiftversion"
 	"github.com/bufbuild/buf/private/buf/cmd/buf/command/alpha/protoc"
 	"github.com/bufbuild/buf/private/buf/cmd/buf/command/alpha/registry/token/tokendelete"
@@ -239,6 +240,7 @@ func NewRootCommand(name string) *appcmd.Command {
 							mavenversion.NewCommand("maven-version", builder),
 							npmversion.NewCommand("npm-version", builder),
 							swiftversion.NewCommand("swift-version", builder),
+							pythonversion.NewCommand("python-version", builder),
 						},
 					},
 					//{
@@ -287,7 +289,8 @@ func wrapError(err error) error {
 				"visit https://docs.buf.build/bsr/authentication`, authErr.TokenEnvKey())
 			}
 			return errors.New(`Failure: you are not authenticated. Create a new entry in your netrc, " +
-			"using a Buf API Key as the password. For details, visit https://docs.buf.build/bsr/authentication`)
+				"using a Buf API Key as the password. If you already have an entry in your netrc, check " +
+				"to see that your token is not expired. For details, visit https://docs.buf.build/bsr/authentication`)
 		case connectCode == connect.CodeUnavailable:
 			msg := `Failure: the server hosted at that remote is unavailable.`
 			// If the returned error is Unavailable, then determine if this is a DNS error.  If so,

private/buf/cmd/buf/command/alpha/package/pythonversion/pythonversion.go

@@ -0,0 +1,123 @@
+// Copyright 2020-2023 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package pythonversion
+
+import (
+	"context"
+	"fmt"
+
+	"connectrpc.com/connect"
+	"github.com/bufbuild/buf/private/buf/bufcli"
+	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
+	"github.com/bufbuild/buf/private/bufpkg/bufplugin/bufpluginref"
+	"github.com/bufbuild/buf/private/gen/proto/connect/buf/alpha/registry/v1alpha1/registryv1alpha1connect"
+	registryv1alpha1 "github.com/bufbuild/buf/private/gen/proto/go/buf/alpha/registry/v1alpha1"
+	"github.com/bufbuild/buf/private/pkg/app/appcmd"
+	"github.com/bufbuild/buf/private/pkg/app/appflag"
+	"github.com/bufbuild/buf/private/pkg/connectclient"
+	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+)
+
+const (
+	pluginFlagName = "plugin"
+	moduleFlagName = "module"
+	registryName   = "python"
+)
+
+// NewCommand returns a new Command
+func NewCommand(
+	name string,
+	builder appflag.Builder,
+) *appcmd.Command {
+	flags := newFlags()
+	return &appcmd.Command{
+		Use:   name + " --module=<buf.build/owner/repository[:ref]> --plugin=<buf.build/owner/plugin[:version]>",
+		Short: bufcli.PackageVersionShortDescription(registryName),
+		Long:  bufcli.PackageVersionLongDescription(registryName, name, "buf.build/protocolbuffers/python"),
+		Args:  cobra.NoArgs,
+		Run: builder.NewRunFunc(
+			func(ctx context.Context, container appflag.Container) error {
+				return run(ctx, container, flags)
+			},
+		),
+		BindFlags: flags.Bind,
+	}
+}
+
+type flags struct {
+	Plugin string
+	Module string
+}
+
+func newFlags() *flags {
+	return &flags{}
+}
+
+func (f *flags) Bind(flagSet *pflag.FlagSet) {
+	flagSet.StringVar(&f.Module, moduleFlagName, "", "The module reference to resolve")
+	flagSet.StringVar(&f.Plugin, pluginFlagName, "", fmt.Sprintf("The %s plugin reference to resolve", registryName))
+	_ = cobra.MarkFlagRequired(flagSet, moduleFlagName)
+	_ = cobra.MarkFlagRequired(flagSet, pluginFlagName)
+}
+
+func run(
+	ctx context.Context,
+	container appflag.Container,
+	flags *flags,
+) error {
+	bufcli.WarnAlphaCommand(ctx, container)
+	clientConfig, err := bufcli.NewConnectClientConfig(container)
+	if err != nil {
+		return err
+	}
+	moduleRef, err := bufmodule.ParseModuleRef(flags.Module)
+	if err != nil {
+		return appcmd.NewInvalidArgumentErrorf("failed parsing module reference: %s", err.Error())
+	}
+	pluginIdentity, pluginVersion, err := bufpluginref.ParsePluginIdentityOptionalVersion(flags.Plugin)
+	if err != nil {
+		return appcmd.NewInvalidArgumentErrorf("failed parsing plugin reference: %s", err.Error())
+	}
+	if pluginIdentity.Remote() != moduleRef.ModuleFullName().Registry() {
+		return appcmd.NewInvalidArgumentError("module and plugin must be from the same remote")
+	}
+	resolver := connectclient.Make(
+		clientConfig,
+		moduleRef.ModuleFullName().Registry(),
+		registryv1alpha1connect.NewResolveServiceClient,
+	)
+	packageVersion, err := resolver.GetPythonVersion(ctx, connect.NewRequest(
+		&registryv1alpha1.GetPythonVersionRequest{
+			ModuleReference: &registryv1alpha1.LocalModuleReference{
+				Owner:      moduleRef.ModuleFullName().Owner(),
+				Repository: moduleRef.ModuleFullName().Name(),
+				Reference:  moduleRef.Ref(),
+			},
+			PluginReference: &registryv1alpha1.GetRemotePackageVersionPlugin{
+				Owner:   pluginIdentity.Owner(),
+				Name:    pluginIdentity.Plugin(),
+				Version: pluginVersion,
+			},
+		},
+	))
+	if err != nil {
+		return err
+	}
+	if _, err := container.Stdout().Write([]byte(packageVersion.Msg.Version)); err != nil {
+		return err
+	}
+	return nil
+}

private/buf/cmd/buf/command/alpha/package/pythonversion/usage.gen.go

@@ -0,0 +1,19 @@
+// Copyright 2020-2023 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Generated. DO NOT EDIT.
+
+package pythonversion
+
+import _ "github.com/bufbuild/buf/private/usage"