8000 Refactor PostNewPipeline to use Replicate public API by aron · Pull Request #2378 · replicate/cog · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Refactor PostNewPipeline to use Replicate public API #2378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub&rd 8000 quo;, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 30, 2025
Merged

Refactor PostNewPipeline to use Replicate public API #2378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b15f4d4
Refactor PostNewPipeline to use Replicate public API
aron May 30, 2025
d8059f6
Gzip the tarball when pushing new versions
aron May 30, 2025
2931bf1
Clean up tests for TestPostPipeline
aron May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/docker/dockertest/mock_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ func (c *MockCommand) Push(ctx context.Context, image string) error {

func (c *MockCommand) LoadUserInformation(ctx context.Context, registryHost string) (*command.UserInfo, error) {
userInfo := command.UserInfo{
Token: "",
Username: "",
Token: "test-token",
Username: "test-user",
}
return &userInfo, nil
}
Expand Down
113 changes: 92 additions & 21 deletions pkg/docker/pipeline_push_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,53 @@ import (
)

func TestPipelinePush(t *testing.T) {
// Setup mock http server
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
output := "{\"version\":\"user/test:53c740f17ce88a61c3da5b0c20e48fd48e2da537c3a1276dec63ab11fbad6bcb\"}"
w.WriteHeader(http.StatusCreated)
w.Write([]byte(output))
w.Header().Add(EtagHeader, "a")
// Setup mock web server for cog.replicate.com (token exchange)
webServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch r.URL.Path {
case "/api/token/user":
// Mock token exchange response
//nolint:gosec
tokenResponse := `{
"keys": {
"cog": {
"key": "test-api-token",
"expires_at": "2024-12-31T23:59:59Z"
}
}
}`
w.WriteHeader(http.StatusOK)
w.Write([]byte(tokenResponse))
default:
w.WriteHeader(http.StatusNotFound)
}
}))
defer server.Close()
url, err := url.Parse(server.URL)
defer webServer.Close()

// Setup mock API server for api.replicate.com (version and release endpoints)
apiServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch r.URL.Path {
case "/v1/models/user/test/versions":
// Mock version creation response
versionResponse := `{"id": "test-version-id"}`
w.WriteHeader(http.StatusCreated)
w.Write([]byte(versionResponse))
case "/v1/models/user/test/releases":
// Mock release creation response - empty body with 204 status
w.WriteHeader(http.StatusNoContent)
default:
w.WriteHeader(http.StatusNotFound)
}
}))
defer apiServer.Close()

webURL, err := url.Parse(webServer.URL)
require.NoError(t, err)
t.Setenv(env.SchemeEnvVarName, url.Scheme)
t.Setenv(env.WebHostEnvVarName, url.Host)
apiURL, err := url.Parse(apiServer.URL)
require.NoError(t, err)

t.Setenv(env.SchemeEnvVarName, webURL.Scheme)
t.Setenv(env.WebHostEnvVarName, webURL.Host)
t.Setenv(env.APIHostEnvVarName, apiURL.Host)

dir := t.TempDir()

Expand All @@ -47,22 +82,58 @@ func TestPipelinePush(t *testing.T) {
webClient := web.NewClient(command, client)

cfg := config.DefaultConfig()
err = PipelinePush(t.Context(), "r8.im/username/modelname", dir, webClient, client, cfg)
err = PipelinePush(t.Context(), "r8.im/user/test", dir, webClient, client, cfg)
require.NoError(t, err)
}

func TestPipelinePushFailWithExtraRequirements(t *testing.T) {
// Setup mock http server
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set(EtagHeader, "a")
output := "apipelinepackage==1.0.0"
w.Write([]byte(output))
// Setup mock web server for cog.replicate.com (token exchange)
webServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch r.URL.Path {
case "/api/token/user":
// Mock token exchange response
//nolint:gosec
tokenResponse := `{
"keys": {
"cog": {
"key": "test-api-token",
"expires_at": "2024-12-31T23:59:59Z"
}
}
}`
w.WriteHeader(http.StatusOK)
w.Write([]byte(tokenResponse))
default:
w.WriteHeader(http.StatusNotFound)
}
}))
defer server.Close()
url, err := url.Parse(server.URL)
defer webServer.Close()

// Setup mock API server for api.replicate.com (version and release endpoints)
apiServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch r.URL.Path {
case "/v1/models/user/test/versions":
// Mock version creation response
versionResponse := `{"id": "test-version-id"}`
w.WriteHeader(http.StatusCreated)
w.Write([]byte(versionResponse))
case "/v1/models/user/test/releases":
// Mock release creation response - empty body with 204 status
w.WriteHeader(http.StatusNoContent)
default:
w.WriteHeader(http.StatusNotFound)
}
}))
defer apiServer.Close()

webURL, err := url.Parse(webServer.URL)
require.NoError(t, err)
t.Setenv(env.SchemeEnvVarName, url.Scheme)
t.Setenv(env.PipelinesRuntimeHostEnvVarName, url.Host)
apiURL, err := url.Parse(apiServer.URL)
require.NoError(t, err)

t.Setenv(env.SchemeEnvVarName, webURL.Scheme)
t.Setenv(env.WebHostEnvVarName, webURL.Host)
t.Setenv(env.APIHostEnvVarName, apiURL.Host)

dir := t.TempDir()

Expand All @@ -87,6 +158,6 @@ func TestPipelinePushFailWithExtraRequirements(t *testing.T) {
handle.WriteString("mycustompackage==1.0.0")
handle.Close()
cfg.Build.PythonRequirements = filepath.Base(requirementsPath)
err = PipelinePush(t.Context(), "r8.im/username/modelname", dir, webClient, client, cfg)
err = PipelinePush(t.Context(), "r8.im/user/test", dir, webClient, client, cfg)
require.Error(t, err)
}
34 changes: 0 additions & 34 deletions pkg/docker/push_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,37 +155,3 @@ func TestPushWithWeight(t *testing.T) {
err = Push(t.Context(), "r8.im/username/modelname", true, dir, command, BuildInfo{}, client, cfg)
require.NoError(t, err)
}

func TestPushPipeline(t *testing.T) {
// Setup mock http server
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
output := "{\"version\":\"user/test:53c740f17ce88a61c3da5b0c20e48fd48e2da537c3a1276dec63ab11fbad6bcb\"}"
w.WriteHeader(http.StatusCreated)
w.Write([]byte(output))
}))
defer server.Close()
url, err := url.Parse(server.URL)
require.NoError(t, err)
t.Setenv(env.SchemeEnvVarName, url.Scheme)
t.Setenv(env.WebHostEnvVarName, url.Host)

dir := t.TempDir()

// Create mock predict
predictPyPath := filepath.Join(dir, "predict.py")
handle, err := os.Create(predictPyPath)
require.NoError(t, err)
handle.WriteString("import cog")
dockertest.MockCogConfig = "{\"build\":{\"python_version\":\"3.12\",\"python_packages\":[\"torch==2.5.0\",\"beautifulsoup4==4.12.3\"],\"system_packages\":[\"git\"]},\"image\":\"test\",\"predict\":\"" + predictPyPath + ":Predictor\"}"

// Setup mock command
command := dockertest.NewMockCommand()
client, err := cogHttp.ProvideHTTPClient(t.Context(), command)
require.NoError(t, err)

cfg := config.DefaultConfig()
err = Push(t.Context(), "r8.im/username/modelname", false, dir, command, BuildInfo{
Pipeline: true,
}, client, cfg)
require.NoError(t, err)
}
9 changes: 9 additions & 0 deletions pkg/env/env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import "os"
const SchemeEnvVarName = "R8_SCHEME"
const MonobeamHostEnvVarName = "R8_MONOBEAM_HOST"
const WebHostEnvVarName = "R8_WEB_HOST"
const APIHostEnvVarName = "R8_API_HOST"
const PipelinesRuntimeHostEnvVarName = "R8_PIPELINES_RUNTIME_HOST"

func SchemeFromEnvironment() string {
Expand All @@ -31,6 +32,14 @@ func WebHostFromEnvironment() string {
return host
}

func APIHostFromEnvironment() string {
host := os.Getenv(APIHostEnvVarName)
if host == "" {
host = "api.replicate.com"
}
return host
}

func PipelinesRuntimeHostFromEnvironment() string {
host := os.Getenv(PipelinesRuntimeHostEnvVarName)
if host == "" {
Expand Down
Loading
0