Skip to content

Commit

Permalink
chore: move to obot-platform org
Browse files Browse the repository at this point in the history
Signed-off-by: Donnie Adams <[email protected]>
  • Loading branch information
thedadams committed Dec 17, 2024
1 parent 8fa4f94 commit 4004a5c
Show file tree
Hide file tree
Showing 189 changed files with 1,339 additions and 1,335 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
**/node_modules/
otto8-tools/
.local/
acorn-tools/
obot-tools/
2 changes: 1 addition & 1 deletion .envrc.dev
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export KUBECONFIG=$(pwd)/tools/devmode-kubeconfig
export ACORN_DEV_MODE=true
export OBOT_DEV_MODE=true
export WORKSPACE_PROVIDER_IGNORE_WORKSPACE_NOT_FOUND=true
4 changes: 2 additions & 2 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
push: true
tags: |
ghcr.io/${{ github.repository }}:${{ github.ref_name }}
${{ github.ref_type == 'tag' && !contains(github.ref_name, '-rc') && format('docker.io/acorn/{0}:{1}', github.event.repository.name, github.ref_name) || '' }}
${{ github.ref_type == 'tag' && !contains(github.ref_name, '-rc') && format('docker.io/obot/{0}:{1}', github.event.repository.name, github.ref_name) || '' }}
platforms: linux/amd64,linux/arm64

