Long running

Dockerfile.api

@@ -5,6 +5,6 @@ COPY go.mod go.sum ./
 RUN go mod download
 COPY api ./api
 WORKDIR /app/api
-RUN go build -o /lilysaas
+RUN go build -o /helix
 EXPOSE 80
-ENTRYPOINT [ "/lilysaas" ]
+ENTRYPOINT [ "/helix" ]

README.md

@@ -1,126 +1,3 @@
-# lilysaas
+# helix
 
- * what are the core database schema "things"
- * what is the plan for taking payments?
- * what are the key actions?
-
-## entities
-
- * auth
-   * use keycloak
- * model
-   * json file to start with
-   * a list of things that lilypad can run
- * job
-   * inference
-   * training (fine tunings)
-     * starts with an existing model
-     * produces a new model
-
-## plan
-
-This is to have a hello world that you can login to.
-
- * docker compose stack
-   * keycloak
-   * frontend (react & vite)
-   * api (go)
-   * postgres
-
-
-## dev
-
-You need the following installed:
-
- * docker
- * docker-compose
- * [abigen](https://geth.ethereum.org/docs/getting-started/installing-geth)
- * [bacalhau](https://github.com/bacalhau-project/lilypad/blob/fe9999b96d0920083ab3b1c4dbe4c647c5db36d3/CONTRIBUTING.md#bacalhau)
-
-You also need the lilypad repo cloned alongside this one.
-
-### smart contract interface
-
-When the smart contract in lilypad changes - checkout latest main of lilypad and then:
-
-```bash
-./stack generate-golang-bindings
-```
-
-This will re-create the `api/pkg/contract/Modicum.go`
-
-## running alongside lilypad in local dev
-
-Make sure that you have cloned [lilypad](https://github.com/bacalhau-project/lilypad) at the same level as this repo.
-
-```bash
-export RUN_LILYPAD=1
-./stack start
-```
-
-This will boot a fresh lilypad and lilysaas stack and link everything together using tmux.
-
-To run each part manually here are the guides:
-
-#### lilypad
-
-First start lilypad and then bacalhau:
-
-```bash
-cd lilypad
-./stack boot
-```
-
-Then we start bacalhau:
-
-**NOTE** you will require the correct version of bacalhau - run through [this guide](https://github.com/bacalhau-project/lilypad/blob/fe9999b96d0920083ab3b1c4dbe4c647c5db36d3/CONTRIBUTING.md#bacalhau): 
-
-```bash
-./stack bacalhau-serve
-```
-
-Now we need 3 other terminals each with `LOG_LEVEL=debug`
-
-```bash
-./stack solver --server-url http://172.17.0.1:8080
-```
-
-so it reports an address accessible from inside docker (the default docker bridge ip - this will probably only work on linux? on mac maybe you can use `host.docker.internal`)
-
-
-```bash
-./stack mediator
-```
-
-```bash
-./stack resource-provider
-```
-
-Now we switch to lilysaas and get it booted alongside lilypad.
-
-#### lilysaas
-
-We need to create an top level `.env` file like so
-
-```
-export WEB3_PRIVATE_KEY=XXX
-```
-
-You can get the WEB3_PRIVATE_KEY value with this command:
-
-```bash
-cat ../lilypad/.env | grep JOB_CREATOR_PRIVATE_KEY
-```
-
-Copy the value of this to be the `WEB3_PRIVATE_KEY` value in the `.env` file - the other values should be as shown.
-
-```bash
-docker-compose up -d
-```
-
-Then we exec into the api container and run the api server:
-
-```bash
-docker-compose exec api bash
-go run . serve
-```
+Your own ChatGPT as a service.

api/cmd/lilysaas/root.go → api/cmd/helix/root.go

@@ -1,4 +1,4 @@
-package lilysaas
+package helix
 
 import (
 	"context"
@@ -16,8 +16,8 @@ func init() { //nolint:gochecknoinits
 func NewRootCmd() *cobra.Command {
 	RootCmd := &cobra.Command{
 		Use:   getCommandLineExecutable(),
-		Short: "LilySaaS",
-		Long:  `LilySaaS`,
+		Short: "Helix",
+		Long:  `Helix`,
 	}
 	RootCmd.AddCommand(newServeCmd())
 	return RootCmd

api/cmd/lilysaas/serve.go → api/cmd/helix/serve.go

@@ -1,4 +1,4 @@
-package lilysaas
+package helix
 
 import (
 	"context"
@@ -8,12 +8,11 @@ import (
 	"os/signal"
 	"path/filepath"
 
-	"github.com/bacalhau-project/lilysaas/api/pkg/controller"
-	"github.com/bacalhau-project/lilysaas/api/pkg/filestore"
-	"github.com/bacalhau-project/lilysaas/api/pkg/job"
-	"github.com/bacalhau-project/lilysaas/api/pkg/server"
-	"github.com/bacalhau-project/lilysaas/api/pkg/store"
-	"github.com/bacalhau-project/lilysaas/api/pkg/system"
+	"github.com/lukemarsden/helix/api/pkg/controller"
+	"github.com/lukemarsden/helix/api/pkg/filestore"
+	"github.com/lukemarsden/helix/api/pkg/server"
+	"github.com/lukemarsden/helix/api/pkg/store"
+	"github.com/lukemarsden/helix/api/pkg/system"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
@@ -35,15 +34,15 @@ func NewAllOptions() *AllOptions {
 		},
 		FilestoreOptions: filestore.FileStoreOptions{
 			Type:         filestore.FileStoreType(getDefaultServeOptionString("FILESTORE_TYPE", "fs")),
-			LocalFSPath:  getDefaultServeOptionString("FILESTORE_LOCALFS_PATH", "/tmp/lilysaas/filestore"),
+			LocalFSPath:  getDefaultServeOptionString("FILESTORE_LOCALFS_PATH", "/tmp/helix/filestore"),
 			GCSKeyBase64: getDefaultServeOptionString("FILESTORE_GCS_KEY_BASE64", ""),
 			GCSKeyFile:   getDefaultServeOptionString("FILESTORE_GCS_KEY_FILE", ""),
 			GCSBucket:    getDefaultServeOptionString("FILESTORE_GCS_BUCKET", ""),
 		},
 		StoreOptions: store.StoreOptions{
 			Host:        getDefaultServeOptionString("POSTGRES_HOST", ""),
 			Port:        getDefaultServeOptionInt("POSTGRES_PORT", 5432),
-			Database:    getDefaultServeOptionString("POSTGRES_DATABASE", "lilysaas"),
+			Database:    getDefaultServeOptionString("POSTGRES_DATABASE", "helix"),
 			Username:    getDefaultServeOptionString("POSTGRES_USER", ""),
 			Password:    getDefaultServeOptionString("POSTGRES_PASSWORD", ""),
 			AutoMigrate: true,
@@ -63,8 +62,8 @@ func newServeCmd() *cobra.Command {
 
 	serveCmd := &cobra.Command{
 		Use:     "serve",
-		Short:   "Start the lilysaas api server.",
-		Long:    "Start the lilysaas api server.",
+		Short:   "Start the helix api server.",
+		Long:    "Start the helix api server.",
 		Example: "TBD",
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			return serve(cmd, allOptions)
@@ -245,19 +244,13 @@ func serve(cmd *cobra.Command, options *AllOptions) error {
 		return err
 	}
 
-	jobRunner, err := job.NewJobRunner(ctx)
-	if err != nil {
-		return err
-	}
-
 	store, err := store.NewPostgresStore(options.StoreOptions)
 	if err != nil {
 		return err
 	}
 
 	options.ControllerOptions.Store = store
 	options.ControllerOptions.Filestore = fs
-	options.ControllerOptions.JobRunner = jobRunner
 
 	if options.FilestoreOptions.Type == filestore.FileStoreTypeLocalFS {
 		options.ServerOptions.LocalFilestorePath = options.FilestoreOptions.LocalFSPath
@@ -278,7 +271,7 @@ func serve(cmd *cobra.Command, options *AllOptions) error {
 		return err
 	}
 
-	log.Info().Msgf("LilySaaS server listening on %s:%d", options.ServerOptions.Host, options.ServerOptions.Port)
+	log.Info().Msgf("Helix server listening on %s:%d", options.ServerOptions.Host, options.ServerOptions.Port)
 
 	go func() {
 		err := server.ListenAndServe(ctx, cm)

api/cmd/lilysaas/utils.go → api/cmd/helix/utils.go

@@ -1,4 +1,4 @@
-package lilysaas
+package helix
 
 import (
 	"os"

api/main.go

@@ -1,11 +1,11 @@
 package main
 
 import (
-	"github.com/bacalhau-project/lilysaas/api/cmd/lilysaas"
 	"github.com/joho/godotenv"
+	"github.com/lukemarsden/helix/api/cmd/helix"
 )
 
 func main() {
 	_ = godotenv.Load()
-	lilysaas.Execute()
+	helix.Execute()
 }