sonamu 0.7.4 → 0.7.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/config.d.ts +1 -4
- package/dist/api/config.d.ts.map +1 -1
- package/dist/api/config.js +1 -1
- package/dist/api/sonamu.d.ts +2 -0
- package/dist/api/sonamu.d.ts.map +1 -1
- package/dist/api/sonamu.js +19 -47
- package/dist/bin/cli.js +6 -6
- package/dist/database/base-model.d.ts +1 -1
- package/dist/database/base-model.d.ts.map +1 -1
- package/dist/database/base-model.js +15 -4
- package/dist/database/code-generator.d.ts.map +1 -1
- package/dist/database/code-generator.js +3 -3
- package/dist/database/db.d.ts.map +1 -1
- package/dist/database/db.js +1 -1
- package/dist/database/puri-wrapper.d.ts +11 -11
- package/dist/database/puri-wrapper.d.ts.map +1 -1
- package/dist/database/puri-wrapper.js +7 -11
- package/dist/database/puri.d.ts +36 -17
- package/dist/database/puri.d.ts.map +1 -1
- package/dist/database/puri.js +54 -7
- package/dist/database/puri.types.d.ts +54 -17
- package/dist/database/puri.types.d.ts.map +1 -1
- package/dist/database/puri.types.js +2 -4
- package/dist/database/puri.types.test-d.js +129 -0
- package/dist/database/upsert-builder.d.ts +16 -10
- package/dist/database/upsert-builder.d.ts.map +1 -1
- package/dist/database/upsert-builder.js +10 -19
- package/dist/entity/entity-manager.d.ts +113 -22
- package/dist/entity/entity-manager.d.ts.map +1 -1
- package/dist/entity/entity-manager.js +1 -1
- package/dist/entity/entity.d.ts +34 -0
- package/dist/entity/entity.d.ts.map +1 -1
- package/dist/entity/entity.js +110 -37
- package/dist/index.d.ts +5 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -2
- package/dist/migration/code-generation.d.ts.map +1 -1
- package/dist/migration/code-generation.js +341 -149
- package/dist/migration/migration-set.d.ts.map +1 -1
- package/dist/migration/migration-set.js +21 -5
- package/dist/migration/migrator.d.ts.map +1 -1
- package/dist/migration/migrator.js +7 -1
- package/dist/migration/postgresql-schema-reader.d.ts +11 -1
- package/dist/migration/postgresql-schema-reader.d.ts.map +1 -1
- package/dist/migration/postgresql-schema-reader.js +111 -10
- package/dist/syncer/syncer.d.ts.map +1 -1
- package/dist/syncer/syncer.js +4 -3
- package/dist/template/implementations/generated.template.d.ts.map +1 -1
- package/dist/template/implementations/generated.template.js +12 -2
- package/dist/template/implementations/generated_sso.template.d.ts +3 -3
- package/dist/template/implementations/generated_sso.template.d.ts.map +1 -1
- package/dist/template/implementations/generated_sso.template.js +50 -2
- package/dist/template/implementations/model.template.js +6 -6
- package/dist/template/implementations/model_test.template.js +4 -4
- package/dist/template/implementations/view_enums_dropdown.template.js +2 -2
- package/dist/template/implementations/view_enums_select.template.js +2 -2
- package/dist/template/implementations/view_form.template.d.ts.map +1 -1
- package/dist/template/implementations/view_form.template.js +12 -9
- package/dist/template/implementations/view_id_async_select.template.js +4 -4
- package/dist/template/implementations/view_list.template.d.ts.map +1 -1
- package/dist/template/implementations/view_list.template.js +12 -9
- package/dist/template/implementations/view_search_input.template.js +2 -2
- package/dist/template/template.js +2 -2
- package/dist/template/zod-converter.d.ts.map +1 -1
- package/dist/template/zod-converter.js +17 -2
- package/dist/testing/fixture-manager.d.ts +2 -1
- package/dist/testing/fixture-manager.d.ts.map +1 -1
- package/dist/testing/fixture-manager.js +29 -29
- package/dist/types/types.d.ts +593 -68
- package/dist/types/types.d.ts.map +1 -1
- package/dist/types/types.js +113 -9
- package/dist/vector/chunking.d.ts +25 -0
- package/dist/vector/chunking.d.ts.map +1 -0
- package/dist/vector/chunking.js +97 -0
- package/dist/vector/config.d.ts +12 -0
- package/dist/vector/config.d.ts.map +1 -0
- package/dist/vector/config.js +83 -0
- package/dist/vector/embedding.d.ts +42 -0
- package/dist/vector/embedding.d.ts.map +1 -0
- package/dist/vector/embedding.js +147 -0
- package/dist/vector/types.d.ts +105 -0
- package/dist/vector/types.d.ts.map +1 -0
- package/dist/vector/types.js +5 -0
- package/dist/vector/vector-search.d.ts +47 -0
- package/dist/vector/vector-search.d.ts.map +1 -0
- package/dist/vector/vector-search.js +176 -0
- package/package.json +9 -8
- package/src/api/config.ts +0 -4
- package/src/api/sonamu.ts +21 -36
- package/src/bin/cli.ts +5 -5
- package/src/database/base-model.ts +20 -11
- package/src/database/code-generator.ts +6 -2
- package/src/database/db.ts +1 -0
- package/src/database/puri-wrapper.ts +22 -16
- package/src/database/puri.ts +150 -27
- package/src/database/puri.types.test-d.ts +457 -0
- package/src/database/puri.types.ts +231 -33
- package/src/database/upsert-builder.ts +43 -34
- package/src/entity/entity-manager.ts +2 -2
- package/src/entity/entity.ts +134 -44
- package/src/index.ts +6 -0
- package/src/migration/code-generation.ts +377 -174
- package/src/migration/migration-set.ts +22 -3
- package/src/migration/migrator.ts +6 -0
- package/src/migration/postgresql-schema-reader.ts +121 -21
- package/src/syncer/syncer.ts +3 -2
- package/src/template/implementations/generated.template.ts +51 -9
- package/src/template/implementations/generated_sso.template.ts +71 -2
- package/src/template/implementations/model.template.ts +5 -5
- package/src/template/implementations/model_test.template.ts +3 -3
- package/src/template/implementations/view_enums_dropdown.template.ts +1 -1
- package/src/template/implementations/view_enums_select.template.ts +1 -1
- package/src/template/implementations/view_form.template.ts +11 -8
- package/src/template/implementations/view_id_async_select.template.ts +3 -3
- package/src/template/implementations/view_list.template.ts +11 -8
- package/src/template/implementations/view_search_input.template.ts +1 -1
- package/src/template/template.ts +1 -1
- package/src/template/zod-converter.ts +20 -0
- package/src/testing/fixture-manager.ts +31 -30
- package/src/types/types.ts +226 -48
- package/src/vector/chunking.ts +115 -0
- package/src/vector/config.ts +68 -0
- package/src/vector/embedding.ts +193 -0
- package/src/vector/types.ts +122 -0
- package/src/vector/vector-search.ts +261 -0
- package/dist/template/implementations/view_enums_buttonset.template.d.ts +0 -17
- package/dist/template/implementations/view_enums_buttonset.template.d.ts.map +0 -1
- package/dist/template/implementations/view_enums_buttonset.template.js +0 -31
- package/dist/template/implementations/view_list_columns.template.d.ts +0 -17
- package/dist/template/implementations/view_list_columns.template.d.ts.map +0 -1
- package/dist/template/implementations/view_list_columns.template.js +0 -49
- package/src/template/implementations/view_enums_buttonset.template.ts +0 -34
- package/src/template/implementations/view_list_columns.template.ts +0 -53
|
@@ -0,0 +1,176 @@
|
|
|
1
|
+
import pgvector from "pgvector/knex";
|
|
2
|
+
import { DEFAULT_VECTOR_CONFIG } from "./config.js";
|
|
3
|
+
import { Embedding } from "./embedding.js";
|
|
4
|
+
/**
|
|
5
|
+
* 벡터 검색
|
|
6
|
+
* pgvector를 활용한 벡터 검색 및 하이브리드 검색 지원
|
|
7
|
+
*/ export class VectorSearch {
|
|
8
|
+
db;
|
|
9
|
+
config;
|
|
10
|
+
embedding;
|
|
11
|
+
tableName;
|
|
12
|
+
constructor(db, tableName, config = {}){
|
|
13
|
+
this.db = db;
|
|
14
|
+
this.tableName = tableName;
|
|
15
|
+
this.config = {
|
|
16
|
+
voyage: {
|
|
17
|
+
...DEFAULT_VECTOR_CONFIG.voyage,
|
|
18
|
+
...config.voyage
|
|
19
|
+
},
|
|
20
|
+
openai: {
|
|
21
|
+
...DEFAULT_VECTOR_CONFIG.openai,
|
|
22
|
+
...config.openai
|
|
23
|
+
},
|
|
24
|
+
chunking: {
|
|
25
|
+
...DEFAULT_VECTOR_CONFIG.chunking,
|
|
26
|
+
...config.chunking
|
|
27
|
+
},
|
|
28
|
+
search: {
|
|
29
|
+
...DEFAULT_VECTOR_CONFIG.search,
|
|
30
|
+
...config.search
|
|
31
|
+
},
|
|
32
|
+
pgvector: {
|
|
33
|
+
...DEFAULT_VECTOR_CONFIG.pgvector,
|
|
34
|
+
...config.pgvector
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
this.embedding = new Embedding(config);
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* 단일 항목에 임베딩 저장
|
|
41
|
+
*/ async saveEmbedding(id, text, provider, embeddingColumn = "content_embedding") {
|
|
42
|
+
const { embedding } = await this.embedding.embedOne(text, provider, "document");
|
|
43
|
+
await this.db(this.tableName).where("id", id).update({
|
|
44
|
+
[embeddingColumn]: pgvector.toSql(embedding)
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* 여러 항목에 임베딩 일괄 저장
|
|
49
|
+
*/ async saveEmbeddingsBatch(items, provider, embeddingColumn = "content_embedding", onProgress) {
|
|
50
|
+
const texts = items.map((item)=>item.text);
|
|
51
|
+
const embeddings = await this.embedding.embedBatch(texts, provider, "document", onProgress);
|
|
52
|
+
await this.db.transaction(async (trx)=>{
|
|
53
|
+
for(let i = 0; i < items.length; i++){
|
|
54
|
+
await trx(this.tableName).where("id", items[i].id).update({
|
|
55
|
+
[embeddingColumn]: pgvector.toSql(embeddings[i].embedding)
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* 벡터 검색 (코사인 유사도)
|
|
62
|
+
*/ async search(query, provider, options = {}) {
|
|
63
|
+
const { embeddingColumn = "content_embedding", limit = this.config.search.defaultLimit, threshold = this.config.search.similarityThreshold, where } = options;
|
|
64
|
+
// 쿼리 임베딩 (input_type: 'query' 중요!)
|
|
65
|
+
const { embedding } = await this.embedding.embedOne(query, provider, "query");
|
|
66
|
+
// pgvector 세션 설정
|
|
67
|
+
if (this.config.pgvector.iterativeScan) {
|
|
68
|
+
await this.db.raw("SET hnsw.iterative_scan = relaxed_order");
|
|
69
|
+
}
|
|
70
|
+
await this.db.raw(`SET hnsw.ef_search = ${this.config.pgvector.efSearch}`);
|
|
71
|
+
// 코사인 유사도 = 1 - 코사인 거리
|
|
72
|
+
const vectorStr = pgvector.toSql(embedding);
|
|
73
|
+
let queryBuilder = this.db(this.tableName).select("*").select(this.db.raw(`1 - (${embeddingColumn} <=> ?::vector) AS similarity`, [
|
|
74
|
+
vectorStr
|
|
75
|
+
])).whereNotNull(embeddingColumn).orderByRaw(`${embeddingColumn} <=> ?::vector`, [
|
|
76
|
+
vectorStr
|
|
77
|
+
]).limit(limit);
|
|
78
|
+
if (where) {
|
|
79
|
+
queryBuilder = queryBuilder.whereRaw(where);
|
|
80
|
+
}
|
|
81
|
+
const rows = await queryBuilder;
|
|
82
|
+
return rows.filter((row)=>row.similarity >= threshold).map((row)=>({
|
|
83
|
+
id: row.id,
|
|
84
|
+
similarity: parseFloat(String(row.similarity)),
|
|
85
|
+
data: row
|
|
86
|
+
}));
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
* 하이브리드 검색 (Vector + FTS)
|
|
90
|
+
*/ async hybridSearch(query, provider, options = {}) {
|
|
91
|
+
const { embeddingColumn = "content_embedding", ftsColumn = "content_tsv", limit = this.config.search.defaultLimit, vectorWeight = this.config.search.vectorWeight, ftsWeight = this.config.search.ftsWeight } = options;
|
|
92
|
+
const { embedding } = await this.embedding.embedOne(query, provider, "query");
|
|
93
|
+
const vectorStr = pgvector.toSql(embedding);
|
|
94
|
+
// pgvector 세션 설정
|
|
95
|
+
if (this.config.pgvector.iterativeScan) {
|
|
96
|
+
await this.db.raw("SET hnsw.iterative_scan = relaxed_order");
|
|
97
|
+
}
|
|
98
|
+
await this.db.raw(`SET hnsw.ef_search = ${this.config.pgvector.efSearch}`);
|
|
99
|
+
const sql = `
|
|
100
|
+
WITH vector_search AS (
|
|
101
|
+
SELECT
|
|
102
|
+
id,
|
|
103
|
+
ROW_NUMBER() OVER (ORDER BY ${embeddingColumn} <=> ?::vector) AS rank
|
|
104
|
+
FROM ${this.tableName}
|
|
105
|
+
WHERE ${embeddingColumn} IS NOT NULL
|
|
106
|
+
ORDER BY ${embeddingColumn} <=> ?::vector
|
|
107
|
+
LIMIT 50
|
|
108
|
+
),
|
|
109
|
+
fts_search AS (
|
|
110
|
+
SELECT
|
|
111
|
+
id,
|
|
112
|
+
ROW_NUMBER() OVER (ORDER BY ts_rank(${ftsColumn}, query) DESC) AS rank
|
|
113
|
+
FROM ${this.tableName}, plainto_tsquery('simple', ?) query
|
|
114
|
+
WHERE ${ftsColumn} @@ query
|
|
115
|
+
LIMIT 50
|
|
116
|
+
),
|
|
117
|
+
combined AS (
|
|
118
|
+
SELECT
|
|
119
|
+
COALESCE(v.id, f.id) AS id,
|
|
120
|
+
COALESCE(1.0 / (60 + v.rank), 0) AS vector_score,
|
|
121
|
+
COALESCE(1.0 / (60 + f.rank), 0) AS fts_score
|
|
122
|
+
FROM vector_search v
|
|
123
|
+
FULL OUTER JOIN fts_search f ON v.id = f.id
|
|
124
|
+
)
|
|
125
|
+
SELECT
|
|
126
|
+
t.*,
|
|
127
|
+
c.vector_score,
|
|
128
|
+
c.fts_score,
|
|
129
|
+
(c.vector_score * ? + c.fts_score * ?) AS similarity
|
|
130
|
+
FROM combined c
|
|
131
|
+
JOIN ${this.tableName} t ON c.id = t.id
|
|
132
|
+
ORDER BY similarity DESC
|
|
133
|
+
LIMIT ?
|
|
134
|
+
`;
|
|
135
|
+
const { rows } = await this.db.raw(sql, [
|
|
136
|
+
vectorStr,
|
|
137
|
+
vectorStr,
|
|
138
|
+
query,
|
|
139
|
+
vectorWeight,
|
|
140
|
+
ftsWeight,
|
|
141
|
+
limit
|
|
142
|
+
]);
|
|
143
|
+
return rows.map((row)=>({
|
|
144
|
+
id: row.id,
|
|
145
|
+
similarity: parseFloat(String(row.similarity)),
|
|
146
|
+
vectorScore: parseFloat(String(row.vector_score)),
|
|
147
|
+
ftsScore: parseFloat(String(row.fts_score)),
|
|
148
|
+
data: row
|
|
149
|
+
}));
|
|
150
|
+
}
|
|
151
|
+
/**
|
|
152
|
+
* 임베딩 현황 조회
|
|
153
|
+
*/ async getEmbeddingStatus(embeddingColumn = "content_embedding") {
|
|
154
|
+
const result = await this.db(this.tableName).count("* as total").count(`${embeddingColumn} as with_embedding`).first();
|
|
155
|
+
const total = parseInt(String(result?.total ?? 0), 10);
|
|
156
|
+
const withEmbedding = parseInt(String(result?.with_embedding ?? 0), 10);
|
|
157
|
+
return {
|
|
158
|
+
total,
|
|
159
|
+
withEmbedding,
|
|
160
|
+
withoutEmbedding: total - withEmbedding
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
/**
|
|
164
|
+
* 임베딩이 없는 항목 ID 조회
|
|
165
|
+
*/ async getItemsWithoutEmbedding(embeddingColumn = "content_embedding", limit = 100) {
|
|
166
|
+
const rows = await this.db(this.tableName).select("id").whereNull(embeddingColumn).orderBy("id").limit(limit);
|
|
167
|
+
return rows.map((row)=>row.id);
|
|
168
|
+
}
|
|
169
|
+
/**
|
|
170
|
+
* Embedding 인스턴스 반환 (고급 사용)
|
|
171
|
+
*/ getEmbedding() {
|
|
172
|
+
return this.embedding;
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"sources":["../../src/vector/vector-search.ts"],"sourcesContent":["import type { Knex } from \"knex\";\nimport pgvector from \"pgvector/knex\";\nimport { DEFAULT_VECTOR_CONFIG } from \"./config\";\nimport { Embedding } from \"./embedding\";\nimport type {\n  EmbeddingItem,\n  EmbeddingProvider,\n  HybridSearchOptions,\n  HybridSearchResult,\n  ProgressCallback,\n  VectorConfig,\n  VectorSearchOptions,\n  VectorSearchResult,\n} from \"./types\";\n\n/**\n * 벡터 검색\n * pgvector를 활용한 벡터 검색 및 하이브리드 검색 지원\n */\nexport class VectorSearch<T = Record<string, unknown>> {\n  private db: Knex;\n  private config: VectorConfig;\n  private embedding: Embedding;\n  private tableName: string;\n\n  constructor(db: Knex, tableName: string, config: Partial<VectorConfig> = {}) {\n    this.db = db;\n    this.tableName = tableName;\n    this.config = {\n      voyage: { ...DEFAULT_VECTOR_CONFIG.voyage, ...config.voyage },\n      openai: { ...DEFAULT_VECTOR_CONFIG.openai, ...config.openai },\n      chunking: { ...DEFAULT_VECTOR_CONFIG.chunking, ...config.chunking },\n      search: { ...DEFAULT_VECTOR_CONFIG.search, ...config.search },\n      pgvector: { ...DEFAULT_VECTOR_CONFIG.pgvector, ...config.pgvector },\n    };\n    this.embedding = new Embedding(config);\n  }\n\n  /**\n   * 단일 항목에 임베딩 저장\n   */\n  async saveEmbedding(\n    id: number,\n    text: string,\n    provider: EmbeddingProvider,\n    embeddingColumn: string = \"content_embedding\",\n  ): Promise<void> {\n    const { embedding } = await this.embedding.embedOne(text, provider, \"document\");\n\n    await this.db(this.tableName)\n      .where(\"id\", id)\n      .update({\n        [embeddingColumn]: pgvector.toSql(embedding),\n      });\n  }\n\n  /**\n   * 여러 항목에 임베딩 일괄 저장\n   */\n  async saveEmbeddingsBatch(\n    items: EmbeddingItem[],\n    provider: EmbeddingProvider,\n    embeddingColumn: string = \"content_embedding\",\n    onProgress?: ProgressCallback,\n  ): Promise<void> {\n    const texts = items.map((item) => item.text);\n    const embeddings = await this.embedding.embedBatch(texts, provider, \"document\", onProgress);\n\n    await this.db.transaction(async (trx) => {\n      for (let i = 0; i < items.length; i++) {\n        await trx(this.tableName)\n          .where(\"id\", items[i].id)\n          .update({\n            [embeddingColumn]: pgvector.toSql(embeddings[i].embedding),\n          });\n      }\n    });\n  }\n\n  /**\n   * 벡터 검색 (코사인 유사도)\n   */\n  async search(\n    query: string,\n    provider: EmbeddingProvider,\n    options: VectorSearchOptions = {},\n  ): Promise<VectorSearchResult<T>[]> {\n    const {\n      embeddingColumn = \"content_embedding\",\n      limit = this.config.search.defaultLimit,\n      threshold = this.config.search.similarityThreshold,\n      where,\n    } = options;\n\n    // 쿼리 임베딩 (input_type: 'query' 중요!)\n    const { embedding } = await this.embedding.embedOne(query, provider, \"query\");\n\n    // pgvector 세션 설정\n    if (this.config.pgvector.iterativeScan) {\n      await this.db.raw(\"SET hnsw.iterative_scan = relaxed_order\");\n    }\n    await this.db.raw(`SET hnsw.ef_search = ${this.config.pgvector.efSearch}`);\n\n    // 코사인 유사도 = 1 - 코사인 거리\n    const vectorStr = pgvector.toSql(embedding);\n    let queryBuilder = this.db(this.tableName)\n      .select(\"*\")\n      .select(this.db.raw(`1 - (${embeddingColumn} <=> ?::vector) AS similarity`, [vectorStr]))\n      .whereNotNull(embeddingColumn)\n      .orderByRaw(`${embeddingColumn} <=> ?::vector`, [vectorStr])\n      .limit(limit);\n\n    if (where) {\n      queryBuilder = queryBuilder.whereRaw(where);\n    }\n\n    const rows = await queryBuilder;\n\n    return rows\n      .filter((row: { similarity: number }) => row.similarity >= threshold)\n      .map((row: T & { similarity: number }) => ({\n        id: (row as unknown as { id: number }).id,\n        similarity: parseFloat(String(row.similarity)),\n        data: row as T,\n      }));\n  }\n\n  /**\n   * 하이브리드 검색 (Vector + FTS)\n   */\n  async hybridSearch(\n    query: string,\n    provider: EmbeddingProvider,\n    options: HybridSearchOptions = {},\n  ): Promise<HybridSearchResult<T>[]> {\n    const {\n      embeddingColumn = \"content_embedding\",\n      ftsColumn = \"content_tsv\",\n      limit = this.config.search.defaultLimit,\n      vectorWeight = this.config.search.vectorWeight,\n      ftsWeight = this.config.search.ftsWeight,\n    } = options;\n\n    const { embedding } = await this.embedding.embedOne(query, provider, \"query\");\n    const vectorStr = pgvector.toSql(embedding);\n\n    // pgvector 세션 설정\n    if (this.config.pgvector.iterativeScan) {\n      await this.db.raw(\"SET hnsw.iterative_scan = relaxed_order\");\n    }\n    await this.db.raw(`SET hnsw.ef_search = ${this.config.pgvector.efSearch}`);\n\n    const sql = `\n      WITH vector_search AS (\n        SELECT\n          id,\n          ROW_NUMBER() OVER (ORDER BY ${embeddingColumn} <=> ?::vector) AS rank\n        FROM ${this.tableName}\n        WHERE ${embeddingColumn} IS NOT NULL\n        ORDER BY ${embeddingColumn} <=> ?::vector\n        LIMIT 50\n      ),\n      fts_search AS (\n        SELECT\n          id,\n          ROW_NUMBER() OVER (ORDER BY ts_rank(${ftsColumn}, query) DESC) AS rank\n        FROM ${this.tableName}, plainto_tsquery('simple', ?) query\n        WHERE ${ftsColumn} @@ query\n        LIMIT 50\n      ),\n      combined AS (\n        SELECT\n          COALESCE(v.id, f.id) AS id,\n          COALESCE(1.0 / (60 + v.rank), 0) AS vector_score,\n          COALESCE(1.0 / (60 + f.rank), 0) AS fts_score\n        FROM vector_search v\n        FULL OUTER JOIN fts_search f ON v.id = f.id\n      )\n      SELECT\n        t.*,\n        c.vector_score,\n        c.fts_score,\n        (c.vector_score * ? + c.fts_score * ?) AS similarity\n      FROM combined c\n      JOIN ${this.tableName} t ON c.id = t.id\n      ORDER BY similarity DESC\n      LIMIT ?\n    `;\n\n    const { rows } = await this.db.raw(sql, [\n      vectorStr,\n      vectorStr,\n      query,\n      vectorWeight,\n      ftsWeight,\n      limit,\n    ]);\n\n    return rows.map(\n      (\n        row: T & {\n          similarity: number;\n          vector_score: number;\n          fts_score: number;\n        },\n      ) => ({\n        id: (row as unknown as { id: number }).id,\n        similarity: parseFloat(String(row.similarity)),\n        vectorScore: parseFloat(String(row.vector_score)),\n        ftsScore: parseFloat(String(row.fts_score)),\n        data: row as T,\n      }),\n    );\n  }\n\n  /**\n   * 임베딩 현황 조회\n   */\n  async getEmbeddingStatus(embeddingColumn: string = \"content_embedding\"): Promise<{\n    total: number;\n    withEmbedding: number;\n    withoutEmbedding: number;\n  }> {\n    const result = await this.db(this.tableName)\n      .count(\"* as total\")\n      .count(`${embeddingColumn} as with_embedding`)\n      .first();\n\n    const total = parseInt(String(result?.total ?? 0), 10);\n    const withEmbedding = parseInt(String(result?.with_embedding ?? 0), 10);\n\n    return {\n      total,\n      withEmbedding,\n      withoutEmbedding: total - withEmbedding,\n    };\n  }\n\n  /**\n   * 임베딩이 없는 항목 ID 조회\n   */\n  async getItemsWithoutEmbedding(\n    embeddingColumn: string = \"content_embedding\",\n    limit: number = 100,\n  ): Promise<number[]> {\n    const rows = await this.db(this.tableName)\n      .select(\"id\")\n      .whereNull(embeddingColumn)\n      .orderBy(\"id\")\n      .limit(limit);\n\n    return rows.map((row: { id: number }) => row.id);\n  }\n\n  /**\n   * Embedding 인스턴스 반환 (고급 사용)\n   */\n  getEmbedding(): Embedding {\n    return this.embedding;\n  }\n}\n"],"names":["pgvector","DEFAULT_VECTOR_CONFIG","Embedding","VectorSearch","db","config","embedding","tableName","voyage","openai","chunking","search","saveEmbedding","id","text","provider","embeddingColumn","embedOne","where","update","toSql","saveEmbeddingsBatch","items","onProgress","texts","map","item","embeddings","embedBatch","transaction","trx","i","length","query","options","limit","defaultLimit","threshold","similarityThreshold","iterativeScan","raw","efSearch","vectorStr","queryBuilder","select","whereNotNull","orderByRaw","whereRaw","rows","filter","row","similarity","parseFloat","String","data","hybridSearch","ftsColumn","vectorWeight","ftsWeight","sql","vectorScore","vector_score","ftsScore","fts_score","getEmbeddingStatus","result","count","first","total","parseInt","withEmbedding","with_embedding","withoutEmbedding","getItemsWithoutEmbedding","whereNull","orderBy","getEmbedding"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sonamu",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.5",
|
|
4
4
|
"description": "Sonamu — TypeScript Fullstack API Framework",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"typescript",
|
|
@@ -70,15 +70,16 @@
|
|
|
70
70
|
"minimatch": "^10.0.3",
|
|
71
71
|
"node-sql-parser": "^5.2.0",
|
|
72
72
|
"pg": "^8.16.3",
|
|
73
|
+
"pgvector": "^0.2.1",
|
|
73
74
|
"prompts": "^2.4.2",
|
|
74
75
|
"qs": "^6.11.0",
|
|
75
76
|
"radashi": "^12.2.0",
|
|
76
77
|
"tsicli": "^1.0.5",
|
|
77
78
|
"vitest": "^4.0.10",
|
|
78
79
|
"zod": "^4.1.12",
|
|
80
|
+
"@sonamu-kit/hmr-runner": "^0.1.1",
|
|
79
81
|
"@sonamu-kit/ts-loader": "^2.1.3",
|
|
80
|
-
"@sonamu-kit/hmr-hook": "^0.4.1"
|
|
81
|
-
"@sonamu-kit/hmr-runner": "^0.1.1"
|
|
82
|
+
"@sonamu-kit/hmr-hook": "^0.4.1"
|
|
82
83
|
},
|
|
83
84
|
"devDependencies": {
|
|
84
85
|
"@biomejs/biome": "^2.3.7",
|
|
@@ -94,15 +95,15 @@
|
|
|
94
95
|
"typescript": "^5.9.3"
|
|
95
96
|
},
|
|
96
97
|
"peerDependencies": {
|
|
98
|
+
"@ai-sdk/openai": "^3.0.0-beta.75",
|
|
99
|
+
"@ai-sdk/provider": "^3.0.0-beta.22",
|
|
100
|
+
"@ai-sdk/provider-utils": "^4.0.0-beta.40",
|
|
97
101
|
"@swc/cli": "^0.7.8",
|
|
98
102
|
"@swc/core": "^1.13.5",
|
|
103
|
+
"ai": "^6.0.0-beta.138",
|
|
99
104
|
"fastify": "^4.23.2",
|
|
100
105
|
"knex": "^3.1.0",
|
|
101
|
-
"typescript": "^5.9.3"
|
|
102
|
-
"@ai-sdk/openai": "^3.0.0-beta.75",
|
|
103
|
-
"@ai-sdk/provider": "^3.0.0-beta.22",
|
|
104
|
-
"@ai-sdk/provider-utils": "^4.0.0-beta.40",
|
|
105
|
-
"ai": "^6.0.0-beta.138"
|
|
106
|
+
"typescript": "^5.9.3"
|
|
106
107
|
},
|
|
107
108
|
"peerDependenciesMeta": {
|
|
108
109
|
"@ai-sdk/openai": {
|
package/src/api/config.ts
CHANGED
|
@@ -97,10 +97,6 @@ export type SonamuConfigExport =
|
|
|
97
97
|
| (() => SonamuConfig)
|
|
98
98
|
| (() => Promise<SonamuConfig>);
|
|
99
99
|
|
|
100
|
-
export function defineConfig(config: SonamuConfig): Promise<SonamuConfig>;
|
|
101
|
-
export function defineConfig(config: Promise<SonamuConfig>): Promise<SonamuConfig>;
|
|
102
|
-
export function defineConfig(config: () => SonamuConfig): Promise<SonamuConfig>;
|
|
103
|
-
export function defineConfig(config: () => Promise<SonamuConfig>): Promise<SonamuConfig>;
|
|
104
100
|
export function defineConfig(config: SonamuConfigExport): Promise<SonamuConfig> {
|
|
105
101
|
if (typeof config === "function") {
|
|
106
102
|
return Promise.resolve(config());
|
package/src/api/sonamu.ts
CHANGED
|
@@ -17,6 +17,8 @@ import type { ExtendedApi } from "./decorators";
|
|
|
17
17
|
|
|
18
18
|
export type SonamuSecrets = {
|
|
19
19
|
anthropic_api_key?: string;
|
|
20
|
+
voyage_api_key?: string;
|
|
21
|
+
openai_api_key?: string;
|
|
20
22
|
};
|
|
21
23
|
class SonamuClass {
|
|
22
24
|
public isInitialized: boolean = false;
|
|
@@ -155,10 +157,19 @@ class SonamuClass {
|
|
|
155
157
|
// sonamu.config.ts 기본값 설정
|
|
156
158
|
this.config.database.database = this.config.database.database ?? "postgresql";
|
|
157
159
|
|
|
160
|
+
// API 키 환경변수 로드
|
|
161
|
+
const secrets: SonamuSecrets = {};
|
|
158
162
|
if (process.env.ANTHROPIC_API_KEY) {
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
163
|
+
secrets.anthropic_api_key = process.env.ANTHROPIC_API_KEY;
|
|
164
|
+
}
|
|
165
|
+
if (process.env.VOYAGE_API_KEY) {
|
|
166
|
+
secrets.voyage_api_key = process.env.VOYAGE_API_KEY;
|
|
167
|
+
}
|
|
168
|
+
if (process.env.OPENAI_API_KEY) {
|
|
169
|
+
secrets.openai_api_key = process.env.OPENAI_API_KEY;
|
|
170
|
+
}
|
|
171
|
+
if (Object.keys(secrets).length > 0) {
|
|
172
|
+
this.secrets = secrets;
|
|
162
173
|
}
|
|
163
174
|
|
|
164
175
|
// DB 로드
|
|
@@ -169,16 +180,18 @@ class SonamuClass {
|
|
|
169
180
|
console.log(chalk.green("DB Config Loaded!"));
|
|
170
181
|
}
|
|
171
182
|
|
|
172
|
-
//
|
|
183
|
+
// Entity 로드
|
|
184
|
+
// 테스트에서도 Entity 정보는 필요합니다.
|
|
185
|
+
// upsert가 제대로 작동하려면 entity의 unique index 정보가 필요하기 때문입니다.
|
|
186
|
+
const { EntityManager } = await import("../entity/entity-manager");
|
|
187
|
+
await EntityManager.autoload(doSilent);
|
|
188
|
+
|
|
189
|
+
// 테스팅인 경우 싱크 없이 중단
|
|
173
190
|
if (forTesting) {
|
|
174
191
|
this.isInitialized = true;
|
|
175
192
|
return;
|
|
176
193
|
}
|
|
177
194
|
|
|
178
|
-
// Entity 로드
|
|
179
|
-
const { EntityManager } = await import("../entity/entity-manager");
|
|
180
|
-
await EntityManager.autoload(doSilent);
|
|
181
|
-
|
|
182
195
|
// Syncer
|
|
183
196
|
const { Syncer } = await import("../syncer/syncer");
|
|
184
197
|
this.syncer = new Syncer();
|
|
@@ -387,30 +400,6 @@ class SonamuClass {
|
|
|
387
400
|
// Content-Type
|
|
388
401
|
reply.type(api.options.contentType ?? "application/json");
|
|
389
402
|
|
|
390
|
-
// 캐시
|
|
391
|
-
const { cacheKey, cacheTtl, cachedData } = await (async () => {
|
|
392
|
-
if (config.cache) {
|
|
393
|
-
try {
|
|
394
|
-
const cacheKeyRes = config.cache.resolveKey(api.path, reqBody);
|
|
395
|
-
if (cacheKeyRes.cache === false) {
|
|
396
|
-
return { cacheKey: null, cachedData: null };
|
|
397
|
-
}
|
|
398
|
-
|
|
399
|
-
const cacheKey = cacheKeyRes.key;
|
|
400
|
-
const cacheTtl = cacheKeyRes.ttl;
|
|
401
|
-
const cachedData = await config.cache.get(cacheKey);
|
|
402
|
-
return { cacheKey, cacheTtl, cachedData };
|
|
403
|
-
} catch (e) {
|
|
404
|
-
console.error(e);
|
|
405
|
-
}
|
|
406
|
-
return { cacheKey: null, cachedData: null };
|
|
407
|
-
}
|
|
408
|
-
return { cacheKey: null, cachedData: null };
|
|
409
|
-
})();
|
|
410
|
-
if (cachedData !== null) {
|
|
411
|
-
return cachedData;
|
|
412
|
-
}
|
|
413
|
-
|
|
414
403
|
// createSSEFactory 함수에 미리 request의 socket과 reply를 바인딩.
|
|
415
404
|
const { createSSEFactory } = await import("../stream/sse");
|
|
416
405
|
const createSSE = (<T extends ZodObject>(
|
|
@@ -458,10 +447,6 @@ class SonamuClass {
|
|
|
458
447
|
);
|
|
459
448
|
reply.type(api.options.contentType ?? "application/json");
|
|
460
449
|
|
|
461
|
-
// 캐시 키 있는 경우 갱신 후 저장
|
|
462
|
-
if (config.cache && cacheKey) {
|
|
463
|
-
await config.cache.put(cacheKey, result, cacheTtl);
|
|
464
|
-
}
|
|
465
450
|
return result;
|
|
466
451
|
});
|
|
467
452
|
};
|
package/src/bin/cli.ts
CHANGED
|
@@ -22,7 +22,7 @@ import { BUILD_DIR, SWC_BUILD_COMMAND, TSC_TYPE_CHECK_COMMAND } from "./build-co
|
|
|
22
22
|
let migrator: Migrator;
|
|
23
23
|
|
|
24
24
|
async function bootstrap() {
|
|
25
|
-
const notToInit = ["dev", "build", "start"].includes(process.argv[2] ?? "");
|
|
25
|
+
const notToInit = ["dev", "build", "start", "ui"].includes(process.argv[2] ?? "");
|
|
26
26
|
if (!notToInit) {
|
|
27
27
|
await Sonamu.init(false, false);
|
|
28
28
|
}
|
|
@@ -451,9 +451,11 @@ async function scaffold_model_test(entityId: string) {
|
|
|
451
451
|
|
|
452
452
|
async function ui() {
|
|
453
453
|
try {
|
|
454
|
+
const apiRootPath = findApiRootPath();
|
|
455
|
+
|
|
454
456
|
// 사용자 프로젝트의 패키지들 중에서 @sonamu-kit/ui를 찾습니다.
|
|
455
457
|
// 이를 위해서 createRequire를 사용하여 프로젝트 경로 기준으로 resolve합니다.
|
|
456
|
-
const projectRequire = createRequire(path.join(
|
|
458
|
+
const projectRequire = createRequire(path.join(apiRootPath, "package.json"));
|
|
457
459
|
const uiPackagePath = projectRequire.resolve("@sonamu-kit/ui"); // 없으면 여기서 터져요(MODULE_NOT_FOUND)
|
|
458
460
|
const uiNodePath = path.join(path.dirname(uiPackagePath), "run-ui.js");
|
|
459
461
|
|
|
@@ -481,9 +483,7 @@ async function ui() {
|
|
|
481
483
|
env: {
|
|
482
484
|
...process.env,
|
|
483
485
|
HOT: "yes",
|
|
484
|
-
|
|
485
|
-
API_ROOT_PATH: Sonamu.apiRootPath,
|
|
486
|
-
UI_PORT: (Sonamu.config.ui?.port ?? 57000).toString(),
|
|
486
|
+
API_ROOT_PATH: apiRootPath, // UI는 얘만 알면 돼요! 나머지는 얘가 떠서 알아서 할 것임 ㅎ
|
|
487
487
|
},
|
|
488
488
|
},
|
|
489
489
|
);
|
|
@@ -306,23 +306,32 @@ export class BaseModelClass<
|
|
|
306
306
|
* Flat 레코드를 중첩 객체로 변환
|
|
307
307
|
*
|
|
308
308
|
* - `user__name` → `{ user: { name } }`
|
|
309
|
-
* - nullable relation의 경우
|
|
309
|
+
* - nullable relation의 경우 id 필드가 null이면 객체 자체를 null로
|
|
310
310
|
*/
|
|
311
311
|
hydrate<T extends UnknownDBRecord>(rows: T[]): T[] {
|
|
312
312
|
return rows.map((row: T) => {
|
|
313
|
-
// nullable relation 처리:
|
|
313
|
+
// nullable relation 처리: 그룹의 id 필드가 null이면 객체 전체를 null로
|
|
314
314
|
const nestedKeys = Object.keys(row).filter((key) => key.includes("__"));
|
|
315
315
|
const groups = Object.groupBy(nestedKeys, (key) => key.split("__")[0]);
|
|
316
|
+
|
|
317
|
+
// id 필드가 null인 그룹 찾기 (예: parent__id가 null이면 parent 그룹 전체가 null)
|
|
316
318
|
const nullKeys = Object.entries(groups)
|
|
317
|
-
.filter(
|
|
318
|
-
(
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
319
|
+
.filter(([groupKey, fields]) => {
|
|
320
|
+
if (!fields || fields.length === 0) return false;
|
|
321
|
+
|
|
322
|
+
// 그룹의 id 필드 찾기 (예: "parent__id")
|
|
323
|
+
const idField = `${groupKey}__id`;
|
|
324
|
+
if (idField in row) {
|
|
325
|
+
// id 필드가 null이면 객체 전체가 null
|
|
326
|
+
return row[idField] === null;
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
// id 필드가 없으면 기존 로직: 모든 필드가 null인지 확인
|
|
330
|
+
return fields.every(
|
|
331
|
+
(field) =>
|
|
332
|
+
row[field] === null || (Array.isArray(row[field]) && row[field].length === 0),
|
|
333
|
+
);
|
|
334
|
+
})
|
|
326
335
|
.map(([key]) => key);
|
|
327
336
|
|
|
328
337
|
const hydrated = Object.keys(row).reduce((r, field) => {
|
|
@@ -38,8 +38,12 @@ export class CodeGenerator {
|
|
|
38
38
|
drop: [] as MigrationIndex[],
|
|
39
39
|
};
|
|
40
40
|
const extraIndexes = {
|
|
41
|
-
db: diff(dbIndexes, entityIndexes, (col) =>
|
|
42
|
-
|
|
41
|
+
db: diff(dbIndexes, entityIndexes, (col) =>
|
|
42
|
+
[col.type, col.columns.map((c) => c.name).join("-")].join("//"),
|
|
43
|
+
),
|
|
44
|
+
entity: diff(entityIndexes, dbIndexes, (col) =>
|
|
45
|
+
[col.type, col.columns.map((c) => c.name).join("-")].join("//"),
|
|
46
|
+
),
|
|
43
47
|
};
|
|
44
48
|
if (extraIndexes.entity.length > 0) {
|
|
45
49
|
indexesTo.add = indexesTo.add.concat(extraIndexes.entity);
|
package/src/database/db.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AsyncLocalStorage } from "async_hooks";
|
|
2
2
|
import knex, { type Knex } from "knex";
|
|
3
3
|
import { assign } from "radashi";
|
|
4
|
+
|
|
4
5
|
import { Sonamu } from "../api";
|
|
5
6
|
import type { DatabaseConfig, SonamuConfig } from "../api/config";
|
|
6
7
|
import { TransactionContext } from "./transaction-context";
|
|
@@ -5,8 +5,8 @@ import type { Knex } from "knex";
|
|
|
5
5
|
import type { DatabaseSchemaExtend } from "../types/types";
|
|
6
6
|
import type { DBPreset } from "./db";
|
|
7
7
|
import { Puri } from "./puri";
|
|
8
|
-
import type { ColumnKeys,
|
|
9
|
-
import type { UBRef, UpsertBuilder } from "./upsert-builder";
|
|
8
|
+
import type { ColumnKeys, OmitInternalTypeKeys, PuriTable } from "./puri.types";
|
|
9
|
+
import type { InsertOnlyOptions, UBRef, UpsertBuilder, UpsertOptions } from "./upsert-builder";
|
|
10
10
|
|
|
11
11
|
type TableName<TSchema extends DatabaseSchemaExtend> = Extract<keyof TSchema, string>;
|
|
12
12
|
|
|
@@ -32,7 +32,7 @@ export class PuriWrapper<TSchema extends DatabaseSchemaExtend = DatabaseSchemaEx
|
|
|
32
32
|
): Puri<
|
|
33
33
|
TSchema,
|
|
34
34
|
Record<TTable, PuriTable<TSchema[TTable]>>,
|
|
35
|
-
|
|
35
|
+
OmitInternalTypeKeys<PuriTable<TSchema[TTable]>>
|
|
36
36
|
>;
|
|
37
37
|
// 테이블명 + Alias로 시작
|
|
38
38
|
from<TTable extends keyof TSchema, TAlias extends string>(
|
|
@@ -42,7 +42,7 @@ export class PuriWrapper<TSchema extends DatabaseSchemaExtend = DatabaseSchemaEx
|
|
|
42
42
|
): Puri<
|
|
43
43
|
TSchema,
|
|
44
44
|
Record<TAlias, PuriTable<TSchema[TTable]>>,
|
|
45
|
-
|
|
45
|
+
OmitInternalTypeKeys<PuriTable<TSchema[TTable]>>
|
|
46
46
|
>;
|
|
47
47
|
// 서브쿼리로 시작
|
|
48
48
|
from<TAlias extends string, TSubResult>(
|
|
@@ -52,7 +52,7 @@ export class PuriWrapper<TSchema extends DatabaseSchemaExtend = DatabaseSchemaEx
|
|
|
52
52
|
): Puri<
|
|
53
53
|
TSchema,
|
|
54
54
|
Record<TAlias, PuriTable<TSubResult>>,
|
|
55
|
-
|
|
55
|
+
OmitInternalTypeKeys<PuriTable<TSubResult>>
|
|
56
56
|
>;
|
|
57
57
|
from(spec: any): any {
|
|
58
58
|
return new Puri(this.knex, spec);
|
|
@@ -64,7 +64,7 @@ export class PuriWrapper<TSchema extends DatabaseSchemaExtend = DatabaseSchemaEx
|
|
|
64
64
|
): Puri<
|
|
65
65
|
TSchema,
|
|
66
66
|
Record<TTable, PuriTable<TSchema[TTable]>>,
|
|
67
|
-
|
|
67
|
+
OmitInternalTypeKeys<PuriTable<TSchema[TTable]>>
|
|
68
68
|
>;
|
|
69
69
|
// 테이블명 + Alias로 시작
|
|
70
70
|
table<TTable extends keyof TSchema, TAlias extends string>(
|
|
@@ -74,7 +74,7 @@ export class PuriWrapper<TSchema extends DatabaseSchemaExtend = DatabaseSchemaEx
|
|
|
74
74
|
): Puri<
|
|
75
75
|
TSchema,
|
|
76
76
|
Record<TAlias, PuriTable<TSchema[TTable]>>,
|
|
77
|
-
|
|
77
|
+
OmitInternalTypeKeys<PuriTable<TSchema[TTable]>>
|
|
78
78
|
>;
|
|
79
79
|
// 서브쿼리로 시작
|
|
80
80
|
table<TAlias extends string, TSubResult>(
|
|
@@ -84,7 +84,7 @@ export class PuriWrapper<TSchema extends DatabaseSchemaExtend = DatabaseSchemaEx
|
|
|
84
84
|
): Puri<
|
|
85
85
|
TSchema,
|
|
86
86
|
Record<TAlias, PuriTable<TSubResult>>,
|
|
87
|
-
|
|
87
|
+
OmitInternalTypeKeys<PuriTable<TSubResult>>
|
|
88
88
|
>;
|
|
89
89
|
table(spec: any): any {
|
|
90
90
|
return new Puri(this.knex, spec);
|
|
@@ -147,20 +147,26 @@ export class PuriWrapper<TSchema extends DatabaseSchemaExtend = DatabaseSchemaEx
|
|
|
147
147
|
return this.upsertBuilder.register(tableName, row);
|
|
148
148
|
}
|
|
149
149
|
|
|
150
|
-
ubUpsert
|
|
151
|
-
|
|
150
|
+
ubUpsert<TTable extends TableName<TSchema> & keyof DatabaseSchemaExtend>(
|
|
151
|
+
tableName: TTable,
|
|
152
|
+
options?: UpsertOptions<TTable>,
|
|
153
|
+
): Promise<number[]> {
|
|
154
|
+
return this.upsertBuilder.upsert(this.knex, tableName, options);
|
|
152
155
|
}
|
|
153
156
|
|
|
154
|
-
ubInsertOnly
|
|
155
|
-
|
|
157
|
+
ubInsertOnly<TTable extends TableName<TSchema> & keyof DatabaseSchemaExtend>(
|
|
158
|
+
tableName: TTable,
|
|
159
|
+
options?: InsertOnlyOptions,
|
|
160
|
+
): Promise<number[]> {
|
|
161
|
+
return this.upsertBuilder.insertOnly(this.knex, tableName, options);
|
|
156
162
|
}
|
|
157
163
|
|
|
158
|
-
ubUpsertOrInsert(
|
|
159
|
-
tableName:
|
|
164
|
+
ubUpsertOrInsert<TTable extends TableName<TSchema> & keyof DatabaseSchemaExtend>(
|
|
165
|
+
tableName: TTable,
|
|
160
166
|
mode: "upsert" | "insert",
|
|
161
|
-
|
|
167
|
+
options?: UpsertOptions<TTable>,
|
|
162
168
|
): Promise<number[]> {
|
|
163
|
-
return this.upsertBuilder.upsertOrInsert(this.knex, tableName, mode,
|
|
169
|
+
return this.upsertBuilder.upsertOrInsert(this.knex, tableName, mode, options);
|
|
164
170
|
}
|
|
165
171
|
|
|
166
172
|
ubUpdateBatch(
|