@rpascene/shared 0.30.10 → 0.30.12

package/dist/lib/env/constants.js

@@ -48,7 +48,16 @@ const VQA_MODEL_CONFIG_KEYS = {
     azureExtraConfig: external_types_js_namespaceObject.MIDSCENE_VQA_AZURE_OPENAI_INIT_CONFIG_JSON,
     useAnthropicSdk: external_types_js_namespaceObject.MIDSCENE_VQA_USE_ANTHROPIC_SDK,
     anthropicApiKey: external_types_js_namespaceObject.MIDSCENE_VQA_ANTHROPIC_API_KEY,
-    vlMode: external_types_js_namespaceObject.MIDSCENE_VQA_VL_MODE
+    vlMode: external_types_js_namespaceObject.MIDSCENE_VQA_VL_MODE,
+    domain: 'domain',
+    yht_access_token: 'yht_access_token',
+    model: 'model',
+    baseURL: 'baseURL',
+    chatType: 'chatType',
+    modelCategory: 'modelCategory',
+    stream: 'stream',
+    temperature: 'temperature',
+    top_p: 'top_p'
 };
 const GROUNDING_MODEL_CONFIG_KEYS = {
     modelName: external_types_js_namespaceObject.MIDSCENE_GROUNDING_MODEL_NAME,
@@ -67,7 +76,16 @@ const GROUNDING_MODEL_CONFIG_KEYS = {
     azureExtraConfig: external_types_js_namespaceObject.MIDSCENE_GROUNDING_AZURE_OPENAI_INIT_CONFIG_JSON,
     useAnthropicSdk: external_types_js_namespaceObject.MIDSCENE_GROUNDING_USE_ANTHROPIC_SDK,
     anthropicApiKey: external_types_js_namespaceObject.MIDSCENE_GROUNDING_ANTHROPIC_API_KEY,
-    vlMode: external_types_js_namespaceObject.MIDSCENE_GROUNDING_VL_MODE
+    vlMode: external_types_js_namespaceObject.MIDSCENE_GROUNDING_VL_MODE,
+    domain: 'domain',
+    yht_access_token: 'yht_access_token',
+    model: 'model',
+    baseURL: 'baseURL',
+    chatType: 'chatType',
+    modelCategory: 'modelCategory',
+    stream: 'stream',
+    temperature: 'temperature',
+    top_p: 'top_p'
 };
 const PLANNING_MODEL_CONFIG_KEYS = {
     modelName: external_types_js_namespaceObject.MIDSCENE_PLANNING_MODEL_NAME,
@@ -86,7 +104,16 @@ const PLANNING_MODEL_CONFIG_KEYS = {
     azureExtraConfig: external_types_js_namespaceObject.MIDSCENE_PLANNING_AZURE_OPENAI_INIT_CONFIG_JSON,
     useAnthropicSdk: external_types_js_namespaceObject.MIDSCENE_PLANNING_USE_ANTHROPIC_SDK,
     anthropicApiKey: external_types_js_namespaceObject.MIDSCENE_PLANNING_ANTHROPIC_API_KEY,
-    vlMode: external_types_js_namespaceObject.MIDSCENE_PLANNING_VL_MODE
+    vlMode: external_types_js_namespaceObject.MIDSCENE_PLANNING_VL_MODE,
+    domain: 'domain',
+    yht_access_token: 'yht_access_token',
+    model: 'model',
+    baseURL: 'baseURL',
+    chatType: 'chatType',
+    modelCategory: 'modelCategory',
+    stream: 'stream',
+    temperature: 'temperature',
+    top_p: 'top_p'
 };
 const DEFAULT_MODEL_CONFIG_KEYS = {
     modelName: external_types_js_namespaceObject.MIDSCENE_MODEL_NAME,
@@ -105,7 +132,16 @@ const DEFAULT_MODEL_CONFIG_KEYS = {
     azureExtraConfig: external_types_js_namespaceObject.MIDSCENE_AZURE_OPENAI_INIT_CONFIG_JSON,
     useAnthropicSdk: external_types_js_namespaceObject.MIDSCENE_USE_ANTHROPIC_SDK,
     anthropicApiKey: external_types_js_namespaceObject.MIDSCENE_ANTHROPIC_API_KEY,
-    vlMode: external_types_js_namespaceObject.MIDSCENE_VL_MODE
+    vlMode: external_types_js_namespaceObject.MIDSCENE_VL_MODE,
+    domain: 'domain',
+    yht_access_token: 'yht_access_token',
+    model: 'model',
+    baseURL: 'baseURL',
+    chatType: 'chatType',
+    modelCategory: 'modelCategory',
+    stream: 'stream',
+    temperature: 'temperature',
+    top_p: 'top_p'
 };
 const DEFAULT_MODEL_CONFIG_KEYS_LEGACY = {
     modelName: external_types_js_namespaceObject.MIDSCENE_MODEL_NAME,
@@ -124,7 +160,16 @@ const DEFAULT_MODEL_CONFIG_KEYS_LEGACY = {
     azureExtraConfig: external_types_js_namespaceObject.MIDSCENE_AZURE_OPENAI_INIT_CONFIG_JSON,
     useAnthropicSdk: external_types_js_namespaceObject.MIDSCENE_USE_ANTHROPIC_SDK,
     anthropicApiKey: external_types_js_namespaceObject.ANTHROPIC_API_KEY,
-    vlMode: 'DEFAULT_MODEL_CONFIG_KEYS has no vlMode key'
+    vlMode: 'DEFAULT_MODEL_CONFIG_KEYS has no vlMode key',
+    domain: 'domain',
+    yht_access_token: 'yht_access_token',
+    model: 'model',
+    baseURL: 'baseURL',
+    chatType: 'chatType',
+    modelCategory: 'modelCategory',
+    stream: 'stream',
+    temperature: 'temperature',
+    top_p: 'top_p'
 };
 exports.DEFAULT_MODEL_CONFIG_KEYS = __webpack_exports__.DEFAULT_MODEL_CONFIG_KEYS;
 exports.DEFAULT_MODEL_CONFIG_KEYS_LEGACY = __webpack_exports__.DEFAULT_MODEL_CONFIG_KEYS_LEGACY;

package/dist/lib/env/global-config-manager.js

@@ -87,6 +87,15 @@ class GlobalConfigManager {
     }
     overrideAIConfig(newConfig, extendMode = false) {
         var _this_override;
+        for(const key in newConfig){
+            if (![
+                ...external_types_js_namespaceObject.GLOBAL_ENV_KEYS,
+                ...external_types_js_namespaceObject.MODEL_ENV_KEYS
+            ].includes(key)) throw new Error(`Failed to override AI config, invalid key: ${key}`);
+            const value = newConfig[key];
+            if ('string' != typeof value) throw new Error(`Failed to override AI config, value for key ${key} must be a string, but got with type ${typeof value}`);
+            if (this.keysHaveBeenRead[key]) console.warn(`Warning: try to override AI config with key ${key} ,but it has been read.`);
+        }
         const savedNewConfig = extendMode ? {
             ...null == (_this_override = this.override) ? void 0 : _this_override.newConfig,
             ...newConfig

package/dist/lib/env/types.js

@@ -141,7 +141,8 @@ __webpack_require__.d(__webpack_exports__, {
     UITarsModelVersion: ()=>UITarsModelVersion,
     UNUSED_ENV_KEYS: ()=>UNUSED_ENV_KEYS,
     VL_MODE_RAW_VALID_VALUES: ()=>VL_MODE_RAW_VALID_VALUES,
-    Yht_ENV_KEYS: ()=>Yht_ENV_KEYS
+    YHT_NUMBER_ENV_KEYS: ()=>YHT_NUMBER_ENV_KEYS,
+    YHT_STRING_ENV_KEYS: ()=>YHT_STRING_ENV_KEYS
 });
 const MIDSCENE_OPENAI_INIT_CONFIG_JSON = 'MIDSCENE_OPENAI_INIT_CONFIG_JSON';
 const MIDSCENE_MODEL_NAME = 'MIDSCENE_MODEL_NAME';
@@ -289,6 +290,19 @@ const GLOBAL_ENV_KEYS = [
     ...NUMBER_ENV_KEYS,
     ...STRING_ENV_KEYS
 ];
+const YHT_STRING_ENV_KEYS = [
+    'domain',
+    'yht_access_token',
+    'model',
+    'baseURL'
+];
+const YHT_NUMBER_ENV_KEYS = [
+    'chatType',
+    'modelCategory',
+    'stream',
+    'temperature',
+    'top_p'
+];
 const MODEL_ENV_KEYS = [
     MIDSCENE_MODEL_NAME,
     MIDSCENE_OPENAI_INIT_CONFIG_JSON,
@@ -371,25 +385,15 @@ const MODEL_ENV_KEYS = [
     MIDSCENE_GROUNDING_AZURE_OPENAI_INIT_CONFIG_JSON,
     MIDSCENE_GROUNDING_USE_ANTHROPIC_SDK,
     MIDSCENE_GROUNDING_ANTHROPIC_API_KEY,
-    MIDSCENE_GROUNDING_VL_MODE
-];
-const Yht_ENV_KEYS = [
-    'domain',
-    'yht_access_token',
-    'chatType',
-    'model',
-    'modelCategory',
-    'stream',
-    'temperature',
-    'top_p',
-    'baseURL'
+    MIDSCENE_GROUNDING_VL_MODE,
+    ...YHT_STRING_ENV_KEYS,
+    ...YHT_NUMBER_ENV_KEYS
 ];
 const ALL_ENV_KEYS = [
     ...UNUSED_ENV_KEYS,
     ...BASIC_ENV_KEYS,
     ...GLOBAL_ENV_KEYS,
-    ...MODEL_ENV_KEYS,
-    ...Yht_ENV_KEYS
+    ...MODEL_ENV_KEYS
 ];
 var UITarsModelVersion = /*#__PURE__*/ function(UITarsModelVersion) {
     UITarsModelVersion["V1_0"] = "1.0";
@@ -524,7 +528,8 @@ exports.STRING_ENV_KEYS = __webpack_exports__.STRING_ENV_KEYS;
 exports.UITarsModelVersion = __webpack_exports__.UITarsModelVersion;
 exports.UNUSED_ENV_KEYS = __webpack_exports__.UNUSED_ENV_KEYS;
 exports.VL_MODE_RAW_VALID_VALUES = __webpack_exports__.VL_MODE_RAW_VALID_VALUES;
-exports.Yht_ENV_KEYS = __webpack_exports__.Yht_ENV_KEYS;
+exports.YHT_NUMBER_ENV_KEYS = __webpack_exports__.YHT_NUMBER_ENV_KEYS;
+exports.YHT_STRING_ENV_KEYS = __webpack_exports__.YHT_STRING_ENV_KEYS;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "ALL_ENV_KEYS",
     "ANTHROPIC_API_KEY",
@@ -643,7 +648,8 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "UITarsModelVersion",
     "UNUSED_ENV_KEYS",
     "VL_MODE_RAW_VALID_VALUES",
-    "Yht_ENV_KEYS"
+    "YHT_NUMBER_ENV_KEYS",
+    "YHT_STRING_ENV_KEYS"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/dist/lib/env/utils.js

@@ -44,7 +44,11 @@ const getPreferredLanguage = ()=>{
     return isChina ? 'Chinese' : 'English';
 };
 const overrideAIConfig = (newConfig, extendMode = false)=>{
-    globalConfigManager.overrideAIConfig(newConfig, extendMode);
+    const config = Object.entries(newConfig).reduce((pre, [key, value])=>({
+            ...pre,
+            [key]: String(value)
+        }), {});
+    globalConfigManager.overrideAIConfig(config, extendMode);
 };
 exports.getPreferredLanguage = __webpack_exports__.getPreferredLanguage;
 exports.globalConfigManager = __webpack_exports__.globalConfigManager;

package/dist/lib/extractor/index.js

@@ -65,6 +65,7 @@ var __webpack_exports__ = {};
     __webpack_require__.d(__webpack_exports__, {
         descriptionOfTree: ()=>_tree__WEBPACK_IMPORTED_MODULE_0__.descriptionOfTree,
         generateElementByPosition: ()=>_dom_util__WEBPACK_IMPORTED_MODULE_4__.generateElementByPosition,
+        getElementFromPoint: ()=>_web_extractor__WEBPACK_IMPORTED_MODULE_1__.getElementFromPoint,
         getElementInfoByXpath: ()=>_locator__WEBPACK_IMPORTED_MODULE_3__.getElementInfoByXpath,
         getElementXpath: ()=>_locator__WEBPACK_IMPORTED_MODULE_3__.getElementXpath,
         getNodeFromCacheList: ()=>_util__WEBPACK_IMPORTED_MODULE_2__.getNodeFromCacheList,
@@ -101,6 +102,7 @@ var __webpack_exports__ = {};
         "truncateText",
         "webExtractTextWithPosition",
         "getElementXpath",
+        "getElementFromPoint",
         "webExtractNodeTree",
         "default",
         "getXpathsByPoint",
@@ -114,6 +116,7 @@ var __webpack_exports__ = {};
 })();
 exports.descriptionOfTree = __webpack_exports__.descriptionOfTree;
 exports.generateElementByPosition = __webpack_exports__.generateElementByPosition;
+exports.getElementFromPoint = __webpack_exports__.getElementFromPoint;
 exports.getElementInfoByXpath = __webpack_exports__.getElementInfoByXpath;
 exports.getElementXpath = __webpack_exports__.getElementXpath;
 exports.getNodeFromCacheList = __webpack_exports__.getNodeFromCacheList;
@@ -132,6 +135,7 @@ exports.webExtractTextWithPosition = __webpack_exports__.webExtractTextWithPosit
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "descriptionOfTree",
     "generateElementByPosition",
+    "getElementFromPoint",
     "getElementInfoByXpath",
     "getElementXpath",
     "getNodeFromCacheList",

package/dist/lib/extractor/web-extractor.js

@@ -26,6 +26,7 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     collectElementInfo: ()=>collectElementInfo,
     extractTreeNodeAsString: ()=>extractTreeNodeAsString,
+    getElementFromPoint: ()=>getElementFromPoint,
     extractTreeNode: ()=>extractTreeNode,
     mergeElementAndChildrenRects: ()=>mergeElementAndChildrenRects,
     extractTextWithPosition: ()=>extractTextWithPosition
@@ -389,17 +390,79 @@ if ('undefined' != typeof window) (0, external_cs_postmessage_js_namespaceObject
             error: 'error message'
         };
     }
+    if ('getElementFromPoint' === action) try {
+        return await getElementFromPoint({
+            x: data.x,
+            y: data.y,
+            containerPaths: data.containerPaths
+        });
+    } catch (error) {
+        return {
+            error: 'error message'
+        };
+    }
 });
+const getElementOffset = (element)=>{
+    const pLeft = parseInt(window.getComputedStyle(element, null).getPropertyValue('padding-left'), 10) || 0;
+    const pTop = parseInt(window.getComputedStyle(element, null).getPropertyValue('padding-top'), 10) || 0;
+    const bLeft = parseInt(window.getComputedStyle(element, null).getPropertyValue('border-left-width'), 10) || 0;
+    const bTop = parseInt(window.getComputedStyle(element, null).getPropertyValue('border-top-width'), 10) || 0;
+    return {
+        x: pLeft + bLeft,
+        y: pTop + bTop
+    };
+};
+const web_extractor_getCssScale = (element)=>{
+    try {
+        const { width, height } = element.getBoundingClientRect();
+        return {
+            cssScaleX: Number((width / element.offsetWidth).toFixed(1)),
+            cssScaleY: Number((height / element.offsetHeight).toFixed(1))
+        };
+    } catch (error) {
+        return {
+            cssScaleX: 1,
+            cssScaleY: 1
+        };
+    }
+};
+const getElementFromPoint = async (args)=>{
+    if (!args.containerPaths) args.containerPaths = [];
+    const dom = document.elementFromPoint(args.x, args.y);
+    if ((null == dom ? void 0 : dom.nodeName) === 'IFRAME') {
+        const containerPath = (0, external_customLocator_js_namespaceObject.getContainerPath)(dom);
+        const bounding = dom.getBoundingClientRect();
+        const offset = getElementOffset(dom);
+        const { cssScaleX, cssScaleY } = web_extractor_getCssScale(dom);
+        return await (0, external_cs_postmessage_js_namespaceObject.postWindowMessage)(dom.contentWindow, window, {
+            action: 'getElementFromPoint',
+            data: {
+                x: (args.x - bounding.x - offset.x) / cssScaleX,
+                y: (args.y - bounding.y - offset.y) / cssScaleY,
+                containerPaths: args.containerPaths.concat(containerPath)
+            }
+        });
+    }
+    {
+        const elementInfo = {
+            allPaths: (0, external_customLocator_js_namespaceObject.getLocators)(dom),
+            containerPaths: args.containerPaths
+        };
+        return elementInfo;
+    }
+};
 exports.collectElementInfo = __webpack_exports__.collectElementInfo;
 exports.extractTextWithPosition = __webpack_exports__.extractTextWithPosition;
 exports.extractTreeNode = __webpack_exports__.extractTreeNode;
 exports.extractTreeNodeAsString = __webpack_exports__.extractTreeNodeAsString;
+exports.getElementFromPoint = __webpack_exports__.getElementFromPoint;
 exports.mergeElementAndChildrenRects = __webpack_exports__.mergeElementAndChildrenRects;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "collectElementInfo",
     "extractTextWithPosition",
     "extractTreeNode",
     "extractTreeNodeAsString",
+    "getElementFromPoint",
     "mergeElementAndChildrenRects"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {