@midscene/shared 1.0.1-beta-20251027074226.0 → 1.0.1-beta-20251028021317.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 (11) hide show
  1. package/dist/es/env/constants.mjs +4 -4
  2. package/dist/es/env/decide-model-config.mjs +8 -4
  3. package/dist/es/env/types.mjs +7 -1
  4. package/dist/lib/env/constants.js +3 -3
  5. package/dist/lib/env/decide-model-config.js +7 -3
  6. package/dist/lib/env/types.js +15 -0
  7. package/dist/types/env/types.d.ts +17 -5
  8. package/package.json +1 -1
  9. package/src/env/constants.ts +7 -4
  10. package/src/env/decide-model-config.ts +42 -5
  11. package/src/env/types.ts +19 -3
package/dist/es/env/constants.mjs CHANGED
@@ -1,4 +1,4 @@
1
- import { MIDSCENE_GROUNDING_LOCATOR_MODE, MIDSCENE_GROUNDING_MODEL_API_KEY, MIDSCENE_GROUNDING_MODEL_BASE_URL, MIDSCENE_GROUNDING_MODEL_HTTP_PROXY, MIDSCENE_GROUNDING_MODEL_INIT_CONFIG_JSON, MIDSCENE_GROUNDING_MODEL_NAME, MIDSCENE_GROUNDING_MODEL_SOCKS_PROXY, MIDSCENE_LOCATOR_MODE, MIDSCENE_MODEL_API_KEY, MIDSCENE_MODEL_BASE_URL, MIDSCENE_MODEL_HTTP_PROXY, MIDSCENE_MODEL_INIT_CONFIG_JSON, MIDSCENE_MODEL_NAME, MIDSCENE_MODEL_SOCKS_PROXY, MIDSCENE_PLANNING_LOCATOR_MODE, MIDSCENE_PLANNING_MODEL_API_KEY, MIDSCENE_PLANNING_MODEL_BASE_URL, MIDSCENE_PLANNING_MODEL_HTTP_PROXY, MIDSCENE_PLANNING_MODEL_INIT_CONFIG_JSON, MIDSCENE_PLANNING_MODEL_NAME, MIDSCENE_PLANNING_MODEL_SOCKS_PROXY, MIDSCENE_VQA_LOCATOR_MODE, MIDSCENE_VQA_MODEL_API_KEY, MIDSCENE_VQA_MODEL_BASE_URL, MIDSCENE_VQA_MODEL_HTTP_PROXY, MIDSCENE_VQA_MODEL_INIT_CONFIG_JSON, MIDSCENE_VQA_MODEL_NAME, MIDSCENE_VQA_MODEL_SOCKS_PROXY, OPENAI_API_KEY, OPENAI_BASE_URL } from "./types.mjs";
1
+ import { MIDSCENE_GROUNDING_LOCATOR_MODE, MIDSCENE_GROUNDING_MODEL_API_KEY, MIDSCENE_GROUNDING_MODEL_BASE_URL, MIDSCENE_GROUNDING_MODEL_HTTP_PROXY, MIDSCENE_GROUNDING_MODEL_INIT_CONFIG_JSON, MIDSCENE_GROUNDING_MODEL_NAME, MIDSCENE_GROUNDING_MODEL_SOCKS_PROXY, MIDSCENE_LOCATOR_MODE, MIDSCENE_MODEL_API_KEY, MIDSCENE_MODEL_BASE_URL, MIDSCENE_MODEL_HTTP_PROXY, MIDSCENE_MODEL_INIT_CONFIG_JSON, MIDSCENE_MODEL_NAME, MIDSCENE_MODEL_SOCKS_PROXY, MIDSCENE_OPENAI_HTTP_PROXY, MIDSCENE_OPENAI_INIT_CONFIG_JSON, MIDSCENE_OPENAI_SOCKS_PROXY, MIDSCENE_PLANNING_LOCATOR_MODE, MIDSCENE_PLANNING_MODEL_API_KEY, MIDSCENE_PLANNING_MODEL_BASE_URL, MIDSCENE_PLANNING_MODEL_HTTP_PROXY, MIDSCENE_PLANNING_MODEL_INIT_CONFIG_JSON, MIDSCENE_PLANNING_MODEL_NAME, MIDSCENE_PLANNING_MODEL_SOCKS_PROXY, MIDSCENE_VQA_LOCATOR_MODE, MIDSCENE_VQA_MODEL_API_KEY, MIDSCENE_VQA_MODEL_BASE_URL, MIDSCENE_VQA_MODEL_HTTP_PROXY, MIDSCENE_VQA_MODEL_INIT_CONFIG_JSON, MIDSCENE_VQA_MODEL_NAME, MIDSCENE_VQA_MODEL_SOCKS_PROXY, OPENAI_API_KEY, OPENAI_BASE_URL } from "./types.mjs";
2
2
  const VQA_MODEL_CONFIG_KEYS = {
3
3
  modelName: MIDSCENE_VQA_MODEL_NAME,
4
4
  socksProxy: MIDSCENE_VQA_MODEL_SOCKS_PROXY,
@@ -37,11 +37,11 @@ const DEFAULT_MODEL_CONFIG_KEYS = {
37
37
  };
38
38
  const DEFAULT_MODEL_CONFIG_KEYS_LEGACY = {
39
39
  modelName: MIDSCENE_MODEL_NAME,
40
- socksProxy: MIDSCENE_MODEL_SOCKS_PROXY,
41
- httpProxy: MIDSCENE_MODEL_HTTP_PROXY,
40
+ socksProxy: MIDSCENE_OPENAI_SOCKS_PROXY,
41
+ httpProxy: MIDSCENE_OPENAI_HTTP_PROXY,
42
42
  openaiBaseURL: OPENAI_BASE_URL,
43
43
  openaiApiKey: OPENAI_API_KEY,
44
- openaiExtraConfig: MIDSCENE_MODEL_INIT_CONFIG_JSON,
44
+ openaiExtraConfig: MIDSCENE_OPENAI_INIT_CONFIG_JSON,
45
45
  vlMode: 'DEFAULT_MODEL_CONFIG_KEYS has no vlMode key'
46
46
  };
47
47
  export { DEFAULT_MODEL_CONFIG_KEYS, DEFAULT_MODEL_CONFIG_KEYS_LEGACY, GROUNDING_MODEL_CONFIG_KEYS, PLANNING_MODEL_CONFIG_KEYS, VQA_MODEL_CONFIG_KEYS };
package/dist/es/env/decide-model-config.mjs CHANGED
@@ -1,5 +1,5 @@
1
1
  import { DEFAULT_MODEL_CONFIG_KEYS, DEFAULT_MODEL_CONFIG_KEYS_LEGACY, GROUNDING_MODEL_CONFIG_KEYS, PLANNING_MODEL_CONFIG_KEYS, VQA_MODEL_CONFIG_KEYS } from "./constants.mjs";
2
- import { MODEL_API_KEY, MODEL_BASE_URL } from "./types.mjs";
2
+ import { MIDSCENE_MODEL_HTTP_PROXY, MIDSCENE_MODEL_INIT_CONFIG_JSON, MIDSCENE_MODEL_SOCKS_PROXY, MIDSCENE_OPENAI_HTTP_PROXY, MIDSCENE_OPENAI_INIT_CONFIG_JSON, MIDSCENE_OPENAI_SOCKS_PROXY, MODEL_API_KEY, MODEL_BASE_URL } from "./types.mjs";
3
3
  import { getDebug } from "../logger.mjs";
4
4
  import { assert } from "../utils.mjs";
5
5
  import { createAssert, maskConfig, parseJson } from "./helper.mjs";
@@ -14,15 +14,19 @@ const KEYS_MAP = {
14
14
  const decideOpenaiSdkConfig = ({ keys, provider, valueAssert })=>{
15
15
  initDebugConfig();
16
16
  const debugLog = getDebug('ai:config');
17
- const socksProxy = provider[keys.socksProxy];
18
- const httpProxy = provider[keys.httpProxy];
19
17
  const vlMode = provider[keys.vlMode];
20
18
  debugLog('enter decideOpenaiSdkConfig with keys:', keys);
21
19
  let openaiBaseURL;
22
20
  let openaiApiKey;
21
+ let socksProxy;
22
+ let httpProxy;
23
+ let openaiExtraConfigStr;
23
24
  openaiBaseURL = 'OPENAI_BASE_URL' === keys.openaiBaseURL ? provider[MODEL_BASE_URL] || provider[keys.openaiBaseURL] : provider[keys.openaiBaseURL];
24
25
  openaiApiKey = 'OPENAI_API_KEY' === keys.openaiApiKey ? provider[MODEL_API_KEY] || provider[keys.openaiApiKey] : provider[keys.openaiApiKey];
25
- const openaiExtraConfig = parseJson(keys.openaiExtraConfig, provider[keys.openaiExtraConfig]);
26
+ socksProxy = keys.socksProxy === MIDSCENE_OPENAI_SOCKS_PROXY ? provider[MIDSCENE_MODEL_SOCKS_PROXY] || provider[keys.socksProxy] : provider[keys.socksProxy];
27
+ httpProxy = keys.httpProxy === MIDSCENE_OPENAI_HTTP_PROXY ? provider[MIDSCENE_MODEL_HTTP_PROXY] || provider[keys.httpProxy] : provider[keys.httpProxy];
28
+ openaiExtraConfigStr = keys.openaiExtraConfig === MIDSCENE_OPENAI_INIT_CONFIG_JSON ? provider[MIDSCENE_MODEL_INIT_CONFIG_JSON] || provider[keys.openaiExtraConfig] : provider[keys.openaiExtraConfig];
29
+ const openaiExtraConfig = parseJson(keys.openaiExtraConfig, openaiExtraConfigStr);
26
30
  valueAssert(openaiApiKey, keys.openaiApiKey);
27
31
  return {
28
32
  socksProxy,
package/dist/es/env/types.mjs CHANGED
@@ -16,6 +16,9 @@ const MODEL_API_KEY = 'MODEL_API_KEY';
16
16
  const MODEL_BASE_URL = 'MODEL_BASE_URL';
17
17
  const OPENAI_API_KEY = 'OPENAI_API_KEY';
18
18
  const OPENAI_BASE_URL = 'OPENAI_BASE_URL';
19
+ const MIDSCENE_OPENAI_INIT_CONFIG_JSON = 'MIDSCENE_OPENAI_INIT_CONFIG_JSON';
20
+ const MIDSCENE_OPENAI_HTTP_PROXY = 'MIDSCENE_OPENAI_HTTP_PROXY';
21
+ const MIDSCENE_OPENAI_SOCKS_PROXY = 'MIDSCENE_OPENAI_SOCKS_PROXY';
19
22
  const OPENAI_MAX_TOKENS = 'OPENAI_MAX_TOKENS';
20
23
  const MIDSCENE_ADB_PATH = 'MIDSCENE_ADB_PATH';
21
24
  const MIDSCENE_ADB_REMOTE_HOST = 'MIDSCENE_ADB_REMOTE_HOST';
@@ -115,6 +118,9 @@ const MODEL_ENV_KEYS = [
115
118
  MIDSCENE_LOCATOR_MODE,
116
119
  OPENAI_API_KEY,
117
120
  OPENAI_BASE_URL,
121
+ MIDSCENE_OPENAI_INIT_CONFIG_JSON,
122
+ MIDSCENE_OPENAI_HTTP_PROXY,
123
+ MIDSCENE_OPENAI_SOCKS_PROXY,
118
124
  MODEL_API_KEY,
119
125
  MODEL_BASE_URL,
120
126
  MIDSCENE_VQA_MODEL_NAME,
@@ -161,4 +167,4 @@ const VL_MODE_RAW_VALID_VALUES = [
161
167
  'vlm-ui-tars-doubao',
162
168
  'vlm-ui-tars-doubao-1.5'
163
169
  ];
164
- export { ALL_ENV_KEYS, BASIC_ENV_KEYS, BOOLEAN_ENV_KEYS, DOCKER_CONTAINER, GLOBAL_ENV_KEYS, MATCH_BY_POSITION, MIDSCENE_ADB_PATH, MIDSCENE_ADB_REMOTE_HOST, MIDSCENE_ADB_REMOTE_PORT, MIDSCENE_ANDROID_IME_STRATEGY, MIDSCENE_CACHE, MIDSCENE_CACHE_MAX_FILENAME_LENGTH, MIDSCENE_DANGEROUSLY_PRINT_ALL_CONFIG, MIDSCENE_DEBUG_MODE, MIDSCENE_DEBUG_MODEL_PROFILE, MIDSCENE_DEBUG_MODEL_RESPONSE, MIDSCENE_FORCE_DEEP_THINK, MIDSCENE_GROUNDING_LOCATOR_MODE, MIDSCENE_GROUNDING_MODEL_API_KEY, MIDSCENE_GROUNDING_MODEL_BASE_URL, MIDSCENE_GROUNDING_MODEL_HTTP_PROXY, MIDSCENE_GROUNDING_MODEL_INIT_CONFIG_JSON, MIDSCENE_GROUNDING_MODEL_NAME, MIDSCENE_GROUNDING_MODEL_SOCKS_PROXY, MIDSCENE_IOS_DEVICE_UDID, MIDSCENE_IOS_SIMULATOR_UDID, MIDSCENE_LANGSMITH_DEBUG, MIDSCENE_LOCATOR_MODE, MIDSCENE_MCP_ANDROID_MODE, MIDSCENE_MCP_CHROME_PATH, MIDSCENE_MCP_USE_PUPPETEER_MODE, MIDSCENE_MODEL_API_KEY, MIDSCENE_MODEL_BASE_URL, MIDSCENE_MODEL_HTTP_PROXY, MIDSCENE_MODEL_INIT_CONFIG_JSON, MIDSCENE_MODEL_NAME, MIDSCENE_MODEL_SOCKS_PROXY, MIDSCENE_PLANNING_LOCATOR_MODE, MIDSCENE_PLANNING_MODEL_API_KEY, MIDSCENE_PLANNING_MODEL_BASE_URL, MIDSCENE_PLANNING_MODEL_HTTP_PROXY, MIDSCENE_PLANNING_MODEL_INIT_CONFIG_JSON, MIDSCENE_PLANNING_MODEL_NAME, MIDSCENE_PLANNING_MODEL_SOCKS_PROXY, MIDSCENE_PREFERRED_LANGUAGE, MIDSCENE_REPLANNING_CYCLE_LIMIT, MIDSCENE_REPORT_TAG_NAME, MIDSCENE_RUN_DIR, MIDSCENE_USE_DOUBAO_VISION, MIDSCENE_USE_GEMINI, MIDSCENE_USE_QWEN3_VL, MIDSCENE_USE_QWEN_VL, MIDSCENE_USE_VLM_UI_TARS, MIDSCENE_USE_VL_MODEL, MIDSCENE_VQA_LOCATOR_MODE, MIDSCENE_VQA_MODEL_API_KEY, MIDSCENE_VQA_MODEL_BASE_URL, MIDSCENE_VQA_MODEL_HTTP_PROXY, MIDSCENE_VQA_MODEL_INIT_CONFIG_JSON, MIDSCENE_VQA_MODEL_NAME, MIDSCENE_VQA_MODEL_SOCKS_PROXY, MODEL_API_KEY, MODEL_BASE_URL, MODEL_ENV_KEYS, NUMBER_ENV_KEYS, OPENAI_API_KEY, OPENAI_BASE_URL, OPENAI_MAX_TOKENS, STRING_ENV_KEYS, types_UITarsModelVersion as UITarsModelVersion, UNUSED_ENV_KEYS, VL_MODE_RAW_VALID_VALUES };
170
+ export { ALL_ENV_KEYS, BASIC_ENV_KEYS, BOOLEAN_ENV_KEYS, DOCKER_CONTAINER, GLOBAL_ENV_KEYS, MATCH_BY_POSITION, MIDSCENE_ADB_PATH, MIDSCENE_ADB_REMOTE_HOST, MIDSCENE_ADB_REMOTE_PORT, MIDSCENE_ANDROID_IME_STRATEGY, MIDSCENE_CACHE, MIDSCENE_CACHE_MAX_FILENAME_LENGTH, MIDSCENE_DANGEROUSLY_PRINT_ALL_CONFIG, MIDSCENE_DEBUG_MODE, MIDSCENE_DEBUG_MODEL_PROFILE, MIDSCENE_DEBUG_MODEL_RESPONSE, MIDSCENE_FORCE_DEEP_THINK, MIDSCENE_GROUNDING_LOCATOR_MODE, MIDSCENE_GROUNDING_MODEL_API_KEY, MIDSCENE_GROUNDING_MODEL_BASE_URL, MIDSCENE_GROUNDING_MODEL_HTTP_PROXY, MIDSCENE_GROUNDING_MODEL_INIT_CONFIG_JSON, MIDSCENE_GROUNDING_MODEL_NAME, MIDSCENE_GROUNDING_MODEL_SOCKS_PROXY, MIDSCENE_IOS_DEVICE_UDID, MIDSCENE_IOS_SIMULATOR_UDID, MIDSCENE_LANGSMITH_DEBUG, MIDSCENE_LOCATOR_MODE, MIDSCENE_MCP_ANDROID_MODE, MIDSCENE_MCP_CHROME_PATH, MIDSCENE_MCP_USE_PUPPETEER_MODE, MIDSCENE_MODEL_API_KEY, MIDSCENE_MODEL_BASE_URL, MIDSCENE_MODEL_HTTP_PROXY, MIDSCENE_MODEL_INIT_CONFIG_JSON, MIDSCENE_MODEL_NAME, MIDSCENE_MODEL_SOCKS_PROXY, MIDSCENE_OPENAI_HTTP_PROXY, MIDSCENE_OPENAI_INIT_CONFIG_JSON, MIDSCENE_OPENAI_SOCKS_PROXY, MIDSCENE_PLANNING_LOCATOR_MODE, MIDSCENE_PLANNING_MODEL_API_KEY, MIDSCENE_PLANNING_MODEL_BASE_URL, MIDSCENE_PLANNING_MODEL_HTTP_PROXY, MIDSCENE_PLANNING_MODEL_INIT_CONFIG_JSON, MIDSCENE_PLANNING_MODEL_NAME, MIDSCENE_PLANNING_MODEL_SOCKS_PROXY, MIDSCENE_PREFERRED_LANGUAGE, MIDSCENE_REPLANNING_CYCLE_LIMIT, MIDSCENE_REPORT_TAG_NAME, MIDSCENE_RUN_DIR, MIDSCENE_USE_DOUBAO_VISION, MIDSCENE_USE_GEMINI, MIDSCENE_USE_QWEN3_VL, MIDSCENE_USE_QWEN_VL, MIDSCENE_USE_VLM_UI_TARS, MIDSCENE_USE_VL_MODEL, MIDSCENE_VQA_LOCATOR_MODE, MIDSCENE_VQA_MODEL_API_KEY, MIDSCENE_VQA_MODEL_BASE_URL, MIDSCENE_VQA_MODEL_HTTP_PROXY, MIDSCENE_VQA_MODEL_INIT_CONFIG_JSON, MIDSCENE_VQA_MODEL_NAME, MIDSCENE_VQA_MODEL_SOCKS_PROXY, MODEL_API_KEY, MODEL_BASE_URL, MODEL_ENV_KEYS, NUMBER_ENV_KEYS, OPENAI_API_KEY, OPENAI_BASE_URL, OPENAI_MAX_TOKENS, STRING_ENV_KEYS, types_UITarsModelVersion as UITarsModelVersion, UNUSED_ENV_KEYS, VL_MODE_RAW_VALID_VALUES };
package/dist/lib/env/constants.js CHANGED
@@ -69,11 +69,11 @@ const DEFAULT_MODEL_CONFIG_KEYS = {
69
69
  };
70
70
  const DEFAULT_MODEL_CONFIG_KEYS_LEGACY = {
71
71
  modelName: external_types_js_namespaceObject.MIDSCENE_MODEL_NAME,
72
- socksProxy: external_types_js_namespaceObject.MIDSCENE_MODEL_SOCKS_PROXY,
73
- httpProxy: external_types_js_namespaceObject.MIDSCENE_MODEL_HTTP_PROXY,
72
+ socksProxy: external_types_js_namespaceObject.MIDSCENE_OPENAI_SOCKS_PROXY,
73
+ httpProxy: external_types_js_namespaceObject.MIDSCENE_OPENAI_HTTP_PROXY,
74
74
  openaiBaseURL: external_types_js_namespaceObject.OPENAI_BASE_URL,
75
75
  openaiApiKey: external_types_js_namespaceObject.OPENAI_API_KEY,
76
- openaiExtraConfig: external_types_js_namespaceObject.MIDSCENE_MODEL_INIT_CONFIG_JSON,
76
+ openaiExtraConfig: external_types_js_namespaceObject.MIDSCENE_OPENAI_INIT_CONFIG_JSON,
77
77
  vlMode: 'DEFAULT_MODEL_CONFIG_KEYS has no vlMode key'
78
78
  };
79
79
  exports.DEFAULT_MODEL_CONFIG_KEYS = __webpack_exports__.DEFAULT_MODEL_CONFIG_KEYS;
package/dist/lib/env/decide-model-config.js CHANGED
@@ -44,15 +44,19 @@ const KEYS_MAP = {
44
44
  const decideOpenaiSdkConfig = ({ keys, provider, valueAssert })=>{
45
45
  (0, external_init_debug_js_namespaceObject.initDebugConfig)();
46
46
  const debugLog = (0, external_logger_js_namespaceObject.getDebug)('ai:config');
47
- const socksProxy = provider[keys.socksProxy];
48
- const httpProxy = provider[keys.httpProxy];
49
47
  const vlMode = provider[keys.vlMode];
50
48
  debugLog('enter decideOpenaiSdkConfig with keys:', keys);
51
49
  let openaiBaseURL;
52
50
  let openaiApiKey;
51
+ let socksProxy;
52
+ let httpProxy;
53
+ let openaiExtraConfigStr;
53
54
  openaiBaseURL = 'OPENAI_BASE_URL' === keys.openaiBaseURL ? provider[external_types_js_namespaceObject.MODEL_BASE_URL] || provider[keys.openaiBaseURL] : provider[keys.openaiBaseURL];
54
55
  openaiApiKey = 'OPENAI_API_KEY' === keys.openaiApiKey ? provider[external_types_js_namespaceObject.MODEL_API_KEY] || provider[keys.openaiApiKey] : provider[keys.openaiApiKey];
55
- const openaiExtraConfig = (0, external_helper_js_namespaceObject.parseJson)(keys.openaiExtraConfig, provider[keys.openaiExtraConfig]);
56
+ socksProxy = keys.socksProxy === external_types_js_namespaceObject.MIDSCENE_OPENAI_SOCKS_PROXY ? provider[external_types_js_namespaceObject.MIDSCENE_MODEL_SOCKS_PROXY] || provider[keys.socksProxy] : provider[keys.socksProxy];
57
+ httpProxy = keys.httpProxy === external_types_js_namespaceObject.MIDSCENE_OPENAI_HTTP_PROXY ? provider[external_types_js_namespaceObject.MIDSCENE_MODEL_HTTP_PROXY] || provider[keys.httpProxy] : provider[keys.httpProxy];
58
+ openaiExtraConfigStr = keys.openaiExtraConfig === external_types_js_namespaceObject.MIDSCENE_OPENAI_INIT_CONFIG_JSON ? provider[external_types_js_namespaceObject.MIDSCENE_MODEL_INIT_CONFIG_JSON] || provider[keys.openaiExtraConfig] : provider[keys.openaiExtraConfig];
59
+ const openaiExtraConfig = (0, external_helper_js_namespaceObject.parseJson)(keys.openaiExtraConfig, openaiExtraConfigStr);
56
60
  valueAssert(openaiApiKey, keys.openaiApiKey);
57
61
  return {
58
62
  socksProxy,
package/dist/lib/env/types.js CHANGED
@@ -61,6 +61,9 @@ __webpack_require__.d(__webpack_exports__, {
61
61
  MIDSCENE_MODEL_INIT_CONFIG_JSON: ()=>MIDSCENE_MODEL_INIT_CONFIG_JSON,
62
62
  MIDSCENE_MODEL_NAME: ()=>MIDSCENE_MODEL_NAME,
63
63
  MIDSCENE_MODEL_SOCKS_PROXY: ()=>MIDSCENE_MODEL_SOCKS_PROXY,
64
+ MIDSCENE_OPENAI_HTTP_PROXY: ()=>MIDSCENE_OPENAI_HTTP_PROXY,
65
+ MIDSCENE_OPENAI_INIT_CONFIG_JSON: ()=>MIDSCENE_OPENAI_INIT_CONFIG_JSON,
66
+ MIDSCENE_OPENAI_SOCKS_PROXY: ()=>MIDSCENE_OPENAI_SOCKS_PROXY,
64
67
  MIDSCENE_PLANNING_LOCATOR_MODE: ()=>MIDSCENE_PLANNING_LOCATOR_MODE,
65
68
  MIDSCENE_PLANNING_MODEL_API_KEY: ()=>MIDSCENE_PLANNING_MODEL_API_KEY,
66
69
  MIDSCENE_PLANNING_MODEL_BASE_URL: ()=>MIDSCENE_PLANNING_MODEL_BASE_URL,
@@ -115,6 +118,9 @@ const MODEL_API_KEY = 'MODEL_API_KEY';
115
118
  const MODEL_BASE_URL = 'MODEL_BASE_URL';
116
119
  const OPENAI_API_KEY = 'OPENAI_API_KEY';
117
120
  const OPENAI_BASE_URL = 'OPENAI_BASE_URL';
121
+ const MIDSCENE_OPENAI_INIT_CONFIG_JSON = 'MIDSCENE_OPENAI_INIT_CONFIG_JSON';
122
+ const MIDSCENE_OPENAI_HTTP_PROXY = 'MIDSCENE_OPENAI_HTTP_PROXY';
123
+ const MIDSCENE_OPENAI_SOCKS_PROXY = 'MIDSCENE_OPENAI_SOCKS_PROXY';
118
124
  const OPENAI_MAX_TOKENS = 'OPENAI_MAX_TOKENS';
119
125
  const MIDSCENE_ADB_PATH = 'MIDSCENE_ADB_PATH';
120
126
  const MIDSCENE_ADB_REMOTE_HOST = 'MIDSCENE_ADB_REMOTE_HOST';
@@ -214,6 +220,9 @@ const MODEL_ENV_KEYS = [
214
220
  MIDSCENE_LOCATOR_MODE,
215
221
  OPENAI_API_KEY,
216
222
  OPENAI_BASE_URL,
223
+ MIDSCENE_OPENAI_INIT_CONFIG_JSON,
224
+ MIDSCENE_OPENAI_HTTP_PROXY,
225
+ MIDSCENE_OPENAI_SOCKS_PROXY,
217
226
  MODEL_API_KEY,
218
227
  MODEL_BASE_URL,
219
228
  MIDSCENE_VQA_MODEL_NAME,
@@ -297,6 +306,9 @@ exports.MIDSCENE_MODEL_HTTP_PROXY = __webpack_exports__.MIDSCENE_MODEL_HTTP_PROX
297
306
  exports.MIDSCENE_MODEL_INIT_CONFIG_JSON = __webpack_exports__.MIDSCENE_MODEL_INIT_CONFIG_JSON;
298
307
  exports.MIDSCENE_MODEL_NAME = __webpack_exports__.MIDSCENE_MODEL_NAME;
299
308
  exports.MIDSCENE_MODEL_SOCKS_PROXY = __webpack_exports__.MIDSCENE_MODEL_SOCKS_PROXY;
309
+ exports.MIDSCENE_OPENAI_HTTP_PROXY = __webpack_exports__.MIDSCENE_OPENAI_HTTP_PROXY;
310
+ exports.MIDSCENE_OPENAI_INIT_CONFIG_JSON = __webpack_exports__.MIDSCENE_OPENAI_INIT_CONFIG_JSON;
311
+ exports.MIDSCENE_OPENAI_SOCKS_PROXY = __webpack_exports__.MIDSCENE_OPENAI_SOCKS_PROXY;
300
312
  exports.MIDSCENE_PLANNING_LOCATOR_MODE = __webpack_exports__.MIDSCENE_PLANNING_LOCATOR_MODE;
301
313
  exports.MIDSCENE_PLANNING_MODEL_API_KEY = __webpack_exports__.MIDSCENE_PLANNING_MODEL_API_KEY;
302
314
  exports.MIDSCENE_PLANNING_MODEL_BASE_URL = __webpack_exports__.MIDSCENE_PLANNING_MODEL_BASE_URL;
@@ -370,6 +382,9 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
370
382
  "MIDSCENE_MODEL_INIT_CONFIG_JSON",
371
383
  "MIDSCENE_MODEL_NAME",
372
384
  "MIDSCENE_MODEL_SOCKS_PROXY",
385
+ "MIDSCENE_OPENAI_HTTP_PROXY",
386
+ "MIDSCENE_OPENAI_INIT_CONFIG_JSON",
387
+ "MIDSCENE_OPENAI_SOCKS_PROXY",
373
388
  "MIDSCENE_PLANNING_LOCATOR_MODE",
374
389
  "MIDSCENE_PLANNING_MODEL_API_KEY",
375
390
  "MIDSCENE_PLANNING_MODEL_BASE_URL",
package/dist/types/env/types.d.ts CHANGED
@@ -22,6 +22,18 @@ export declare const OPENAI_API_KEY = "OPENAI_API_KEY";
22
22
  * @deprecated Use MODEL_BASE_URL instead. This is kept for backward compatibility.
23
23
  */
24
24
  export declare const OPENAI_BASE_URL = "OPENAI_BASE_URL";
25
+ /**
26
+ * @deprecated Use MIDSCENE_MODEL_INIT_CONFIG_JSON instead. This is kept for backward compatibility.
27
+ */
28
+ export declare const MIDSCENE_OPENAI_INIT_CONFIG_JSON = "MIDSCENE_OPENAI_INIT_CONFIG_JSON";
29
+ /**
30
+ * @deprecated Use MIDSCENE_MODEL_HTTP_PROXY instead. This is kept for backward compatibility.
31
+ */
32
+ export declare const MIDSCENE_OPENAI_HTTP_PROXY = "MIDSCENE_OPENAI_HTTP_PROXY";
33
+ /**
34
+ * @deprecated Use MIDSCENE_MODEL_SOCKS_PROXY instead. This is kept for backward compatibility.
35
+ */
36
+ export declare const MIDSCENE_OPENAI_SOCKS_PROXY = "MIDSCENE_OPENAI_SOCKS_PROXY";
25
37
  export declare const OPENAI_MAX_TOKENS = "OPENAI_MAX_TOKENS";
26
38
  export declare const MIDSCENE_ADB_PATH = "MIDSCENE_ADB_PATH";
27
39
  export declare const MIDSCENE_ADB_REMOTE_HOST = "MIDSCENE_ADB_REMOTE_HOST";
@@ -89,8 +101,8 @@ export declare const GLOBAL_ENV_KEYS: readonly ["MIDSCENE_CACHE", "MIDSCENE_LANG
89
101
  * Can be override by both agent.modelConfig and overrideAIConfig
90
102
  * Can only be access after agent.constructor
91
103
  */
92
- export declare const MODEL_ENV_KEYS: readonly ["MIDSCENE_MODEL_NAME", "MIDSCENE_MODEL_INIT_CONFIG_JSON", "MIDSCENE_MODEL_API_KEY", "MIDSCENE_MODEL_BASE_URL", "MIDSCENE_MODEL_SOCKS_PROXY", "MIDSCENE_MODEL_HTTP_PROXY", "MIDSCENE_USE_VLM_UI_TARS", "MIDSCENE_USE_QWEN_VL", "MIDSCENE_USE_QWEN3_VL", "MIDSCENE_USE_DOUBAO_VISION", "MIDSCENE_USE_GEMINI", "MIDSCENE_USE_VL_MODEL", "MIDSCENE_LOCATOR_MODE", "OPENAI_API_KEY", "OPENAI_BASE_URL", "MODEL_API_KEY", "MODEL_BASE_URL", "MIDSCENE_VQA_MODEL_NAME", "MIDSCENE_VQA_MODEL_SOCKS_PROXY", "MIDSCENE_VQA_MODEL_HTTP_PROXY", "MIDSCENE_VQA_MODEL_BASE_URL", "MIDSCENE_VQA_MODEL_API_KEY", "MIDSCENE_VQA_MODEL_INIT_CONFIG_JSON", "MIDSCENE_VQA_LOCATOR_MODE", "MIDSCENE_PLANNING_MODEL_NAME", "MIDSCENE_PLANNING_MODEL_SOCKS_PROXY", "MIDSCENE_PLANNING_MODEL_HTTP_PROXY", "MIDSCENE_PLANNING_MODEL_BASE_URL", "MIDSCENE_PLANNING_MODEL_API_KEY", "MIDSCENE_PLANNING_MODEL_INIT_CONFIG_JSON", "MIDSCENE_PLANNING_LOCATOR_MODE", "MIDSCENE_GROUNDING_MODEL_NAME", "MIDSCENE_GROUNDING_MODEL_SOCKS_PROXY", "MIDSCENE_GROUNDING_MODEL_HTTP_PROXY", "MIDSCENE_GROUNDING_MODEL_BASE_URL", "MIDSCENE_GROUNDING_MODEL_API_KEY", "MIDSCENE_GROUNDING_MODEL_INIT_CONFIG_JSON", "MIDSCENE_GROUNDING_LOCATOR_MODE"];
93
- export declare const ALL_ENV_KEYS: readonly [...string[], "MIDSCENE_DEBUG_MODE", "MIDSCENE_DEBUG_MODEL_PROFILE", "MIDSCENE_DEBUG_MODEL_RESPONSE", "MIDSCENE_RUN_DIR", "MIDSCENE_CACHE", "MIDSCENE_LANGSMITH_DEBUG", "MIDSCENE_FORCE_DEEP_THINK", "MIDSCENE_MCP_USE_PUPPETEER_MODE", "MIDSCENE_MCP_ANDROID_MODE", "MIDSCENE_CACHE_MAX_FILENAME_LENGTH", "MIDSCENE_REPLANNING_CYCLE_LIMIT", "OPENAI_MAX_TOKENS", "MIDSCENE_ADB_PATH", "MIDSCENE_ADB_REMOTE_HOST", "MIDSCENE_ADB_REMOTE_PORT", "MIDSCENE_ANDROID_IME_STRATEGY", "MIDSCENE_IOS_DEVICE_UDID", "MIDSCENE_IOS_SIMULATOR_UDID", "MIDSCENE_REPORT_TAG_NAME", "MIDSCENE_PREFERRED_LANGUAGE", "MATCH_BY_POSITION", "MIDSCENE_MCP_CHROME_PATH", "DOCKER_CONTAINER", "MIDSCENE_MODEL_NAME", "MIDSCENE_MODEL_INIT_CONFIG_JSON", "MIDSCENE_MODEL_API_KEY", "MIDSCENE_MODEL_BASE_URL", "MIDSCENE_MODEL_SOCKS_PROXY", "MIDSCENE_MODEL_HTTP_PROXY", "MIDSCENE_USE_VLM_UI_TARS", "MIDSCENE_USE_QWEN_VL", "MIDSCENE_USE_QWEN3_VL", "MIDSCENE_USE_DOUBAO_VISION", "MIDSCENE_USE_GEMINI", "MIDSCENE_USE_VL_MODEL", "MIDSCENE_LOCATOR_MODE", "OPENAI_API_KEY", "OPENAI_BASE_URL", "MODEL_API_KEY", "MODEL_BASE_URL", "MIDSCENE_VQA_MODEL_NAME", "MIDSCENE_VQA_MODEL_SOCKS_PROXY", "MIDSCENE_VQA_MODEL_HTTP_PROXY", "MIDSCENE_VQA_MODEL_BASE_URL", "MIDSCENE_VQA_MODEL_API_KEY", "MIDSCENE_VQA_MODEL_INIT_CONFIG_JSON", "MIDSCENE_VQA_LOCATOR_MODE", "MIDSCENE_PLANNING_MODEL_NAME", "MIDSCENE_PLANNING_MODEL_SOCKS_PROXY", "MIDSCENE_PLANNING_MODEL_HTTP_PROXY", "MIDSCENE_PLANNING_MODEL_BASE_URL", "MIDSCENE_PLANNING_MODEL_API_KEY", "MIDSCENE_PLANNING_MODEL_INIT_CONFIG_JSON", "MIDSCENE_PLANNING_LOCATOR_MODE", "MIDSCENE_GROUNDING_MODEL_NAME", "MIDSCENE_GROUNDING_MODEL_SOCKS_PROXY", "MIDSCENE_GROUNDING_MODEL_HTTP_PROXY", "MIDSCENE_GROUNDING_MODEL_BASE_URL", "MIDSCENE_GROUNDING_MODEL_API_KEY", "MIDSCENE_GROUNDING_MODEL_INIT_CONFIG_JSON", "MIDSCENE_GROUNDING_LOCATOR_MODE"];
104
+ export declare const MODEL_ENV_KEYS: readonly ["MIDSCENE_MODEL_NAME", "MIDSCENE_MODEL_INIT_CONFIG_JSON", "MIDSCENE_MODEL_API_KEY", "MIDSCENE_MODEL_BASE_URL", "MIDSCENE_MODEL_SOCKS_PROXY", "MIDSCENE_MODEL_HTTP_PROXY", "MIDSCENE_USE_VLM_UI_TARS", "MIDSCENE_USE_QWEN_VL", "MIDSCENE_USE_QWEN3_VL", "MIDSCENE_USE_DOUBAO_VISION", "MIDSCENE_USE_GEMINI", "MIDSCENE_USE_VL_MODEL", "MIDSCENE_LOCATOR_MODE", "OPENAI_API_KEY", "OPENAI_BASE_URL", "MIDSCENE_OPENAI_INIT_CONFIG_JSON", "MIDSCENE_OPENAI_HTTP_PROXY", "MIDSCENE_OPENAI_SOCKS_PROXY", "MODEL_API_KEY", "MODEL_BASE_URL", "MIDSCENE_VQA_MODEL_NAME", "MIDSCENE_VQA_MODEL_SOCKS_PROXY", "MIDSCENE_VQA_MODEL_HTTP_PROXY", "MIDSCENE_VQA_MODEL_BASE_URL", "MIDSCENE_VQA_MODEL_API_KEY", "MIDSCENE_VQA_MODEL_INIT_CONFIG_JSON", "MIDSCENE_VQA_LOCATOR_MODE", "MIDSCENE_PLANNING_MODEL_NAME", "MIDSCENE_PLANNING_MODEL_SOCKS_PROXY", "MIDSCENE_PLANNING_MODEL_HTTP_PROXY", "MIDSCENE_PLANNING_MODEL_BASE_URL", "MIDSCENE_PLANNING_MODEL_API_KEY", "MIDSCENE_PLANNING_MODEL_INIT_CONFIG_JSON", "MIDSCENE_PLANNING_LOCATOR_MODE", "MIDSCENE_GROUNDING_MODEL_NAME", "MIDSCENE_GROUNDING_MODEL_SOCKS_PROXY", "MIDSCENE_GROUNDING_MODEL_HTTP_PROXY", "MIDSCENE_GROUNDING_MODEL_BASE_URL", "MIDSCENE_GROUNDING_MODEL_API_KEY", "MIDSCENE_GROUNDING_MODEL_INIT_CONFIG_JSON", "MIDSCENE_GROUNDING_LOCATOR_MODE"];
105
+ export declare const ALL_ENV_KEYS: readonly [...string[], "MIDSCENE_DEBUG_MODE", "MIDSCENE_DEBUG_MODEL_PROFILE", "MIDSCENE_DEBUG_MODEL_RESPONSE", "MIDSCENE_RUN_DIR", "MIDSCENE_CACHE", "MIDSCENE_LANGSMITH_DEBUG", "MIDSCENE_FORCE_DEEP_THINK", "MIDSCENE_MCP_USE_PUPPETEER_MODE", "MIDSCENE_MCP_ANDROID_MODE", "MIDSCENE_CACHE_MAX_FILENAME_LENGTH", "MIDSCENE_REPLANNING_CYCLE_LIMIT", "OPENAI_MAX_TOKENS", "MIDSCENE_ADB_PATH", "MIDSCENE_ADB_REMOTE_HOST", "MIDSCENE_ADB_REMOTE_PORT", "MIDSCENE_ANDROID_IME_STRATEGY", "MIDSCENE_IOS_DEVICE_UDID", "MIDSCENE_IOS_SIMULATOR_UDID", "MIDSCENE_REPORT_TAG_NAME", "MIDSCENE_PREFERRED_LANGUAGE", "MATCH_BY_POSITION", "MIDSCENE_MCP_CHROME_PATH", "DOCKER_CONTAINER", "MIDSCENE_MODEL_NAME", "MIDSCENE_MODEL_INIT_CONFIG_JSON", "MIDSCENE_MODEL_API_KEY", "MIDSCENE_MODEL_BASE_URL", "MIDSCENE_MODEL_SOCKS_PROXY", "MIDSCENE_MODEL_HTTP_PROXY", "MIDSCENE_USE_VLM_UI_TARS", "MIDSCENE_USE_QWEN_VL", "MIDSCENE_USE_QWEN3_VL", "MIDSCENE_USE_DOUBAO_VISION", "MIDSCENE_USE_GEMINI", "MIDSCENE_USE_VL_MODEL", "MIDSCENE_LOCATOR_MODE", "OPENAI_API_KEY", "OPENAI_BASE_URL", "MIDSCENE_OPENAI_INIT_CONFIG_JSON", "MIDSCENE_OPENAI_HTTP_PROXY", "MIDSCENE_OPENAI_SOCKS_PROXY", "MODEL_API_KEY", "MODEL_BASE_URL", "MIDSCENE_VQA_MODEL_NAME", "MIDSCENE_VQA_MODEL_SOCKS_PROXY", "MIDSCENE_VQA_MODEL_HTTP_PROXY", "MIDSCENE_VQA_MODEL_BASE_URL", "MIDSCENE_VQA_MODEL_API_KEY", "MIDSCENE_VQA_MODEL_INIT_CONFIG_JSON", "MIDSCENE_VQA_LOCATOR_MODE", "MIDSCENE_PLANNING_MODEL_NAME", "MIDSCENE_PLANNING_MODEL_SOCKS_PROXY", "MIDSCENE_PLANNING_MODEL_HTTP_PROXY", "MIDSCENE_PLANNING_MODEL_BASE_URL", "MIDSCENE_PLANNING_MODEL_API_KEY", "MIDSCENE_PLANNING_MODEL_INIT_CONFIG_JSON", "MIDSCENE_PLANNING_LOCATOR_MODE", "MIDSCENE_GROUNDING_MODEL_NAME", "MIDSCENE_GROUNDING_MODEL_SOCKS_PROXY", "MIDSCENE_GROUNDING_MODEL_HTTP_PROXY", "MIDSCENE_GROUNDING_MODEL_BASE_URL", "MIDSCENE_GROUNDING_MODEL_API_KEY", "MIDSCENE_GROUNDING_MODEL_INIT_CONFIG_JSON", "MIDSCENE_GROUNDING_LOCATOR_MODE"];
94
106
  export type TEnvKeys = (typeof ALL_ENV_KEYS)[number];
95
107
  export type TGlobalConfig = Record<TEnvKeys, string | undefined>;
96
108
  export type TVlModeValues = 'qwen-vl' | 'qwen3-vl' | 'doubao-vision' | 'gemini' | 'vlm-ui-tars' | 'vlm-ui-tars-doubao' | 'vlm-ui-tars-doubao-1.5';
@@ -148,11 +160,11 @@ export interface IModelConfigForDefault {
148
160
  }
149
161
  export interface IModelConfigForDefaultLegacy {
150
162
  [MIDSCENE_MODEL_NAME]: string;
151
- [MIDSCENE_MODEL_SOCKS_PROXY]?: string;
152
- [MIDSCENE_MODEL_HTTP_PROXY]?: string;
163
+ [MIDSCENE_OPENAI_SOCKS_PROXY]?: string;
164
+ [MIDSCENE_OPENAI_HTTP_PROXY]?: string;
153
165
  [OPENAI_BASE_URL]?: string;
154
166
  [OPENAI_API_KEY]?: string;
155
- [MIDSCENE_MODEL_INIT_CONFIG_JSON]?: string;
167
+ [MIDSCENE_OPENAI_INIT_CONFIG_JSON]?: string;
156
168
  [MIDSCENE_LOCATOR_MODE]?: TVlModeValues;
157
169
  }
158
170
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@midscene/shared",
3
- "version": "1.0.1-beta-20251027074226.0",
3
+ "version": "1.0.1-beta-20251028021317.0",
4
4
  "repository": "https://github.com/web-infra-dev/midscene",
5
5
  "homepage": "https://midscenejs.com/",
6
6
  "types": "./dist/types/index.d.ts",
package/src/env/constants.ts CHANGED
@@ -13,6 +13,9 @@ import {
13
13
  MIDSCENE_MODEL_INIT_CONFIG_JSON,
14
14
  MIDSCENE_MODEL_NAME,
15
15
  MIDSCENE_MODEL_SOCKS_PROXY,
16
+ MIDSCENE_OPENAI_HTTP_PROXY,
17
+ MIDSCENE_OPENAI_INIT_CONFIG_JSON,
18
+ MIDSCENE_OPENAI_SOCKS_PROXY,
16
19
  MIDSCENE_PLANNING_LOCATOR_MODE,
17
20
  MIDSCENE_PLANNING_MODEL_API_KEY,
18
21
  MIDSCENE_PLANNING_MODEL_BASE_URL,
@@ -134,16 +137,16 @@ export const DEFAULT_MODEL_CONFIG_KEYS: IModelConfigKeys = {
134
137
  export const DEFAULT_MODEL_CONFIG_KEYS_LEGACY: IModelConfigKeys = {
135
138
  modelName: MIDSCENE_MODEL_NAME,
136
139
  /**
137
- * proxy
140
+ * proxy - Uses legacy MIDSCENE_OPENAI_* variables for backward compatibility
138
141
  */
139
- socksProxy: MIDSCENE_MODEL_SOCKS_PROXY,
140
- httpProxy: MIDSCENE_MODEL_HTTP_PROXY,
142
+ socksProxy: MIDSCENE_OPENAI_SOCKS_PROXY,
143
+ httpProxy: MIDSCENE_OPENAI_HTTP_PROXY,
141
144
  /**
142
145
  * Model API - Uses legacy OPENAI_* variables for backward compatibility
143
146
  */
144
147
  openaiBaseURL: OPENAI_BASE_URL,
145
148
  openaiApiKey: OPENAI_API_KEY,
146
- openaiExtraConfig: MIDSCENE_MODEL_INIT_CONFIG_JSON,
149
+ openaiExtraConfig: MIDSCENE_OPENAI_INIT_CONFIG_JSON,
147
150
  /**
148
151
  * Extra
149
152
  */
package/src/env/decide-model-config.ts CHANGED
@@ -12,7 +12,16 @@ import {
12
12
  PLANNING_MODEL_CONFIG_KEYS,
13
13
  VQA_MODEL_CONFIG_KEYS,
14
14
  } from './constants';
15
- import { MODEL_API_KEY, MODEL_BASE_URL } from './types';
15
+ import {
16
+ MIDSCENE_MODEL_HTTP_PROXY,
17
+ MIDSCENE_MODEL_INIT_CONFIG_JSON,
18
+ MIDSCENE_MODEL_SOCKS_PROXY,
19
+ MIDSCENE_OPENAI_HTTP_PROXY,
20
+ MIDSCENE_OPENAI_INIT_CONFIG_JSON,
21
+ MIDSCENE_OPENAI_SOCKS_PROXY,
22
+ MODEL_API_KEY,
23
+ MODEL_BASE_URL,
24
+ } from './types';
16
25
 
17
26
  import { getDebug } from '../logger';
18
27
  import { assert } from '../utils';
@@ -64,15 +73,16 @@ export const decideOpenaiSdkConfig = ({
64
73
  initDebugConfig();
65
74
  const debugLog = getDebug('ai:config');
66
75
 
67
- const socksProxy = provider[keys.socksProxy];
68
- const httpProxy = provider[keys.httpProxy];
69
76
  const vlMode = provider[keys.vlMode];
70
77
 
71
78
  debugLog('enter decideOpenaiSdkConfig with keys:', keys);
72
79
 
73
- // Implement compatibility logic: prefer new variable names (MODEL_*), fallback to old ones (OPENAI_*)
80
+ // Implement compatibility logic: prefer new variable names (MIDSCENE_MODEL_*), fallback to old ones (MIDSCENE_OPENAI_*)
74
81
  let openaiBaseURL: string | undefined;
75
82
  let openaiApiKey: string | undefined;
83
+ let socksProxy: string | undefined;
84
+ let httpProxy: string | undefined;
85
+ let openaiExtraConfigStr: string | undefined;
76
86
 
77
87
  // When using legacy keys (OPENAI_BASE_URL, OPENAI_API_KEY), check for new names first
78
88
  if (keys.openaiBaseURL === 'OPENAI_BASE_URL') {
@@ -89,9 +99,36 @@ export const decideOpenaiSdkConfig = ({
89
99
  openaiApiKey = provider[keys.openaiApiKey];
90
100
  }
91
101
 
102
+ // Proxy compatibility: prefer MIDSCENE_MODEL_* over MIDSCENE_OPENAI_*
103
+ if (keys.socksProxy === MIDSCENE_OPENAI_SOCKS_PROXY) {
104
+ // Priority: MIDSCENE_MODEL_SOCKS_PROXY > MIDSCENE_OPENAI_SOCKS_PROXY
105
+ socksProxy =
106
+ provider[MIDSCENE_MODEL_SOCKS_PROXY] || provider[keys.socksProxy];
107
+ } else {
108
+ socksProxy = provider[keys.socksProxy];
109
+ }
110
+
111
+ if (keys.httpProxy === MIDSCENE_OPENAI_HTTP_PROXY) {
112
+ // Priority: MIDSCENE_MODEL_HTTP_PROXY > MIDSCENE_OPENAI_HTTP_PROXY
113
+ httpProxy =
114
+ provider[MIDSCENE_MODEL_HTTP_PROXY] || provider[keys.httpProxy];
115
+ } else {
116
+ httpProxy = provider[keys.httpProxy];
117
+ }
118
+
119
+ // Init config compatibility: prefer MIDSCENE_MODEL_INIT_CONFIG_JSON over MIDSCENE_OPENAI_INIT_CONFIG_JSON
120
+ if (keys.openaiExtraConfig === MIDSCENE_OPENAI_INIT_CONFIG_JSON) {
121
+ // Priority: MIDSCENE_MODEL_INIT_CONFIG_JSON > MIDSCENE_OPENAI_INIT_CONFIG_JSON
122
+ openaiExtraConfigStr =
123
+ provider[MIDSCENE_MODEL_INIT_CONFIG_JSON] ||
124
+ provider[keys.openaiExtraConfig];
125
+ } else {
126
+ openaiExtraConfigStr = provider[keys.openaiExtraConfig];
127
+ }
128
+
92
129
  const openaiExtraConfig = parseJson(
93
130
  keys.openaiExtraConfig,
94
- provider[keys.openaiExtraConfig],
131
+ openaiExtraConfigStr,
95
132
  );
96
133
 
97
134
  valueAssert(openaiApiKey, keys.openaiApiKey);
package/src/env/types.ts CHANGED
@@ -30,6 +30,19 @@ export const OPENAI_API_KEY = 'OPENAI_API_KEY';
30
30
  * @deprecated Use MODEL_BASE_URL instead. This is kept for backward compatibility.
31
31
  */
32
32
  export const OPENAI_BASE_URL = 'OPENAI_BASE_URL';
33
+ /**
34
+ * @deprecated Use MIDSCENE_MODEL_INIT_CONFIG_JSON instead. This is kept for backward compatibility.
35
+ */
36
+ export const MIDSCENE_OPENAI_INIT_CONFIG_JSON =
37
+ 'MIDSCENE_OPENAI_INIT_CONFIG_JSON';
38
+ /**
39
+ * @deprecated Use MIDSCENE_MODEL_HTTP_PROXY instead. This is kept for backward compatibility.
40
+ */
41
+ export const MIDSCENE_OPENAI_HTTP_PROXY = 'MIDSCENE_OPENAI_HTTP_PROXY';
42
+ /**
43
+ * @deprecated Use MIDSCENE_MODEL_SOCKS_PROXY instead. This is kept for backward compatibility.
44
+ */
45
+ export const MIDSCENE_OPENAI_SOCKS_PROXY = 'MIDSCENE_OPENAI_SOCKS_PROXY';
33
46
  export const OPENAI_MAX_TOKENS = 'OPENAI_MAX_TOKENS';
34
47
 
35
48
  export const MIDSCENE_ADB_PATH = 'MIDSCENE_ADB_PATH';
@@ -182,6 +195,9 @@ export const MODEL_ENV_KEYS = [
182
195
  // model default legacy
183
196
  OPENAI_API_KEY,
184
197
  OPENAI_BASE_URL,
198
+ MIDSCENE_OPENAI_INIT_CONFIG_JSON,
199
+ MIDSCENE_OPENAI_HTTP_PROXY,
200
+ MIDSCENE_OPENAI_SOCKS_PROXY,
185
201
  MODEL_API_KEY,
186
202
  MODEL_BASE_URL,
187
203
  // VQA
@@ -311,12 +327,12 @@ export interface IModelConfigForDefaultLegacy {
311
327
  // model name
312
328
  [MIDSCENE_MODEL_NAME]: string;
313
329
  // proxy
314
- [MIDSCENE_MODEL_SOCKS_PROXY]?: string;
315
- [MIDSCENE_MODEL_HTTP_PROXY]?: string;
330
+ [MIDSCENE_OPENAI_SOCKS_PROXY]?: string;
331
+ [MIDSCENE_OPENAI_HTTP_PROXY]?: string;
316
332
  // OpenAI
317
333
  [OPENAI_BASE_URL]?: string;
318
334
  [OPENAI_API_KEY]?: string;
319
- [MIDSCENE_MODEL_INIT_CONFIG_JSON]?: string;
335
+ [MIDSCENE_OPENAI_INIT_CONFIG_JSON]?: string;
320
336
  // extra
321
337
  [MIDSCENE_LOCATOR_MODE]?: TVlModeValues;
322
338
  }