@onereach/idw-init-account-resources 0.16.7 → 0.16.9
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/.turbo/turbo-build.log +1 -1
- package/CHANGELOG.md +12 -0
- package/dist/initializers/rdb.js +32 -14
- package/dist/initializers/rdb.js.map +1 -1
- package/package.json +1 -1
- package/src/initializers/rdb.ts +32 -2
- package/src/types.ts +5 -0
package/.turbo/turbo-build.log
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
WARN Issue while reading "/builds/onereach/platform/idw/idw-template/.npmrc". Failed to replace env in config: ${OR_NPM_TOKEN}
|
|
2
2
|
|
|
3
|
-
> @onereach/idw-init-account-resources@0.16.
|
|
3
|
+
> @onereach/idw-init-account-resources@0.16.8 build /builds/onereach/platform/idw/idw-template/packages/level-system/idw-init-account-resources
|
|
4
4
|
> rimraf dist && tsc -b && mkdir dist/assets/skills/documentation && cp -r src/assets/skills/documentation/* dist/assets/skills/documentation
|
|
5
5
|
|
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# @onereach/idw-init-account-resources
|
|
2
2
|
|
|
3
|
+
## 0.16.9
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 4e7df0e: feat: create mcp url when adding a new default datasource
|
|
8
|
+
|
|
9
|
+
## 0.16.8
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- 8e2f8bb: fix knowledge init
|
|
14
|
+
|
|
3
15
|
## 0.16.7
|
|
4
16
|
|
|
5
17
|
### Patch Changes
|
package/dist/initializers/rdb.js
CHANGED
|
@@ -69,11 +69,22 @@ var InitRdbResources = (function () {
|
|
|
69
69
|
}
|
|
70
70
|
InitRdbResources.prototype.init = function () {
|
|
71
71
|
return __awaiter(this, void 0, void 0, function () {
|
|
72
|
-
var connectionParams, sequelize, umzug, error_1;
|
|
72
|
+
var services, sdkApiUrl, accountId, connectionParams, sequelize, umzug, error_1;
|
|
73
73
|
return __generator(this, function (_a) {
|
|
74
74
|
switch (_a.label) {
|
|
75
|
-
case 0: return [4, this.
|
|
75
|
+
case 0: return [4, fetch("".concat(this.discoveryUrl, "/api/v2/services")).then(function (res) { return res.json(); })];
|
|
76
76
|
case 1:
|
|
77
|
+
services = (_a.sent()).services;
|
|
78
|
+
sdkApiUrl = services.find(function (service) { return service.serviceKey === 'sdk-api'; }).url;
|
|
79
|
+
this.mcpApi = services.find(function (service) { return service.serviceKey === 'mcp-api'; }).url;
|
|
80
|
+
return [4, fetch("".concat(sdkApiUrl, "/auth/token"), {
|
|
81
|
+
headers: { Authorization: this.token },
|
|
82
|
+
}).then(function (res) { return res.json(); })];
|
|
83
|
+
case 2:
|
|
84
|
+
accountId = (_a.sent()).accountId;
|
|
85
|
+
this.accPart = accountId.split('-')[0];
|
|
86
|
+
return [4, this._getPgConnectionParams()];
|
|
87
|
+
case 3:
|
|
77
88
|
connectionParams = _a.sent();
|
|
78
89
|
sequelize = new sequelize_1.Sequelize({
|
|
79
90
|
database: connectionParams.database,
|
|
@@ -104,25 +115,25 @@ var InitRdbResources = (function () {
|
|
|
104
115
|
var name = _a.name;
|
|
105
116
|
console.log("Finished migration: ".concat(name));
|
|
106
117
|
});
|
|
107
|
-
_a.label =
|
|
108
|
-
case
|
|
109
|
-
_a.trys.push([
|
|
118
|
+
_a.label = 4;
|
|
119
|
+
case 4:
|
|
120
|
+
_a.trys.push([4, 6, , 7]);
|
|
110
121
|
return [4, umzug.up()];
|
|
111
|
-
case
|
|
122
|
+
case 5:
|
|
112
123
|
_a.sent();
|
|
113
|
-
return [3,
|
|
114
|
-
case
|
|
124
|
+
return [3, 7];
|
|
125
|
+
case 6:
|
|
115
126
|
error_1 = _a.sent();
|
|
116
127
|
console.error('Migration failed', error_1);
|
|
117
128
|
throw error_1;
|
|
118
|
-
case
|
|
119
|
-
case
|
|
129
|
+
case 7: return [4, this.upsertDefaultData(sequelize, models_1.models, models_1.datasources)];
|
|
130
|
+
case 8:
|
|
120
131
|
_a.sent();
|
|
121
132
|
return [4, this.linkOldKnowledgesToDefaultDomain(sequelize)];
|
|
122
|
-
case
|
|
133
|
+
case 9:
|
|
123
134
|
_a.sent();
|
|
124
135
|
return [4, sequelize.close()];
|
|
125
|
-
case
|
|
136
|
+
case 10:
|
|
126
137
|
_a.sent();
|
|
127
138
|
return [2];
|
|
128
139
|
}
|
|
@@ -157,7 +168,7 @@ var InitRdbResources = (function () {
|
|
|
157
168
|
case 0:
|
|
158
169
|
_a.trys.push([0, 2, , 3]);
|
|
159
170
|
return [4, sequelize.transaction(function (transaction) { return __awaiter(_this, void 0, void 0, function () {
|
|
160
|
-
var _i, datasources_1, ds, _a, models_2, model, modelResult, modelId, _b, _c, dsSlug;
|
|
171
|
+
var _i, datasources_1, ds, mcp_url, _a, models_2, model, modelResult, modelId, _b, _c, dsSlug;
|
|
161
172
|
var _d;
|
|
162
173
|
return __generator(this, function (_e) {
|
|
163
174
|
switch (_e.label) {
|
|
@@ -167,7 +178,8 @@ var InitRdbResources = (function () {
|
|
|
167
178
|
case 1:
|
|
168
179
|
if (!(_i < datasources_1.length)) return [3, 4];
|
|
169
180
|
ds = datasources_1[_i];
|
|
170
|
-
|
|
181
|
+
mcp_url = "https://".concat(this.accPart, "-").concat(ds.slug, ".").concat(this.mcpApi.replace('https://', ''), "/mcp");
|
|
182
|
+
return [4, sequelize.query("\n INSERT INTO datasources (\n name, slug, description, config, display_order, icon_url,\n is_default, is_llm, search_order, for_user_roles, mcp_url\n )\n VALUES (\n :name, :slug, :description, :config, :display_order, :icon_url,\n :is_default, :is_llm, :search_order, :for_user_roles, :mcp_url\n )\n ON CONFLICT (slug) DO UPDATE\n SET name = EXCLUDED.name,\n description = EXCLUDED.description,\n config = EXCLUDED.config,\n display_order = EXCLUDED.display_order,\n search_order = EXCLUDED.search_order,\n for_user_roles = EXCLUDED.for_user_roles,\n icon_url = EXCLUDED.icon_url,\n is_llm = EXCLUDED.is_llm,\n mcp_url = EXCLUDED.mcp_url,\n updated_at = NOW();\n ", {
|
|
171
183
|
replacements: {
|
|
172
184
|
name: ds.name,
|
|
173
185
|
slug: ds.slug,
|
|
@@ -179,6 +191,7 @@ var InitRdbResources = (function () {
|
|
|
179
191
|
icon_url: ds.icon_url || null,
|
|
180
192
|
is_default: true,
|
|
181
193
|
is_llm: (_d = ds.is_llm) !== null && _d !== void 0 ? _d : null,
|
|
194
|
+
mcp_url: mcp_url,
|
|
182
195
|
},
|
|
183
196
|
transaction: transaction,
|
|
184
197
|
})];
|
|
@@ -268,6 +281,11 @@ var InitRdbResources = (function () {
|
|
|
268
281
|
host: connectionParams.host,
|
|
269
282
|
dialect: 'postgres',
|
|
270
283
|
logging: false,
|
|
284
|
+
dialectOptions: {
|
|
285
|
+
ssl: {
|
|
286
|
+
rejectUnauthorized: false,
|
|
287
|
+
},
|
|
288
|
+
},
|
|
271
289
|
});
|
|
272
290
|
_b.label = 2;
|
|
273
291
|
case 2:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rdb.js","sourceRoot":"","sources":["../../src/initializers/rdb.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAsC;AACtC,8CAAwB;AAExB,uCAAsC;AACtC,+BAAgD;AAEhD,6CAAqD;AACrD,2CAAuD;
|
|
1
|
+
{"version":3,"file":"rdb.js","sourceRoot":"","sources":["../../src/initializers/rdb.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/initializers/rdb.ts
CHANGED
|
@@ -12,12 +12,15 @@ import {
|
|
|
12
12
|
InitRdbResourcesConfig,
|
|
13
13
|
IdwModelDefinition,
|
|
14
14
|
IdwModel,
|
|
15
|
+
DiscovyreService,
|
|
15
16
|
} from '../types';
|
|
16
17
|
|
|
17
18
|
export class InitRdbResources {
|
|
18
19
|
private token: string;
|
|
19
20
|
private discoveryUrl: string;
|
|
20
21
|
private pgSql: Pgsql;
|
|
22
|
+
private mcpApi!: string;
|
|
23
|
+
private accPart!: string;
|
|
21
24
|
|
|
22
25
|
constructor({ token, discoveryUrl }: InitRdbResourcesConfig) {
|
|
23
26
|
this.token = token;
|
|
@@ -30,6 +33,18 @@ export class InitRdbResources {
|
|
|
30
33
|
}
|
|
31
34
|
|
|
32
35
|
public async init(): Promise<void> {
|
|
36
|
+
const { services } =
|
|
37
|
+
await fetch(`${this.discoveryUrl}/api/v2/services`).then(res => res.json());
|
|
38
|
+
|
|
39
|
+
const sdkApiUrl = services.find((service: DiscovyreService) => service.serviceKey === 'sdk-api').url;
|
|
40
|
+
this.mcpApi = services.find((service: DiscovyreService) => service.serviceKey === 'mcp-api').url;
|
|
41
|
+
|
|
42
|
+
const { accountId } = await fetch(`${sdkApiUrl}/auth/token`, {
|
|
43
|
+
headers: { Authorization: this.token },
|
|
44
|
+
}).then(res => res.json());
|
|
45
|
+
|
|
46
|
+
this.accPart = accountId.split('-')[0];
|
|
47
|
+
|
|
33
48
|
const connectionParams = await this._getPgConnectionParams();
|
|
34
49
|
const sequelize = new Sequelize(
|
|
35
50
|
{
|
|
@@ -103,10 +118,18 @@ export class InitRdbResources {
|
|
|
103
118
|
await sequelize.transaction(async (transaction) => {
|
|
104
119
|
// Upsert datasources
|
|
105
120
|
for (const ds of datasources) {
|
|
121
|
+
const mcp_url = `https://${this.accPart}-${ds.slug}.${this.mcpApi.replace('https://', '')}/mcp`;
|
|
122
|
+
|
|
106
123
|
await sequelize.query(
|
|
107
124
|
`
|
|
108
|
-
INSERT INTO datasources (
|
|
109
|
-
|
|
125
|
+
INSERT INTO datasources (
|
|
126
|
+
name, slug, description, config, display_order, icon_url,
|
|
127
|
+
is_default, is_llm, search_order, for_user_roles, mcp_url
|
|
128
|
+
)
|
|
129
|
+
VALUES (
|
|
130
|
+
:name, :slug, :description, :config, :display_order, :icon_url,
|
|
131
|
+
:is_default, :is_llm, :search_order, :for_user_roles, :mcp_url
|
|
132
|
+
)
|
|
110
133
|
ON CONFLICT (slug) DO UPDATE
|
|
111
134
|
SET name = EXCLUDED.name,
|
|
112
135
|
description = EXCLUDED.description,
|
|
@@ -116,6 +139,7 @@ export class InitRdbResources {
|
|
|
116
139
|
for_user_roles = EXCLUDED.for_user_roles,
|
|
117
140
|
icon_url = EXCLUDED.icon_url,
|
|
118
141
|
is_llm = EXCLUDED.is_llm,
|
|
142
|
+
mcp_url = EXCLUDED.mcp_url,
|
|
119
143
|
updated_at = NOW();
|
|
120
144
|
`,
|
|
121
145
|
{
|
|
@@ -130,6 +154,7 @@ export class InitRdbResources {
|
|
|
130
154
|
icon_url: ds.icon_url || null,
|
|
131
155
|
is_default: true,
|
|
132
156
|
is_llm: ds.is_llm ?? null,
|
|
157
|
+
mcp_url,
|
|
133
158
|
},
|
|
134
159
|
transaction,
|
|
135
160
|
},
|
|
@@ -211,6 +236,11 @@ export class InitRdbResources {
|
|
|
211
236
|
host: connectionParams.host,
|
|
212
237
|
dialect: 'postgres',
|
|
213
238
|
logging: false,
|
|
239
|
+
dialectOptions: {
|
|
240
|
+
ssl: {
|
|
241
|
+
rejectUnauthorized: false,
|
|
242
|
+
},
|
|
243
|
+
},
|
|
214
244
|
});
|
|
215
245
|
|
|
216
246
|
try {
|
package/src/types.ts
CHANGED
|
@@ -5,6 +5,11 @@ export interface InitResourcesConfig {
|
|
|
5
5
|
discoveryUrl: string;
|
|
6
6
|
}
|
|
7
7
|
|
|
8
|
+
export type DiscovyreService = {
|
|
9
|
+
serviceKey: string;
|
|
10
|
+
url: string;
|
|
11
|
+
};
|
|
12
|
+
|
|
8
13
|
export interface InitLookupResourcesConfig extends InitResourcesConfig { }
|
|
9
14
|
export interface InitIdwResourcesConfig extends InitResourcesConfig { }
|
|
10
15
|
export interface InitHitlResourcesConfig extends InitResourcesConfig { }
|