promptfoo 0.91.3 → 0.92.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.
Files changed (181) hide show
  1. package/dist/drizzle/0006_harsh_caretaker.sql +42 -0
  2. package/dist/drizzle/0007_cloudy_wong.sql +1 -0
  3. package/dist/drizzle/meta/0006_snapshot.json +721 -0
  4. package/dist/drizzle/meta/0007_snapshot.json +723 -0
  5. package/dist/drizzle/meta/_journal.json +14 -0
  6. package/dist/package.json +10 -8
  7. package/dist/src/app/assets/{index-C6z1nbLN.js → index-CMDD1oSm.js} +233 -231
  8. package/dist/src/app/assets/{index.es-oqbvfIxR.js → index.es-D8cSwMq4.js} +1 -1
  9. package/dist/src/app/assets/{sync-D2s75VlC.js → sync-DJZvzYiS.js} +1 -1
  10. package/dist/src/app/index.html +1 -1
  11. package/dist/src/assertions.js +2 -2
  12. package/dist/src/assertions.js.map +1 -1
  13. package/dist/src/commands/cache.d.ts.map +1 -1
  14. package/dist/src/commands/cache.js +0 -2
  15. package/dist/src/commands/cache.js.map +1 -1
  16. package/dist/src/commands/eval.d.ts.map +1 -1
  17. package/dist/src/commands/eval.js +19 -16
  18. package/dist/src/commands/eval.js.map +1 -1
  19. package/dist/src/commands/export.d.ts.map +1 -1
  20. package/dist/src/commands/export.js +8 -31
  21. package/dist/src/commands/export.js.map +1 -1
  22. package/dist/src/commands/import.d.ts.map +1 -1
  23. package/dist/src/commands/import.js +52 -13
  24. package/dist/src/commands/import.js.map +1 -1
  25. package/dist/src/commands/list.d.ts.map +1 -1
  26. package/dist/src/commands/list.js +35 -7
  27. package/dist/src/commands/list.js.map +1 -1
  28. package/dist/src/commands/share.d.ts +2 -2
  29. package/dist/src/commands/share.d.ts.map +1 -1
  30. package/dist/src/commands/share.js +12 -13
  31. package/dist/src/commands/share.js.map +1 -1
  32. package/dist/src/commands/show.d.ts.map +1 -1
  33. package/dist/src/commands/show.js +10 -6
  34. package/dist/src/commands/show.js.map +1 -1
  35. package/dist/src/constants.d.ts +1 -0
  36. package/dist/src/constants.d.ts.map +1 -1
  37. package/dist/src/constants.js +2 -1
  38. package/dist/src/constants.js.map +1 -1
  39. package/dist/src/database/index.js +1 -1
  40. package/dist/src/database/index.js.map +1 -1
  41. package/dist/src/database/tables.d.ts +602 -4
  42. package/dist/src/database/tables.d.ts.map +1 -1
  43. package/dist/src/database/tables.js +67 -8
  44. package/dist/src/database/tables.js.map +1 -1
  45. package/dist/src/database/types.d.ts +3 -3
  46. package/dist/src/database/types.d.ts.map +1 -1
  47. package/dist/src/evaluator.d.ts +3 -2
  48. package/dist/src/evaluator.d.ts.map +1 -1
  49. package/dist/src/evaluator.js +75 -104
  50. package/dist/src/evaluator.js.map +1 -1
  51. package/dist/src/evaluatorHelpers.d.ts.map +1 -1
  52. package/dist/src/evaluatorHelpers.js +2 -1
  53. package/dist/src/evaluatorHelpers.js.map +1 -1
  54. package/dist/src/index.d.ts +2 -1
  55. package/dist/src/index.d.ts.map +1 -1
  56. package/dist/src/index.js +12 -9
  57. package/dist/src/index.js.map +1 -1
  58. package/dist/src/models/eval.d.ts +95 -0
  59. package/dist/src/models/eval.d.ts.map +1 -0
  60. package/dist/src/models/eval.js +390 -0
  61. package/dist/src/models/eval.js.map +1 -0
  62. package/dist/src/models/evalResult.d.ts +50 -0
  63. package/dist/src/models/evalResult.d.ts.map +1 -0
  64. package/dist/src/models/evalResult.js +122 -0
  65. package/dist/src/models/evalResult.js.map +1 -0
  66. package/dist/src/models/provider.d.ts +9 -0
  67. package/dist/src/models/provider.d.ts.map +1 -0
  68. package/dist/src/models/provider.js +47 -0
  69. package/dist/src/models/provider.js.map +1 -0
  70. package/dist/src/prompts/index.d.ts.map +1 -1
  71. package/dist/src/prompts/index.js +2 -1
  72. package/dist/src/prompts/index.js.map +1 -1
  73. package/dist/src/prompts/utils.d.ts +1 -0
  74. package/dist/src/prompts/utils.d.ts.map +1 -1
  75. package/dist/src/prompts/utils.js +7 -0
  76. package/dist/src/prompts/utils.js.map +1 -1
  77. package/dist/src/providers/http.js +2 -2
  78. package/dist/src/providers/http.js.map +1 -1
  79. package/dist/src/providers.js +5 -5
  80. package/dist/src/providers.js.map +1 -1
  81. package/dist/src/redteam/eval/excessive-agency/llm_rubric-20240617.json +10 -0
  82. package/dist/src/redteam/eval/excessive-agency/llm_rubric-20240618.json +10 -0
  83. package/dist/src/redteam/eval/harmful/llm_rubric-20240723.json +10 -0
  84. package/dist/src/redteam/eval/harmful/llm_rubric-20240724.json +10 -0
  85. package/dist/src/server/routes/evalRoutes.d.ts +1 -0
  86. package/dist/src/server/routes/evalRoutes.d.ts.map +1 -0
  87. package/dist/src/server/routes/evalRoutes.js +2 -0
  88. package/dist/src/server/routes/evalRoutes.js.map +1 -0
  89. package/dist/src/server/server.d.ts +1 -0
  90. package/dist/src/server/server.d.ts.map +1 -1
  91. package/dist/src/server/server.js +70 -31
  92. package/dist/src/server/server.js.map +1 -1
  93. package/dist/src/share.d.ts +2 -2
  94. package/dist/src/share.d.ts.map +1 -1
  95. package/dist/src/share.js +93 -34
  96. package/dist/src/share.js.map +1 -1
  97. package/dist/src/table.d.ts +2 -2
  98. package/dist/src/table.d.ts.map +1 -1
  99. package/dist/src/table.js +3 -3
  100. package/dist/src/table.js.map +1 -1
  101. package/dist/src/types/index.d.ts +163 -11
  102. package/dist/src/types/index.d.ts.map +1 -1
  103. package/dist/src/types/index.js +21 -1
  104. package/dist/src/types/index.js.map +1 -1
  105. package/dist/src/util/config/load.d.ts.map +1 -1
  106. package/dist/src/util/config/load.js +2 -1
  107. package/dist/src/util/config/load.js.map +1 -1
  108. package/dist/src/util/config/manage.d.ts.map +1 -1
  109. package/dist/src/util/config/manage.js.map +1 -1
  110. package/dist/src/util/convertEvalResultsToTable.d.ts +16 -0
  111. package/dist/src/util/convertEvalResultsToTable.d.ts.map +1 -0
  112. package/dist/src/util/convertEvalResultsToTable.js +137 -0
  113. package/dist/src/util/convertEvalResultsToTable.js.map +1 -0
  114. package/dist/src/util/createHash.d.ts +1 -0
  115. package/dist/src/util/createHash.d.ts.map +1 -1
  116. package/dist/src/util/createHash.js +9 -0
  117. package/dist/src/util/createHash.js.map +1 -1
  118. package/dist/src/util/file.d.ts +8 -0
  119. package/dist/src/util/file.d.ts.map +1 -0
  120. package/dist/src/util/file.js +13 -0
  121. package/dist/src/util/file.js.map +1 -0
  122. package/dist/src/util/index.d.ts +9 -14
  123. package/dist/src/util/index.d.ts.map +1 -1
  124. package/dist/src/util/index.js +87 -223
  125. package/dist/src/util/index.js.map +1 -1
  126. package/dist/src/util/time.d.ts +2 -0
  127. package/dist/src/util/time.d.ts.map +1 -0
  128. package/dist/src/util/time.js +7 -0
  129. package/dist/src/util/time.js.map +1 -0
  130. package/dist/src/util/transform.js +2 -2
  131. package/dist/src/util/transform.js.map +1 -1
  132. package/dist/src/validators/providers.d.ts +6 -0
  133. package/dist/src/validators/providers.d.ts.map +1 -1
  134. package/dist/src/validators/providers.js +1 -0
  135. package/dist/src/validators/providers.js.map +1 -1
  136. package/dist/src/validators/redteam.d.ts +6 -0
  137. package/dist/src/validators/redteam.d.ts.map +1 -1
  138. package/dist/test/commands/eval/filterFailingTests.test.js +24 -2
  139. package/dist/test/commands/eval/filterFailingTests.test.js.map +1 -1
  140. package/dist/test/evaluator.test.js +153 -74
  141. package/dist/test/evaluator.test.js.map +1 -1
  142. package/dist/test/factories/data/eval/database_records.d.ts +142 -0
  143. package/dist/test/factories/data/eval/database_records.d.ts.map +1 -0
  144. package/dist/test/factories/data/eval/database_records.js +251 -0
  145. package/dist/test/factories/data/eval/database_records.js.map +1 -0
  146. package/dist/test/factories/evalFactory.d.ts +768 -0
  147. package/dist/test/factories/evalFactory.d.ts.map +1 -0
  148. package/dist/test/factories/evalFactory.js +121 -0
  149. package/dist/test/factories/evalFactory.js.map +1 -0
  150. package/dist/test/factories/index.d.ts +1 -0
  151. package/dist/test/factories/index.d.ts.map +1 -0
  152. package/dist/test/factories/index.js +2 -0
  153. package/dist/test/factories/index.js.map +1 -0
  154. package/dist/test/index.test.js +17 -33
  155. package/dist/test/index.test.js.map +1 -1
  156. package/dist/test/models/eval.test.d.ts +2 -0
  157. package/dist/test/models/eval.test.d.ts.map +1 -0
  158. package/dist/test/models/eval.test.js +34 -0
  159. package/dist/test/models/eval.test.js.map +1 -0
  160. package/dist/test/providers.test.js +3 -3
  161. package/dist/test/providers.test.js.map +1 -1
  162. package/dist/test/server/share.test.d.ts +2 -0
  163. package/dist/test/server/share.test.d.ts.map +1 -0
  164. package/dist/test/server/share.test.js +36 -0
  165. package/dist/test/server/share.test.js.map +1 -0
  166. package/dist/test/server/v3evalToShare.json +507 -0
  167. package/dist/test/server/v4evalToShare.json +421 -0
  168. package/dist/test/types.test.js +58 -0
  169. package/dist/test/types.test.js.map +1 -1
  170. package/dist/test/util.file.test.d.ts +2 -0
  171. package/dist/test/util.file.test.d.ts.map +1 -0
  172. package/dist/test/util.file.test.js +32 -0
  173. package/dist/test/util.file.test.js.map +1 -0
  174. package/dist/test/util.listPrevious.test.d.ts +2 -0
  175. package/dist/test/util.listPrevious.test.d.ts.map +1 -0
  176. package/dist/test/util.listPrevious.test.js +37 -0
  177. package/dist/test/util.listPrevious.test.js.map +1 -0
  178. package/dist/test/util.test.js +38 -311
  179. package/dist/test/util.test.js.map +1 -1
  180. package/dist/tsconfig.tsbuildinfo +1 -0
  181. package/package.json +10 -8
