Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ DB_PASSWORD=admin123
DB_HOST=db

MICROSOFT_CLIENT_ID=${CLIENT_ID}
OPENAI_API_KEY=${OPENAI_API_KEY}
MICROSOFT_CLIENT_SECRET=${CLIENT_SECRET}
MICROSOFT_JWT_KEY=${JWT_SECRET_KEY}
MICROSOFT_TENANT_ID=${TENANT_ID}
Expand All @@ -13,3 +12,7 @@ DEVELOPMENT=true

PUBLIC_URL=${PUBLIC_URL}
UI_SERVER=http://ui:3000

OPENAI_API_KEY=${OPENAI_API_KEY}
OPENAI_BASE_URL=https://api.openai.com/v1/
DEFAULT_MODEL=gpt-4o
19 changes: 17 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ DB_PASSWORD=admin123
DB_HOST=db

MICROSOFT_CLIENT_ID=${CLIENT_ID}
OPENAI_API_KEY=${OPENAI_API_KEY}
MICROSOFT_CLIENT_SECRET=${CLIENT_SECRET}
MICROSOFT_JWT_KEY=${JWT_SECRET_KEY}
MICROSOFT_TENANT_ID=${TENANT_ID}
Expand All @@ -61,14 +60,30 @@ DEVELOPMENT=true

PUBLIC_URL=${PUBLIC_URL}
UI_SERVER=http://ui:3000

OPENAI_API_KEY=${OPENAI_API_KEY}
OPENAI_BASE_URL=https://api.openai.com/v1/
DEFAULT_MODEL=gpt-4o
```

Then run docker-compose:

```bash
docker compose -f docker-compose-local.yaml up
docker compose -f docker-compose.yaml up
```

Go to `http://localhost:8080` and you can start logging in and using the app.

### Using a Different Model

The default model is `gpt-4o`. To use a different OpenAI model, update the `DEFAULT_MODEL` in the `.env` file.

To connect to an OpenAI-compatible local model server, such as llama.cpp, ollama, or Rubra's tool.cpp, update the `OPENAI_API_KEY`, `OPENAI_BASE_URL`, and `DEFAULT_MODEL` accordingly. For example:

```
OPENAI_API_KEY=sk-123
OPENAI_BASE_URL=http://host.docker.internal:1234/v1
DEFAULT_MODEL=rubra-meta-llama-3-8b-instruct.Q8_0.gguf
```

---
1 change: 1 addition & 0 deletions docker-compose-remote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ services:
PUBLIC_URL: ${PUBLIC_URL}
UI_SERVER: ${UI_SERVER}
OPENAI_API_KEY: ${OPENAI_API_KEY}
DEFAULT_MODEL: ${DEFAULT_MODEL}
env_file:
- .env

Expand Down
1 change: 1 addition & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ services:
UI_SERVER: ${UI_SERVER}
OPENAI_API_KEY: ${OPENAI_API_KEY}
DEVELOPMENT: "true"
DEFAULT_MODEL: ${DEFAULT_MODEL}
env_file:
- .env

Expand Down
1 change: 1 addition & 0 deletions pkg/server/task/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ func (h *Handler) RunTask(w http.ResponseWriter, r *http.Request) {

client, err := gptscript.NewGPTScript(gptscript.GlobalOptions{
OpenAIAPIKey: os.Getenv("OPENAI_API_KEY"),
DefaultModel: os.Getenv("DEFAULT_MODEL"),
Env: append(os.Environ(), fmt.Sprintf("GPTSCRIPT_GRAPH_MICROSOFT_COM_BEARER_TOKEN=%v", user.Token)),
HashID: uuid.UUID(user.ID.Bytes).String(),
})
Expand Down