Prevent pydantic 2 clobbering (#2273)

* Add granite integration test

* Verify the behaviour of pydantic clobbering with
the IBM granite project

* Use the stated pydantic tolerances

* We now support >=2 in pydantic so mirror the
tolerances we set in the toml

* Fix test to focus on granite-project

---------

Signed-off-by: Will Sackfield <[email protected]>

Author: 8W9aG

pkg/dockerfile/standard_generator.go

@@ -432,9 +432,7 @@ func (g *StandardGenerator) installCog() (string, error) {
 	}
 	pipInstallLine := "RUN --mount=type=cache,target=/root/.cache/pip pip install --no-cache-dir"
 	pipInstallLine += " " + containerPath
-	// Install pydantic<2 for now, installing pydantic>2 wouldn't allow a downgrade later,
-	// but upgrading works fine
-	pipInstallLine += " 'pydantic<2'"
+	pipInstallLine += " 'pydantic>=1.9,<3'"
 	if g.strip {
 		pipInstallLine += " && " + StripDebugSymbolsCommand
 	}

pkg/dockerfile/standard_generator_test.go

@@ -46,7 +46,7 @@ func testInstallCog(relativeTmpDir string, stripped bool) string {
 	}
 	return fmt.Sprintf(`COPY %s/%s /tmp/%s
 ENV CFLAGS="-O3 -funroll-loops -fno-strict-aliasing -flto -S"
-RUN --mount=type=cache,target=/root/.cache/pip pip install --no-cache-dir /tmp/%s 'pydantic<2'%s
+RUN --mount=type=cache,target=/root/.cache/pip pip install --no-cache-dir /tmp/%s 'pydantic>=1.9,<3'%s
 ENV CFLAGS=`, relativeTmpDir, wheel, wheel, wheel, strippedCall)
 }
 

test-integration/test_integration/fixtures/granite-project/cog.yaml

@@ -0,0 +1,15 @@
+# Configuration for Cog ⚙️
+# Reference: https://cog.run/yaml
+
+# image name:version
+image: "r8.im/ibm-granite/granite-3.3-8b-instruct:1.0.0"
+
+build:
+  # python version in the form '3.11' or '3.11.4'
+  python_version: "3.11"
+
+  # path to a Python requirements.txt file
+  python_requirements: requirements.txt
+
+# predict.py defines how predictions are run on your model
+predict: "predict.py:Predictor"

test-integration/test_integration/fixtures/granite-project/predict.py

@@ -0,0 +1,8 @@
+from cog import BasePredictor
+
+import pydantic
+
+
+class Predictor(BasePredictor):
+    def predict(self) -> str:
+        return pydantic.__version__