Skip to content

Commit 308085b

Browse files
authored
remove trunk, update links (#226)
1 parent 01115af commit 308085b

File tree

8 files changed

+19
-255
lines changed

8 files changed

+19
-255
lines changed

.github/actions/build-and-push-to-quay/action.yml

-152
This file was deleted.

.github/runs-on.yml

-3
This file was deleted.

.github/workflows/build-vector-serve.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
docker push ghcr.io/chuckhend/vector-serve:${{ steps.versions.outputs.SHORT_SHA }}-amd64
7777
7878
- name: Build and push -- Release
79-
# if: github.ref == 'refs/heads/main'
79+
if: github.ref == 'refs/heads/main'
8080
run: |
8181
docker build \
8282
-f ./vector-serve/Dockerfile \
@@ -115,7 +115,7 @@ jobs:
115115
docker push ghcr.io/chuckhend/vector-serve:${{ steps.versions.outputs.SHORT_SHA }}-arm64
116116
117117
- name: Build and push -- Release
118-
# if: github.ref == 'refs/heads/main'
118+
if: github.ref == 'refs/heads/main'
119119
run: |
120120
docker build \
121121
-f ./vector-serve/Dockerfile \
@@ -161,7 +161,7 @@ jobs:
161161
162162
- name: Create and push Docker manifest -- latest (main)
163163
# only push latest off main
164-
# if: github.ref == 'refs/heads/main'
164+
if: github.ref == 'refs/heads/main'
165165
run: |
166166
docker manifest create \
167167
ghcr.io/chuckhend/vector-serve:latest \

.github/workflows/extension_ci.yml

+2-42
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
7474
- name: Test Core - Integration
7575
# skip when on external forks
76-
if: github.repository_owner == 'tembo-io'
76+
if: github.repository_owner == 'ChuckHend'
7777
env:
7878
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
7979
CO_API_KEY: ${{ secrets.CO_API_KEY }}
@@ -117,51 +117,11 @@ jobs:
117117
echo "\q" | make run
118118
make test-unit
119119
- name: integration-test
120-
if: github.repository_owner == 'tembo-io'
120+
if: github.repository_owner == 'ChuckHend'
121121
env:
122122
HF_API_KEY: ${{ secrets.HF_API_KEY }}
123123
CO_API_KEY: ${{ secrets.CO_API_KEY }}
124124
PORTKEY_API_KEY: ${{ secrets.PORTKEY_API_KEY }}
125125
PORTKEY_VIRTUAL_KEY_OPENAI: ${{ secrets.PORTKEY_VIRTUAL_KEY_OPENAI }}
126126
VOYAGE_API_KEY: ${{ secrets.VOYAGE_API_KEY }}
127127
run: make test-integration
128-
129-
publish:
130-
if: github.event_name == 'release'
131-
name: trunk publish
132-
runs-on: ubuntu-24.04
133-
strategy:
134-
matrix:
135-
pg-version: [14, 15, 16, 17]
136-
steps:
137-
- uses: actions/checkout@v2
138-
- name: Install Rust stable toolchain
139-
uses: dtolnay/rust-toolchain@stable
140-
- uses: Swatinem/rust-cache@v2
141-
with:
142-
prefix-key: "pg-vectorize-extension-test"
143-
workspaces: pg-vectorize
144-
# Additional directories to cache
145-
cache-directories: /home/runner/.pgrx
146-
- name: Install stoml and pg-trunk
147-
shell: bash
148-
run: |
149-
set -xe
150-
wget https://github.com/freshautomations/stoml/releases/download/v0.7.1/stoml_linux_amd64 &> /dev/null
151-
mv stoml_linux_amd64 stoml
152-
chmod +x stoml
153-
sudo mv stoml /usr/local/bin/
154-
cargo install pg-trunk
155-
- name: trunk build
156-
working-directory: ./extension
157-
# trunk does not support path dependencies in Cargo.toml that are not within the current working directory
158-
# therefore, we need to move the core crate into the extension directory for the build
159-
run: |
160-
mv ../core ./core
161-
sed -i '0,/..\/core/s//.\/core/' Cargo.toml
162-
~/.cargo/bin/trunk build --pg-version ${{ matrix.pg-version }}
163-
- name: trunk publish
164-
working-directory: ./extension
165-
env:
166-
TRUNK_API_TOKEN: ${{ secrets.TRUNK_AUTH_TOKEN }}
167-
run: ~/.cargo/bin/trunk publish

.github/workflows/pg-image-build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Checkout
3535
uses: actions/checkout@v4
3636

37-
- name: Install stoml and pg-trunk
37+
- name: Install stoml
3838
shell: bash
3939
run: |
4040
set -xe
@@ -96,7 +96,7 @@ jobs:
9696
- name: Set up Docker Buildx
9797
uses: docker/setup-buildx-action@v3
9898

99-
- name: Install stoml and pg-trunk
99+
- name: Install stoml
100100
shell: bash
101101
run: |
102102
set -xe
@@ -170,7 +170,7 @@ jobs:
170170
- name: Set up Docker Buildx
171171
uses: docker/setup-buildx-action@v3
172172

173-
- name: Install stoml and pg-trunk
173+
- name: Install stoml
174174
shell: bash
175175
run: |
176176
set -xe

README.md

+7-27
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,20 @@
11
<h1 align="center">
22
<b>pg_vectorize: a VectorDB for Postgres</b>
3-
<br>
4-
5-
<br/>
6-
<a href="https://tembo.io"><img src="https://github.com/tembo-io/pg_vectorize/assets/15756360/34d65cba-065b-485f-84a4-76284e9def19" alt="pg_vectorize" width="368px"></a>
7-
8-
<p align="center">
9-
<div style="text-align: center;">
10-
<a href="https://cloud.tembo.io/sign-up">
11-
<img src="https://tembo.io/tryFreeButton.svg" alt="Tembo Cloud Try Free">
12-
</a>
13-
</div>
14-
</p>
15-
163
</h1>
174

185
A Postgres extension that automates the transformation and orchestration of text to embeddings and provides hooks into the most popular LLMs. This allows you to do vector search and build LLM applications on existing data with as little as two function calls.
196

20-
This project relies heavily on the work by [pgvector](https://github.com/pgvector/pgvector) for vector similarity search, [pgmq](https://github.com/tembo-io/pgmq) for orchestration in background workers, and [SentenceTransformers](https://huggingface.co/sentence-transformers).
7+
This project relies heavily on the work by [pgvector](https://github.com/pgvector/pgvector) for vector similarity search, [pgmq](https://github.com/pgmq/pgmq) for orchestration in background workers, and [SentenceTransformers](https://huggingface.co/sentence-transformers).
218

229
---
2310

24-
[![Static Badge](https://img.shields.io/badge/%40tembo-community?logo=slack&label=slack)](https://join.slack.com/t/tembocommunity/shared_invite/zt-277pu7chi-NHtvHWvLhHwyK0Y5Y6vTPw)
2511
[![PGXN version](https://badge.fury.io/pg/vectorize.svg)](https://pgxn.org/dist/vectorize/)
2612
[![OSSRank](https://shields.io/endpoint?url=https://ossrank.com/shield/3815)](https://ossrank.com/p/3815)
2713

28-
pg_vectorize powers the [VectorDB Stack](https://tembo.io/docs/product/stacks/ai/vectordb) on [Tembo Cloud](https://cloud.tembo.io/) and is available in all hobby tier instances.
2914

30-
**API Documentation**: https://tembo.io/pg_vectorize/
15+
**API Documentation**: https://chuckhend.github.io/pg_vectorize/
3116

32-
**Source**: https://github.com/tembo-io/pg_vectorize
17+
**Source**: https://github.com/ChuckHend/pg_vectorize
3318

3419
## Features
3520

@@ -51,7 +36,7 @@ pg_vectorize powers the [VectorDB Stack](https://tembo.io/docs/product/stacks/ai
5136

5237
## Installation
5338

54-
The fastest way to get started is by running the Tembo docker container and the vector server with docker compose:
39+
The fastest way to get started is by using [docker compose](https://docs.docker.com/compose/).
5540

5641
```bash
5742
docker compose up -d
@@ -82,7 +67,7 @@ Rust:
8267
Postgres Extensions:
8368

8469
- [pg_cron](https://github.com/citusdata/pg_cron) ^1.5
85-
- [pgmq](https://github.com/tembo-io/pgmq) ^1
70+
- [pgmq](https://github.com/pgmq/pgmq) ^1
8671
- [pgvector](https://github.com/pgvector/pgvector) ^0.5.0
8772

8873
Then set the following either in postgresql.conf or as a configuration parameter:
@@ -106,7 +91,7 @@ SELECT pg_reload_conf();
10691

10792
## Vector Search Example
10893

109-
Text-to-embedding transformation can be done with either Hugging Face's Sentence-Transformers or OpenAI's embeddings. The following examples use Hugging Face's Sentence-Transformers. See the project [documentation](https://tembo.io/pg_vectorize/examples/openai_embeddings/) for OpenAI examples.
94+
Text-to-embedding transformation can be done with either Hugging Face's Sentence-Transformers or OpenAI's embeddings. The following examples use Hugging Face's Sentence-Transformers. See the project [documentation](https://chuckhend.github.io/pg_vectorize/examples/openai_embeddings/) for OpenAI examples.
11095

11196
Follow the [installation](#installation) steps if you haven't already.
11297

@@ -336,9 +321,4 @@ The embeddings must match the dimensions of the specified transformer model. Thi
336321

337322
## Contributing
338323

339-
We welcome contributions from the community! If you're interested in contributing to `pg_vectorize`, please check out our [Contributing Guide](CONTRIBUTING.md). Your contributions help make this project better for everyone.
340-
341-
## Community Support
342-
343-
If you encounter any issues or have any questions, feel free to join our [Tembo Community Slack](https://join.slack.com/t/tembocommunity/shared_invite/zt-2u3ctm86u-XzcyL76T7o~7Mpnt6KUx1g). We're here to help!
344-
324+
We welcome contributions from the community! If you're interested in contributing to `pg_vectorize`, please check out our [Contributing Guide](CONTRIBUTING.md). You can also open an issue.

extension/Makefile

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SQLX_OFFLINE:=true
2-
DISTNAME = $(shell grep -m 1 '^name' Trunk.toml | sed -e 's/[^"]*"\([^"]*\)",\{0,1\}/\1/')
3-
DISTVERSION = $(shell grep -m 1 '^version' Trunk.toml | sed -e 's/[^"]*"\([^"]*\)",\{0,1\}/\1/')
2+
DISTNAME = $(shell grep -m 1 '^name' Cargo.toml | sed -e 's/[^"]*"\([^"]*\)",\{0,1\}/\1/')
3+
DISTVERSION = $(shell grep -m 1 '^version' Cargo.toml | sed -e 's/[^"]*"\([^"]*\)",\{0,1\}/\1/')
44
PG_VERSION:=17
55
DATABASE_URL:=postgres://${USER}:${USER}@localhost:288${PG_VERSION}/postgres
66
PGRX_PG_CONFIG:=$(shell cargo pgrx info pg-config pg${PG_VERSION})
@@ -26,7 +26,7 @@ format:
2626
run:
2727
SQLX_OFFLINE=${SQLX_OFFLINE} DATABASE_URL=${DATABASE_URL} cargo pgrx run pg${PG_VERSION} postgres
2828

29-
META.json: META.json.in Trunk.toml
29+
META.json: META.json.in
3030
@sed "s/@CARGO_VERSION@/$(DISTVERSION)/g" META.json.in > META.json
3131

3232
# `git archive` only archives committed stuff, so use `git stash create` to
@@ -50,13 +50,6 @@ setup: setup.dependencies setup.shared_preload_libraries setup.urls
5050
cat-logs:
5151
cat ~/.pgrx/${PG_VERSION}.log
5252

53-
# install dependencies from trunk (limited OS/arch)
54-
trunk-dependencies:
55-
trunk install pgvector --pg-config ${PGRX_PG_CONFIG}
56-
trunk install pgmq --pg-config ${PGRX_PG_CONFIG}
57-
trunk install pg_cron --pg-config ${PGRX_PG_CONFIG}
58-
trunk install vectorscale --pg-config ${PGRX_PG_CONFIG}
59-
6053
install-pg_cron:
6154
git clone https://github.com/citusdata/pg_cron.git && \
6255
cd pg_cron && \
@@ -74,7 +67,7 @@ install-pgvector:
7467
cd .. && rm -rf pgvector
7568

7669
install-pgmq:
77-
git clone https://github.com/tembo-io/pgmq.git && \
70+
git clone https://github.com/pgmq/pgmq.git && \
7871
cd pgmq/pgmq-extension && \
7972
PG_CONFIG=${PGRX_PG_CONFIG} make clean && \
8073
PG_CONFIG=${PGRX_PG_CONFIG} make && \

0 commit comments

Comments
 (0)