@@ -1 +1 @@
1
- {"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../src/share.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,eAAe,EAAiB,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7E;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAU1D;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,EAC9B,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAqExB"}
1
+ {"version":3,"file":"share.d.ts","sourceRoot":"","sources":["../../src/share.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,IAAI,MAAM,eAAe,CAAC;AAoCtC;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAU1D;AAED,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,IAAI,EAChB,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmGxB"}
package/dist/src/share.js CHANGED
@@ -15,6 +15,34 @@ const accounts_1 = require("./globalConfig/accounts");
15
15
  const accounts_2 = require("./globalConfig/accounts");
16
16
  const cloud_1 = require("./globalConfig/cloud");
17
17
  const logger_1 = __importDefault(require("./logger"));
18
+ async function targetHostCanUseNewResults(apiHost) {
19
+ const response = await (0, fetch_1.fetchWithProxy)(`${apiHost}/health`, {
20
+ method: 'GET',
21
+ headers: {
22
+ 'Content-Type': 'application/json',
23
+ },
24
+ });
25
+ if (!response.ok) {
26
+ return false;
27
+ }
28
+ const responseJson = await response.json();
29
+ return 'version' in responseJson;
30
+ }
31
+ async function sendEvalResults(evalRecord, url) {
32
+ await evalRecord.loadResults();
33
+ const response = await (0, fetch_1.fetchWithProxy)(url, {
34
+ method: 'POST',
35
+ headers: {
36
+ 'Content-Type': 'application/json',
37
+ },
38
+ body: JSON.stringify(evalRecord),
39
+ });
40
+ if (!response.ok) {
41
+ throw new Error(`Failed to send eval results: ${response.statusText}`);
42
+ }
43
+ const evalId = (await response.json()).id;
44
+ return evalId;
45
+ }
18
46
  /**
19
47
  * Removes authentication information (username and password) from a URL.
20
48
  *
@@ -38,7 +66,7 @@ function stripAuthFromUrl(urlString) {
38
66
  return urlString;
39
67
  }
40
68
  }
41
- async function createShareableUrl(results, config, showAuth = false) {
69
+ async function createShareableUrl(evalRecord, showAuth = false) {
42
70
  if (process.stdout.isTTY && !(0, envars_1.isCI)() && !(0, envars_1.getEnvBool)('PROMPTFOO_DISABLE_SHARE_EMAIL_REQUEST')) {
43
71
  let email = (0, accounts_2.getUserEmail)();
44
72
  if (!email) {
@@ -51,54 +79,85 @@ async function createShareableUrl(results, config, showAuth = false) {
51
79
  (0, accounts_2.setUserEmail)(email);
52
80
  }
53
81
  }
54
- const sharedResults = {
55
- data: {
56
- version: 3,
57
- createdAt: new Date().toISOString(),
58
- author: (0, accounts_1.getAuthor)(),
59
- results,
60
- config,
61
- },
62
- };
63
82
  let response;
64
- let apiBaseUrl = typeof config.sharing === 'object' ? config.sharing.apiBaseUrl : constants_1.SHARE_API_BASE_URL;
65
- // check if we're using the cloud
83
+ let apiBaseUrl;
84
+ let url;
66
85
  if (cloud_1.cloudConfig.isEnabled()) {
67
86
  apiBaseUrl = cloud_1.cloudConfig.getApiHost();
68
- response = await (0, fetch_1.fetchWithProxy)(`${apiBaseUrl}/results`, {
69
- method: 'POST',
70
- headers: {
71
- 'Content-Type': 'application/json',
72
- Authorization: `Bearer ${cloud_1.cloudConfig.getApiKey()}`,
73
- },
74
- body: JSON.stringify(sharedResults),
75
- });
87
+ url = `${apiBaseUrl}/results`;
76
88
  }
77
89
  else {
78
- response = await (0, fetch_1.fetchWithProxy)(`${apiBaseUrl}/api/eval`, {
79
- method: 'POST',
80
- headers: {
81
- 'Content-Type': 'application/json',
82
- },
83
- body: JSON.stringify(sharedResults),
84
- });
90
+ apiBaseUrl =
91
+ typeof evalRecord.config.sharing === 'object'
92
+ ? evalRecord.config.sharing.apiBaseUrl || constants_1.SHARE_API_BASE_URL
93
+ : constants_1.SHARE_API_BASE_URL;
94
+ url = `${apiBaseUrl}/api/eval`;
95
+ }
96
+ const canUseNewResults = await targetHostCanUseNewResults(apiBaseUrl);
97
+ logger_1.default.debug(`Sharing with ${url} canUseNewResults: ${canUseNewResults} Use old results: ${evalRecord.useOldResults()}`);
98
+ let evalId;
99
+ if (canUseNewResults && !evalRecord.useOldResults()) {
100
+ evalId = await sendEvalResults(evalRecord, url);
85
101
  }
86
- const responseJson = (await response.json());
87
- if (responseJson.error) {
88
- throw new Error(`Failed to create shareable URL: ${responseJson.error}`);
102
+ else {
103
+ const summary = await evalRecord.toEvaluateSummary();
104
+ const table = await evalRecord.getTable();
105
+ const v2Summary = {
106
+ ...summary,
107
+ table,
108
+ version: 2,
109
+ };
110
+ logger_1.default.debug(`Sending eval results (v2 result file) to ${url}`);
111
+ // check if we're using the cloud
112
+ const sharedResults = {
113
+ data: {
114
+ version: 3,
115
+ createdAt: new Date().toISOString(),
116
+ author: (0, accounts_1.getAuthor)(),
117
+ results: v2Summary,
118
+ config: evalRecord.config,
119
+ },
120
+ };
121
+ if (cloud_1.cloudConfig.isEnabled()) {
122
+ response = await (0, fetch_1.fetchWithProxy)(url, {
123
+ method: 'POST',
124
+ headers: {
125
+ 'Content-Type': 'application/json',
126
+ Authorization: `Bearer ${cloud_1.cloudConfig.getApiKey()}`,
127
+ },
128
+ body: JSON.stringify(sharedResults),
129
+ });
130
+ }
131
+ else {
132
+ response = await (0, fetch_1.fetchWithProxy)(url, {
133
+ method: 'POST',
134
+ headers: {
135
+ 'Content-Type': 'application/json',
136
+ },
137
+ body: JSON.stringify(sharedResults),
138
+ });
139
+ }
140
+ const responseJson = (await response.json());
141
+ if (responseJson.error) {
142
+ throw new Error(`Failed to create shareable URL: ${responseJson.error}`);
143
+ }
144
+ evalId = responseJson.id;
89
145
  }
146
+ logger_1.default.debug(`New eval ID on remote instance: ${evalId}`);
90
147
  let appBaseUrl = constants_1.SHARE_VIEW_BASE_URL;
91
148
  let fullUrl = constants_1.SHARE_VIEW_BASE_URL;
92
149
  if (cloud_1.cloudConfig.isEnabled()) {
93
150
  appBaseUrl = cloud_1.cloudConfig.getAppUrl();
94
- fullUrl = `${appBaseUrl}/results/${responseJson.id}`;
151
+ fullUrl = `${appBaseUrl}/results/${evalId}`;
95
152
  }
96
153
  else {
97
- const appBaseUrl = typeof config.sharing === 'object' ? config.sharing.appBaseUrl : constants_1.SHARE_VIEW_BASE_URL;
154
+ const appBaseUrl = typeof evalRecord.config.sharing === 'object'
155
+ ? evalRecord.config.sharing.appBaseUrl
156
+ : constants_1.SHARE_VIEW_BASE_URL;
98
157
  fullUrl =
99
158
  constants_1.SHARE_VIEW_BASE_URL === constants_1.DEFAULT_SHARE_VIEW_BASE_URL
100
- ? `${appBaseUrl}/eval/${responseJson.id}`
101
- : `${appBaseUrl}/eval/?evalId=${responseJson.id}`;
159
+ ? `${appBaseUrl}/eval/${evalId}`
160
+ : `${appBaseUrl}/eval/?evalId=${evalId}`;
102
161
  }
103
162
  return showAuth ? fullUrl : stripAuthFromUrl(fullUrl);
104
163
  }
@@ -1 +1 @@
1
- {"version":3,"file":"share.js","sourceRoot":"","sources":["../../src/share.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"share.js","sourceRoot":"","sources":["../../src/share.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import Table from 'cli-table3';
2
- import type { EvaluateSummary } from './types';
3
- export declare function generateTable(summary: EvaluateSummary, tableCellMaxLength?: number, maxRows?: number): Table.Table;
2
+ import type { EvaluateTable } from './types';
3
+ export declare function generateTable(evaluateTable: EvaluateTable, tableCellMaxLength?: number, maxRows?: number): Table.Table;
4
4
  export declare function wrapTable(rows: Record<string, string | number>[]): Table.Table | "No data to display";
5
5
  //# sourceMappingURL=table.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/table.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAS/C,wBAAgB,aAAa,CAAC,OAAO,EAAE,eAAe,EAAE,kBAAkB,SAAM,EAAE,OAAO,SAAK,eAsC7F;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,sCAehE"}
1
+ {"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../src/table.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,YAAY,CAAC;AAE/B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAS7C,wBAAgB,aAAa,CAC3B,aAAa,EAAE,aAAa,EAC5B,kBAAkB,SAAM,EACxB,OAAO,SAAK,eAuCb;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,sCAehE"}
package/dist/src/table.js CHANGED
@@ -14,8 +14,8 @@ function ellipsize(str, maxLen) {
14
14
  }
15
15
  return str;
16
16
  }
17
- function generateTable(summary, tableCellMaxLength = 250, maxRows = 25) {
18
- const head = summary.table.head;
17
+ function generateTable(evaluateTable, tableCellMaxLength = 250, maxRows = 25) {
18
+ const head = evaluateTable.head;
19
19
  const headLength = head.prompts.length + head.vars.length;
20
20
  const table = new cli_table3_1.default({
21
21
  head: [
@@ -30,7 +30,7 @@ function generateTable(summary, tableCellMaxLength = 250, maxRows = 25) {
30
30
  },
31
31
  });
32
32
  // Skip first row (header) and add the rest. Color PASS/FAIL
33
- for (const row of summary.table.body.slice(0, maxRows)) {
33
+ for (const row of evaluateTable.body.slice(0, maxRows)) {
34
34
  table.push([
35
35
  ...row.vars.map((v) => ellipsize(v, tableCellMaxLength)),
36
36
  ...row.outputs.map(({ pass, score, text }) => {
@@ -1 +1 @@
1
- {"version":3,"file":"table.js","sourceRoot":"","sources":["../../src/table.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"table.js","sourceRoot":"","sources":["../../src/table.ts"],"names":[],"mappings":"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"}