feat: support for list in inputs

pkg/predict/input.go

@@ -1,20 +1,23 @@
 package predict
 
 import (
+	"encoding/json"
+	"fmt"
+	"mime"
 	"os"
 	"path/filepath"
 	"strings"
 
-	"github.com/mitchellh/go-homedir"
 	"github.com/vincent-petithory/dataurl"
 
+	"github.com/mitchellh/go-homedir"
 	"github.com/replicate/cog/pkg/util/console"
-	"github.com/replicate/cog/pkg/util/mime"
 )
 
 type Input struct {
 	String *string
 	File   *string
+	Array  *[]interface{}
 }
 
 type Inputs map[string]Input
@@ -25,15 +28,16 @@ func NewInputs(keyVals map[string]string) Inputs {
 		val := val
 		if strings.HasPrefix(val, "@") {
 			val = val[1:]
-			expandedVal, err := homedir.Expand(val)
-			if err != nil {
-				// FIXME: handle this better?
-				console.Warnf("Error expanding homedir: %s", err)
+			input[key] = Input{File: &val}
+		} else if strings.HasPrefix(val, "[") && strings.HasSuffix(val, "]") {
+			// Handle array of strings
+			var arr []interface{}
+			if err := json.Unmarshal([]byte(val), &arr); err != nil {
+				// Handle JSON unmarshalling error
+				console.Warnf("Error parsing array for key '%s': %s", key, err)
 			} else {
-				val = expandedVal
+				input[key] = Input{Array: &arr}
 			}
-
-			input[key] = Input{File: &val}
 		} else {
 			input[key] = Input{String: &val}
 		}
@@ -55,19 +59,54 @@ func NewInputsWithBaseDir(keyVals map[string]string, baseDir string) Inputs {
 	return input
 }
 
-func (inputs *Inputs) toMap() (map[string]string, error) {
-	keyVals := map[string]string{}
+func (inputs *Inputs) toMap() (map[string]interface{}, error) {
+	keyVals := map[string]interface{}{}
 	for key, input := range *inputs {
 		if input.String != nil {
+			// Directly assign the string value
 			keyVals[key] = *input.String
 		} else if input.File != nil {
-			content, err := os.ReadFile(*input.File)
+			// Single file handling: read content and convert to a data URL
+			dataURL, err := fileToDataURL(*input.File)
 			if err != nil {
 				return keyVals, err
 			}
-			mimeType := mime.TypeByExtension(filepath.Ext(*input.File))
-			keyVals[key] = dataurl.New(content, mimeType).String()
+			keyVals[key] = dataURL
+		} else if input.Array != nil {
+			// Handle array, potentially containing file paths
+			var dataURLs []string
+			for _, elem := range *input.Array {
+				if str, ok := elem.(string); ok && strings.HasPrefix(str, "@") {
+					filePath := str[1:] // Remove '@' prefix
+					dataURL, err := fileToDataURL(filePath)
+					if err != nil {
+						return keyVals, err
+					}
+					dataURLs = append(dataURLs, dataURL)
+				} else if ok {
+					// Directly use the string if it's not a file path
+					dataURLs = append(dataURLs, str)
+				}
+			}
+			keyVals[key] = dataURLs
 		}
 	}
 	return keyVals, nil
 }
+
+// Helper function to read file content and convert to a data URL
+func fileToDataURL(filePath string) (string, error) {
+	// Expand home directory if necessary
+	expandedVal, err := homedir.Expand(filePath)
+	if err != nil {
+		return "", fmt.Errorf("error expanding homedir for '%s': %w", filePath, err)
+	}
+
+	content, err := os.ReadFile(expandedVal)
+	if err != nil {
+		return "", err
+	}
+	mimeType := mime.TypeByExtension(filepath.Ext(expandedVal))
+	dataURL := dataurl.New(content, mimeType).String()
+	return dataURL, nil
+}

pkg/predict/predictor.go

@@ -24,7 +24,7 @@ type HealthcheckResponse struct {
 
 type Request struct {
 	// TODO: could this be Inputs?
-	Input map[string]string `json:"input"`
+	Input map[string]interface{} `json:"input"`
 }
 
 type Response struct {

python/cog/command/openapi_schema.py

@@ -3,6 +3,7 @@
 
 This prints a JSON object describing the inputs of the model.
 """
+
 import json
 
 from ..errors import CogError, ConfigDoesNotExist, PredictorNotSet

python/cog/schema.py

@@ -50,9 +50,9 @@ class PredictionRequest(PredictionBaseModel):
     output_file_prefix: t.Optional[str]
 
     webhook: t.Optional[pydantic.AnyHttpUrl]
-    webhook_events_filter: t.Optional[
-        t.List[WebhookEvent]
-    ] = WebhookEvent.default_events()
+    webhook_events_filter: t.Optional[t.List[WebhookEvent]] = (
+        WebhookEvent.default_events()
+    )
 
     @classmethod
     def with_types(cls, input_type: t.Type[t.Any]) -> t.Any:

python/cog/server/runner.py

@@ -382,15 +382,21 @@ def _predict(
     input_dict = initial_prediction["input"]
 
     for k, v in input_dict.items():
-        if isinstance(v, types.URLPath):
-            try:
+        try:
+            # Check if v is an instance of URLPath
+            if isinstance(v, types.URLPath):
                 input_dict[k] = v.convert()
-            except requests.exceptions.RequestException as e:
-                tb = traceback.format_exc()
-                event_handler.append_logs(tb)
-                event_handler.failed(error=str(e))
-                log.warn("failed to download url path from input", exc_info=True)
-                return event_handler.response
+            # Check if v is a list of URLPath instances
+            elif isinstance(v, list) and all(
+                isinstance(item, types.URLPath) for item in v
+            ):
+                input_dict[k] = [item.convert() for item in v]
+        except requests.exceptions.RequestException as e:
+            tb = traceback.format_exc()
+            event_handler.append_logs(tb)
+            event_handler.failed(error=str(e))
+            log.warn("Failed to download url path from input", exc_info=True)
+            return event_handler.response
 
     for event in worker.predict(input_dict, poll=0.1):
         if should_cancel.is_set():

test-integration/test_integration/fixtures/file-input-project/predict.py

@@ -1,7 +1,10 @@
-from cog import BasePredictor, Path
+from cog import BasePredictor, File
 
 
 class Predictor(BasePredictor):
-    def predict(self, path: Path) -> str:
-        with open(path) as f:
-            return f.read()
+    def predict(self, file: File) -> str:
+        content = file.read()
+        if isinstance(content, bytes):
+            # Decode bytes to str assuming UTF-8 encoding; adjust if needed
+            content = content.decode('utf-8')
+        return content

test-integration/test_integration/fixtures/file-input-project/test.txt

@@ -0,0 +1 @@
+text

test-integration/test_integration/fixtures/file-list-input-project/cog.yaml

@@ -0,0 +1,3 @@
+build:
+  python_version: "3.11"
+predict: "predict.py:Predictor"

test-integration/test_integration/fixtures/file-list-input-project/predict.py

@@ -0,0 +1,14 @@
+from cog import BasePredictor, File
+
+
+class Predictor(BasePredictor):
+    def predict(self, files: list[File]) -> str:
+        output_parts = []  # Use a list to collect file contents
+        for f in files:
+            # Assuming file content is in bytes, decode to str before appending
+            content = f.read()
+            if isinstance(content, bytes):
+                # Decode bytes to str assuming UTF-8 encoding; adjust if needed
+                content = content.decode('utf-8')
+            output_parts.append(content)
+        return "\n\n".join(output_parts)

test-integration/test_integration/fixtures/path-input-project/predict.py

@@ -0,0 +1,7 @@
+from cog import BasePredictor, Path
+
+
+class Predictor(BasePredictor):
+    def predict(self, path: Path) -> str:
+        with open(path) as f:
+            return f.read()

test-integration/test_integration/fixtures/path-list-input-project/cog.yaml

@@ -0,0 +1,3 @@
+build:
+  python_version: "3.11"
+predict: "predict.py:Predictor"

test-integration/test_integration/fixtures/path-list-input-project/predict.py

@@ -0,0 +1,9 @@
+from cog import BasePredictor, Path
+
+class Predictor(BasePredictor):
+   def predict(self, paths: list[Path]) -> str:
+       output_parts = []  # Use a list to collect file contents
+       for path in paths:
+           with open(path) as f:
+             output_parts.append(f.read())
+       return "".join(output_parts)

test-integration/test_integration/fixtures/path-list-output-project/cog.yaml

@@ -0,0 +1,3 @@
+build:
+  python_version: "3.8"
+predict: "predict.py:Predictor"

test-integration/test_integration/test_build.py

@@ -49,7 +49,7 @@ def predict(self, text: str) -> str:
 
 
 def test_build_with_model(docker_image):
-    project_dir = Path(__file__).parent / "fixtures/file-project"
+    project_dir = Path(__file__).parent / "fixtures/path-project"
     subprocess.run(
         ["cog", "build", "-t", docker_image],
         cwd=project_dir,

test-integration/test_integration/test_predict.py

@@ -31,7 +31,7 @@ def test_predict_takes_int_inputs_and_returns_ints_to_stdout():
 
 
 def test_predict_takes_file_inputs(tmpdir_factory):
-    project_dir = Path(__file__).parent / "fixtures/file-input-project"
+    project_dir = Path(__file__).parent / "fixtures/path-input-project"
     out_dir = pathlib.Path(tmpdir_factory.mktemp("project"))
     shutil.copytree(project_dir, out_dir, dirs_exist_ok=True)
     with open(out_dir / "input.txt", "w") as fh:
@@ -46,7 +46,7 @@ def test_predict_takes_file_inputs(tmpdir_factory):
 
 
 def test_predict_writes_files_to_files(tmpdir_factory):
-    project_dir = Path(__file__).parent / "fixtures/file-output-project"
+    project_dir = Path(__file__).parent / "fixtures/path-output-project"
     out_dir = pathlib.Path(tmpdir_factory.mktemp("project"))
     shutil.copytree(project_dir, out_dir, dirs_exist_ok=True)
     result = subprocess.run(
@@ -61,7 +61,7 @@ def test_predict_writes_files_to_files(tmpdir_factory):
 
 
 def test_predict_writes_files_to_files_with_custom_name(tmpdir_factory):
-    project_dir = Path(__file__).parent / "fixtures/file-output-project"
+    project_dir = Path(__file__).parent / "fixtures/path-output-project"
     out_dir = pathlib.Path(tmpdir_factory.mktemp("project"))
     shutil.copytree(project_dir, out_dir, dirs_exist_ok=True)
     result = subprocess.run(
@@ -76,7 +76,7 @@ def test_predict_writes_files_to_files_with_custom_name(tmpdir_factory):
 
 
 def test_predict_writes_multiple_files_to_files(tmpdir_factory):
-    project_dir = Path(__file__).parent / "fixtures/file-list-output-project"
+    project_dir = Path(__file__).parent / "fixtures/path-list-output-project"
     out_dir = pathlib.Path(tmpdir_factory.mktemp("project"))
     shutil.copytree(project_dir, out_dir, dirs_exist_ok=True)
     result = subprocess.run(
@@ -229,3 +229,24 @@ def test_predict_many_inputs_with_existing_image(docker_image, tmpdir_factory):
         capture_output=True,
     )
     assert result.stdout.decode() == "hello default 20 world jpg foo 6\n"
+
+
+def test_predict_path_list_input(tmpdir_factory):
+    project_dir = Path(__file__).parent / "fixtures/path-list-input-project"
+    out_dir = pathlib.Path(tmpdir_factory.mktemp("project"))
+    shutil.copytree(project_dir, out_dir, dirs_exist_ok=True)
+    with open(out_dir / "1.txt", "w") as fh:
+        fh.write("test1")
+    with open(out_dir / "2.txt", "w") as fh:
+        fh.write("test2")
+    cmd = ["cog", "predict", "-i", "paths=[\"@1.txt\",\"@2.txt\"]"]
+
+    result = subprocess.run(
+        cmd,
+        cwd=out_dir,
+        check=True,
+        capture_output=True,
+    )
+    stdout = result.stdout.decode()
+    assert "test1" in stdout
+    assert "test2" in stdout