🌐 AI搜索 & 代理 主页
Skip to content

Commit 29edeb2

Browse files
SilasMarvinSilasMarvin
authored
Changed pgml.sdk_splitters to pgml.splitters (#938)
1 parent 16e8f39 commit 29edeb2

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

‎pgml-sdks/rust/pgml/javascript/tests/typescript-tests/test.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if (!DATABASE_URL) {
1616
}
1717
const LOG_LEVEL = process.env.LOG_LEVEL ? process.env.LOG_LEVEL : "ERROR";
1818

19-
pgml.js_init_logger(DATABASE_URL, LOG_LEVEL);
19+
pgml.js_init_logger(LOG_LEVEL);
2020

2121
const generate_dummy_documents = (count: number) => {
2222
let docs = [];
@@ -127,9 +127,10 @@ it("pipeline to dict", async () => {
127127
let model = pgml.newModel("text-embedding-ada-002", "openai");
128128
let splitter = pgml.newSplitter();
129129
let pipeline = pgml.newPipeline("test_j_p_ptd_0", model, splitter);
130-
let collection = pgml.newCollection("test_j_c_ptd_1");
130+
let collection = pgml.newCollection("test_j_c_ptd_2");
131131
await collection.add_pipeline(pipeline);
132132
let pipeline_dict = await pipeline.to_dict();
133133
console.log(JSON.stringify(pipeline_dict))
134134
expect(pipeline_dict["name"]).toBe("test_j_p_ptd_0");
135+
await collection.archive();
135136
});

‎pgml-sdks/rust/pgml/src/collection.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ impl Collection {
939939
FROM
940940
%s p
941941
INNER JOIN pgml.models m ON p.model_id = m.id
942-
INNER JOIN pgml.sdk_splitters s ON p.splitter_id = s.id
942+
INNER JOIN pgml.splitters s ON p.splitter_id = s.id
943943
WHERE
944944
p.active = TRUE
945945
"#,
@@ -1002,7 +1002,7 @@ impl Collection {
10021002
FROM
10031003
%s p
10041004
INNER JOIN pgml.models m ON p.model_id = m.id
1005-
INNER JOIN pgml.sdk_splitters s ON p.splitter_id = s.id
1005+
INNER JOIN pgml.splitters s ON p.splitter_id = s.id
10061006
WHERE
10071007
p.active = TRUE
10081008
AND p.name = $1

‎pgml-sdks/rust/pgml/src/pipeline.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ impl Pipeline {
257257
self.model = Some(model);
258258

259259
let splitter: models::Splitter =
260-
sqlx::query_as("SELECT * FROM pgml.sdk_splitters WHERE id = $1")
260+
sqlx::query_as("SELECT * FROM pgml.splitters WHERE id = $1")
261261
.bind(p.splitter_id)
262262
.fetch_one(&pool)
263263
.await?;

‎pgml-sdks/rust/pgml/src/queries.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CREATE TABLE IF NOT EXISTS %s (
1818
name text NOT NULL,
1919
created_at timestamp NOT NULL DEFAULT now(),
2020
model_id int8 NOT NULL REFERENCES pgml.models ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
21-
splitter_id int8 NOT NULL REFERENCES pgml.sdk_splitters ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
21+
splitter_id int8 NOT NULL REFERENCES pgml.splitters ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
2222
active BOOLEAN NOT NULL DEFAULT TRUE,
2323
parameters jsonb NOT NULL DEFAULT '{}',
2424
UNIQUE (name)
@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS %s (
3737
"#;
3838

3939
pub const CREATE_SPLITTERS_TABLE: &str = r#"
40-
CREATE TABLE IF NOT EXISTS pgml.sdk_splitters (
40+
CREATE TABLE IF NOT EXISTS pgml.splitters (
4141
id serial8 PRIMARY KEY,
4242
created_at timestamp NOT NULL DEFAULT now(),
4343
name text NOT NULL,
@@ -49,7 +49,7 @@ CREATE TABLE IF NOT EXISTS pgml.sdk_splitters (
4949
pub const CREATE_CHUNKS_TABLE: &str = r#"CREATE TABLE IF NOT EXISTS %s (
5050
id serial8 PRIMARY KEY, created_at timestamp NOT NULL DEFAULT now(),
5151
document_id int8 NOT NULL REFERENCES %s ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
52-
splitter_id int8 NOT NULL REFERENCES pgml.sdk_splitters ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
52+
splitter_id int8 NOT NULL REFERENCES pgml.splitters ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED,
5353
chunk_index int8 NOT NULL,
5454
chunk text NOT NULL,
5555
UNIQUE (document_id, splitter_id, chunk_index)
@@ -241,7 +241,7 @@ WITH splitter as (
241241
name,
242242
parameters
243243
FROM
244-
pgml.sdk_splitters
244+
pgml.splitters
245245
WHERE
246246
id = $1
247247
)
@@ -291,7 +291,7 @@ WITH splitter as (
291291
name,
292292
parameters
293293
FROM
294-
pgml.sdk_splitters
294+
pgml.splitters
295295
WHERE
296296
id = $1
297297
)

‎pgml-sdks/rust/pgml/src/splitter.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl Splitter {
7272
.expect("Cannot verify splitter without project info");
7373

7474
let splitter: Option<models::Splitter> = sqlx::query_as(
75-
"SELECT * FROM pgml.sdk_splitters WHERE project_id = $1 AND name = $2 and parameters = $3",
75+
"SELECT * FROM pgml.splitters WHERE project_id = $1 AND name = $2 and parameters = $3",
7676
)
7777
.bind(project_info.id)
7878
.bind(&self.name)
@@ -85,7 +85,7 @@ impl Splitter {
8585
s
8686
} else {
8787
sqlx::query_as(
88-
"INSERT INTO pgml.sdk_splitters (project_id, name, parameters) VALUES ($1, $2, $3) RETURNING *",
88+
"INSERT INTO pgml.splitters (project_id, name, parameters) VALUES ($1, $2, $3) RETURNING *",
8989
)
9090
.bind(project_info.id)
9191
.bind(&self.name)

0 commit comments

Comments
 (0)