@magda/typescript-common 6.0.0-alpha.6 → 6.0.0-alpha.7

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.
Files changed (7) hide show
  1. package/dist/EmbeddingApiClient.d.ts +3 -2
  2. package/dist/EmbeddingApiClient.js +25 -19
  3. package/dist/EmbeddingApiClient.js.map +1 -1
  4. package/dist/OpensearchApiClient.d.ts +2 -1
  5. package/dist/OpensearchApiClient.js +9 -14
  6. package/dist/OpensearchApiClient.js.map +1 -1
  7. package/package.json +3 -3
package/dist/EmbeddingApiClient.d.ts CHANGED
@@ -5,11 +5,12 @@ export interface EmbeddingResult {
5
5
  }[];
6
6
  }
7
7
  export interface EmbeddingApiClientConfig extends BaseApiClientConfig {
8
+ taskSize?: number;
8
9
  }
9
10
  export default class EmbeddingApiClient extends BaseApiClient {
10
- private taskSize;
11
+ taskSize: number;
11
12
  constructor(options: EmbeddingApiClientConfig);
12
- private testConnection;
13
+ testConnection(): Promise<boolean>;
13
14
  get(text: string): Promise<number[]>;
14
15
  get(textList: string[]): Promise<number[][]>;
15
16
  }
package/dist/EmbeddingApiClient.js CHANGED
@@ -1,42 +1,48 @@
1
1
  import BaseApiClient from "./BaseApiClient.js";
2
2
  import fetchRequest from "./fetchRequest.js";
