@dsh-gis/dsh-opengis-skill 0.1.3 → 0.2.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/CHANGELOG.md +40 -0
- package/README.md +48 -22
- package/THIRD_PARTY_NOTICES.md +9 -0
- package/adaptations/brutile.md +8 -0
- package/adaptations/cesiumjs.md +8 -0
- package/adaptations/common.md +16 -0
- package/adaptations/deck-gl.md +8 -0
- package/adaptations/duckdb-spatial.md +8 -0
- package/adaptations/gdal-api.md +8 -0
- package/adaptations/gdal.md +8 -0
- package/adaptations/geolibre.md +8 -0
- package/adaptations/geometry-api-java.md +8 -0
- package/adaptations/geometry-api-net.md +8 -0
- package/adaptations/geonode.md +8 -0
- package/adaptations/geopandas.md +8 -0
- package/adaptations/geopipe-agent.md +8 -0
- package/adaptations/geoserver-cloud.md +8 -0
- package/adaptations/geoserver-rest-api.md +8 -0
- package/adaptations/geoserver.md +8 -0
- package/adaptations/geotools.md +8 -0
- package/adaptations/grass-gis.md +8 -0
- package/adaptations/jts.md +8 -0
- package/adaptations/kepler-gl.md +8 -0
- package/adaptations/leaflet.md +8 -0
- package/adaptations/mapbox-gl-js.md +8 -0
- package/adaptations/mapserver.md +8 -0
- package/adaptations/mapsui.md +8 -0
- package/adaptations/nettopologysuite.md +8 -0
- package/adaptations/opengis-all.md +8 -0
- package/adaptations/opengis-daf.md +8 -0
- package/adaptations/opengis-utils-for-java.md +8 -0
- package/adaptations/opengis-utils-for-net.md +8 -0
- package/adaptations/openlayers.md +8 -0
- package/adaptations/pdal.md +8 -0
- package/adaptations/postgis.md +8 -0
- package/adaptations/proj.md +8 -0
- package/adaptations/projnet4geoapi.md +8 -0
- package/adaptations/pyqgis.md +8 -0
- package/adaptations/qgis-process.md +8 -0
- package/adaptations/qgis-server.md +8 -0
- package/adaptations/shapely.md +8 -0
- package/adaptations/sharpmap.md +8 -0
- package/adaptations/spatialite.md +8 -0
- package/adaptations/whitebox-tools.md +8 -0
- package/assets/brutile/SKILL.md +289 -0
- package/assets/cesiumjs/SKILL.md +73 -23
- package/assets/deck-gl/SKILL.md +19 -20
- package/assets/duckdb-spatial/SKILL.md +370 -0
- package/assets/gdal/SKILL.md +50 -21
- package/assets/gdal-api/SKILL.md +6 -4
- package/assets/geolibre/SKILL.md +364 -0
- package/assets/geometry-api-java/SKILL.md +5 -6
- package/assets/geometry-api-net/SKILL.md +65 -21
- package/assets/geonode/SKILL.md +347 -0
- package/assets/geopandas/SKILL.md +17 -15
- package/assets/geopipe-agent/SKILL.md +25 -20
- package/assets/geoserver/SKILL.md +6 -4
- package/assets/geoserver-cloud/SKILL.md +14 -15
- package/assets/geoserver-rest-api/SKILL.md +13 -8
- package/assets/geotools/SKILL.md +7 -5
- package/assets/grass-gis/SKILL.md +19 -20
- package/assets/jts/SKILL.md +7 -4
- package/assets/kepler-gl/SKILL.md +313 -0
- package/assets/leaflet/SKILL.md +41 -19
- package/assets/mapbox-gl-js/SKILL.md +18 -19
- package/assets/mapserver/SKILL.md +17 -19
- package/assets/mapsui/SKILL.md +85 -48
- package/assets/nettopologysuite/SKILL.md +91 -20
- package/assets/opengis-all/SKILL.md +78 -270
- package/assets/opengis-all/reference/data-stages.md +262 -4
- package/assets/opengis-daf/SKILL.md +6 -5
- package/assets/opengis-utils-for-java/SKILL.md +52 -39
- package/assets/opengis-utils-for-java/reference/common-tasks.md +12 -12
- package/assets/opengis-utils-for-net/SKILL.md +105 -39
- package/assets/opengis-utils-for-net/reference/code-patterns.md +11 -11
- package/assets/opengis-utils-for-net/reference/util-classes.md +25 -26
- package/assets/openlayers/SKILL.md +66 -9
- package/assets/pdal/SKILL.md +21 -17
- package/assets/postgis/SKILL.md +61 -11
- package/assets/proj/SKILL.md +28 -30
- package/assets/projnet4geoapi/SKILL.md +299 -0
- package/assets/pyqgis/SKILL.md +28 -20
- package/assets/qgis-process/SKILL.md +71 -22
- package/assets/qgis-server/SKILL.md +20 -20
- package/assets/shapely/SKILL.md +132 -75
- package/assets/sharpmap/SKILL.md +93 -50
- package/assets/spatialite/SKILL.md +365 -0
- package/assets/whitebox-tools/SKILL.md +269 -0
- package/lib/adaptations.d.ts +47 -0
- package/lib/adaptations.js +268 -0
- package/lib/index.d.ts +1 -1
- package/lib/index.js +14 -2
- package/lib/skill-file.js +31 -7
- package/locale/en.json +1 -1
- package/locale/zh.json +1 -1
- package/package.json +12 -2
- package/upstream.json +56 -40
|
@@ -0,0 +1,268 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* DeepSeek Harness adaptation layer for the vendored GIS skills.
|
|
3
|
+
*
|
|
4
|
+
* The files under "assets/" are an exact snapshot of the upstream
|
|
5
|
+
* opengis-skills repository, so they are never edited here: "upstream.json"
|
|
6
|
+
* records one SHA-256 digest per vendored file and "npm run sync" restores the
|
|
7
|
+
* snapshot byte for byte. DSH-specific execution guidance therefore lives in
|
|
8
|
+
* "adaptations/": "common.md" carries the rules that apply to every skill and
|
|
9
|
+
* "<skill>.md" carries the skill-specific notes. The provider appends both to
|
|
10
|
+
* the upstream body when a skill is loaded.
|
|
11
|
+
*
|
|
12
|
+
* Every function here is pure Node built-ins and takes the adaptation root as
|
|
13
|
+
* an argument, so the plugin, the validation script, and the tests share one
|
|
14
|
+
* implementation. No DeepSeek Harness imports.
|
|
15
|
+
*
|
|
16
|
+
* @module @dsh-gis/dsh-opengis-skill/adaptations
|
|
17
|
+
*/
|
|
18
|
+
|
|
19
|
+
import { readdirSync, readFileSync } from "node:fs";
|
|
20
|
+
import { readFile } from "node:fs/promises";
|
|
21
|
+
import { join } from "node:path";
|
|
22
|
+
|
|
23
|
+
/** Directory (relative to the package root) holding the DSH adaptation files. */
|
|
24
|
+
export const ADAPTATION_DIRECTORY = "adaptations";
|
|
25
|
+
|
|
26
|
+
/** File name of the guidance shared by every skill. */
|
|
27
|
+
export const COMMON_FILE = "common.md";
|
|
28
|
+
|
|
29
|
+
/** Heading the shared guidance must start with. */
|
|
30
|
+
export const COMMON_HEADING = "## DeepSeek Harness 通用约定";
|
|
31
|
+
|
|
32
|
+
/** Heading every per-skill guidance must start with. */
|
|
33
|
+
export const SKILL_HEADING = "## DeepSeek Harness 使用建议";
|
|
34
|
+
|
|
35
|
+
/** Separator between the upstream body and the DSH guidance block. */
|
|
36
|
+
export const SKILL_SEPARATOR = "\n\n---\n\n";
|
|
37
|
+
|
|
38
|
+
/** Labels every per-skill guidance must keep, in this order. */
|
|
39
|
+
export const REQUIRED_LABELS = ["加载与引用", "执行环境", "先探测版本", "验证产物", "风险与权限"];
|
|
40
|
+
|
|
41
|
+
/** Minimum bullets in the shared guidance. */
|
|
42
|
+
const COMMON_MIN_BULLETS = 8;
|
|
43
|
+
|
|
44
|
+
/** Minimum characters in one per-skill guidance file. */
|
|
45
|
+
const SKILL_MIN_CHARACTERS = 240;
|
|
46
|
+
|
|
47
|
+
/** Maximum characters in one per-skill guidance file. */
|
|
48
|
+
const SKILL_MAX_CHARACTERS = 4000;
|
|
49
|
+
|
|
50
|
+
/** Markers that mean an adaptation file was left unfinished. */
|
|
51
|
+
const UNFINISHED = /\b(?:TODO|FIXME|TBD|待补充|占位)\b/u;
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* Build the path of one per-skill adaptation file.
|
|
55
|
+
*
|
|
56
|
+
* @param root - absolute adaptations directory.
|
|
57
|
+
* @param name - kebab-case skill name.
|
|
58
|
+
* @returns the absolute Markdown path.
|
|
59
|
+
*/
|
|
60
|
+
export function adaptationFile(root, name) {
|
|
61
|
+
return join(root, name + ".md");
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/**
|
|
65
|
+
* Build the path of the shared adaptation file.
|
|
66
|
+
*
|
|
67
|
+
* @param root - absolute adaptations directory.
|
|
68
|
+
* @returns the absolute Markdown path.
|
|
69
|
+
*/
|
|
70
|
+
export function commonFile(root) {
|
|
71
|
+
return join(root, COMMON_FILE);
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
/**
|
|
75
|
+
* Normalize one adaptation file for use inside a skill body.
|
|
76
|
+
*
|
|
77
|
+
* @param text - the file contents.
|
|
78
|
+
* @returns the text with CRLF collapsed to LF and the edges trimmed.
|
|
79
|
+
*/
|
|
80
|
+
function normalizeAdaptation(text) {
|
|
81
|
+
return text.replace(/\r\n?/gu, "\n").trim();
|
|
82
|
+
}
|
|
83
|
+
|
|
84
|
+
/**
|
|
85
|
+
* Read and normalize one per-skill adaptation file.
|
|
86
|
+
*
|
|
87
|
+
* @param root - absolute adaptations directory.
|
|
88
|
+
* @param name - kebab-case skill name.
|
|
89
|
+
* @returns the normalized guidance text.
|
|
90
|
+
* @throws when the file is missing or does not start with the required heading.
|
|
91
|
+
*/
|
|
92
|
+
export function readAdaptationSync(root, name) {
|
|
93
|
+
const file = adaptationFile(root, name);
|
|
94
|
+
let text;
|
|
95
|
+
try {
|
|
96
|
+
text = readFileSync(file, "utf8");
|
|
97
|
+
} catch (cause) {
|
|
98
|
+
throw new Error('missing DSH adaptation for skill "' + name + '": ' + file + " (run npm run validate)", { cause });
|
|
99
|
+
}
|
|
100
|
+
return assertAdaptation(name, normalizeAdaptation(text));
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
/**
|
|
104
|
+
* Read and normalize the shared adaptation file.
|
|
105
|
+
*
|
|
106
|
+
* @param root - absolute adaptations directory.
|
|
107
|
+
* @returns the normalized guidance text.
|
|
108
|
+
* @throws when the file is missing or does not start with the required heading.
|
|
109
|
+
*/
|
|
110
|
+
export function readCommonSync(root) {
|
|
111
|
+
const file = commonFile(root);
|
|
112
|
+
let text;
|
|
113
|
+
try {
|
|
114
|
+
text = readFileSync(file, "utf8");
|
|
115
|
+
} catch (cause) {
|
|
116
|
+
throw new Error("missing shared DSH adaptation: " + file + " (run npm run validate)", { cause });
|
|
117
|
+
}
|
|
118
|
+
return assertCommon(normalizeAdaptation(text));
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
/**
|
|
122
|
+
* Read one per-skill adaptation file without blocking the event loop.
|
|
123
|
+
*
|
|
124
|
+
* @param root - absolute adaptations directory.
|
|
125
|
+
* @param name - kebab-case skill name.
|
|
126
|
+
* @param signal - optional abort signal handed to the read.
|
|
127
|
+
* @returns the normalized guidance text.
|
|
128
|
+
* @throws when the file is missing or does not start with the required heading.
|
|
129
|
+
*/
|
|
130
|
+
export async function readAdaptation(root, name, signal) {
|
|
131
|
+
const file = adaptationFile(root, name);
|
|
132
|
+
let text;
|
|
133
|
+
try {
|
|
134
|
+
text = await readFile(file, { encoding: "utf8", signal });
|
|
135
|
+
} catch (cause) {
|
|
136
|
+
if (cause?.name === "AbortError") throw cause;
|
|
137
|
+
throw new Error('missing DSH adaptation for skill "' + name + '": ' + file + " (run npm run validate)", { cause });
|
|
138
|
+
}
|
|
139
|
+
return assertAdaptation(name, normalizeAdaptation(text));
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
/**
|
|
143
|
+
* Read the shared adaptation file without blocking the event loop.
|
|
144
|
+
*
|
|
145
|
+
* @param root - absolute adaptations directory.
|
|
146
|
+
* @param signal - optional abort signal handed to the read.
|
|
147
|
+
* @returns the normalized guidance text.
|
|
148
|
+
* @throws when the file is missing or does not start with the required heading.
|
|
149
|
+
*/
|
|
150
|
+
export async function readCommon(root, signal) {
|
|
151
|
+
const file = commonFile(root);
|
|
152
|
+
let text;
|
|
153
|
+
try {
|
|
154
|
+
text = await readFile(file, { encoding: "utf8", signal });
|
|
155
|
+
} catch (cause) {
|
|
156
|
+
if (cause?.name === "AbortError") throw cause;
|
|
157
|
+
throw new Error("missing shared DSH adaptation: " + file + " (run npm run validate)", { cause });
|
|
158
|
+
}
|
|
159
|
+
return assertCommon(normalizeAdaptation(text));
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
/**
|
|
163
|
+
* List the adaptation file names (without the ".md" suffix), sorted.
|
|
164
|
+
*
|
|
165
|
+
* @param root - absolute adaptations directory.
|
|
166
|
+
* @returns the file base names, including "common".
|
|
167
|
+
* @throws when the directory is missing.
|
|
168
|
+
*/
|
|
169
|
+
export function listAdaptations(root) {
|
|
170
|
+
return readdirSync(root, { withFileTypes: true })
|
|
171
|
+
.filter((entry) => entry.isFile() && entry.name.endsWith(".md"))
|
|
172
|
+
.map((entry) => entry.name.slice(0, -".md".length))
|
|
173
|
+
.sort(compareCodePoints);
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
/**
|
|
177
|
+
* Append the DSH guidance block to one upstream skill body.
|
|
178
|
+
*
|
|
179
|
+
* @param base - the upstream instruction body, already trimmed and LF-normalized.
|
|
180
|
+
* @param adaptation - the per-skill guidance.
|
|
181
|
+
* @param common - the shared guidance.
|
|
182
|
+
* @returns the body a DeepSeek Harness session should read.
|
|
183
|
+
*/
|
|
184
|
+
export function composeSkillContent(base, adaptation, common) {
|
|
185
|
+
return base.trimEnd() + SKILL_SEPARATOR + adaptation.trim() + "\n\n" + common.trim() + "\n";
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
/**
|
|
189
|
+
* Report every problem with one per-skill adaptation file.
|
|
190
|
+
*
|
|
191
|
+
* The checks keep the 40 files comparable: each one states how to load it,
|
|
192
|
+
* where the commands run, how to probe the installed version, how to verify
|
|
193
|
+
* the artifact, and which operations need the user's consent.
|
|
194
|
+
*
|
|
195
|
+
* @param name - kebab-case skill name, used in every message.
|
|
196
|
+
* @param text - the normalized adaptation text.
|
|
197
|
+
* @returns human-readable problems, empty when the file is valid.
|
|
198
|
+
*/
|
|
199
|
+
export function adaptationProblems(name, text) {
|
|
200
|
+
const problems = [];
|
|
201
|
+
const label = ADAPTATION_DIRECTORY + "/" + name + ".md";
|
|
202
|
+
if (text.includes("\r")) problems.push(label + ": contains CR bytes; adaptations must use LF");
|
|
203
|
+
if (!text.startsWith(SKILL_HEADING)) problems.push(label + ': must start with "' + SKILL_HEADING + '"');
|
|
204
|
+
if (/^# /mu.test(text)) problems.push(label + ": must not carry a top-level heading");
|
|
205
|
+
if (text.length < SKILL_MIN_CHARACTERS) problems.push(label + ": " + text.length + " characters is too short for DSH guidance (minimum " + SKILL_MIN_CHARACTERS + ")");
|
|
206
|
+
if (text.length > SKILL_MAX_CHARACTERS) problems.push(label + ": " + text.length + " characters exceeds the " + SKILL_MAX_CHARACTERS + "-character budget");
|
|
207
|
+
const bullets = text.split("\n").filter((line) => line.startsWith("- **"));
|
|
208
|
+
if (bullets.length < REQUIRED_LABELS.length) problems.push(label + ": needs at least " + REQUIRED_LABELS.length + ' bullets of the form "- **label**:…"');
|
|
209
|
+
for (const required of REQUIRED_LABELS) {
|
|
210
|
+
if (!text.includes("- **" + required + "**")) problems.push(label + ': missing the "' + required + '" bullet');
|
|
211
|
+
}
|
|
212
|
+
if (!/`[^`]+`/u.test(text)) problems.push(label + ": must name at least one concrete command or tool in backticks");
|
|
213
|
+
if (UNFINISHED.test(text)) problems.push(label + ": still contains an unfinished marker (TODO/FIXME/TBD/待补充/占位)");
|
|
214
|
+
return problems;
|
|
215
|
+
}
|
|
216
|
+
|
|
217
|
+
/**
|
|
218
|
+
* Report every problem with the shared adaptation file.
|
|
219
|
+
*
|
|
220
|
+
* @param text - the normalized common guidance.
|
|
221
|
+
* @returns human-readable problems, empty when the file is valid.
|
|
222
|
+
*/
|
|
223
|
+
export function commonProblems(text) {
|
|
224
|
+
const problems = [];
|
|
225
|
+
const label = ADAPTATION_DIRECTORY + "/" + COMMON_FILE;
|
|
226
|
+
if (text.includes("\r")) problems.push(label + ": contains CR bytes; adaptations must use LF");
|
|
227
|
+
if (!text.startsWith(COMMON_HEADING)) problems.push(label + ': must start with "' + COMMON_HEADING + '"');
|
|
228
|
+
if (/^# /mu.test(text)) problems.push(label + ": must not carry a top-level heading");
|
|
229
|
+
if (text.length < 600) problems.push(label + ": " + text.length + " characters is too short for the shared guidance");
|
|
230
|
+
const bullets = text.split("\n").filter((line) => line.startsWith("- **"));
|
|
231
|
+
if (bullets.length < COMMON_MIN_BULLETS) problems.push(label + ": needs at least " + COMMON_MIN_BULLETS + ' bullets of the form "- **label**:…"');
|
|
232
|
+
if (UNFINISHED.test(text)) problems.push(label + ": still contains an unfinished marker (TODO/FIXME/TBD/待补充/占位)");
|
|
233
|
+
return problems;
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
/**
|
|
237
|
+
* Reject a per-skill adaptation that cannot be appended to a skill body.
|
|
238
|
+
*
|
|
239
|
+
* @param name - kebab-case skill name.
|
|
240
|
+
* @param text - the normalized adaptation text.
|
|
241
|
+
* @returns the same text.
|
|
242
|
+
* @throws when the file is empty or does not start with the required heading.
|
|
243
|
+
*/
|
|
244
|
+
function assertAdaptation(name, text) {
|
|
245
|
+
if (!text.startsWith(SKILL_HEADING)) {
|
|
246
|
+
throw new Error('DSH adaptation for skill "' + name + '" must start with "' + SKILL_HEADING + '": ' + adaptationFile("<adaptations>", name));
|
|
247
|
+
}
|
|
248
|
+
return text;
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
/**
|
|
252
|
+
* Reject a shared adaptation that cannot be appended to a skill body.
|
|
253
|
+
*
|
|
254
|
+
* @param text - the normalized common guidance.
|
|
255
|
+
* @returns the same text.
|
|
256
|
+
* @throws when the file is empty or does not start with the required heading.
|
|
257
|
+
*/
|
|
258
|
+
function assertCommon(text) {
|
|
259
|
+
if (!text.startsWith(COMMON_HEADING)) throw new Error('shared DSH adaptation must start with "' + COMMON_HEADING + '"');
|
|
260
|
+
return text;
|
|
261
|
+
}
|
|
262
|
+
|
|
263
|
+
/** Compare two strings by Unicode code point, independent of the locale. */
|
|
264
|
+
function compareCodePoints(left, right) {
|
|
265
|
+
if (left < right) return -1;
|
|
266
|
+
if (left > right) return 1;
|
|
267
|
+
return 0;
|
|
268
|
+
}
|
package/lib/index.d.ts
CHANGED
|
@@ -29,7 +29,7 @@ export interface OpenGisSkillCandidate {
|
|
|
29
29
|
resourceBase: OpenGisResourceBase;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
/** One loaded skill body returned by the provider. */
|
|
32
|
+
/** One loaded skill body returned by the provider; "content" also carries the DSH guidance. */
|
|
33
33
|
export interface OpenGisSkillDefinition {
|
|
34
34
|
name: string;
|
|
35
35
|
description: string;
|
package/lib/index.js
CHANGED
|
@@ -7,11 +7,16 @@
|
|
|
7
7
|
* "reference/*.md" files are read on demand, and each candidate carries the
|
|
8
8
|
* skill directory as its resource base so relative references resolve.
|
|
9
9
|
*
|
|
10
|
+
* The vendored bodies are an exact upstream snapshot, so the DeepSeek Harness
|
|
11
|
+
* guidance lives outside them: "adaptations/<skill>.md" plus the shared
|
|
12
|
+
* "adaptations/common.md" are appended when a skill is loaded.
|
|
13
|
+
*
|
|
10
14
|
* @module @dsh-gis/dsh-opengis-skill
|
|
11
15
|
*/
|
|
12
16
|
|
|
13
17
|
import { readFile } from "node:fs/promises";
|
|
14
18
|
import { fileURLToPath } from "node:url";
|
|
19
|
+
import { composeSkillContent, readAdaptation, readCommon } from "./adaptations.js";
|
|
15
20
|
import { readSkillCatalog, resourceBaseOf } from "./catalog.js";
|
|
16
21
|
import { parseSkillFile } from "./skill-file.js";
|
|
17
22
|
|
|
@@ -27,6 +32,9 @@ const RANK = 600;
|
|
|
27
32
|
/** Absolute asset root, resolved from this module inside the installed package. */
|
|
28
33
|
const ASSET_ROOT = fileURLToPath(new URL("../assets/", import.meta.url));
|
|
29
34
|
|
|
35
|
+
/** Absolute adaptation root holding the DSH guidance appended on load. */
|
|
36
|
+
const ADAPTATION_ROOT = fileURLToPath(new URL("../adaptations/", import.meta.url));
|
|
37
|
+
|
|
30
38
|
/** Stable Loader identity. */
|
|
31
39
|
const name = "opengis-skill";
|
|
32
40
|
|
|
@@ -79,7 +87,11 @@ function apply(ctx) {
|
|
|
79
87
|
async get(candidate, options) {
|
|
80
88
|
const skill = byName.get(candidate.name);
|
|
81
89
|
if (skill === undefined) throw new Error('opengis-skill: unknown skill "' + candidate.name + '"');
|
|
82
|
-
const raw = await
|
|
90
|
+
const [raw, adaptation, common] = await Promise.all([
|
|
91
|
+
readFile(skill.path, { encoding: "utf8", signal: options?.signal }),
|
|
92
|
+
readAdaptation(ADAPTATION_ROOT, skill.name, options?.signal),
|
|
93
|
+
readCommon(ADAPTATION_ROOT, options?.signal)
|
|
94
|
+
]);
|
|
83
95
|
let parsed;
|
|
84
96
|
try {
|
|
85
97
|
parsed = parseSkillFile(raw, skill.path);
|
|
@@ -97,7 +109,7 @@ function apply(ctx) {
|
|
|
97
109
|
provider: PROVIDER_NAME,
|
|
98
110
|
resourceBase: resourceBaseOf(skill.directory),
|
|
99
111
|
path: skill.path,
|
|
100
|
-
content: parsed.content
|
|
112
|
+
content: composeSkillContent(parsed.content, adaptation, common)
|
|
101
113
|
};
|
|
102
114
|
}
|
|
103
115
|
};
|
package/lib/skill-file.js
CHANGED
|
@@ -4,8 +4,11 @@
|
|
|
4
4
|
*
|
|
5
5
|
* Vendored opengis-skills files keep "name" and "description" on single lines,
|
|
6
6
|
* so only scalar fields are read; list fields such as "tags" are ignored.
|
|
7
|
-
* Multi-line block scalars are rejected instead of being silently truncated
|
|
8
|
-
*
|
|
7
|
+
* Multi-line block scalars are rejected instead of being silently truncated.
|
|
8
|
+
* Double-quoted scalars support the common YAML escape sequences; a value whose
|
|
9
|
+
* inner quotes were left unescaped upstream (invalid YAML, but unambiguous in
|
|
10
|
+
* practice) is read between the outermost quotes so the vendored snapshot does
|
|
11
|
+
* not have to be rewritten.
|
|
9
12
|
*
|
|
10
13
|
* @module @dsh-gis/dsh-opengis-skill/skill-file
|
|
11
14
|
*/
|
|
@@ -111,8 +114,8 @@ function parseScalar(value, subject) {
|
|
|
111
114
|
if (value.length === 0) return "";
|
|
112
115
|
if (value.startsWith('"')) {
|
|
113
116
|
const quoted = DOUBLE_QUOTED.exec(value);
|
|
114
|
-
if (quoted
|
|
115
|
-
return
|
|
117
|
+
if (quoted !== null) return decodeDoubleQuoted(quoted[1], subject, false);
|
|
118
|
+
return decodeLenientDoubleQuoted(value, subject);
|
|
116
119
|
}
|
|
117
120
|
if (value.startsWith("'")) {
|
|
118
121
|
const quoted = SINGLE_QUOTED.exec(value);
|
|
@@ -126,14 +129,34 @@ function parseScalar(value, subject) {
|
|
|
126
129
|
return (comment === -1 ? value : value.slice(0, comment)).trim();
|
|
127
130
|
}
|
|
128
131
|
|
|
132
|
+
/**
|
|
133
|
+
* Decode a double-quoted scalar that carries unescaped inner quotes.
|
|
134
|
+
*
|
|
135
|
+
* Upstream writes long descriptions with literal inner quotes
|
|
136
|
+
* ("... also for validate "not registered" errors ..."), which strict YAML
|
|
137
|
+
* rejects. The text between the outermost quotes is kept, known escapes are
|
|
138
|
+
* decoded, and any other backslash sequence stays literal so technical text
|
|
139
|
+
* such as "\d" or a Windows path survives unchanged.
|
|
140
|
+
*
|
|
141
|
+
* @param value - the trimmed text after "key:", starting and ending with a quote.
|
|
142
|
+
* @param subject - the error-message prefix.
|
|
143
|
+
* @returns the decoded scalar text.
|
|
144
|
+
* @throws when the value does not close with a quote.
|
|
145
|
+
*/
|
|
146
|
+
function decodeLenientDoubleQuoted(value, subject) {
|
|
147
|
+
if (value.length < 2 || !value.endsWith('"')) throw new Error(subject + ": malformed or unterminated double-quoted scalar");
|
|
148
|
+
return decodeDoubleQuoted(value.slice(1, -1), subject, true);
|
|
149
|
+
}
|
|
150
|
+
|
|
129
151
|
/**
|
|
130
152
|
* Decode the body of a double-quoted YAML scalar.
|
|
131
153
|
*
|
|
132
154
|
* @param body - the text between the surrounding quotes.
|
|
133
155
|
* @param subject - the error-message prefix.
|
|
156
|
+
* @param lenient - whether unknown escape sequences stay literal instead of throwing.
|
|
134
157
|
* @returns the decoded text.
|
|
135
158
|
*/
|
|
136
|
-
function
|
|
159
|
+
function decodeDoubleQuoted(body, subject, lenient) {
|
|
137
160
|
return body.replace(DOUBLE_QUOTED_ESCAPE, (match, escape) => {
|
|
138
161
|
if (escape.length > 1) {
|
|
139
162
|
const codePoint = Number.parseInt(escape.slice(1), 16);
|
|
@@ -143,7 +166,8 @@ function unescapeDoubleQuoted(body, subject) {
|
|
|
143
166
|
return String.fromCodePoint(codePoint);
|
|
144
167
|
}
|
|
145
168
|
const simple = SIMPLE_ESCAPES.get(escape);
|
|
146
|
-
if (simple
|
|
147
|
-
return
|
|
169
|
+
if (simple !== undefined) return simple;
|
|
170
|
+
if (lenient) return match;
|
|
171
|
+
throw new Error(subject + ': unsupported escape sequence "\\' + escape + '"');
|
|
148
172
|
});
|
|
149
173
|
}
|
package/locale/en.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"meta": {
|
|
3
3
|
"title": "OpenGIS Skills",
|
|
4
|
-
"description": "GIS skills from opengis-skills
|
|
4
|
+
"description": "40 GIS skills from opengis-skills (GDAL, QGIS, GeoServer, PostGIS, DuckDB Spatial, JTS, CesiumJS, OpenLayers and more), loaded on demand with DeepSeek Harness execution guidance."
|
|
5
5
|
}
|
|
6
6
|
}
|
package/locale/zh.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"meta": {
|
|
3
3
|
"title": "OpenGIS 技能包",
|
|
4
|
-
"description": "来自 opengis-skills 的 GIS 技能:GDAL、QGIS、GeoServer、PostGIS、JTS、CesiumJS、OpenLayers
|
|
4
|
+
"description": "来自 opengis-skills 的 40 个 GIS 技能:GDAL、QGIS、GeoServer、PostGIS、DuckDB Spatial、JTS、CesiumJS、OpenLayers 等,按需加载并附带 DeepSeek Harness 执行指引。"
|
|
5
5
|
}
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dsh-gis/dsh-opengis-skill",
|
|
3
|
-
"version": "0.
|
|
4
|
-
"description": "OpenGIS skill pack for DeepSeek Harness: the gis/ skills from opengis-skills (GDAL, QGIS, GeoServer, PostGIS, JTS, CesiumJS, OpenLayers and more), loaded on demand.",
|
|
3
|
+
"version": "0.2.0",
|
|
4
|
+
"description": "OpenGIS skill pack for DeepSeek Harness: the 40 gis/ skills from opengis-skills (GDAL, QGIS, GeoServer, PostGIS, DuckDB Spatial, JTS, CesiumJS, OpenLayers and more), loaded on demand with a DeepSeek Harness adaptation layer.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"types": "lib/index.d.ts",
|
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
"files": [
|
|
24
24
|
"lib",
|
|
25
25
|
"assets",
|
|
26
|
+
"adaptations",
|
|
26
27
|
"cordis.patch.yml",
|
|
27
28
|
"locale/*.json",
|
|
28
29
|
"icon.svg",
|
|
@@ -45,6 +46,7 @@
|
|
|
45
46
|
"sync": "node scripts/sync-opengis-skills.mjs",
|
|
46
47
|
"sync:check": "node scripts/sync-opengis-skills.mjs --check",
|
|
47
48
|
"validate": "node scripts/validate-skills.mjs",
|
|
49
|
+
"check:adaptations": "node scripts/check-adaptations.mjs",
|
|
48
50
|
"test": "node --test",
|
|
49
51
|
"check": "npm run validate && npm test",
|
|
50
52
|
"prepublishOnly": "npm run check"
|
|
@@ -80,6 +82,14 @@
|
|
|
80
82
|
"proj",
|
|
81
83
|
"pdal",
|
|
82
84
|
"grass-gis",
|
|
85
|
+
"duckdb-spatial",
|
|
86
|
+
"spatialite",
|
|
87
|
+
"whitebox-tools",
|
|
88
|
+
"geonode",
|
|
89
|
+
"geolibre",
|
|
90
|
+
"kepler-gl",
|
|
91
|
+
"brutile",
|
|
92
|
+
"projnet4geoapi",
|
|
83
93
|
"jts",
|
|
84
94
|
"geopandas",
|
|
85
95
|
"shapely",
|
package/upstream.json
CHANGED
|
@@ -1,17 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schemaVersion": 1,
|
|
3
3
|
"repository": "https://github.com/znlgis/opengis-skills",
|
|
4
|
-
"commit": "
|
|
5
|
-
"syncedAt": "2026-10-
|
|
4
|
+
"commit": "6562616dd88baaa102b03683b4e210e16fa35a38",
|
|
5
|
+
"syncedAt": "2026-10-27T14:08:07.195Z",
|
|
6
6
|
"hashAlgorithm": "sha256",
|
|
7
|
-
"skillCount":
|
|
7
|
+
"skillCount": 40,
|
|
8
8
|
"skills": [
|
|
9
|
+
"brutile",
|
|
9
10
|
"cesiumjs",
|
|
10
11
|
"deck-gl",
|
|
12
|
+
"duckdb-spatial",
|
|
11
13
|
"gdal",
|
|
12
14
|
"gdal-api",
|
|
15
|
+
"geolibre",
|
|
13
16
|
"geometry-api-java",
|
|
14
17
|
"geometry-api-net",
|
|
18
|
+
"geonode",
|
|
15
19
|
"geopandas",
|
|
16
20
|
"geopipe-agent",
|
|
17
21
|
"geoserver",
|
|
@@ -20,6 +24,7 @@
|
|
|
20
24
|
"geotools",
|
|
21
25
|
"grass-gis",
|
|
22
26
|
"jts",
|
|
27
|
+
"kepler-gl",
|
|
23
28
|
"leaflet",
|
|
24
29
|
"mapbox-gl-js",
|
|
25
30
|
"mapserver",
|
|
@@ -33,70 +38,81 @@
|
|
|
33
38
|
"pdal",
|
|
34
39
|
"postgis",
|
|
35
40
|
"proj",
|
|
41
|
+
"projnet4geoapi",
|
|
36
42
|
"pyqgis",
|
|
37
43
|
"qgis-process",
|
|
38
44
|
"qgis-server",
|
|
39
45
|
"shapely",
|
|
40
|
-
"sharpmap"
|
|
46
|
+
"sharpmap",
|
|
47
|
+
"spatialite",
|
|
48
|
+
"whitebox-tools"
|
|
41
49
|
],
|
|
42
50
|
"files": {
|
|
43
|
-
"
|
|
44
|
-
"
|
|
45
|
-
"
|
|
51
|
+
"brutile/SKILL.md": "c7e17232ea115928e719b6153c4086bb4418cb494b974a1ae3763474fcba3231",
|
|
52
|
+
"cesiumjs/SKILL.md": "1a54fc765a7b6804472fe92a75d438f79ae72155e413af53cc8c89e2d4d1db09",
|
|
53
|
+
"deck-gl/SKILL.md": "367c5d00de188b5df9669d67f634d99f7238813404b924973cda619ed100416f",
|
|
54
|
+
"duckdb-spatial/SKILL.md": "85b336cf52f2336d61054bc28948918d352661e0eb6419b9256783fbebcf1f6c",
|
|
55
|
+
"gdal-api/SKILL.md": "d9817d295b2ddb73cee5ce6f8828af8182fbdfeb1511d16cc60d532b8669fdc3",
|
|
46
56
|
"gdal-api/reference/raster-api.md": "c0d4526602bf3e2e3f80abeaa972997c132e3f6fbbabd79347d035a3cd1f1c84",
|
|
47
57
|
"gdal-api/reference/vector-api.md": "5907be299d5e969f294c25a53737454f0e5abcd6d74e0d3831ddd46d9f18d03f",
|
|
48
|
-
"gdal/SKILL.md": "
|
|
58
|
+
"gdal/SKILL.md": "ede3b50b9f2adee8659841564e47e8d8d15ec9d5c2e696f55b26ca6cf7138268",
|
|
49
59
|
"gdal/reference/data-formats.md": "443731a0f13330ab90e7ecc3e8e46d85519fbcd7013861dfa63f693668fdffd3",
|
|
50
60
|
"gdal/reference/raster-tools.md": "a3ed2dbb9571ce59973729e8cea5d68cf039d30bf39c98b614fb523a61541f97",
|
|
51
61
|
"gdal/reference/vector-tools.md": "284b5685f3f72b13865a8da2bef33637eb92820aa0b3cfec57f8c745a1fe3966",
|
|
52
|
-
"
|
|
53
|
-
"geometry-api-
|
|
62
|
+
"geolibre/SKILL.md": "3cc4d346e40e4cf0a6b40c27043bddf7e96ed36c59a18fb8e3507d87540402eb",
|
|
63
|
+
"geometry-api-java/SKILL.md": "0a95028b3204889d9fef73591eb3d5570cddf7240d56a34599d4c26a06f34202",
|
|
64
|
+
"geometry-api-net/SKILL.md": "e23a0897af0b5cf81c7de0adfdc590c0a3f6abfc38e6c7c9f93c7c0efea122f9",
|
|
54
65
|
"geometry-api-net/reference/geometry-types.md": "121e6ef0f5c7fb053b8e14bf42e952629bfb8b0717626fd7744db59ca6cfb4e7",
|
|
55
|
-
"
|
|
66
|
+
"geonode/SKILL.md": "8fa05d5b0c1f0f9f8b3241050640009708d3dac63e1a42267dec693daaddb264",
|
|
67
|
+
"geopandas/SKILL.md": "26876895c1bce4cfb281a004da18cacd4573ea1cd8189493bc18c5bb1f1e8944",
|
|
56
68
|
"geopandas/reference/core-api.md": "1e233adb18510d7d4788cfc18ac47982b53784b09ce37d2171494e9beba4e05f",
|
|
57
|
-
"geopipe-agent/SKILL.md": "
|
|
69
|
+
"geopipe-agent/SKILL.md": "d5eee4068db3b61010b1d7ab5f1bf036e74b14fb0224836bbae204127af4f96e",
|
|
58
70
|
"geopipe-agent/reference/backends.md": "00d7658470e67661d6774eb827f9ab0ccbb2262604b3cb65a0382bf27d2b331f",
|
|
59
71
|
"geopipe-agent/reference/knowledge.md": "63b1d44d6f83d4e33011c35855d08b2c83cd07f2ec21722a120b1e2164685e07",
|
|
60
72
|
"geopipe-agent/reference/pipeline-schema.md": "9b6a7a87002fa2fa53f61441a0f9ace804b970ba9ea6b00b0308e2dba9a77cb6",
|
|
61
73
|
"geopipe-agent/reference/self-extension.md": "552be0bfaef58f3cb7f10567362c3c7328bea520b8ef61bda5f79f84529e16a1",
|
|
62
74
|
"geopipe-agent/reference/steps-reference.md": "3c1adaf5f9960ea9c99919cc61bb065e59ce2b77a6a029aa2a2e9977dc794bf8",
|
|
63
75
|
"geopipe-agent/reference/workflows.md": "e4e0fb32dd83b7f7b27de5a42f6a2d7eea71c4fae7e8c7764d7defe7340e1313",
|
|
64
|
-
"geoserver-cloud/SKILL.md": "
|
|
65
|
-
"geoserver-rest-api/SKILL.md": "
|
|
76
|
+
"geoserver-cloud/SKILL.md": "9e971fb41c08ea2d06f96943715f233a9c74d14f7546262ad583f4442414b603",
|
|
77
|
+
"geoserver-rest-api/SKILL.md": "3183b5f9c24bce8619331e70c35cae515d70f563609b6232ee3fcfa2b33b5244",
|
|
66
78
|
"geoserver-rest-api/reference/endpoints.md": "20fbb2ea7ccddcbb34f5ecb227d53127073a8109edbff9ad1bbcae07a3cf1be7",
|
|
67
|
-
"geoserver/SKILL.md": "
|
|
68
|
-
"geotools/SKILL.md": "
|
|
79
|
+
"geoserver/SKILL.md": "2ef0a329e5cf20425869eb3ac304dde81c00bff7c56c05ee4e84faf6cb15323c",
|
|
80
|
+
"geotools/SKILL.md": "e5bfdfbd4d9f2e962b1d73f4de9b9cf7abd250694f29386e293baf64c6d119eb",
|
|
69
81
|
"geotools/reference/raster-rendering.md": "3b1876ad39d8c11756b1ff5eac8cda9dab0d94f958f8cafa4f32d9ff5fa6ebd3",
|
|
70
82
|
"geotools/reference/vector-io.md": "2dca5de4e149bc9e79bd5bfcb345c36e45da06a9d86a53bc28869168f55902f1",
|
|
71
|
-
"grass-gis/SKILL.md": "
|
|
72
|
-
"jts/SKILL.md": "
|
|
83
|
+
"grass-gis/SKILL.md": "a2b6b2325c51813c63b7283d65412faf6fa8ca3d8069dc08bcc254121ac5d3f8",
|
|
84
|
+
"jts/SKILL.md": "f90756d84502329fcfe5ab31729677cdc75068eb7ce57db61d503d1f183225d9",
|
|
73
85
|
"jts/reference/geometry-operations.md": "a242f1f0185136baa60f632072c041fb734185b844da25c37ef1f4e3b2685124",
|
|
74
|
-
"
|
|
75
|
-
"
|
|
76
|
-
"
|
|
77
|
-
"
|
|
78
|
-
"
|
|
79
|
-
"
|
|
80
|
-
"opengis-all/
|
|
86
|
+
"kepler-gl/SKILL.md": "b007eae1f1268cb22e75288c847c6b6f322b1b1c93390d077c89853417d57d3a",
|
|
87
|
+
"leaflet/SKILL.md": "a25c68aafa1819b75e983aeca719cd7bbbe700ad1e5d8f8bfe5673ddfae20c8e",
|
|
88
|
+
"mapbox-gl-js/SKILL.md": "4eb813fef30b3edb0cd3ccc4e429e41f19f4564fe12ce5754b5046e0bc6476ec",
|
|
89
|
+
"mapserver/SKILL.md": "8ec0cba8b647176d744796a3e93cab84ae573f170fdc55d5f8b5e93eb51fa5cb",
|
|
90
|
+
"mapsui/SKILL.md": "bf75f1e1bc3be6e11dccf31678193ee2e21acb46311f256c45b6ff2679f28292",
|
|
91
|
+
"nettopologysuite/SKILL.md": "3dd90cfbd0b9bfbb7f04e98d5ba7aa9ea9ccb976ca062521ba5de2e1dc6c31ee",
|
|
92
|
+
"opengis-all/SKILL.md": "cb852fb55d89c4012ee08ccbb31e63f80060ccfd2df8365d314b4229e31685cd",
|
|
93
|
+
"opengis-all/reference/data-stages.md": "5698a1d8ee208f50a1430c1d34b2e4e35175470f2012be43edc59c522533c659",
|
|
81
94
|
"opengis-all/reference/workflow-cheatsheets.md": "3bb58ea3b966ab1bd85380cda1253056ff03accb97f37d863f3f96e7ce6dbdb7",
|
|
82
|
-
"opengis-daf/SKILL.md": "
|
|
83
|
-
"opengis-utils-for-java/SKILL.md": "
|
|
84
|
-
"opengis-utils-for-java/reference/common-tasks.md": "
|
|
85
|
-
"opengis-utils-for-net/SKILL.md": "
|
|
86
|
-
"opengis-utils-for-net/reference/code-patterns.md": "
|
|
87
|
-
"opengis-utils-for-net/reference/util-classes.md": "
|
|
88
|
-
"openlayers/SKILL.md": "
|
|
89
|
-
"pdal/SKILL.md": "
|
|
90
|
-
"postgis/SKILL.md": "
|
|
91
|
-
"proj/SKILL.md": "
|
|
92
|
-
"
|
|
95
|
+
"opengis-daf/SKILL.md": "60596394913b4be5d655b25d3909b87ba41b263216a96c81893a79daf5ee159c",
|
|
96
|
+
"opengis-utils-for-java/SKILL.md": "ac6d4df5fce8f0d3c7a371c4db6ebf61d98d67b1d3a8f1a5d2ddbccf81102d8c",
|
|
97
|
+
"opengis-utils-for-java/reference/common-tasks.md": "1d6439465db14b04705e722705f3a1d17cd566e2a105d9d9e5ab24e64145e64b",
|
|
98
|
+
"opengis-utils-for-net/SKILL.md": "badba3643c064bf28672fec57a0819d0757191cf5d70ccf6f247e818259dadfe",
|
|
99
|
+
"opengis-utils-for-net/reference/code-patterns.md": "a2f3b4b2b5f47a2c3d3a27b3fd2058bb90301094d9c5d1319510ee5e556c8501",
|
|
100
|
+
"opengis-utils-for-net/reference/util-classes.md": "d2d7cec635049def96d29ef8778c8427028f1108220011e8cd71544627d615ac",
|
|
101
|
+
"openlayers/SKILL.md": "ba304defef694237c50fd44fb82215a8812e2917a22b19e8430a49585930d368",
|
|
102
|
+
"pdal/SKILL.md": "bfedb5b2362f7157fa09411dd6042ffaabfef217754d2d59ea370e0e380654cc",
|
|
103
|
+
"postgis/SKILL.md": "01b23023a795003dce03e50907b14740f7216571b968cc3f5e21f6b8bd4eff67",
|
|
104
|
+
"proj/SKILL.md": "e58af39b84679b53094aa1aa84d52da2d452b685a4271c08189d644ea1d7d568",
|
|
105
|
+
"projnet4geoapi/SKILL.md": "d36e4d2c80ca0bff729b2fb48e1b8d7a0071f902b69c57530801dab837bf1057",
|
|
106
|
+
"pyqgis/SKILL.md": "2adec0e91e13a9ce2a8e0cb0009764f8d626026815ce30401d6edd3ca9729977",
|
|
93
107
|
"pyqgis/reference/processing-rendering.md": "138644c36ca3f30e746016bb7457fd3a2d18349c5740f02d1735ba6c59173a3e",
|
|
94
108
|
"pyqgis/reference/vector-raster-layers.md": "fec965918eff2d24c6e8f8c68379c52bb10727892f8d599e6c425760d168cd2d",
|
|
95
|
-
"qgis-process/SKILL.md": "
|
|
109
|
+
"qgis-process/SKILL.md": "a8491dc814386ecaec8f0a0890adbc5d49684ceca6e1d043742265abb8145987",
|
|
96
110
|
"qgis-process/reference/algorithm-cheatsheet.md": "d88720d80a2d78efefcf1ff9027b451f291bef5ef166fa9befcae484bfa91e8f",
|
|
97
|
-
"qgis-server/SKILL.md": "
|
|
98
|
-
"shapely/SKILL.md": "
|
|
111
|
+
"qgis-server/SKILL.md": "480ca4d9f28c49c9180df7bf8c33e62b0638d61540e953995d350244af17f5d9",
|
|
112
|
+
"shapely/SKILL.md": "9e5059ad3f133a07b79a19dd7693f56f601d9e4f270a7ba28719d77c3d848227",
|
|
99
113
|
"shapely/reference/operations-reference.md": "a984e9cd84dbfa3bc299284725639520883a85289f67a61d7b296a00665c2714",
|
|
100
|
-
"sharpmap/SKILL.md": "
|
|
114
|
+
"sharpmap/SKILL.md": "c01e13bcdc501f794c3a3c17c95d9e63a89fb0708473981f7297d9159b2b6642",
|
|
115
|
+
"spatialite/SKILL.md": "2ae64fb306f64cda1ebc6aa4c0fe73c643e69ec61dbaa2eef0f1efed787bfaed",
|
|
116
|
+
"whitebox-tools/SKILL.md": "6497b11ba7d38a0dd68b22924b0c7e17bce342a907031711131943fe79953d35"
|
|
101
117
|
}
|
|
102
118
|
}
|