Merge pull request #870 from docker/remove-dead-code

Remove dead code

Author: ericcurtin

cmd/cli/readline/errors.go

@@ -5,11 +5,3 @@ import (
 )
 
 var ErrInterrupt = errors.New("Interrupt")
-
-type InterruptError struct {
-	Line []rune
-}
-
-func (*InterruptError) Error() string {
-	return "Interrupted"
-}

cmd/cli/readline/history.go

@@ -98,10 +98,6 @@ func (h *History) Compact() {
 	}
 }
 
-func (h *History) Clear() {
-	h.Buf.Clear()
-}
-
 func (h *History) Prev() (line string) {
 	if h.Pos > 0 {
 		h.Pos--

cmd/cli/readline/readline.go

@@ -241,10 +241,6 @@ func (i *Instance) Readline() (string, error) {
 	}
 }
 
-func (i *Instance) HistoryEnable() {
-	i.History.Enabled = true
-}
-
 func (i *Instance) HistoryDisable() {
 	i.History.Enabled = false
 }

pkg/distribution/builder/builder.go

@@ -455,33 +455,6 @@ func (b *Builder) WithChatTemplateFile(path string) (*Builder, error) {
 	}, nil
 }
 
-// WithConfigArchive adds a config archive (tar) file to the artifact.
-func (b *Builder) WithConfigArchive(path string) (*Builder, error) {
-	// Check if config archive already exists.
-	layers, err := b.model.Layers()
-	if err != nil {
-		return nil, fmt.Errorf("get model layers: %w", err)
-	}
-
-	for _, layer := range layers {
-		mediaType, mediaTypeErr := layer.MediaType()
-		if mediaTypeErr == nil && mediaType == types.MediaTypeVLLMConfigArchive {
-			return nil, fmt.Errorf("model already has a config archive layer")
-		}
-	}
-
-	mt := b.resolveLayerMediaType(types.MediaTypeVLLMConfigArchive)
-	configLayer, err := partial.NewLayer(path, mt)
-	if err != nil {
-		return nil, fmt.Errorf("config archive layer from %q: %w", path, err)
-	}
-	return &Builder{
-		model:          mutate.AppendLayers(b.model, configLayer),
-		originalLayers: b.originalLayers,
-		outputFormat:   b.outputFormat,
-	}, nil
-}
-
 // Target represents a build target
 type Target interface {
 	Write(context.Context, types.ModelArtifact, io.Writer) error

pkg/distribution/builder/from_directory.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/docker/model-runner/pkg/distribution/files"
 	"github.com/docker/model-runner/pkg/distribution/format"
-	"github.com/docker/model-runner/pkg/distribution/internal/mutate"
 	"github.com/docker/model-runner/pkg/distribution/internal/partial"
 	"github.com/docker/model-runner/pkg/distribution/modelpack"
 	"github.com/docker/model-runner/pkg/distribution/oci"
@@ -382,21 +381,3 @@ func fileTypeToMediaType(ft files.FileType) oci.MediaType {
 		return types.MediaTypeModelFile
 	}
 }
-
-// WithFileLayer adds an individual file layer with a relative path annotation.
-// This is useful for adding files that should be extracted to a specific path.
-func (b *Builder) WithFileLayer(absPath, relPath string) (*Builder, error) {
-	// Classify the file to determine media type
-	fileType := files.Classify(absPath)
-	mediaType := fileTypeToMediaType(fileType)
-
-	layer, err := partial.NewLayerWithRelativePath(absPath, relPath, mediaType)
-	if err != nil {
-		return nil, fmt.Errorf("file layer from %q: %w", absPath, err)
-	}
-
-	return &Builder{
-		model:          mutate.AppendLayers(b.model, layer),
-		originalLayers: b.originalLayers,
-	}, nil
-}

pkg/distribution/huggingface/client.go

@@ -72,15 +72,6 @@ func WithToken(token string) ClientOption {
 	}
 }
 
-// WithTransport sets the HTTP transport for the client
-func WithTransport(transport http.RoundTripper) ClientOption {
-	return func(c *Client) {
-		if transport != nil {
-			c.httpClient.Transport = transport
-		}
-	}
-}
-
 // WithUserAgent sets the User-Agent header for requests
 func WithUserAgent(userAgent string) ClientOption {
 	return func(c *Client) {

pkg/distribution/huggingface/downloader.go

@@ -214,8 +214,3 @@ func (pr *progressReader) Read(p []byte) (n int, err error) {
 	}
 	return n, err
 }
-
-// DownloadSingleFile downloads a single file and returns its local path
-func (d *Downloader) DownloadSingleFile(ctx context.Context, file RepoFile) (string, error) {
-	return d.downloadFileWithProgress(ctx, file, uint64(file.ActualSize()), nil)
-}

pkg/distribution/internal/mutate/mutate.go

@@ -25,14 +25,3 @@ func ContextSize(mdl types.ModelArtifact, cs int32) types.ModelArtifact {
 		contextSize: &cs,
 	}
 }
-
-// SetManifestOptions applies manifest-level metadata (config media type and
-// artifact type) to the given model. The options propagate through subsequent
-// mutate wrappers via GetManifestOptions.
-func SetManifestOptions(mdl types.ModelArtifact, configMT oci.MediaType, artifactType string) types.ModelArtifact {
-	return &model{
-		base:            mdl,
-		configMediaType: configMT,
-		artifactType:    artifactType,
-	}
-}

pkg/distribution/internal/progress/reporter.go

@@ -142,15 +142,6 @@ func WriteError(w io.Writer, message string, mode oci.Mode) error {
 	})
 }
 
-// WriteWarning writes a warning message
-func WriteWarning(w io.Writer, message string, mode oci.Mode) error {
-	return write(w, oci.ProgressMessage{
-		Type:    oci.TypeWarning,
-		Message: message,
-		Mode:    mode,
-	})
-}
-
 // write writes a JSON-formatted progress message to the writer
 func write(w io.Writer, msg oci.ProgressMessage) error {
 	if w == nil {