3
+ import ServerError from "./ServerError.js";
3
4
  export default class EmbeddingApiClient extends BaseApiClient {
4
5
  taskSize = 10;
5
6
  constructor(options) {
6
7
  options.baseApiUrl = options.baseApiUrl || "http://localhost:3000";
7
8
  super(options);
9
+ this.taskSize = options.taskSize || 10;
8
10
  this.testConnection();
9
11
  }
10
12
  async testConnection() {
11
13
  try {
12
14
  await this.get("test");
13
- console.log(`Successfully connected to embedding API: ${this.getBaseApiUri().toString()}`);
15
+ return true;
14
16
  }
15
17
  catch (err) {
16
18
  throw new Error(`Failed to connect to embedding API: ${this.getBaseApiUri().toString()}, error: ${err}`);
17
19
  }
18
20
  }
19
21
  async get(input) {
20
- if (Array.isArray(input)) {
21
- const result = [];
22
- for (let i = 0; i < input.length; i += this.taskSize) {
23
- const chunk = input.slice(i, i + this.taskSize);
24
- const body = { input: chunk };
25
- const response = await fetchRequest("post", this.getBaseApiUri()
26
- .segmentCoded("v1")
27
- .segmentCoded("embeddings")
28
- .toString(), body, "application/json", false, this.addAuthHeader());
29
- result.push(...response.data.map((d) => d.embedding));
22
+ const url = this.getBaseApiUri()
23
+ .segmentCoded("v1")
24
+ .segmentCoded("embeddings")
25
+ .toString();
26
+ try {
27
+ if (Array.isArray(input)) {
28
+ const result = [];
29
+ for (let i = 0; i < input.length; i += this.taskSize) {
30
+ const chunk = input.slice(i, i + this.taskSize);
31
+ const res = await fetchRequest("post", url, { input: chunk }, "application/json", false, this.addAuthHeader());
32
+ result.push(...res.data.map((d) => d.embedding));
33
+ }
34
+ return result;
35
+ }
36
+ else {
37
+ const res = await fetchRequest("post", url, { input }, "application/json", false, this.addAuthHeader());
38
+ return res.data[0].embedding;
30
39
  }
31
- return result;
32
40
  }
33
- else {
34
- const body = { input };
35
- const response = await fetchRequest("post", this.getBaseApiUri()
36
- .segmentCoded("v1")
37
- .segmentCoded("embeddings")
38
- .toString(), body, "application/json", false, this.addAuthHeader());
39
- return response.data[0].embedding;
41
+ catch (e) {
42
+ if (e instanceof ServerError) {
43
+ throw new Error(`Embedding API error: ${e.statusCode}: ${e.message}`);
44
+ }
45
+ throw new Error(`Embedding API request failed: ${e instanceof Error ? e.message : String(e)}`);
40
46
  }
41
47
  }
42
48
  }
package/dist/EmbeddingApiClient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"EmbeddingApiClient.js","sourceRoot":"","sources":["../src/EmbeddingApiClient.ts"],"names":[],"mappings":"AAAA,OAAO,aAAsC,MAAM,oBAAoB,CAAC;AACxE,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAU7C,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,aAAa;IACjD,QAAQ,GAAW,EAAE,CAAC;IAE9B,YAAY,OAAiC;QACzC,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,uBAAuB,CAAC;QACnE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,cAAc;QACxB,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACvB,OAAO,CAAC,GAAG,CACP,4CAA4C,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE,CAChF,CAAC;QACN,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CACX,uCAAuC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,YAAY,GAAG,EAAE,CAC1F,CAAC;QACN,CAAC;IACL,CAAC;IAID,KAAK,CAAC,GAAG,CAAC,KAAwB;QAC9B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,MAAM,MAAM,GAAe,EAAE,CAAC;YAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAChD,MAAM,IAAI,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;gBAE9B,MAAM,QAAQ,GAAG,MAAM,YAAY,CAC/B,MAAM,EACN,IAAI,CAAC,aAAa,EAAE;qBACf,YAAY,CAAC,IAAI,CAAC;qBAClB,YAAY,CAAC,YAAY,CAAC;qBAC1B,QAAQ,EAAE,EACf,IAAI,EACJ,kBAAkB,EAClB,KAAK,EACL,IAAI,CAAC,aAAa,EAAE,CACvB,CAAC;gBAEF,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YAC1D,CAAC;YAED,OAAO,MAAM,CAAC;QAClB,CAAC;aAAM,CAAC;YACJ,MAAM,IAAI,GAAG,EAAE,KAAK,EAAE,CAAC;YAEvB,MAAM,QAAQ,GAAG,MAAM,YAAY,CAC/B,MAAM,EACN,IAAI,CAAC,aAAa,EAAE;iBACf,YAAY,CAAC,IAAI,CAAC;iBAClB,YAAY,CAAC,YAAY,CAAC;iBAC1B,QAAQ,EAAE,EACf,IAAI,EACJ,kBAAkB,EAClB,KAAK,EACL,IAAI,CAAC,aAAa,EAAE,CACvB,CAAC;YAEF,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACtC,CAAC;IACL,CAAC;CACJ"}
1
+ {"version":3,"file":"EmbeddingApiClient.js","sourceRoot":"","sources":["../src/EmbeddingApiClient.ts"],"names":[],"mappings":"AAAA,OAAO,aAAsC,MAAM,oBAAoB,CAAC;AACxE,OAAO,YAAY,MAAM,mBAAmB,CAAC;AAC7C,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAY3C,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,aAAa;IAClD,QAAQ,GAAW,EAAE,CAAC;IAE7B,YAAY,OAAiC;QACzC,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,uBAAuB,CAAC;QACnE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;QACvC,IAAI,CAAC,cAAc,EAAE,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,cAAc;QACvB,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACvB,OAAO,IAAI,CAAC;QAChB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CACX,uCAAuC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,YAAY,GAAG,EAAE,CAC1F,CAAC;QACN,CAAC;IACL,CAAC;IAID,KAAK,CAAC,GAAG,CAAC,KAAwB;QAC9B,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,EAAE;aAC3B,YAAY,CAAC,IAAI,CAAC;aAClB,YAAY,CAAC,YAAY,CAAC;aAC1B,QAAQ,EAAE,CAAC;QAEhB,IAAI,CAAC;YACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvB,MAAM,MAAM,GAAe,EAAE,CAAC;gBAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACnD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;oBAChD,MAAM,GAAG,GAAG,MAAM,YAAY,CAC1B,MAAM,EACN,GAAG,EACH,EAAE,KAAK,EAAE,KAAK,EAAE,EAChB,kBAAkB,EAClB,KAAK,EACL,IAAI,CAAC,aAAa,EAAE,CACvB,CAAC;oBACF,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBACrD,CAAC;gBACD,OAAO,MAAM,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG,GAAG,MAAM,YAAY,CAC1B,MAAM,EACN,GAAG,EACH,EAAE,KAAK,EAAE,EACT,kBAAkB,EAClB,KAAK,EACL,IAAI,CAAC,aAAa,EAAE,CACvB,CAAC;gBACF,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACjC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,YAAY,WAAW,EAAE,CAAC;gBAC3B,MAAM,IAAI,KAAK,CACX,wBAAwB,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,OAAO,EAAE,CACvD,CAAC;YACN,CAAC;YACD,MAAM,IAAI,KAAK,CACX,iCACI,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAC7C,EAAE,CACL,CAAC;QACN,CAAC;IACL,CAAC;CACJ"}
package/dist/OpensearchApiClient.d.ts CHANGED
@@ -7,6 +7,7 @@ export default class OpensearchApiClient {
7
7
  private client;
8
8
  constructor(config: OpensearchConfig);
9
9
  static getOpensearchApiClient(openSearchConfig: OpensearchConfig): Promise<OpensearchApiClient>;
10
+ ping(): Promise<void>;
10
11
  createIndex(indexDefinition: {
11
12
  indexName: string;
12
13
  settings?: any;
@@ -16,7 +17,7 @@ export default class OpensearchApiClient {
16
17
  indexExists(indexName: string): Promise<boolean>;
17
18
  indexDocument(indexName: string, document: any): Promise<void>;
18
19
  bulkIndexDocument(indexName: string, documents: any[]): Promise<void>;
19
- searchDocuments(indexName: string, query: string): Promise<import("@opensearch-project/opensearch/api/_types/_core.search.js").ResponseBody>;
20
20
  deleteDocument(indexName: string, documentId: string): Promise<void>;
21
21
  deleteByQuery(params: DeleteByQuery_Request, options?: TransportRequestOptions): Promise<import("@opensearch-project/opensearch/api/_core/deleteByQuery.js").DeleteByQuery_Response>;
22
+ search(indexName: string, searchBody: Record<string, unknown>): Promise<import("@opensearch-project/opensearch/api/index.js").Search_Response>;
22
23
  }
package/dist/OpensearchApiClient.js CHANGED
@@ -21,6 +21,9 @@ export default class OpensearchApiClient {
21
21
  }
22
22
  return instance;
23
23
  }
24
+ async ping() {
25
+ await this.client.ping();
26
+ }
24
27
  async createIndex(indexDefinition) {
25
28
  await this.client.indices.create({
26
29
  index: indexDefinition.indexName,
@@ -66,20 +69,6 @@ export default class OpensearchApiClient {
66
69
  }
67
70
  });
68
71
  }
69
- async searchDocuments(indexName, query) {
70
- const searchResult = await this.client.search({
71
- index: indexName,
72
- body: {
73
- query: {
74
- match: {
75
- text: query
76
- }
77
- }
78
- }
79
- });
80
- console.log(`Search query: ${query}, result: ${JSON.stringify(searchResult.body)}`);
81
- return searchResult.body;
82
- }
83
72
  async deleteDocument(indexName, documentId) {
84
73
  await this.client.delete({
85
74
  index: indexName,
@@ -94,5 +83,11 @@ export default class OpensearchApiClient {
94
83
  });
95
84
  return response;
96
85
  }
86
+ async search(indexName, searchBody) {
87
+ return this.client.search({
88
+ index: indexName,
89
+ body: searchBody
90
+ });
91
+ }
97
92
  }
98
93
  //# sourceMappingURL=OpensearchApiClient.js.map
package/dist/OpensearchApiClient.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"OpensearchApiClient.js","sourceRoot":"","sources":["../src/OpensearchApiClient.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"OpensearchApiClient.js","sourceRoot":"","sources":["../src/OpensearchApiClient.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@magda/typescript-common",
3
3
  "description": "Common TypeScript code shared between components.",
4
- "version": "6.0.0-alpha.6",
4
+ "version": "6.0.0-alpha.7",
5
5
  "license": "Apache-2.0",
6
6
  "type": "module",
7
7
  "exports": {
@@ -23,8 +23,8 @@
23
23
  },
24
24
  "devDependencies": {
25
25
  "@magda/esm-utils": "^1.0.1",
26
- "@magda/registry-aspects": "^6.0.0-alpha.6",
27
- "@magda/scripts": "^6.0.0-alpha.6",
26
+ "@magda/registry-aspects": "^6.0.0-alpha.7",
27
+ "@magda/scripts": "^6.0.0-alpha.7",
28
28
  "@types/chai": "^4.3.11",
29
29
  "@types/chai-as-promised": "^7.1.0",
30
30
  "@types/cross-spawn": "^6.0.1",