@xyz17711/extract-correct 0.0.0-stage → 0.1.0
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/README.md +86 -2
- package/dist/index.d.ts +46 -0
- package/dist/index.js +11 -0
- package/dist/langchain.d.ts +19 -0
- package/dist/langchain.js +19 -0
- package/package.json +40 -4
- package/src/index.ts +55 -0
- package/src/langchain.ts +28 -0
- package/test/index.test.mjs +24 -0
- package/test/langchain.test.mjs +16 -0
- package/tsconfig.json +16 -0
package/README.md
CHANGED
|
@@ -1,3 +1,87 @@
|
|
|
1
|
-
#
|
|
1
|
+
# @xyz17711/extract-correct
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
[](https://github.com/17711-services/clients/actions/workflows/publish-node.yml)
|
|
4
|
+
[](https://www.npmjs.com/package/@xyz17711/extract-correct)
|
|
5
|
+
[](https://github.com/17711-services/clients/blob/main/LICENSE)
|
|
6
|
+
|
|
7
|
+
Typed TypeScript client for **🩹 extract-correct-service**, part of the
|
|
8
|
+
[17711.xyz](https://api.17711.xyz) microservice fleet -- pay-per-call APIs settled in USDC via
|
|
9
|
+
[x402](https://x402.org), listed on [x402scan](https://www.x402scan.com/server/f1c7b972-3405-4b75-8b4f-d1bfbd6305ff).
|
|
10
|
+
|
|
11
|
+
## Install
|
|
12
|
+
|
|
13
|
+
```bash
|
|
14
|
+
npm install @xyz17711/extract-correct
|
|
15
|
+
```
|
|
16
|
+
|
|
17
|
+
## Methods
|
|
18
|
+
|
|
19
|
+
| Method | Description |
|
|
20
|
+
| --- | --- |
|
|
21
|
+
| `parseJson` | JSON repair API: extract valid JSON from messy text or model output and fix it against a JSON Schema ($0.006, x402) |
|
|
22
|
+
|
|
23
|
+
## Quickstart
|
|
24
|
+
|
|
25
|
+
```typescript
|
|
26
|
+
import { Client } from "@xyz17711/extract-correct";
|
|
27
|
+
|
|
28
|
+
const client = new Client("https://api.17711.xyz/registry/🩹 extract-correct-service");
|
|
29
|
+
// see the Methods table above for every available call and its request/response type
|
|
30
|
+
```
|
|
31
|
+
|
|
32
|
+
## Paying past the free quota
|
|
33
|
+
|
|
34
|
+
Every gated tool allows a small number of free calls per day; beyond that it returns a 402
|
|
35
|
+
challenge. Without a wallet configured, this client throws `PaymentRequiredError` with the price,
|
|
36
|
+
network, and payee address attached:
|
|
37
|
+
|
|
38
|
+
```typescript
|
|
39
|
+
import { Client, PaymentRequiredError } from "@xyz17711/extract-correct";
|
|
40
|
+
|
|
41
|
+
const client = new Client("https://api.17711.xyz/registry/🩹 extract-correct-service");
|
|
42
|
+
try {
|
|
43
|
+
await client.parseJson(/* ... */);
|
|
44
|
+
} catch (e) {
|
|
45
|
+
if (e instanceof PaymentRequiredError) {
|
|
46
|
+
console.log(`needs ${e.priceUsdc} USDC on ${e.network}, payable to ${e.payTo}`);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
```
|
|
50
|
+
|
|
51
|
+
To pay automatically, configure a wallet on the client -- the private key should come from your
|
|
52
|
+
own environment/secrets manager, never a literal string in source code:
|
|
53
|
+
|
|
54
|
+
```typescript
|
|
55
|
+
import { Client } from "@xyz17711/extract-correct";
|
|
56
|
+
|
|
57
|
+
const client = new Client("https://api.17711.xyz/registry/🩹 extract-correct-service", {
|
|
58
|
+
x402PrivateKey: process.env.X402_PRIVATE_KEY,
|
|
59
|
+
x402ExpectedNetwork: "eip155:8453", // Base mainnet; use eip155:84532 for Base Sepolia testnet
|
|
60
|
+
x402MaxPaymentUsdc: 0.01, // refuse any single call above this
|
|
61
|
+
x402MaxTotalSpendUsdc: 1.0, // refuse once this WALLET's lifetime spend would exceed it
|
|
62
|
+
});
|
|
63
|
+
```
|
|
64
|
+
|
|
65
|
+
**Never commit a private key.** Both spend caps are required together with the key -- a wallet
|
|
66
|
+
with real funds and no explicit caps refuses to construct at all (`WalletConfigError`), on
|
|
67
|
+
purpose. The cumulative cap is tracked per wallet address, shared by every `Client` you construct
|
|
68
|
+
with that same key in this process.
|
|
69
|
+
|
|
70
|
+
## LangChain.js
|
|
71
|
+
|
|
72
|
+
```typescript
|
|
73
|
+
import { Client } from "@xyz17711/extract-correct";
|
|
74
|
+
import { ExtractCorrectToolkit } from "@xyz17711/extract-correct/langchain";
|
|
75
|
+
|
|
76
|
+
const client = new Client("https://api.17711.xyz/registry/🩹 extract-correct-service", { /* ...wallet options... */ });
|
|
77
|
+
const tools = new ExtractCorrectToolkit(client).getTools();
|
|
78
|
+
```
|
|
79
|
+
|
|
80
|
+
Requires the optional `@langchain/core`+`zod` peer dependencies (`npm install @langchain/core
|
|
81
|
+
zod`) -- importing the base package above never requires them; only `@xyz17711/extract-correct/langchain`
|
|
82
|
+
does.
|
|
83
|
+
|
|
84
|
+
## License
|
|
85
|
+
|
|
86
|
+
MIT -- see [`LICENSE`](../../LICENSE), shared by every language's client library in the
|
|
87
|
+
`clients` repo this package lives in.
|
package/dist/index.d.ts
ADDED
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Typed HTTP client and request/response interfaces for 🩹 extract-correct-service.
|
|
3
|
+
*/
|
|
4
|
+
import { Client as BaseClient, type ClientOptions } from "@xyz17711/core";
|
|
5
|
+
/** One deterministic correction actually applied to the extracted value. */
|
|
6
|
+
export interface AppliedFix {
|
|
7
|
+
/** Human-readable detail of what changed. */
|
|
8
|
+
detail: string;
|
|
9
|
+
/** JSON Pointer to the field that was corrected (e.g. `/user/age`; `""` = the whole value). */
|
|
10
|
+
path: string;
|
|
11
|
+
/** Which bounded correction rule fired (e.g. `type_coercion`, `additional_property_stripped`, `enum_case_insensitive_match`, `required_default_filled`, `clamped_to_minimum`, `clamped_to_maximum`, `array_truncated_to_max_items`). */
|
|
12
|
+
rule: string;
|
|
13
|
+
}
|
|
14
|
+
/** One schema violation that could NOT be corrected -- never silently dropped or guessed. */
|
|
15
|
+
export interface RemainingIssue {
|
|
16
|
+
/** The JSON Schema keyword that failed (e.g. `pattern`, `format`, `minItems`, `oneOf`). */
|
|
17
|
+
keyword: string;
|
|
18
|
+
/** The underlying validator's own error message. */
|
|
19
|
+
message: string;
|
|
20
|
+
/** JSON Pointer to the field that still fails validation. */
|
|
21
|
+
path: string;
|
|
22
|
+
}
|
|
23
|
+
export interface ParseJsonResponse {
|
|
24
|
+
/** Every correction actually applied, in the order applied. */
|
|
25
|
+
applied_fixes: AppliedFix[];
|
|
26
|
+
/** The extracted (and, if a schema was supplied, corrected) JSON value. */
|
|
27
|
+
data: unknown;
|
|
28
|
+
/** How `data` was obtained: `"direct"` (already valid JSON), `"repaired"` (malformed JSON fixed in place), or `"extracted_and_repaired"` (isolated from surrounding text, then fixed). */
|
|
29
|
+
extraction_method: string;
|
|
30
|
+
/** Every schema violation that remains after correction -- non-empty only when `schema` was supplied and at least one issue couldn't be fixed by a bounded v1 rule. */
|
|
31
|
+
remaining_issues: RemainingIssue[];
|
|
32
|
+
/** Whether `data` satisfies `schema` after correction. `None` when no `schema` was supplied -- never conflated with "assumed valid". */
|
|
33
|
+
valid?: boolean | null;
|
|
34
|
+
}
|
|
35
|
+
export interface ParseJsonRequest {
|
|
36
|
+
/** Optional JSON Schema to validate the extracted value against and auto-correct where a bounded, deterministic fix rule applies. Omitted = extraction only, no validation. */
|
|
37
|
+
schema?: unknown;
|
|
38
|
+
/** Free-form or messy text to extract structured JSON from -- already-valid JSON, JSON wrapped in prose or a markdown code fence, or malformed JSON (trailing commas, single-quoted strings, unquoted keys, a truncated array/object). */
|
|
39
|
+
text: string;
|
|
40
|
+
}
|
|
41
|
+
/** Typed client for 🩹 extract-correct-service, e.g. `client.parseJson(...)`. */
|
|
42
|
+
export declare class Client extends BaseClient {
|
|
43
|
+
/** JSON repair API: extract valid JSON from messy text or model output and fix it against a JSON Schema ($0.006, x402) */
|
|
44
|
+
parseJson(request: ParseJsonRequest): Promise<ParseJsonResponse>;
|
|
45
|
+
}
|
|
46
|
+
export { ClientOptions };
|
package/dist/index.js
ADDED
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Typed HTTP client and request/response interfaces for 🩹 extract-correct-service.
|
|
3
|
+
*/
|
|
4
|
+
import { Client as BaseClient } from "@xyz17711/core";
|
|
5
|
+
/** Typed client for 🩹 extract-correct-service, e.g. `client.parseJson(...)`. */
|
|
6
|
+
export class Client extends BaseClient {
|
|
7
|
+
/** JSON repair API: extract valid JSON from messy text or model output and fix it against a JSON Schema ($0.006, x402) */
|
|
8
|
+
async parseJson(request) {
|
|
9
|
+
return this.post("/v1/extract-correct/parse_json", request);
|
|
10
|
+
}
|
|
11
|
+
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* LangChain.js tools for 🩹 extract-correct-service, grouped in one Toolkit -- one tool per operation, each just an async function (JS has no separate sync form to generate). Requires the `@langchain/core`+`zod` peer dependencies declared in this package's own package.json -- imported from `extract-correct/langchain`, never from the package root, so importing the base client never requires them installed.
|
|
3
|
+
*/
|
|
4
|
+
import { z } from "zod";
|
|
5
|
+
import { Client } from "./index.js";
|
|
6
|
+
export declare class ExtractCorrectToolkit {
|
|
7
|
+
private client;
|
|
8
|
+
constructor(client: Client);
|
|
9
|
+
getTools(): import("@langchain/core/tools").DynamicStructuredTool<z.ZodObject<{
|
|
10
|
+
schema: z.ZodOptional<z.ZodUnknown>;
|
|
11
|
+
text: z.ZodString;
|
|
12
|
+
}, z.core.$strip>, {
|
|
13
|
+
text: string;
|
|
14
|
+
schema?: unknown;
|
|
15
|
+
}, {
|
|
16
|
+
text: string;
|
|
17
|
+
schema?: unknown;
|
|
18
|
+
}, import("./index.js").ParseJsonResponse, unknown, "parseJson">[];
|
|
19
|
+
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* LangChain.js tools for 🩹 extract-correct-service, grouped in one Toolkit -- one tool per operation, each just an async function (JS has no separate sync form to generate). Requires the `@langchain/core`+`zod` peer dependencies declared in this package's own package.json -- imported from `extract-correct/langchain`, never from the package root, so importing the base client never requires them installed.
|
|
3
|
+
*/
|
|
4
|
+
import { tool } from "@langchain/core/tools";
|
|
5
|
+
import { z } from "zod";
|
|
6
|
+
export class ExtractCorrectToolkit {
|
|
7
|
+
constructor(client) {
|
|
8
|
+
this.client = client;
|
|
9
|
+
}
|
|
10
|
+
getTools() {
|
|
11
|
+
return [
|
|
12
|
+
tool(async (input) => this.client.parseJson(input), {
|
|
13
|
+
name: "parseJson",
|
|
14
|
+
description: "JSON repair API: extract valid JSON from messy text or model output and fix it against a JSON Schema ($0.006, x402)",
|
|
15
|
+
schema: z.object({ schema: z.unknown().optional(), text: z.string() }),
|
|
16
|
+
}),
|
|
17
|
+
];
|
|
18
|
+
}
|
|
19
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,42 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xyz17711/extract-correct",
|
|
3
|
-
"version": "0.
|
|
4
|
-
"
|
|
5
|
-
"
|
|
6
|
-
|
|
3
|
+
"version": "0.1.0",
|
|
4
|
+
"description": "Generated typed client for the 🩹 extract-correct-service 17711.xyz microservice.",
|
|
5
|
+
"type": "module",
|
|
6
|
+
"main": "dist/index.js",
|
|
7
|
+
"types": "dist/index.d.ts",
|
|
8
|
+
"exports": {
|
|
9
|
+
".": {
|
|
10
|
+
"types": "./dist/index.d.ts",
|
|
11
|
+
"default": "./dist/index.js"
|
|
12
|
+
},
|
|
13
|
+
"./langchain": {
|
|
14
|
+
"types": "./dist/langchain.d.ts",
|
|
15
|
+
"default": "./dist/langchain.js"
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
"scripts": {
|
|
19
|
+
"build": "tsc -p .",
|
|
20
|
+
"test": "npm run build && node --test test/*.test.mjs"
|
|
21
|
+
},
|
|
22
|
+
"dependencies": {
|
|
23
|
+
"@xyz17711/core": "^0.1.0"
|
|
24
|
+
},
|
|
25
|
+
"peerDependencies": {
|
|
26
|
+
"@langchain/core": ">=0.3",
|
|
27
|
+
"zod": "^3 || ^4"
|
|
28
|
+
},
|
|
29
|
+
"peerDependenciesMeta": {
|
|
30
|
+
"@langchain/core": {
|
|
31
|
+
"optional": true
|
|
32
|
+
},
|
|
33
|
+
"zod": {
|
|
34
|
+
"optional": true
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
"devDependencies": {
|
|
38
|
+
"typescript": "^5",
|
|
39
|
+
"@langchain/core": "^1.2",
|
|
40
|
+
"zod": "^4"
|
|
41
|
+
}
|
|
42
|
+
}
|
package/src/index.ts
ADDED
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Typed HTTP client and request/response interfaces for 🩹 extract-correct-service.
|
|
3
|
+
*/
|
|
4
|
+
|
|
5
|
+
import { Client as BaseClient, type ClientOptions } from "@xyz17711/core";
|
|
6
|
+
|
|
7
|
+
/** One deterministic correction actually applied to the extracted value. */
|
|
8
|
+
export interface AppliedFix {
|
|
9
|
+
/** Human-readable detail of what changed. */
|
|
10
|
+
detail: string;
|
|
11
|
+
/** JSON Pointer to the field that was corrected (e.g. `/user/age`; `""` = the whole value). */
|
|
12
|
+
path: string;
|
|
13
|
+
/** Which bounded correction rule fired (e.g. `type_coercion`, `additional_property_stripped`, `enum_case_insensitive_match`, `required_default_filled`, `clamped_to_minimum`, `clamped_to_maximum`, `array_truncated_to_max_items`). */
|
|
14
|
+
rule: string;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/** One schema violation that could NOT be corrected -- never silently dropped or guessed. */
|
|
18
|
+
export interface RemainingIssue {
|
|
19
|
+
/** The JSON Schema keyword that failed (e.g. `pattern`, `format`, `minItems`, `oneOf`). */
|
|
20
|
+
keyword: string;
|
|
21
|
+
/** The underlying validator's own error message. */
|
|
22
|
+
message: string;
|
|
23
|
+
/** JSON Pointer to the field that still fails validation. */
|
|
24
|
+
path: string;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export interface ParseJsonResponse {
|
|
28
|
+
/** Every correction actually applied, in the order applied. */
|
|
29
|
+
applied_fixes: AppliedFix[];
|
|
30
|
+
/** The extracted (and, if a schema was supplied, corrected) JSON value. */
|
|
31
|
+
data: unknown;
|
|
32
|
+
/** How `data` was obtained: `"direct"` (already valid JSON), `"repaired"` (malformed JSON fixed in place), or `"extracted_and_repaired"` (isolated from surrounding text, then fixed). */
|
|
33
|
+
extraction_method: string;
|
|
34
|
+
/** Every schema violation that remains after correction -- non-empty only when `schema` was supplied and at least one issue couldn't be fixed by a bounded v1 rule. */
|
|
35
|
+
remaining_issues: RemainingIssue[];
|
|
36
|
+
/** Whether `data` satisfies `schema` after correction. `None` when no `schema` was supplied -- never conflated with "assumed valid". */
|
|
37
|
+
valid?: boolean | null;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
export interface ParseJsonRequest {
|
|
41
|
+
/** Optional JSON Schema to validate the extracted value against and auto-correct where a bounded, deterministic fix rule applies. Omitted = extraction only, no validation. */
|
|
42
|
+
schema?: unknown;
|
|
43
|
+
/** Free-form or messy text to extract structured JSON from -- already-valid JSON, JSON wrapped in prose or a markdown code fence, or malformed JSON (trailing commas, single-quoted strings, unquoted keys, a truncated array/object). */
|
|
44
|
+
text: string;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** Typed client for 🩹 extract-correct-service, e.g. `client.parseJson(...)`. */
|
|
48
|
+
export class Client extends BaseClient {
|
|
49
|
+
/** JSON repair API: extract valid JSON from messy text or model output and fix it against a JSON Schema ($0.006, x402) */
|
|
50
|
+
async parseJson(request: ParseJsonRequest): Promise<ParseJsonResponse> {
|
|
51
|
+
return this.post<ParseJsonResponse>("/v1/extract-correct/parse_json", request);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
export { ClientOptions };
|
package/src/langchain.ts
ADDED
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* LangChain.js tools for 🩹 extract-correct-service, grouped in one Toolkit -- one tool per operation, each just an async function (JS has no separate sync form to generate). Requires the `@langchain/core`+`zod` peer dependencies declared in this package's own package.json -- imported from `extract-correct/langchain`, never from the package root, so importing the base client never requires them installed.
|
|
3
|
+
*/
|
|
4
|
+
|
|
5
|
+
import { tool } from "@langchain/core/tools";
|
|
6
|
+
import { z } from "zod";
|
|
7
|
+
import { Client } from "./index.js";
|
|
8
|
+
|
|
9
|
+
export class ExtractCorrectToolkit {
|
|
10
|
+
private client: Client;
|
|
11
|
+
|
|
12
|
+
constructor(client: Client) {
|
|
13
|
+
this.client = client;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
getTools() {
|
|
17
|
+
return [
|
|
18
|
+
tool(
|
|
19
|
+
async (input) => this.client.parseJson(input),
|
|
20
|
+
{
|
|
21
|
+
name: "parseJson",
|
|
22
|
+
description: "JSON repair API: extract valid JSON from messy text or model output and fix it against a JSON Schema ($0.006, x402)",
|
|
23
|
+
schema: z.object({ schema: z.unknown().optional(), text: z.string() }),
|
|
24
|
+
},
|
|
25
|
+
),
|
|
26
|
+
];
|
|
27
|
+
}
|
|
28
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Verifies every extract-correct client method sends a request to the expected path/HTTP verb and parses a well-formed response -- one test per operation, real fetch mocked via a plain reassignment of `globalThis.fetch` (no extra test/mocking dependency). Runs against the COMPILED package (`../dist/index.js`) -- build before testing.
|
|
3
|
+
*/
|
|
4
|
+
|
|
5
|
+
import { test } from "node:test";
|
|
6
|
+
import assert from "node:assert/strict";
|
|
7
|
+
import { Client } from "../dist/index.js";
|
|
8
|
+
|
|
9
|
+
test("parseJson calls the expected path", async () => {
|
|
10
|
+
const originalFetch = globalThis.fetch;
|
|
11
|
+
globalThis.fetch = async (url, init = {}) => {
|
|
12
|
+
const parsed = new URL(url);
|
|
13
|
+
assert.equal((init.method ?? "GET").toUpperCase(), "POST");
|
|
14
|
+
assert.equal(parsed.pathname, "/v1/extract-correct/parse_json");
|
|
15
|
+
return new Response(JSON.stringify({ applied_fixes: [], data: null, extraction_method: "test", remaining_issues: [], valid: null }), { status: 200 });
|
|
16
|
+
};
|
|
17
|
+
try {
|
|
18
|
+
const client = new Client("https://example.test");
|
|
19
|
+
const result = await client.parseJson({ schema: null, text: "test" });
|
|
20
|
+
assert.ok(result !== undefined);
|
|
21
|
+
} finally {
|
|
22
|
+
globalThis.fetch = originalFetch;
|
|
23
|
+
}
|
|
24
|
+
});
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Verifies every extract-correct LangChain tool through the real StructuredTool (`.invoke()`), not just the underlying client method -- catches schema-shape bugs a plain client-method test would miss. Requires the `langchain`/`zod` dev dependencies.
|
|
3
|
+
*/
|
|
4
|
+
|
|
5
|
+
import { test } from "node:test";
|
|
6
|
+
import assert from "node:assert/strict";
|
|
7
|
+
import { Client } from "../dist/index.js";
|
|
8
|
+
import { ExtractCorrectToolkit } from "../dist/langchain.js";
|
|
9
|
+
|
|
10
|
+
test("parseJson tool invoke", async () => {
|
|
11
|
+
globalThis.fetch = async () => new Response(JSON.stringify({ applied_fixes: [], data: null, extraction_method: "test", remaining_issues: [], valid: null }), { status: 200 });
|
|
12
|
+
const toolkit = new ExtractCorrectToolkit(new Client("https://example.test"));
|
|
13
|
+
const t = toolkit.getTools().find((x) => x.name === "parseJson");
|
|
14
|
+
const result = await t.invoke({ schema: null, text: "test" });
|
|
15
|
+
assert.ok(result !== undefined);
|
|
16
|
+
});
|
package/tsconfig.json
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
{
|
|
2
|
+
"compilerOptions": {
|
|
3
|
+
"target": "ES2020",
|
|
4
|
+
"module": "ES2020",
|
|
5
|
+
"moduleResolution": "bundler",
|
|
6
|
+
"declaration": true,
|
|
7
|
+
"outDir": "dist",
|
|
8
|
+
"rootDir": "src",
|
|
9
|
+
"strict": true,
|
|
10
|
+
"esModuleInterop": true,
|
|
11
|
+
"skipLibCheck": true
|
|
12
|
+
},
|
|
13
|
+
"include": [
|
|
14
|
+
"src"
|
|
15
|
+
]
|
|
16
|
+
}
|