funboost 48.7__py3-none-any.whl → 48.9__py3-none-any.whl

funboost/function_result_web/app.py

@@ -12,6 +12,9 @@ import os
 
 import datetime
 import json
+import traceback
+
+from funboost.core.func_params_model import PriorityConsumingControlConfig
 
 """
 pip install Flask flask_bootstrap  flask_wtf  wtforms flask_login       
@@ -26,6 +29,7 @@ from flask_login import login_user, logout_user, login_required, LoginManager, U
 import nb_log
 from funboost import nb_print,ActiveCousumerProcessInfoGetter,BoostersManager,PublisherParams,RedisMixin
 from funboost.function_result_web.functions import get_cols, query_result, get_speed, Statistic
+from funboost.function_result_web import functions as app_functions
 from funboost.core.active_cousumer_info_getter import QueueConusmerParamsGetter
 from funboost.constant import RedisKeys
 
@@ -119,7 +123,8 @@ def logout():
 @app.route('/')
 @login_required
 def index():
-    return render_template('index.html')
+    page = request.args.get('page')
+    return render_template('index.html', page=page)
 
 
 @app.route('/query_cols')
@@ -238,6 +243,39 @@ def resume_consume(queue_name):
     RedisMixin().redis_db_frame.hset(RedisKeys.REDIS_KEY_PAUSE_FLAG, queue_name,'0')
     return jsonify({'success':True})
 
+@app.route('/queue/get_msg_num',methods=['GET'])
+def get_msg_num():
+    return jsonify(QueueConusmerParamsGetter().get_msg_num(ignore_report_ts=True))
+        
+@app.route('/rpc/rpc_call',methods=['POST'])
+def rpc_call():
+    """
+    class MsgItem(BaseModel):
+        queue_name: str  # 队列名
+        msg_body: dict  # 消息体,就是boost函数的入参字典,例如 {"x":1,"y":2}
+        need_result: bool = False  # 发布消息后,是否需要返回结果
+        timeout: int = 60  # 等待结果返回的最大等待时间.
+
+
+    class PublishResponse(BaseModel):
+        succ: bool
+        msg: str
+        status_and_result: typing.Optional[dict] = None  # 消费函数的消费状态和结果.
+        task_id:str
+    """
+    
+    msg_item = request.get_json()
+    return jsonify(app_functions.rpc_call(**msg_item))
+    
+@app.route('/rpc/get_result_by_task_id',methods=['GET'])
+def get_result_by_task_id():
+    res = app_functions.get_result_by_task_id(task_id=request.args.get('task_id'),
+                                                          timeout=request.args.get('timeout') or 60)
+    if res['status_and_result'] is None:
+        return jsonify({'succ':False,'msg':'task_id不存在或者超时或者结果已经过期'})
+    return jsonify(res)
+   
+
 def start_funboost_web_manager(host='0.0.0.0', port=27018,block=False):
     print('start_funboost_web_manager , sys.path :', sys.path)
     def _start_funboost_web_manager():
@@ -246,7 +284,9 @@ def start_funboost_web_manager(host='0.0.0.0', port=27018,block=False):
         _start_funboost_web_manager()
     else:
         threading.Thread(target=_start_funboost_web_manager).start()
-
+        
+        
+        
 if __name__ == '__main__':
     # app.jinja_env.auto_reload = True
     # with app.test_request_context():

funboost/function_result_web/app_debug_start.py

@@ -0,0 +1,6 @@
+from funboost.function_result_web.app import app
+
+
+if __name__ == '__main__':
+    app.run(debug=True, threaded=True, host='0.0.0.0', port=27019)
+

funboost/function_result_web/functions.py

@@ -6,9 +6,16 @@ import json
 from pprint import pprint
 import time
 import copy
+import traceback
 from funboost import nb_print
+from funboost.constant import RedisKeys
+from funboost.core.booster import BoostersManager
+from funboost.core.func_params_model import PriorityConsumingControlConfig, PublisherParams
+from funboost.core.msg_result_getter import AsyncResult
+from funboost.core.serialization import Serialization
 from funboost.utils import time_util, decorators, LoggerMixin
 from funboost.utils.mongo_util import MongoMixin
+from funboost.utils.redis_manager import RedisMixin
 
 # from test_frame.my_patch_frame_config import do_patch_frame_config
 #
@@ -144,6 +151,55 @@ class Statistic(LoggerMixin):
                                                  t2.strftime('%Y-%m-%d %H:%M:%S'))
                 self.result['recent_60_seconds']['count_arr'].append(count)
 
+def rpc_call(queue_name, msg_body, need_result, timeout):
+  
+    status_and_result = None
+    task_id = None
+    try:
+        boost_params_json = RedisMixin().redis_db_frame.hget(RedisKeys.FUNBOOST_QUEUE__CONSUMER_PARAMS,queue_name)
+        boost_params_dict = Serialization.to_dict(boost_params_json)
+        broker_kind = boost_params_dict['broker_kind']
+        publisher = BoostersManager.get_cross_project_publisher(PublisherParams(queue_name=queue_name,
+                                                                            broker_kind=broker_kind, 
+                                                                            publish_msg_log_use_full_msg=True))
+    
+        if need_result:
+            # if booster.boost_params.is_using_rpc_mode is False:
+            #     raise ValueError(f' need_result 为true,{booster.queue_name} 队列消费者 需要@boost设置支持rpc模式')
+            
+            async_result: AsyncResult =  publisher.publish(msg_body,priority_control_config=PriorityConsumingControlConfig(is_using_rpc_mode=True))
+            async_result.set_timeout(timeout)
+            status_and_result = async_result.status_and_result
+            # print(status_and_result)
+            task_id = async_result.task_id
+        else:
+            async_result =publisher.publish(msg_body)
+            task_id = async_result.task_id
+        if status_and_result['success'] is False:
+            return dict(succ=False, msg=f'{queue_name} 队列,消息发布成功,但是函数执行失败', 
+                            status_and_result=status_and_result,task_id=task_id)
+        return dict(succ=True, msg=f'{queue_name} 队列,消息发布成功', 
+                            status_and_result=status_and_result,task_id=task_id)
+    except Exception as e:
+        return dict(succ=False, msg=f'{queue_name} 队列,消息发布失败 {type(e)} {e} {traceback.format_exc()}',
+                               status_and_result=status_and_result,task_id=task_id)
+    
+
+def get_result_by_task_id(task_id,timeout):
+    async_result = AsyncResult(task_id)
+    async_result.set_timeout(timeout)
+    status_and_result = async_result.status_and_result
+    if status_and_result is None:
+        return dict(succ=False, msg=f'{task_id} 不存在 或 超时 或 结果已过期', 
+                        status_and_result=status_and_result,task_id=task_id)
+    if status_and_result['success'] is False:
+        return dict(succ=False, msg=f'{task_id} 执行失败', 
+                        status_and_result=status_and_result,task_id=task_id)
+    return dict(succ=True, msg=f'task_id:{task_id} 获取结果成功', 
+                            status_and_result=status_and_result,task_id=task_id)
+        
+    
+     
 
 if __name__ == '__main__':
     # print(get_cols('4'))
@@ -152,6 +208,13 @@ if __name__ == '__main__':
     # nb_print(get_speed_last_minute('queue_test54'))
 
     # nb_print(get_speed('queue_test56', '2019-09-18 16:03:29', '2019-09-23 16:03:29'))
-    stat = Statistic('queue_test_f01t')
-    stat.build_result()
-    nb_print(stat.result)
+    # stat = Statistic('queue_test_f01t')
+    # stat.build_result()
+    # nb_print(stat.result)
+    
+    # res = rpc_call('queue_test_g02t',{'x':1,'y':2},True,60)
+    
+    res = get_result_by_task_id('3232',60)
+    print(res)
+    
+    

funboost/function_result_web/static/js/form-memory.js

@@ -0,0 +1,92 @@
+// 表单记忆功能 - 保存和恢复iframe内的表单值
+(function() {
+    // 简化版 - 只保存基本输入值
+    function saveFormInputs() {
+        const iframe = document.getElementById('content');
+        if (!iframe || !iframe.contentWindow) return;
+        
+        const pageId = iframe.src.split('/').pop().replace('.html', '');
+        
+        try {
+            const iframeDoc = iframe.contentDocument || iframe.contentWindow.document;
+            const formData = {};
+            
+            // 保存所有输入元素值
+            const inputs = iframeDoc.querySelectorAll('input, textarea, select');
+            inputs.forEach(input => {
+                const inputId = input.id || input.name || input.getAttribute('placeholder');
+                if (inputId) {
+                    formData[inputId] = input.value;
+                }
+            });
+            
+            // 特殊处理下拉框的选中文本
+            const selects = iframeDoc.querySelectorAll('select');
+            selects.forEach(select => {
+                const inputId = select.id || select.name;
+                if (inputId && select.selectedIndex >= 0 && select.options[select.selectedIndex]) {
+                    formData[`${inputId}_text`] = select.options[select.selectedIndex].text;
+                }
+            });
+            
+            localStorage.setItem(`funboost_form_${pageId}`, JSON.stringify(formData));
+        } catch (e) {
+            console.error("保存表单数据失败:", e);
+        }
+    }
+
+    // 简化版 - 只恢复基本输入值
+    function restoreFormInputs() {
+        setTimeout(() => {
+            const iframe = document.getElementById('content');
+            if (!iframe || !iframe.contentWindow) return;
+            
+            const pageId = iframe.src.split('/').pop().replace('.html', '');
+            const savedData = localStorage.getItem(`funboost_form_${pageId}`);
+            
+            if (savedData) {
+                try {
+                    const formData = JSON.parse(savedData);
+                    const iframeDoc = iframe.contentDocument || iframe.contentWindow.document;
+                    
+                    // 恢复所有基本输入元素的值
+                    Object.keys(formData).forEach(inputId => {
+                        if (inputId.endsWith('_text')) return;
+                        
+                        const input = iframeDoc.getElementById(inputId) || 
+                                  iframeDoc.querySelector(`[name="${inputId}"]`) || 
+                                  iframeDoc.querySelector(`[placeholder="${inputId}"]`);
+                        
+                        if (input) {
+                            input.value = formData[inputId];
+                            
+                            // 触发change事件
+                            const event = new Event('change', { bubbles: true });
+                            input.dispatchEvent(event);
+                        }
+                    });
+                } catch (e) {
+                    console.error("恢复表单数据失败:", e);
+                }
+            }
+        }, 500);
+    }
+
+    // 当DOM加载完成时初始化事件监听
+    document.addEventListener('DOMContentLoaded', function() {
+        // 监听iframe加载完成事件
+        const contentFrame = document.getElementById('content');
+        if (contentFrame) {
+            contentFrame.addEventListener('load', restoreFormInputs);
+        }
+
+        // 在页面切换前保存
+        const navLinks = document.querySelectorAll('.sidebar .nav-link');
+        navLinks.forEach(link => {
+            link.addEventListener('click', saveFormInputs);
+        });
+
+        // 页面离开前保存
+        window.addEventListener('beforeunload', saveFormInputs);
+    });
+})();