- name: Setup crane
Expand All @@ -60,7 +60,7 @@ jobs:
if: ${{ github.ref_type == 'tag' && !contains(github.ref_name, '-rc') }}
run: |
crane tag ghcr.io/${{ github.repository }}:${{ github.ref_name }} latest
crane tag docker.io/acorn/${{ github.event.repository.name }}:${{ github.ref_name }} latest
crane tag docker.io/obot/${{ github.event.repository.name }}:${{ github.ref_name }} latest
- name: Deploy to Test Render
if: ${{ env.DEPLOY_TO_TEST == 'true' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ jobs:
Invoke-WebRequest -Uri 'https://aka.ms/wingetcreate/latest' -OutFile 'wingetcreate.exe'
- name: Create WinGet Package Update Pull Request
run: |
$url = "${{ github.server_url }}/${{ github.repository }}/releases/download/${{ github.ref_name }}/acorn_${{ github.ref_name }}_windows_amd64.zip"
./wingetcreate.exe update --submit --token "${{ secrets.WINGET_GH_TOKEN }}" --urls $url --version "${{ github.ref_name }}" acorn-io.acorn
$url = "${{ github.server_url }}/${{ github.repository }}/releases/download/${{ github.ref_name }}/obot_${{ github.ref_name }}_windows_amd64.zip"
./wingetcreate.exe update --submit --token "${{ secrets.WINGET_GH_TOKEN }}" --urls $url --version "${{ github.ref_name }}" obot-platform.obot
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ vendor/
Thumbs.db

# Ignore local DB files
acorn*.db*
obot*.db*


18 changes: 9 additions & 9 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2

project_name: "acorn"
project_name: "obot"

builds:
- id: build
Expand All @@ -13,7 +13,7 @@ builds:
- amd64
- arm64
ldflags:
- -X "github.com/acorn-io/acorn/pkg/version.Tag=v{{ .Version }}"
- -X "github.com/obot-platform/obot/pkg/version.Tag=v{{ .Version }}"

archives:
- format: tar.gz
Expand All @@ -24,20 +24,20 @@ archives:

release:
github:
owner: "acorn-io"
name: "acorn"
owner: "obot-platform"
name: "obot"
make_latest: false
prerelease: auto

brews:
- name: acorn
description: "Acorn CLI"
- name: obot
description: "Obot CLI"
install: |
bin.install "acorn"
homepage: "https://github.com/acorn-io/acorn"
bin.install "obot"
homepage: "https://github.com/obot-platform/obot"
skip_upload: false
directory: "Formula"
repository:
owner: acorn-io
owner: obot-platform
name: homebrew-tap
token: "{{ .Env.TAP_GITHUB_TOKEN }}"
22 changes: 11 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ RUN git clone --branch v0.8.0 https://github.com/pgvector/pgvector.git && \
rm -rf pgvector

FROM cgr.dev/chainguard/postgres:latest-dev AS final
ENV POSTGRES_USER=acorn
ENV POSTGRES_PASSWORD=acorn
ENV POSTGRES_DB=acorn
ENV POSTGRES_USER=obot
ENV POSTGRES_PASSWORD=obot
ENV POSTGRES_DB=obot
ENV PGDATA=/data/postgresql

COPY --from=build-pgvector /usr/lib/postgresql17/vector.so /usr/lib/postgresql17/
Expand All @@ -49,19 +49,19 @@ RUN mkdir /run/sshd && /usr/sbin/sshd
COPY encryption.yaml /
COPY --chmod=0755 run.sh /bin/run.sh

COPY --link --from=tools /app/acorn-tools /acorn-tools
COPY --from=bin /app/bin/acorn /bin/
COPY --link --from=tools /app/obot-tools /obot-tools
COPY --from=bin /app/bin/obot /bin/

EXPOSE 22
# libreoffice executables
ENV PATH=/acorn-tools/venv/bin:$PATH:/usr/lib/libreoffice/program
ENV PATH=/obot-tools/venv/bin:$PATH:/usr/lib/libreoffice/program
ENV HOME=/data
ENV XDG_CACHE_HOME=/data/cache
ENV GPTSCRIPT_SYSTEM_TOOLS_DIR=/acorn-tools/
ENV ACORN_SERVER_WORKSPACE_TOOL=/acorn-tools/workspace-provider
ENV ACORN_SERVER_DATASETS_TOOL=/acorn-tools/datasets
ENV ACORN_SERVER_TOOL_REGISTRY=/acorn-tools
ENV ACORN_SERVER_ENCRYPTION_CONFIG_FILE=/encryption.yaml
ENV GPTSCRIPT_SYSTEM_TOOLS_DIR=/obot-tools/
ENV OBOT_SERVER_WORKSPACE_TOOL=/obot-tools/workspace-provider
ENV OBOT_SERVER_DATASETS_TOOL=/obot-tools/datasets
ENV OBOT_SERVER_TOOL_REGISTRY=/obot-tools
ENV OBOT_SERVER_ENCRYPTION_CONFIG_FILE=/encryption.yaml
ENV GOMEMLIMIT=1GiB
ENV BAAAH_THREADINESS=20
ENV TERM=vt100
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ serve-docs:

# Build the project

GIT_TAG := $(shell git describe --tags --exact-match 2>/dev/null | xargs -I {} echo -X 'github.com/acorn-io/acorn/pkg/version.Tag={}')
GIT_TAG := $(shell git describe --tags --exact-match 2>/dev/null | xargs -I {} echo -X 'github.com/obot-platform/obot/pkg/version.Tag={}')
GO_LD_FLAGS := "-s -w $(GIT_TAG)"
build:
go build -ldflags=$(GO_LD_FLAGS) -o bin/acorn .
go build -ldflags=$(GO_LD_FLAGS) -o bin/obot .

dev:
./tools/dev.sh $(ARGS)
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Acorn
# Obot

Acorn is an open source AI agent platform. Key features include:
Obot is an open source AI agent platform. Key features include:
- Ability to build agents to support a variety of usecases including copilots, assistants, and autonomous agentic workflows.
- Integration with leading LLM providers
- Built-in RAG for your data
- Easy integration with custom or private web services and APIs
- OAuth 2.0 authentication

### Getting Started
Launch Acorn via docker:
Launch Obot via docker:
```bash
docker run -d -p 8080:8080 -e "OPENAI_API_KEY=<OPEN AI KEY>" ghcr.io/acorn-io/acorn:latest
docker run -d -p 8080:8080 -e "OPENAI_API_KEY=<OPEN AI KEY>" ghcr.io/obot-platform/obot:latest
```
Then visit http://localhost:8080.

The `acorn` CLI can be installed via brew on MacOS or Linux:
The `obot` CLI can be installed via brew on MacOS or Linux:
```bash
brew tap acorn-io/tap
brew install acorn
brew tap obot-platform/tap
brew install obot
```
or by downloading the binary for your platform from our [latest release](https://github.com/acorn-io/acorn/releases/latest).
or by downloading the binary for your platform from our [latest release](https://github.com/obot-platform/obot/releases/latest).

### Next Steps

Expand Down
2 changes: 1 addition & 1 deletion apiclient/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"sort"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/obot-platform/obot/apiclient/types"
)

func (c *Client) UpdateAgent(ctx context.Context, id string, manifest types.AgentManifest) (*types.Agent, error) {
Expand Down
2 changes: 1 addition & 1 deletion apiclient/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strings"
"unicode/utf8"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/acorn-io/acorn/logger"
"github.com/obot-platform/obot/apiclient/types"
)

var log = logger.Package()
Expand Down
2 changes: 1 addition & 1 deletion apiclient/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"
"net/http"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/obot-platform/obot/apiclient/types"
)

func (c *Client) getGeneric(ctx context.Context, typeName, ref string) (string, error) {
Expand Down
2 changes: 1 addition & 1 deletion apiclient/credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"
"net/url"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/obot-platform/obot/apiclient/types"
)

type ListCredentialsOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion apiclient/emailreceiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"sort"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/obot-platform/obot/apiclient/types"
)

func (c *Client) GetEmailReceiver(ctx context.Context, id string) (*types.EmailReceiver, error) {
Expand Down
2 changes: 1 addition & 1 deletion apiclient/files.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"net/http"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/obot-platform/obot/apiclient/types"
)

type ListFileOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion apiclient/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/acorn-io/acorn/apiclient
module github.com/obot-platform/obot/apiclient

go 1.23.1

Expand Down
3 changes: 2 additions & 1 deletion apiclient/go.sum
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
github.com/acorn-io/acorn/logger v0.0.0-20241216130324-9a09554e0785 h1:nOyU2uk23fpVxfUh/s+5syXbvqpE2tHPl5chkUEFbg4=
github.com/acorn-io/acorn/logger v0.0.0-20241216130324-9a09554e0785/go.mod h1:p1+KVqMIAMjKoQoYiNwG9uNlkdCP3pw85lFLI/+tsYE=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down Expand Up @@ -26,6 +25,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw=
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
github.com/acorn-io/acorn/logger v0.0.0-20241216130324-9a09554e0785 h1:nOyU2uk23fpVxfUh/s+5syXbvqpE2tHPl5chkUEFbg4=
github.com/acorn-io/acorn/logger v0.0.0-20241216130324-9a09554e0785/go.mod h1:p1+KVqMIAMjKoQoYiNwG9uNlkdCP3pw85lFLI/+tsYE=
github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
Expand Down
2 changes: 1 addition & 1 deletion apiclient/invoke.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io"
"net/http"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/obot-platform/obot/apiclient/types"
)

type InvokeOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion apiclient/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"sort"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/obot-platform/obot/apiclient/types"
)

type ListRunsOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion apiclient/task.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"sort"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/obot-platform/obot/apiclient/types"
)

type ListTasksOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion apiclient/thread.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"sort"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/obot-platform/obot/apiclient/types"
)

func (c *Client) DeleteThread(ctx context.Context, id string) error {
Expand Down
2 changes: 1 addition & 1 deletion apiclient/toolref.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/obot-platform/obot/apiclient/types"
)

type ListToolReferencesOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion apiclient/webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"sort"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/obot-platform/obot/apiclient/types"
)

func (c *Client) GetWebhook(ctx context.Context, id string) (result *types.Webhook, _ error) {
Expand Down
2 changes: 1 addition & 1 deletion apiclient/workflow.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"sort"

"github.com/acorn-io/acorn/apiclient/types"
"github.com/obot-platform/obot/apiclient/types"
)

func (c *Client) UpdateWorkflow(ctx context.Context, id string, manifest types.WorkflowManifest) (*types.Workflow, error) {
Expand Down
6 changes: 3 additions & 3 deletions generate.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//go:generate go run github.com/acorn-io/nah/cmd/deepcopy ./pkg/storage/apis/otto.otto8.ai/v1/
//go:generate go run github.com/acorn-io/nah/cmd/deepcopy ./apiclient/types/
//go:generate go run k8s.io/kube-openapi/cmd/openapi-gen --go-header-file tools/header.txt --output-file openapi_generated.go --output-dir ./pkg/storage/openapi/generated/ --output-pkg github.com/acorn-io/acorn/pkg/storage/openapi/generated github.com/acorn-io/acorn/pkg/storage/apis/otto.otto8.ai/v1 k8s.io/apimachinery/pkg/apis/meta/v1 k8s.io/apimachinery/pkg/runtime k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/util/intstr k8s.io/api/coordination/v1 github.com/acorn-io/acorn/apiclient/types
//go:generate go run github.com/obot-platform/nah/cmd/deepcopy ./pkg/storage/apis/otto.otto8.ai/v1/
//go:generate go run github.com/obot-platform/nah/cmd/deepcopy ./apiclient/types/
//go:generate go run k8s.io/kube-openapi/cmd/openapi-gen --go-header-file tools/header.txt --output-file openapi_generated.go --output-dir ./pkg/storage/openapi/generated/ --output-pkg github.com/obot-platform/obot/pkg/storage/openapi/generated github.com/obot-platform/obot/pkg/storage/apis/otto.otto8.ai/v1 k8s.io/apimachinery/pkg/apis/meta/v1 k8s.io/apimachinery/pkg/runtime k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/api/resource k8s.io/apimachinery/pkg/util/intstr k8s.io/api/coordination/v1 github.com/obot-platform/obot/apiclient/types

package main
19 changes: 10 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
module github.com/acorn-io/acorn
module github.com/obot-platform/obot

go 1.23.2

replace (
github.com/acorn-io/acorn/apiclient => ./apiclient
github.com/acorn-io/acorn/logger => ./logger
github.com/oauth2-proxy/oauth2-proxy/v7 => github.com/acorn-io/oauth2-proxy/v7 v7.0.0-20241008204315-265dabe17f43
github.com/oauth2-proxy/oauth2-proxy/v7 => github.com/obot-platform/oauth2-proxy/v7 v7.0.0-20241008204315-265dabe17f43
github.com/obot-platform/obot/apiclient => ./apiclient
github.com/obot-platform/obot/logger => ./logger
)

require (
github.com/acorn-io/acorn/apiclient v0.0.0-00010101000000-000000000000
github.com/acorn-io/acorn/logger v0.0.0-20241216130324-9a09554e0785
github.com/acorn-io/kinm v0.0.0-20241216114326-54409c6274c9
github.com/acorn-io/nah v0.0.0-20241216115213-e6506200369b
github.com/acorn-io/namegenerator v0.0.0-20220915160418-9e3d5a0ffe78
github.com/adrg/xdg v0.5.3
github.com/dustin/go-humanize v1.0.1
github.com/fatih/color v1.18.0
Expand All @@ -26,6 +21,11 @@ require (
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
github.com/mhale/smtpd v0.8.3
github.com/oauth2-proxy/oauth2-proxy/v7 v7.0.0-00010101000000-000000000000
github.com/obot-platform/kinm v0.0.0-20241217120617-52c566a38b04
github.com/obot-platform/nah v0.0.0-20241217120500-e9169e4a999f
github.com/obot-platform/namegenerator v0.0.0-20241217121223-fc58bdb7dca2
github.com/obot-platform/obot/apiclient v0.0.0-00010101000000-000000000000
github.com/obot-platform/obot/logger v0.0.0-20241216130324-9a09554e0785
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
github.com/pterm/pterm v0.12.79
github.com/robfig/cron/v3 v3.0.1
Expand Down Expand Up @@ -64,6 +64,7 @@ require (
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/ProtonMail/go-crypto v1.0.0 // indirect
github.com/a8m/envsubst v1.4.2 // indirect
github.com/acorn-io/acorn/logger v0.0.0-20241216130324-9a09554e0785 // indirect
github.com/alecthomas/chroma/v2 v2.14.0 // indirect
github.com/andybalholm/brotli v1.1.1 // indirect
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
Expand Down
Loading

0 comments on commit 4004a5c

Please sign in to comment.