@dssp/supervision 1.0.0-alpha.93 → 1.0.0-alpha.97
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-client/pages/checklist/checklist-view.js +93 -45
- package/dist-client/pages/checklist/checklist-view.js.map +1 -1
- package/dist-client/pages/checklist/kcs-criteria-popup.d.ts +1 -0
- package/dist-client/pages/checklist/kcs-criteria-popup.js +11 -6
- package/dist-client/pages/checklist/kcs-criteria-popup.js.map +1 -1
- package/dist-client/pages/project-checklist/project-checklist-management.d.ts +4 -0
- package/dist-client/pages/project-checklist/project-checklist-management.js +81 -12
- package/dist-client/pages/project-checklist/project-checklist-management.js.map +1 -1
- package/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-server/service/project-checklist/spec-matching-service.js +53 -4
- package/dist-server/service/project-checklist/spec-matching-service.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -2
|
@@ -3,8 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.matchInspectionCriteria = matchInspectionCriteria;
|
|
4
4
|
exports.updateProjectChecklistCriteria = updateProjectChecklistCriteria;
|
|
5
5
|
exports.queueUpdateProjectChecklistCriteria = queueUpdateProjectChecklistCriteria;
|
|
6
|
+
const client_s3_1 = require("@aws-sdk/client-s3");
|
|
7
|
+
const s3_request_presigner_1 = require("@aws-sdk/s3-request-presigner");
|
|
8
|
+
const env_1 = require("@things-factory/env");
|
|
6
9
|
const shell_1 = require("@things-factory/shell");
|
|
7
10
|
const project_checklist_item_1 = require("../project-checklist-item/project-checklist-item");
|
|
11
|
+
const STORAGE = env_1.config.get('storage', {});
|
|
8
12
|
const SPEC_MATCHING_API_URL = 'https://hatiolab-korea-uni.ettisoft.com/api/run/spec-matching';
|
|
9
13
|
const API_USERNAME = 'admin';
|
|
10
14
|
const API_PASSWORD = 'admin1234';
|
|
@@ -12,6 +16,36 @@ const API_PASSWORD = 'admin1234';
|
|
|
12
16
|
function formatClauses(text) {
|
|
13
17
|
return (text || '').replace(/\s*(?=\(\d+\))/g, '\n').trim();
|
|
14
18
|
}
|
|
19
|
+
/**
|
|
20
|
+
* 현장 시방서 URL을 매칭 서버가 접근 가능한 URL로 변환한다.
|
|
21
|
+
* 저장된 URL은 앱 프록시 경로(/attachment/{s3-key})라서 외부 매칭 서버가 접근할 수 없으므로,
|
|
22
|
+
* S3 스토리지인 경우 해당 key에 대한 presigned GET URL(1시간)을 생성해서 반환한다.
|
|
23
|
+
*/
|
|
24
|
+
async function toDownloadableUrl(siteSpecPdfUrl) {
|
|
25
|
+
if (!siteSpecPdfUrl)
|
|
26
|
+
return undefined;
|
|
27
|
+
const matched = siteSpecPdfUrl.match(/\/attachment\/([^/?#]+)/);
|
|
28
|
+
if (!matched || (STORAGE === null || STORAGE === void 0 ? void 0 : STORAGE.type) !== 's3') {
|
|
29
|
+
console.log('현장 시방서 URL 변환 생략 (원본 그대로 사용) :', siteSpecPdfUrl);
|
|
30
|
+
return siteSpecPdfUrl;
|
|
31
|
+
}
|
|
32
|
+
try {
|
|
33
|
+
const client = new client_s3_1.S3Client({
|
|
34
|
+
credentials: {
|
|
35
|
+
accessKeyId: STORAGE.accessKeyId,
|
|
36
|
+
secretAccessKey: STORAGE.secretAccessKey
|
|
37
|
+
},
|
|
38
|
+
region: STORAGE.region
|
|
39
|
+
});
|
|
40
|
+
const signedUrl = await (0, s3_request_presigner_1.getSignedUrl)(client, new client_s3_1.GetObjectCommand({ Bucket: STORAGE.bucketName, Key: decodeURIComponent(matched[1]) }), { expiresIn: 3600 });
|
|
41
|
+
console.log('현장 시방서 presigned URL 생성 완료 (key :', decodeURIComponent(matched[1]), ')');
|
|
42
|
+
return signedUrl;
|
|
43
|
+
}
|
|
44
|
+
catch (error) {
|
|
45
|
+
console.error('현장 시방서 presigned URL 생성 실패:', error);
|
|
46
|
+
return siteSpecPdfUrl;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
15
49
|
/**
|
|
16
50
|
* 검사항목(query) 1건에 대해 KCS 표준 기준과 현장 시방서 기준을 매칭 API로 조회한다.
|
|
17
51
|
* - KCS 표준은 API 서버에 파일(kcs.csv)이 이미 존재한다.
|
|
@@ -19,7 +53,7 @@ function formatClauses(text) {
|
|
|
19
53
|
* - 첨부파일이 없으면 site_spec_pdf_url 파라미터는 생략한다.
|
|
20
54
|
*/
|
|
21
55
|
async function matchInspectionCriteria(query, siteSpecPdfUrl) {
|
|
22
|
-
var _a, _b, _c;
|
|
56
|
+
var _a, _b, _c, _d;
|
|
23
57
|
// operato-runner /api/run/{module} 은 multipart 폼필드 'input'(JSON 문자열)으로 입력을 받는다
|
|
24
58
|
const params = { query, top_k: 1 };
|
|
25
59
|
// 첨부파일(현장 시방서 PDF)이 없으면 site_spec_pdf_url 은 생략
|
|
@@ -40,17 +74,30 @@ async function matchInspectionCriteria(query, siteSpecPdfUrl) {
|
|
|
40
74
|
});
|
|
41
75
|
const outer = await (response === null || response === void 0 ? void 0 : response.json());
|
|
42
76
|
console.log('data :', outer);
|
|
77
|
+
// 현장 시방서 매칭 결과 로그 (PDF URL 전달 여부 / 매칭 결과 / 에러)
|
|
78
|
+
if (siteSpecPdfUrl) {
|
|
79
|
+
const innerResult = ((_a = outer === null || outer === void 0 ? void 0 : outer.result) === null || _a === void 0 ? void 0 : _a.result) || {};
|
|
80
|
+
console.log('현장 시방서 query :', query);
|
|
81
|
+
console.log('현장 시방서 pdf_url :', siteSpecPdfUrl);
|
|
82
|
+
console.log('현장 시방서 matches :', innerResult.site_spec_matches);
|
|
83
|
+
if (innerResult.site_spec_error) {
|
|
84
|
+
console.error('현장 시방서 매칭 에러 :', innerResult.site_spec_error);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
console.log('현장 시방서 pdf_url 없음 → KCS 매칭만 수행 (query :', query, ')');
|
|
89
|
+
}
|
|
43
90
|
// runner 응답: { result: <모듈 main() 반환>, exit_code, ... }, 모듈 반환: { status, result: {...} }
|
|
44
91
|
const moduleReturn = outer === null || outer === void 0 ? void 0 : outer.result;
|
|
45
92
|
if ((moduleReturn === null || moduleReturn === void 0 ? void 0 : moduleReturn.status) === 'success') {
|
|
46
93
|
const result = moduleReturn.result || {};
|
|
47
|
-
const kcsMatch = ((
|
|
94
|
+
const kcsMatch = ((_b = result.kcs_matches) === null || _b === void 0 ? void 0 : _b[0]) || null;
|
|
48
95
|
// 조항 번호 마커 (1) (2) ... 앞에서 줄바꿈 (저장 시 1회 파싱)
|
|
49
96
|
if (kcsMatch === null || kcsMatch === void 0 ? void 0 : kcsMatch.text)
|
|
50
97
|
kcsMatch.text = formatClauses(kcsMatch.text);
|
|
51
98
|
return {
|
|
52
99
|
kcsCriteria: kcsMatch ? JSON.stringify(kcsMatch) : null,
|
|
53
|
-
siteSpecCriteria: formatClauses((
|
|
100
|
+
siteSpecCriteria: formatClauses((_d = (_c = result.site_spec_matches) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.text) || null
|
|
54
101
|
};
|
|
55
102
|
}
|
|
56
103
|
}
|
|
@@ -65,12 +112,14 @@ async function matchInspectionCriteria(query, siteSpecPdfUrl) {
|
|
|
65
112
|
*/
|
|
66
113
|
async function updateProjectChecklistCriteria(itemIds, siteSpecPdfUrl) {
|
|
67
114
|
const repository = (0, shell_1.getRepository)(project_checklist_item_1.ProjectChecklistItem);
|
|
115
|
+
// 앱 프록시 URL(/attachment/...) → S3 presigned URL 변환 (배치당 1회)
|
|
116
|
+
const downloadableUrl = await toDownloadableUrl(siteSpecPdfUrl);
|
|
68
117
|
for (const id of itemIds) {
|
|
69
118
|
try {
|
|
70
119
|
const item = await repository.findOneBy({ id });
|
|
71
120
|
if (!item)
|
|
72
121
|
continue;
|
|
73
|
-
const { kcsCriteria, siteSpecCriteria } = await matchInspectionCriteria(item.name,
|
|
122
|
+
const { kcsCriteria, siteSpecCriteria } = await matchInspectionCriteria(item.name, downloadableUrl);
|
|
74
123
|
await repository.update({ id }, { kcsCriteria, siteSpecCriteria });
|
|
75
124
|
}
|
|
76
125
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spec-matching-service.js","sourceRoot":"","sources":["../../../server/service/project-checklist/spec-matching-service.ts"],"names":[],"mappings":"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","sourcesContent":["import { getRepository } from '@things-factory/shell'\nimport { ProjectChecklistItem } from '../project-checklist-item/project-checklist-item'\n\nconst SPEC_MATCHING_API_URL: string = 'https://hatiolab-korea-uni.ettisoft.com/api/run/spec-matching'\nconst API_USERNAME: string = 'admin'\nconst API_PASSWORD: string = 'admin1234'\n\n// 조항 번호 마커 (1) (2) ... 앞에서 줄바꿈\nfunction formatClauses(text?: string): string {\n return (text || '').replace(/\\s*(?=\\(\\d+\\))/g, '\\n').trim()\n}\n\nexport interface MatchedCriteria {\n // KCS 시방서 기준: kcs_matches[0] 오브젝트 전체를 JSON 문자열로 저장 (file_label 등 포함)\n kcsCriteria: string | null\n // 현장 시방서 기준: site_spec_matches[0].text\n siteSpecCriteria: string | null\n}\n\n/**\n * 검사항목(query) 1건에 대해 KCS 표준 기준과 현장 시방서 기준을 매칭 API로 조회한다.\n * - KCS 표준은 API 서버에 파일(kcs.csv)이 이미 존재한다.\n * - 현장 시방서는 업로드한 PDF URL(siteSpecPdfUrl)을 넘길 때만 매칭된다.\n * - 첨부파일이 없으면 site_spec_pdf_url 파라미터는 생략한다.\n */\nexport async function matchInspectionCriteria(query: string, siteSpecPdfUrl?: string): Promise<MatchedCriteria> {\n // operato-runner /api/run/{module} 은 multipart 폼필드 'input'(JSON 문자열)으로 입력을 받는다\n const params: any = { query, top_k: 1 }\n // 첨부파일(현장 시방서 PDF)이 없으면 site_spec_pdf_url 은 생략\n if (siteSpecPdfUrl) {\n params.site_spec_pdf_url = siteSpecPdfUrl\n }\n\n const form = new FormData()\n form.append('input', JSON.stringify(params))\n\n // Content-Type은 FormData가 boundary와 함께 자동 설정하므로 지정하지 않음\n const headers: any = {\n Authorization: `Basic ${Buffer.from(`${API_USERNAME}:${API_PASSWORD}`).toString('base64')}`\n }\n\n try {\n const response = await fetch(SPEC_MATCHING_API_URL, {\n method: 'POST',\n headers,\n body: form\n })\n\n const outer = await response?.json()\n\n console.log('data :', outer)\n // runner 응답: { result: <모듈 main() 반환>, exit_code, ... }, 모듈 반환: { status, result: {...} }\n const moduleReturn = outer?.result\n if (moduleReturn?.status === 'success') {\n const result = moduleReturn.result || {}\n const kcsMatch = result.kcs_matches?.[0] || null\n // 조항 번호 마커 (1) (2) ... 앞에서 줄바꿈 (저장 시 1회 파싱)\n if (kcsMatch?.text) kcsMatch.text = formatClauses(kcsMatch.text)\n\n return {\n kcsCriteria: kcsMatch ? JSON.stringify(kcsMatch) : null,\n siteSpecCriteria: formatClauses(result.site_spec_matches?.[0]?.text) || null\n }\n }\n } catch (error) {\n console.error('spec-matching API 호출 실패:', error)\n }\n\n return { kcsCriteria: null, siteSpecCriteria: null }\n}\n\n/**\n * 검사항목 ID 목록에 대해 KCS/현장 시방서 기준을 매칭하여 저장한다.\n * (트랜잭션 커밋 후 백그라운드에서 실행되므로 전역 repository 사용)\n */\nexport async function updateProjectChecklistCriteria(itemIds: string[], siteSpecPdfUrl?: string): Promise<void> {\n const repository = getRepository(ProjectChecklistItem)\n\n for (const id of itemIds) {\n try {\n const item = await repository.findOneBy({ id })\n if (!item) continue\n const { kcsCriteria, siteSpecCriteria } = await matchInspectionCriteria(item.name, siteSpecPdfUrl)\n await repository.update({ id }, { kcsCriteria, siteSpecCriteria })\n } catch (error) {\n console.error('project-checklist 검사 기준 매칭 실패:', error)\n }\n }\n}\n\n// 검사 기준 매칭을 백그라운드(비동기)로 트리거 — 저장 응답을 막지 않는다.\nexport function queueUpdateProjectChecklistCriteria(itemIds: string[], siteSpecPdfUrl?: string): void {\n if (!itemIds || itemIds.length === 0) return\n\n setTimeout(() => {\n updateProjectChecklistCriteria(itemIds, siteSpecPdfUrl).catch(err => {\n console.error('Background spec-matching update failed (project-checklist):', err)\n })\n }, 0)\n}\n"]}
|
|
1
|
+
{"version":3,"file":"spec-matching-service.js","sourceRoot":"","sources":["../../../server/service/project-checklist/spec-matching-service.ts"],"names":[],"mappings":"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","sourcesContent":["import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3'\nimport { getSignedUrl } from '@aws-sdk/s3-request-presigner'\nimport { config } from '@things-factory/env'\nimport { getRepository } from '@things-factory/shell'\nimport { ProjectChecklistItem } from '../project-checklist-item/project-checklist-item'\n\nconst STORAGE: any = config.get('storage', {})\n\nconst SPEC_MATCHING_API_URL: string = 'https://hatiolab-korea-uni.ettisoft.com/api/run/spec-matching'\nconst API_USERNAME: string = 'admin'\nconst API_PASSWORD: string = 'admin1234'\n\n// 조항 번호 마커 (1) (2) ... 앞에서 줄바꿈\nfunction formatClauses(text?: string): string {\n return (text || '').replace(/\\s*(?=\\(\\d+\\))/g, '\\n').trim()\n}\n\n/**\n * 현장 시방서 URL을 매칭 서버가 접근 가능한 URL로 변환한다.\n * 저장된 URL은 앱 프록시 경로(/attachment/{s3-key})라서 외부 매칭 서버가 접근할 수 없으므로,\n * S3 스토리지인 경우 해당 key에 대한 presigned GET URL(1시간)을 생성해서 반환한다.\n */\nasync function toDownloadableUrl(siteSpecPdfUrl?: string): Promise<string | undefined> {\n if (!siteSpecPdfUrl) return undefined\n\n const matched = siteSpecPdfUrl.match(/\\/attachment\\/([^/?#]+)/)\n if (!matched || STORAGE?.type !== 's3') {\n console.log('현장 시방서 URL 변환 생략 (원본 그대로 사용) :', siteSpecPdfUrl)\n return siteSpecPdfUrl\n }\n\n try {\n const client = new S3Client({\n credentials: {\n accessKeyId: STORAGE.accessKeyId,\n secretAccessKey: STORAGE.secretAccessKey\n },\n region: STORAGE.region\n })\n const signedUrl = await getSignedUrl(\n client,\n new GetObjectCommand({ Bucket: STORAGE.bucketName, Key: decodeURIComponent(matched[1]) }),\n { expiresIn: 3600 }\n )\n console.log('현장 시방서 presigned URL 생성 완료 (key :', decodeURIComponent(matched[1]), ')')\n return signedUrl\n } catch (error) {\n console.error('현장 시방서 presigned URL 생성 실패:', error)\n return siteSpecPdfUrl\n }\n}\n\nexport interface MatchedCriteria {\n // KCS 시방서 기준: kcs_matches[0] 오브젝트 전체를 JSON 문자열로 저장 (file_label 등 포함)\n kcsCriteria: string | null\n // 현장 시방서 기준: site_spec_matches[0].text\n siteSpecCriteria: string | null\n}\n\n/**\n * 검사항목(query) 1건에 대해 KCS 표준 기준과 현장 시방서 기준을 매칭 API로 조회한다.\n * - KCS 표준은 API 서버에 파일(kcs.csv)이 이미 존재한다.\n * - 현장 시방서는 업로드한 PDF URL(siteSpecPdfUrl)을 넘길 때만 매칭된다.\n * - 첨부파일이 없으면 site_spec_pdf_url 파라미터는 생략한다.\n */\nexport async function matchInspectionCriteria(query: string, siteSpecPdfUrl?: string): Promise<MatchedCriteria> {\n // operato-runner /api/run/{module} 은 multipart 폼필드 'input'(JSON 문자열)으로 입력을 받는다\n const params: any = { query, top_k: 1 }\n // 첨부파일(현장 시방서 PDF)이 없으면 site_spec_pdf_url 은 생략\n if (siteSpecPdfUrl) {\n params.site_spec_pdf_url = siteSpecPdfUrl\n }\n\n const form = new FormData()\n form.append('input', JSON.stringify(params))\n\n // Content-Type은 FormData가 boundary와 함께 자동 설정하므로 지정하지 않음\n const headers: any = {\n Authorization: `Basic ${Buffer.from(`${API_USERNAME}:${API_PASSWORD}`).toString('base64')}`\n }\n\n try {\n const response = await fetch(SPEC_MATCHING_API_URL, {\n method: 'POST',\n headers,\n body: form\n })\n\n const outer = await response?.json()\n\n console.log('data :', outer)\n\n // 현장 시방서 매칭 결과 로그 (PDF URL 전달 여부 / 매칭 결과 / 에러)\n if (siteSpecPdfUrl) {\n const innerResult = outer?.result?.result || {}\n console.log('현장 시방서 query :', query)\n console.log('현장 시방서 pdf_url :', siteSpecPdfUrl)\n console.log('현장 시방서 matches :', innerResult.site_spec_matches)\n if (innerResult.site_spec_error) {\n console.error('현장 시방서 매칭 에러 :', innerResult.site_spec_error)\n }\n } else {\n console.log('현장 시방서 pdf_url 없음 → KCS 매칭만 수행 (query :', query, ')')\n }\n // runner 응답: { result: <모듈 main() 반환>, exit_code, ... }, 모듈 반환: { status, result: {...} }\n const moduleReturn = outer?.result\n if (moduleReturn?.status === 'success') {\n const result = moduleReturn.result || {}\n const kcsMatch = result.kcs_matches?.[0] || null\n // 조항 번호 마커 (1) (2) ... 앞에서 줄바꿈 (저장 시 1회 파싱)\n if (kcsMatch?.text) kcsMatch.text = formatClauses(kcsMatch.text)\n\n return {\n kcsCriteria: kcsMatch ? JSON.stringify(kcsMatch) : null,\n siteSpecCriteria: formatClauses(result.site_spec_matches?.[0]?.text) || null\n }\n }\n } catch (error) {\n console.error('spec-matching API 호출 실패:', error)\n }\n\n return { kcsCriteria: null, siteSpecCriteria: null }\n}\n\n/**\n * 검사항목 ID 목록에 대해 KCS/현장 시방서 기준을 매칭하여 저장한다.\n * (트랜잭션 커밋 후 백그라운드에서 실행되므로 전역 repository 사용)\n */\nexport async function updateProjectChecklistCriteria(itemIds: string[], siteSpecPdfUrl?: string): Promise<void> {\n const repository = getRepository(ProjectChecklistItem)\n\n // 앱 프록시 URL(/attachment/...) → S3 presigned URL 변환 (배치당 1회)\n const downloadableUrl = await toDownloadableUrl(siteSpecPdfUrl)\n\n for (const id of itemIds) {\n try {\n const item = await repository.findOneBy({ id })\n if (!item) continue\n const { kcsCriteria, siteSpecCriteria } = await matchInspectionCriteria(item.name, downloadableUrl)\n await repository.update({ id }, { kcsCriteria, siteSpecCriteria })\n } catch (error) {\n console.error('project-checklist 검사 기준 매칭 실패:', error)\n }\n }\n}\n\n// 검사 기준 매칭을 백그라운드(비동기)로 트리거 — 저장 응답을 막지 않는다.\nexport function queueUpdateProjectChecklistCriteria(itemIds: string[], siteSpecPdfUrl?: string): void {\n if (!itemIds || itemIds.length === 0) return\n\n setTimeout(() => {\n updateProjectChecklistCriteria(itemIds, siteSpecPdfUrl).catch(err => {\n console.error('Background spec-matching update failed (project-checklist):', err)\n })\n }, 0)\n}\n"]}
|