From bbd9aa7646ce960ce3ec3fd33b414b2e4ae33234 Mon Sep 17 00:00:00 2001 From: Aaron Pham <29749331+aarnphm@users.noreply.github.com> Date: Wed, 23 Aug 2023 00:21:59 -0400 Subject: [PATCH] refactor(contrib): similar namespace [clojure-ui build] (#251) --- .github/CODEOWNERS | 2 +- .github/actions/release.sh | 4 ++-- .github/workflows/binary-releases.yml | 4 ++-- .github/workflows/ci.yml | 10 ++++++---- .github/workflows/clojure-frontend.yml | 4 ++-- .github/workflows/compile-pypi.yml | 4 ++-- .github/workflows/create-releases.yml | 4 ++-- .github/workflows/cron.yml | 3 +++ CHANGELOG.md | 2 +- DEVELOPMENT.md | 2 +- changelog.d/191.refactor.md | 2 +- changelog.d/240.feature.md | 7 ++++--- changelog.d/249.refactor.md | 6 +++--- hatch.toml | 4 ++-- {contrib => openllm-contrib}/clojure/.dockerignore | 0 {contrib => openllm-contrib}/clojure/.gitignore | 0 {contrib => openllm-contrib}/clojure/Dockerfile | 0 {contrib => openllm-contrib}/clojure/LICENSE.md | 0 {contrib => openllm-contrib}/clojure/README.md | 2 +- {contrib => openllm-contrib}/clojure/deps.edn | 0 {contrib => openllm-contrib}/clojure/package.json | 0 {contrib => openllm-contrib}/clojure/pnpm-lock.yaml | 0 {contrib => openllm-contrib}/clojure/postcss.config.js | 0 {contrib => openllm-contrib}/clojure/public/index.html | 0 .../clojure/public/static/atom-one-light.css | 0 .../clojure/public/static/logo-dark.svg | 0 .../clojure/public/static/logo-light.svg | 0 {tools => openllm-contrib/clojure}/run-clojure-ui.sh | 10 +++------- {contrib => openllm-contrib}/clojure/shadow-cljs.edn | 0 .../clojure/src/css/tailwind.css | 0 .../clojure/src/generated/README.md | 0 .../clojure/src/main/openllm/api/components.cljs | 0 .../clojure/src/main/openllm/api/http.cljs | 0 .../clojure/src/main/openllm/api/indexed_db/core.cljs | 0 .../clojure/src/main/openllm/api/log4cljs/core.cljs | 0 .../clojure/src/main/openllm/api/persistence.cljs | 0 .../clojure/src/main/openllm/app.cljs | 0 .../clojure/src/main/openllm/build.clj | 0 .../clojure/src/main/openllm/components/chat/db.cljs | 0 .../src/main/openllm/components/chat/events.cljs | 0 .../clojure/src/main/openllm/components/chat/subs.cljs | 0 .../src/main/openllm/components/chat/views.cljs | 0 .../src/main/openllm/components/common/views.cljs | 0 .../clojure/src/main/openllm/components/db.cljs | 0 .../src/main/openllm/components/nav_bar/db.cljs | 0 .../src/main/openllm/components/nav_bar/events.cljs | 0 .../src/main/openllm/components/nav_bar/subs.cljs | 0 .../src/main/openllm/components/nav_bar/views.cljs | 0 .../src/main/openllm/components/playground/db.cljs | 0 .../src/main/openllm/components/playground/events.cljs | 0 .../src/main/openllm/components/playground/subs.cljs | 0 .../src/main/openllm/components/playground/views.cljs | 0 .../src/main/openllm/components/side_bar/db.cljs | 0 .../src/main/openllm/components/side_bar/events.cljs | 0 .../openllm/components/side_bar/model_params/db.cljs | 0 .../components/side_bar/model_params/events.cljs | 0 .../openllm/components/side_bar/model_params/subs.cljs | 0 .../components/side_bar/model_params/views.cljs | 0 .../components/side_bar/model_selection/db.cljs | 0 .../components/side_bar/model_selection/events.cljs | 0 .../components/side_bar/model_selection/subs.cljs | 0 .../components/side_bar/model_selection/views.cljs | 0 .../src/main/openllm/components/side_bar/subs.cljs | 0 .../src/main/openllm/components/side_bar/views.cljs | 0 .../clojure/src/main/openllm/components/subs.cljs | 0 .../clojure/src/main/openllm/db.cljs | 0 .../clojure/src/main/openllm/events.cljs | 0 .../clojure/src/main/openllm/subs.cljs | 0 .../clojure/src/main/openllm/util.cljs | 0 .../clojure/src/main/openllm/views.cljs | 0 .../clojure/tailwind.config.js | 0 openllm-python/CHANGELOG.md | 2 +- openllm-python/README.md | 8 ++++---- package.json | 2 +- 74 files changed, 42 insertions(+), 40 deletions(-) rename {contrib => openllm-contrib}/clojure/.dockerignore (100%) rename {contrib => openllm-contrib}/clojure/.gitignore (100%) rename {contrib => openllm-contrib}/clojure/Dockerfile (100%) rename {contrib => openllm-contrib}/clojure/LICENSE.md (100%) rename {contrib => openllm-contrib}/clojure/README.md (98%) rename {contrib => openllm-contrib}/clojure/deps.edn (100%) rename {contrib => openllm-contrib}/clojure/package.json (100%) rename {contrib => openllm-contrib}/clojure/pnpm-lock.yaml (100%) rename {contrib => openllm-contrib}/clojure/postcss.config.js (100%) rename {contrib => openllm-contrib}/clojure/public/index.html (100%) rename {contrib => openllm-contrib}/clojure/public/static/atom-one-light.css (100%) rename {contrib => openllm-contrib}/clojure/public/static/logo-dark.svg (100%) rename {contrib => openllm-contrib}/clojure/public/static/logo-light.svg (100%) rename {tools => openllm-contrib/clojure}/run-clojure-ui.sh (75%) rename {contrib => openllm-contrib}/clojure/shadow-cljs.edn (100%) rename {contrib => openllm-contrib}/clojure/src/css/tailwind.css (100%) rename {contrib => openllm-contrib}/clojure/src/generated/README.md (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/api/components.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/api/http.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/api/indexed_db/core.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/api/log4cljs/core.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/api/persistence.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/app.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/build.clj (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/chat/db.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/chat/events.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/chat/subs.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/chat/views.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/common/views.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/db.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/nav_bar/db.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/nav_bar/events.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/nav_bar/subs.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/nav_bar/views.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/playground/db.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/playground/events.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/playground/subs.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/playground/views.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/side_bar/db.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/side_bar/events.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/side_bar/model_params/db.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/side_bar/model_params/events.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/side_bar/model_params/subs.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/side_bar/model_params/views.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/side_bar/model_selection/db.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/side_bar/model_selection/events.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/side_bar/model_selection/subs.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/side_bar/model_selection/views.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/side_bar/subs.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/side_bar/views.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/components/subs.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/db.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/events.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/subs.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/util.cljs (100%) rename {contrib => openllm-contrib}/clojure/src/main/openllm/views.cljs (100%) rename {contrib => openllm-contrib}/clojure/tailwind.config.js (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index bf55a501..0c898b5f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ * @aarnphm -contrib/clojure @GutZuFusss +openllm-contrib/clojure @GutZuFusss diff --git a/.github/actions/release.sh b/.github/actions/release.sh index e89617dc..2083c078 100755 --- a/.github/actions/release.sh +++ b/.github/actions/release.sh @@ -52,12 +52,12 @@ release_package() { pushd openllm-node &>/dev/null jq --arg release_version "${version}" '.version = $release_version' < package.json > package.json.tmp && mv package.json.tmp package.json popd &>/dev/null - pushd contrib/clojure &>/dev/null + pushd openllm-contrib/clojure &>/dev/null jq --arg release_version "${version}" '.version = $release_version' < package.json > package.json.tmp && mv package.json.tmp package.json popd &>/dev/null towncrier build --yes --version "${version}" cp CHANGELOG.md openllm-python/CHANGELOG.md - git add CHANGELOG.md openllm-python/CHANGELOG.md changelog.d package.json openllm-node/package.json contrib/clojure/package.json + git add CHANGELOG.md openllm-python/CHANGELOG.md changelog.d package.json openllm-node/package.json openllm-contrib/clojure/package.json git commit -S -sm "infra: prepare for release ${version} [generated] [skip ci]" git push origin main echo "Releasing tag ${version}..." && git tag -a "v${version}" -sm "Release ${version} [generated by GitHub Actions]" diff --git a/.github/workflows/binary-releases.yml b/.github/workflows/binary-releases.yml index 4d1eb38d..192929d2 100644 --- a/.github/workflows/binary-releases.yml +++ b/.github/workflows/binary-releases.yml @@ -14,7 +14,7 @@ on: - 'assets/**' - 'openllm-node/**' - 'Formula/**' - - 'contrib/clojure/**' + - 'openllm-contrib/clojure/**' pull_request: branches: [main] paths-ignore: @@ -26,7 +26,7 @@ on: - 'assets/**' - 'openllm-node/**' - 'Formula/**' - - 'contrib/clojure/**' + - 'openllm-contrib/clojure/**' defaults: run: shell: bash --noprofile --norc -exo pipefail {0} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc66c9ce..2efe84c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,6 @@ name: Continuous Integration on: + workflow_call: push: branches: [main] paths-ignore: @@ -9,7 +10,7 @@ on: - '*.md' - 'changelog.d/**' - 'assets/**' - - 'contrib/clojure/**' + - 'openllm-contrib/clojure/**' pull_request: branches: [main] paths-ignore: @@ -19,7 +20,7 @@ on: - '*.md' - 'changelog.d/**' - 'assets/**' - - 'contrib/clojure/**' + - 'openllm-contrib/clojure/**' env: LINES: 120 COLUMNS: 120 @@ -46,6 +47,7 @@ jobs: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # ratchet:actions/checkout@v3 with: fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - uses: bentoml/setup-bentoml-action@59beefe94e2e8f8ebbedf555fc86bd5d1ae0a708 # ratchet:bentoml/setup-bentoml-action@v1 with: bentoml-version: 'main' @@ -63,12 +65,12 @@ jobs: name: report-coverage runs-on: ubuntu-latest if: false - needs: - - tests + needs: tests steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # ratchet:actions/checkout@v3 with: fetch-depth: 0 + ref: ${{ github.event.pull_request.head.sha }} - uses: bentoml/setup-bentoml-action@59beefe94e2e8f8ebbedf555fc86bd5d1ae0a708 # ratchet:bentoml/setup-bentoml-action@v1 with: bentoml-version: 'main' diff --git a/.github/workflows/clojure-frontend.yml b/.github/workflows/clojure-frontend.yml index 2772c91a..9eaf3976 100644 --- a/.github/workflows/clojure-frontend.yml +++ b/.github/workflows/clojure-frontend.yml @@ -102,8 +102,8 @@ jobs: id: build-and-push uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # ratchet:docker/build-push-action@v4 with: - context: contrib/clojure - file: contrib/clojure/Dockerfile + context: openllm-contrib/clojure + file: openllm-contrib/clojure/Dockerfile platforms: linux/amd64,linux/arm64 push: true build-args: | diff --git a/.github/workflows/compile-pypi.yml b/.github/workflows/compile-pypi.yml index 7a3add0b..d340aa1d 100644 --- a/.github/workflows/compile-pypi.yml +++ b/.github/workflows/compile-pypi.yml @@ -24,7 +24,7 @@ on: - '*.md' - 'changelog.d/**' - 'assets/**' - - 'contrib/clojure/**' + - 'openllm-contrib/clojure/**' pull_request: branches: [main] paths-ignore: @@ -34,7 +34,7 @@ on: - '*.md' - 'changelog.d/**' - 'assets/**' - - 'contrib/clojure/**' + - 'openllm-contrib/clojure/**' env: LINES: 120 COLUMNS: 120 diff --git a/.github/workflows/create-releases.yml b/.github/workflows/create-releases.yml index 333ce9e9..0bf9e321 100644 --- a/.github/workflows/create-releases.yml +++ b/.github/workflows/create-releases.yml @@ -169,10 +169,10 @@ jobs: pushd openllm-node &>/dev/null jq --arg release_version "${DEV_VERSION}" '.version = $release_version' < package.json > package.json.tmp && mv package.json.tmp package.json popd &>/dev/null - pushd contrib/clojure &>/dev/null + pushd openllm-contrib/clojure &>/dev/null jq --arg release_version "${version}" '.version = $release_version' < package.json > package.json.tmp && mv package.json.tmp package.json popd &>/dev/null - git add package.json openllm-node/package.json contrib/clojure/package.json && git commit -S -sm "infra: bump to dev version of ${DEV_VERSION} [generated] [skip ci]" + git add package.json openllm-node/package.json openllm-contrib/clojure/package.json && git commit -S -sm "infra: bump to dev version of ${DEV_VERSION} [generated] [skip ci]" git push origin HEAD:main binary-distribution: if: github.repository_owner == 'bentoml' diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 315a522e..54b54230 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -17,6 +17,9 @@ concurrency: group: cron-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: + scheduled-tests: + if: github.repository_owner == 'bentoml' + uses: bentoml/OpenLLM/.github/workflows/ci.yml@main # ratchet:exclude update-actions: runs-on: 'ubuntu-latest' name: Ratchet update diff --git a/CHANGELOG.md b/CHANGELOG.md index e03b3d39..6e8e0259 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,7 +39,7 @@ This changelog is managed by towncrier and is compiled at release time. - OpenLLM now include a community-maintained ClojureScript UI, Thanks @GutZuFusss - See [this README.md](/contrib/clojure/README.md) for more information + See [this README.md](/openllm-contrib/clojure/README.md) for more information OpenLLM will also include a `--cors` to enable start with cors enabled. [#89](https://github.com/bentoml/openllm/issues/89) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 45156c29..630261f8 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -196,7 +196,7 @@ See this [docs](/.github/INFRA.md) for more information on OpenLLM's CI/CD workf ## UI -See [ClojureScript UI's README.md](/contrib/clojure/README.md) for more information. +See [ClojureScript UI's README.md](/openllm-contrib/clojure/README.md) for more information. ## Install from git archive install diff --git a/changelog.d/191.refactor.md b/changelog.d/191.refactor.md index dd0547f7..1bf94da7 100644 --- a/changelog.d/191.refactor.md +++ b/changelog.d/191.refactor.md @@ -4,4 +4,4 @@ Added a separate section for all extension with the CLI. `openllm playground` is introduce compiled wheels gradually -added a easy `loc.py` for LOC tracking +added a easy `cz.py` for code golf and LOC diff --git a/changelog.d/240.feature.md b/changelog.d/240.feature.md index 9d608a34..1f20485c 100644 --- a/changelog.d/240.feature.md +++ b/changelog.d/240.feature.md @@ -1,9 +1,10 @@ OpenLLM now provides SSE support > [!NOTE] -> For this to work, you must install BentoML from HEAD: -> `pip install 'git+https://github.com/bentoml/BentoML.git@main'` +> For this to work, you must install BentoML>=1.1.2: +> `pip install -U bentoml>=1.1.2` The endpoint can be accessed via `/v1/generate_stream` -Curl in fact does support SSE (by passing in `-N`) +> [!NOTE] +> Curl does in fact does support SSE by passing in `-N` diff --git a/changelog.d/249.refactor.md b/changelog.d/249.refactor.md index fcc6f2da..d8bfd324 100644 --- a/changelog.d/249.refactor.md +++ b/changelog.d/249.refactor.md @@ -1,5 +1,5 @@ OpenLLM now comprise of three packages: -- openllm-core: main building blocks of OpenLLM, that doesn't depend on transformers and heavy DL libraries -- openllm-client: The implementation of `openllm.client` -- openllm: = openllm-core + openllm-client + DL features +- `openllm-core`: main building blocks of OpenLLM, that doesn't depend on transformers and heavy DL libraries +- `openllm-client`: The implementation of `openllm.client` +- `openllm`: = `openllm-core` + `openllm-client` + DL features (under `openllm-python`) diff --git a/hatch.toml b/hatch.toml index b73fcf77..875a7140 100644 --- a/hatch.toml +++ b/hatch.toml @@ -93,7 +93,7 @@ write-summary-report = "python tools/write-coverage-report.py" detached = true [envs.ui.scripts] server = "openllm start {args:flan-t5} --working-dir {root:uri} --cors --debug" -clojure = ["bash tools/run-clojure-ui.sh"] +clojure = ["bash openllm-contrib/clojure/run-clojure-ui.sh"] [envs.ci] detached = true [envs.ci.scripts] @@ -102,5 +102,5 @@ recompile = ["bash ./clean.sh", "compile"] edi = "bash local.sh" lock = [ "bash tools/lock-actions.sh", - "pushd contrib/clojure && pnpm i --frozen-lockfile", + "pushd openllm-contrib/clojure && pnpm i --frozen-lockfile", ] diff --git a/contrib/clojure/.dockerignore b/openllm-contrib/clojure/.dockerignore similarity index 100% rename from contrib/clojure/.dockerignore rename to openllm-contrib/clojure/.dockerignore diff --git a/contrib/clojure/.gitignore b/openllm-contrib/clojure/.gitignore similarity index 100% rename from contrib/clojure/.gitignore rename to openllm-contrib/clojure/.gitignore diff --git a/contrib/clojure/Dockerfile b/openllm-contrib/clojure/Dockerfile similarity index 100% rename from contrib/clojure/Dockerfile rename to openllm-contrib/clojure/Dockerfile diff --git a/contrib/clojure/LICENSE.md b/openllm-contrib/clojure/LICENSE.md similarity index 100% rename from contrib/clojure/LICENSE.md rename to openllm-contrib/clojure/LICENSE.md diff --git a/contrib/clojure/README.md b/openllm-contrib/clojure/README.md similarity index 98% rename from contrib/clojure/README.md rename to openllm-contrib/clojure/README.md index 4a669aef..78f6d1d2 100644 --- a/contrib/clojure/README.md +++ b/openllm-contrib/clojure/README.md @@ -1,5 +1,5 @@
-

OpenLLM ClojureScript UI

+

🧭 OpenLLM ClojureScript UI

Built using reagent, reframe, Tailwind CSS, and shadow-cljs

diff --git a/contrib/clojure/deps.edn b/openllm-contrib/clojure/deps.edn similarity index 100% rename from contrib/clojure/deps.edn rename to openllm-contrib/clojure/deps.edn diff --git a/contrib/clojure/package.json b/openllm-contrib/clojure/package.json similarity index 100% rename from contrib/clojure/package.json rename to openllm-contrib/clojure/package.json diff --git a/contrib/clojure/pnpm-lock.yaml b/openllm-contrib/clojure/pnpm-lock.yaml similarity index 100% rename from contrib/clojure/pnpm-lock.yaml rename to openllm-contrib/clojure/pnpm-lock.yaml diff --git a/contrib/clojure/postcss.config.js b/openllm-contrib/clojure/postcss.config.js similarity index 100% rename from contrib/clojure/postcss.config.js rename to openllm-contrib/clojure/postcss.config.js diff --git a/contrib/clojure/public/index.html b/openllm-contrib/clojure/public/index.html similarity index 100% rename from contrib/clojure/public/index.html rename to openllm-contrib/clojure/public/index.html diff --git a/contrib/clojure/public/static/atom-one-light.css b/openllm-contrib/clojure/public/static/atom-one-light.css similarity index 100% rename from contrib/clojure/public/static/atom-one-light.css rename to openllm-contrib/clojure/public/static/atom-one-light.css diff --git a/contrib/clojure/public/static/logo-dark.svg b/openllm-contrib/clojure/public/static/logo-dark.svg similarity index 100% rename from contrib/clojure/public/static/logo-dark.svg rename to openllm-contrib/clojure/public/static/logo-dark.svg diff --git a/contrib/clojure/public/static/logo-light.svg b/openllm-contrib/clojure/public/static/logo-light.svg similarity index 100% rename from contrib/clojure/public/static/logo-light.svg rename to openllm-contrib/clojure/public/static/logo-light.svg diff --git a/tools/run-clojure-ui.sh b/openllm-contrib/clojure/run-clojure-ui.sh similarity index 75% rename from tools/run-clojure-ui.sh rename to openllm-contrib/clojure/run-clojure-ui.sh index 73893909..50e2824c 100755 --- a/tools/run-clojure-ui.sh +++ b/openllm-contrib/clojure/run-clojure-ui.sh @@ -2,9 +2,9 @@ set -ex -o pipefail -GIT_ROOT=$(git rev-parse --show-toplevel) +SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd) -cd "$GIT_ROOT" || exit 1 +cd "$SCRIPT_DIR" || exit 1 if ! command -v node @ >&1 > /dev/null; then echo "Cannot find 'node' executable in PATH. Make sure to have Node.js setup. Refer to" @@ -23,8 +23,4 @@ if ! command -v hatch @ >&1 > /dev/null; then exit 1 fi -pushd contrib/clojure > /dev/null -pnpm install -popd > /dev/null - -pnpm run -C "$GIT_ROOT"/contrib/clojure dev +pnpm i && pnpm run dev diff --git a/contrib/clojure/shadow-cljs.edn b/openllm-contrib/clojure/shadow-cljs.edn similarity index 100% rename from contrib/clojure/shadow-cljs.edn rename to openllm-contrib/clojure/shadow-cljs.edn diff --git a/contrib/clojure/src/css/tailwind.css b/openllm-contrib/clojure/src/css/tailwind.css similarity index 100% rename from contrib/clojure/src/css/tailwind.css rename to openllm-contrib/clojure/src/css/tailwind.css diff --git a/contrib/clojure/src/generated/README.md b/openllm-contrib/clojure/src/generated/README.md similarity index 100% rename from contrib/clojure/src/generated/README.md rename to openllm-contrib/clojure/src/generated/README.md diff --git a/contrib/clojure/src/main/openllm/api/components.cljs b/openllm-contrib/clojure/src/main/openllm/api/components.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/api/components.cljs rename to openllm-contrib/clojure/src/main/openllm/api/components.cljs diff --git a/contrib/clojure/src/main/openllm/api/http.cljs b/openllm-contrib/clojure/src/main/openllm/api/http.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/api/http.cljs rename to openllm-contrib/clojure/src/main/openllm/api/http.cljs diff --git a/contrib/clojure/src/main/openllm/api/indexed_db/core.cljs b/openllm-contrib/clojure/src/main/openllm/api/indexed_db/core.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/api/indexed_db/core.cljs rename to openllm-contrib/clojure/src/main/openllm/api/indexed_db/core.cljs diff --git a/contrib/clojure/src/main/openllm/api/log4cljs/core.cljs b/openllm-contrib/clojure/src/main/openllm/api/log4cljs/core.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/api/log4cljs/core.cljs rename to openllm-contrib/clojure/src/main/openllm/api/log4cljs/core.cljs diff --git a/contrib/clojure/src/main/openllm/api/persistence.cljs b/openllm-contrib/clojure/src/main/openllm/api/persistence.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/api/persistence.cljs rename to openllm-contrib/clojure/src/main/openllm/api/persistence.cljs diff --git a/contrib/clojure/src/main/openllm/app.cljs b/openllm-contrib/clojure/src/main/openllm/app.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/app.cljs rename to openllm-contrib/clojure/src/main/openllm/app.cljs diff --git a/contrib/clojure/src/main/openllm/build.clj b/openllm-contrib/clojure/src/main/openllm/build.clj similarity index 100% rename from contrib/clojure/src/main/openllm/build.clj rename to openllm-contrib/clojure/src/main/openllm/build.clj diff --git a/contrib/clojure/src/main/openllm/components/chat/db.cljs b/openllm-contrib/clojure/src/main/openllm/components/chat/db.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/chat/db.cljs rename to openllm-contrib/clojure/src/main/openllm/components/chat/db.cljs diff --git a/contrib/clojure/src/main/openllm/components/chat/events.cljs b/openllm-contrib/clojure/src/main/openllm/components/chat/events.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/chat/events.cljs rename to openllm-contrib/clojure/src/main/openllm/components/chat/events.cljs diff --git a/contrib/clojure/src/main/openllm/components/chat/subs.cljs b/openllm-contrib/clojure/src/main/openllm/components/chat/subs.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/chat/subs.cljs rename to openllm-contrib/clojure/src/main/openllm/components/chat/subs.cljs diff --git a/contrib/clojure/src/main/openllm/components/chat/views.cljs b/openllm-contrib/clojure/src/main/openllm/components/chat/views.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/chat/views.cljs rename to openllm-contrib/clojure/src/main/openllm/components/chat/views.cljs diff --git a/contrib/clojure/src/main/openllm/components/common/views.cljs b/openllm-contrib/clojure/src/main/openllm/components/common/views.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/common/views.cljs rename to openllm-contrib/clojure/src/main/openllm/components/common/views.cljs diff --git a/contrib/clojure/src/main/openllm/components/db.cljs b/openllm-contrib/clojure/src/main/openllm/components/db.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/db.cljs rename to openllm-contrib/clojure/src/main/openllm/components/db.cljs diff --git a/contrib/clojure/src/main/openllm/components/nav_bar/db.cljs b/openllm-contrib/clojure/src/main/openllm/components/nav_bar/db.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/nav_bar/db.cljs rename to openllm-contrib/clojure/src/main/openllm/components/nav_bar/db.cljs diff --git a/contrib/clojure/src/main/openllm/components/nav_bar/events.cljs b/openllm-contrib/clojure/src/main/openllm/components/nav_bar/events.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/nav_bar/events.cljs rename to openllm-contrib/clojure/src/main/openllm/components/nav_bar/events.cljs diff --git a/contrib/clojure/src/main/openllm/components/nav_bar/subs.cljs b/openllm-contrib/clojure/src/main/openllm/components/nav_bar/subs.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/nav_bar/subs.cljs rename to openllm-contrib/clojure/src/main/openllm/components/nav_bar/subs.cljs diff --git a/contrib/clojure/src/main/openllm/components/nav_bar/views.cljs b/openllm-contrib/clojure/src/main/openllm/components/nav_bar/views.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/nav_bar/views.cljs rename to openllm-contrib/clojure/src/main/openllm/components/nav_bar/views.cljs diff --git a/contrib/clojure/src/main/openllm/components/playground/db.cljs b/openllm-contrib/clojure/src/main/openllm/components/playground/db.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/playground/db.cljs rename to openllm-contrib/clojure/src/main/openllm/components/playground/db.cljs diff --git a/contrib/clojure/src/main/openllm/components/playground/events.cljs b/openllm-contrib/clojure/src/main/openllm/components/playground/events.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/playground/events.cljs rename to openllm-contrib/clojure/src/main/openllm/components/playground/events.cljs diff --git a/contrib/clojure/src/main/openllm/components/playground/subs.cljs b/openllm-contrib/clojure/src/main/openllm/components/playground/subs.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/playground/subs.cljs rename to openllm-contrib/clojure/src/main/openllm/components/playground/subs.cljs diff --git a/contrib/clojure/src/main/openllm/components/playground/views.cljs b/openllm-contrib/clojure/src/main/openllm/components/playground/views.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/playground/views.cljs rename to openllm-contrib/clojure/src/main/openllm/components/playground/views.cljs diff --git a/contrib/clojure/src/main/openllm/components/side_bar/db.cljs b/openllm-contrib/clojure/src/main/openllm/components/side_bar/db.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/side_bar/db.cljs rename to openllm-contrib/clojure/src/main/openllm/components/side_bar/db.cljs diff --git a/contrib/clojure/src/main/openllm/components/side_bar/events.cljs b/openllm-contrib/clojure/src/main/openllm/components/side_bar/events.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/side_bar/events.cljs rename to openllm-contrib/clojure/src/main/openllm/components/side_bar/events.cljs diff --git a/contrib/clojure/src/main/openllm/components/side_bar/model_params/db.cljs b/openllm-contrib/clojure/src/main/openllm/components/side_bar/model_params/db.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/side_bar/model_params/db.cljs rename to openllm-contrib/clojure/src/main/openllm/components/side_bar/model_params/db.cljs diff --git a/contrib/clojure/src/main/openllm/components/side_bar/model_params/events.cljs b/openllm-contrib/clojure/src/main/openllm/components/side_bar/model_params/events.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/side_bar/model_params/events.cljs rename to openllm-contrib/clojure/src/main/openllm/components/side_bar/model_params/events.cljs diff --git a/contrib/clojure/src/main/openllm/components/side_bar/model_params/subs.cljs b/openllm-contrib/clojure/src/main/openllm/components/side_bar/model_params/subs.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/side_bar/model_params/subs.cljs rename to openllm-contrib/clojure/src/main/openllm/components/side_bar/model_params/subs.cljs diff --git a/contrib/clojure/src/main/openllm/components/side_bar/model_params/views.cljs b/openllm-contrib/clojure/src/main/openllm/components/side_bar/model_params/views.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/side_bar/model_params/views.cljs rename to openllm-contrib/clojure/src/main/openllm/components/side_bar/model_params/views.cljs diff --git a/contrib/clojure/src/main/openllm/components/side_bar/model_selection/db.cljs b/openllm-contrib/clojure/src/main/openllm/components/side_bar/model_selection/db.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/side_bar/model_selection/db.cljs rename to openllm-contrib/clojure/src/main/openllm/components/side_bar/model_selection/db.cljs diff --git a/contrib/clojure/src/main/openllm/components/side_bar/model_selection/events.cljs b/openllm-contrib/clojure/src/main/openllm/components/side_bar/model_selection/events.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/side_bar/model_selection/events.cljs rename to openllm-contrib/clojure/src/main/openllm/components/side_bar/model_selection/events.cljs diff --git a/contrib/clojure/src/main/openllm/components/side_bar/model_selection/subs.cljs b/openllm-contrib/clojure/src/main/openllm/components/side_bar/model_selection/subs.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/side_bar/model_selection/subs.cljs rename to openllm-contrib/clojure/src/main/openllm/components/side_bar/model_selection/subs.cljs diff --git a/contrib/clojure/src/main/openllm/components/side_bar/model_selection/views.cljs b/openllm-contrib/clojure/src/main/openllm/components/side_bar/model_selection/views.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/side_bar/model_selection/views.cljs rename to openllm-contrib/clojure/src/main/openllm/components/side_bar/model_selection/views.cljs diff --git a/contrib/clojure/src/main/openllm/components/side_bar/subs.cljs b/openllm-contrib/clojure/src/main/openllm/components/side_bar/subs.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/side_bar/subs.cljs rename to openllm-contrib/clojure/src/main/openllm/components/side_bar/subs.cljs diff --git a/contrib/clojure/src/main/openllm/components/side_bar/views.cljs b/openllm-contrib/clojure/src/main/openllm/components/side_bar/views.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/side_bar/views.cljs rename to openllm-contrib/clojure/src/main/openllm/components/side_bar/views.cljs diff --git a/contrib/clojure/src/main/openllm/components/subs.cljs b/openllm-contrib/clojure/src/main/openllm/components/subs.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/components/subs.cljs rename to openllm-contrib/clojure/src/main/openllm/components/subs.cljs diff --git a/contrib/clojure/src/main/openllm/db.cljs b/openllm-contrib/clojure/src/main/openllm/db.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/db.cljs rename to openllm-contrib/clojure/src/main/openllm/db.cljs diff --git a/contrib/clojure/src/main/openllm/events.cljs b/openllm-contrib/clojure/src/main/openllm/events.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/events.cljs rename to openllm-contrib/clojure/src/main/openllm/events.cljs diff --git a/contrib/clojure/src/main/openllm/subs.cljs b/openllm-contrib/clojure/src/main/openllm/subs.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/subs.cljs rename to openllm-contrib/clojure/src/main/openllm/subs.cljs diff --git a/contrib/clojure/src/main/openllm/util.cljs b/openllm-contrib/clojure/src/main/openllm/util.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/util.cljs rename to openllm-contrib/clojure/src/main/openllm/util.cljs diff --git a/contrib/clojure/src/main/openllm/views.cljs b/openllm-contrib/clojure/src/main/openllm/views.cljs similarity index 100% rename from contrib/clojure/src/main/openllm/views.cljs rename to openllm-contrib/clojure/src/main/openllm/views.cljs diff --git a/contrib/clojure/tailwind.config.js b/openllm-contrib/clojure/tailwind.config.js similarity index 100% rename from contrib/clojure/tailwind.config.js rename to openllm-contrib/clojure/tailwind.config.js diff --git a/openllm-python/CHANGELOG.md b/openllm-python/CHANGELOG.md index e03b3d39..6e8e0259 100644 --- a/openllm-python/CHANGELOG.md +++ b/openllm-python/CHANGELOG.md @@ -39,7 +39,7 @@ This changelog is managed by towncrier and is compiled at release time. - OpenLLM now include a community-maintained ClojureScript UI, Thanks @GutZuFusss - See [this README.md](/contrib/clojure/README.md) for more information + See [this README.md](/openllm-contrib/clojure/README.md) for more information OpenLLM will also include a `--cors` to enable start with cors enabled. [#89](https://github.com/bentoml/openllm/issues/89) diff --git a/openllm-python/README.md b/openllm-python/README.md index 3ce8b7fa..cf7afaab 100644 --- a/openllm-python/README.md +++ b/openllm-python/README.md @@ -543,10 +543,10 @@ client.embed("I like to eat apples") The following UIs are currently available for OpenLLM: -| UI | Owner | Type | Progress | -|-----------------------------------------------------------------------------------|-----------------------------------------------|----------------------|----------| -| [Clojure](https://github.com/bentoml/OpenLLM/blob/main/contrib/clojure/README.md) | [@GutZuFusss](https://github.com/GutZuFusss) | Community-maintained | 🔧 | -| TS | BentoML Team | | 🚧 | +| UI | Owner | Type | Progress | +|-------------------------------------------------------------------------------------------|----------------------------------------------|----------------------|----------| +| [Clojure](https://github.com/bentoml/OpenLLM/blob/main/openllm-contrib/clojure/README.md) | [@GutZuFusss](https://github.com/GutZuFusss) | Community-maintained | 🔧 | +| TS | BentoML Team | | 🚧 | ## ⚙️ Integrations diff --git a/package.json b/package.json index 7e29744a..2950642e 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "workspaces": [ "openllm-node", - "contrib/clojure" + "openllm-contrib/clojure" ], "private": true, "devDependencies": {