fix: upload image error

image size up to 20MB

.streamlit/config.toml

@@ -83,7 +83,7 @@ enableXsrfProtection = true
 # Max size, in megabytes, for files uploaded with the file_uploader.
 
 # Default: 200
-maxUploadSize = 10
+maxUploadSize = 20
 
 # Max size, in megabytes, of messages that can be sent via the WebSocket
 # connection.

modules/new_app.py

@@ -9,6 +9,7 @@
 from modules import get_comfyui_object_info, get_workspace_model
 
 NODE_SEP = '||'
+FAQ_URL = "https://github.com/xingren23/ComfyFlowApp/wiki/FAQ"
 
 def format_input_node_info(param):
     # format {id}.{class_type}.{alias}.{param_name}
@@ -38,7 +39,7 @@ def process_workflow_meta(image_upload):
         return None
 
 
-def parse_prompt(prompt_info):
+def parse_prompt(prompt_info, object_info_meta):
     # parse prompt to inputs and outputs
     try:
         prompt = json.loads(prompt_info)
@@ -64,7 +65,7 @@ def parse_prompt(prompt_info):
                 params_inputs.update({option_key: option_value})
                 node_inputs.append(param_value)
 
-            is_output = get_comfyui_object_info()[class_type]['output_node']
+            is_output = object_info_meta[class_type]['output_node']
             if is_output:
                 # TODO: support multi output
                 if class_type == 'SaveImage':
@@ -77,62 +78,71 @@ def parse_prompt(prompt_info):
                 else:
                     logger.warning(f"Only support SaveImage as output node, {class_type}")
 
-        return params_inputs, params_outputs
+        return (params_inputs, params_outputs)
     except Exception as e:
-        logger.error(f"parse_prompt error, {e}")
-        return None, None
+        st.error(f"parse_prompt error, {e} refer to {FAQ_URL}")
+        return (None, None)
 
 
 def process_image_change():
+    comfyui_object_info = st.session_state.get('comfyui_object_info')
     upload_image = st.session_state['create_upload_image']
     if upload_image:
         metas = process_workflow_meta(upload_image)
         if metas and 'prompt' in metas.keys() and 'workflow' in metas.keys():
             st.session_state['create_prompt'] = metas.get('prompt')
             st.session_state['create_workflow'] = metas.get('workflow')
-            inputs, outputs = parse_prompt(metas.get('prompt'))
-            if inputs and outputs:
+            inputs, outputs = parse_prompt(metas.get('prompt'), comfyui_object_info)
+            if inputs:
                 logger.info(f"create_prompt_inputs, {inputs}")
+                st.success(f"parse inputs from workflow image, input nodes {len(inputs)}")
                 st.session_state['create_prompt_inputs'] = inputs
+            else:
+                st.error(f"parse workflow from image error, inputs is None, refer to {FAQ_URL}")
 
+            if outputs:
                 logger.info(f"create_prompt_outputs, {outputs}")
-                st.session_state['create_prompt_outputs'] = outputs 
-
-                st.success("parse workflow from image successfully")
+                st.success(f"parse outputs from workflow image, output nodes {len(outputs)}")
+                st.session_state['create_prompt_outputs'] = outputs
             else:
-                st.error("parse workflow from image error, inputs or outputs is None")
+                st.error(f"parse workflow from image error, outputs is None, refer to {FAQ_URL}")
+
         else:
-            st.error("the image don't contain workflow info")
+            st.error(f"the image don't contain workflow info, refer to {FAQ_URL}")
     else:
         st.session_state['create_prompt'] = None
         st.session_state['create_workflow'] = None
         st.session_state['create_prompt_inputs'] = {}
         st.session_state['create_prompt_outputs'] = {}
 
 def process_image_edit(api_prompt):
+    comfyui_object_info = st.session_state.get('comfyui_object_info')
     if api_prompt:
         st.session_state['create_prompt'] =api_prompt
-        inputs, outputs = parse_prompt(api_prompt)
-        if inputs and outputs:
+        inputs, outputs = parse_prompt(api_prompt, comfyui_object_info)
+        if inputs:
             logger.info(f"create_prompt_inputs, {inputs}")
+            st.success(f"parse inputs from workflow image, input nodes {len(inputs)}")
             st.session_state['create_prompt_inputs'] = inputs
+        else:
+            st.error(f"parse workflow from image error, inputs is None, refer to {FAQ_URL}")
 
+        if outputs:
             logger.info(f"create_prompt_outputs, {outputs}")
-            st.session_state['create_prompt_outputs'] = outputs 
-
-            st.success("parse workflow from image successfully")
+            st.success(f"parse outputs from workflow image, output nodes {len(outputs)}")
+            st.session_state['create_prompt_outputs'] = outputs
         else:
-            st.error("parse workflow from image error, inputs or outputs is None")
+            st.error(f"parse workflow from image error, outputs is None, refer to {FAQ_URL}")
     else:
-        st.error("the image don't contain workflow info")
+        st.error(f"the image don't contain workflow info, refer to {FAQ_URL}")
 
 
 def get_node_input_config(input_param, app_input_name, app_input_description):
     params_inputs = st.session_state.get('create_prompt_inputs', {})
     option_params_value = params_inputs[input_param]
     logger.debug(f"get_node_input_config, {input_param} {option_params_value}")
     node_id, class_type, param, param_value = option_params_value.split(NODE_SEP)
-    comfyui_object_info = get_comfyui_object_info()
+    comfyui_object_info = st.session_state.get('comfyui_object_info')
     class_meta = comfyui_object_info[class_type]
     class_input = class_meta['input']['required']
     if 'optional' in class_meta['input'].keys():
@@ -327,6 +337,12 @@ def edit_app_ui(app):
         header_row.title("🌱 Edit app from comfyui workflow")
         header_row.button("Back Workspace", help="Back to your workspace", key="edit_back_workspace", on_click=on_edit_workspace)
 
+    try:
+        comfyui_object_info = get_comfyui_object_info()
+        st.session_state['comfyui_object_info'] = comfyui_object_info
+    except Exception as e:
+        st.error(f"connect to comfyui node error, {e}")
+        st.stop()
 
     # upload workflow image and config params
     with st.expander("### :one: Upload image of comfyui workflow", expanded=True):
@@ -386,19 +402,19 @@ def edit_app_ui(app):
                 input_param = input_params[0]
                 add_input_config_param(params_inputs_options, 1, input_param)
             else:
-                add_input_config_param(params_inputs_options, 1)
+                add_input_config_param(params_inputs_options, 1, None)
 
             if len(input_params) > 1:
                 input_param_2 = input_params[1]
                 add_input_config_param(params_inputs_options, 2, input_param_2)
             else:
-                add_input_config_param(params_inputs_options, 2)
+                add_input_config_param(params_inputs_options, 2, None)
 
             if len(input_params) > 2:
                 input_param_3 = input_params[2]
                 add_input_config_param(params_inputs_options, 3, input_param_3)
             else:
-                add_input_config_param(params_inputs_options, 3)
+                add_input_config_param(params_inputs_options, 3, None)
 
         with st.container():
 
@@ -424,7 +440,7 @@ def edit_app_ui(app):
                 output_param_1 = output_params[0]
                 add_output_config_param(params_outputs_options, 1, output_param_1)
             else:
-                add_output_config_param(params_outputs_options, 1)
+                add_output_config_param(params_outputs_options, 1, None)
 
     with st.container():
         operation_row = row([0.15, 0.7, 0.15])
@@ -437,7 +453,7 @@ def edit_app_ui(app):
                 st.success("Save app successfully, back your workspace")
                 st.stop()
             else:
-                st.error("Save app error, please check up app params")
+                st.error(f"Save app error, please check up app params, refer to {FAQ_URL}")
 
         operation_row.empty()
         next_placeholder = operation_row.empty()
@@ -446,7 +462,7 @@ def on_new_workspace():
     st.session_state.pop('new_app', None)
     logger.info("back to workspace")
 
-def add_input_config_param(params_inputs_options, index, input_param=None):
+def add_input_config_param(params_inputs_options, index, input_param):
     if not input_param:
         input_param = {
             'name': None,
@@ -464,7 +480,7 @@ def add_input_config_param(params_inputs_options, index, input_param=None):
     param_input_row.text_input("App Input Description", value=input_param['help'], placeholder="Param Description",
                                 key=f"input_param{index}_desc", help="Input param description")
 
-def add_output_config_param(params_outputs_options, index, output_param=None):
+def add_output_config_param(params_outputs_options, index, output_param):
     if not output_param:
         output_param = {
             'name': None,
@@ -494,13 +510,20 @@ def new_app_ui():
             st.warning("Please go to homepage for your login :point_left:")
             st.stop()
 
+    try:
+        comfyui_object_info = get_comfyui_object_info()
+        st.session_state['comfyui_object_info'] = comfyui_object_info
+    except Exception as e:
+        st.error(f"connect to comfyui node error, {e}")
+        st.stop()
+
     # upload workflow image and config params
     with st.expander("### :one: Upload image of comfyui workflow", expanded=True):
         image_col1, image_col2 = st.columns([0.5, 0.5])
         with image_col1:
-            st.file_uploader("Upload image *", type=["png", "jpg", "jpeg"], 
+            st.file_uploader("Upload image from comfyui outputs *", type=["png", "jpg", "jpeg"], 
                                             key="create_upload_image", 
-                                            help="upload image of comfyui workflow")
+                                            help="upload image from comfyui output folder", accept_multiple_files=False)
             process_image_change()  
 
         with image_col2:
@@ -530,15 +553,15 @@ def new_app_ui():
             params_inputs = st.session_state.get('create_prompt_inputs', {})
             params_inputs_options = list(params_inputs.keys())
 
-            add_input_config_param(params_inputs_options, 1)
-            add_input_config_param(params_inputs_options, 2)
-            add_input_config_param(params_inputs_options, 3)
+            add_input_config_param(params_inputs_options, 1, None)
+            add_input_config_param(params_inputs_options, 2, None)
+            add_input_config_param(params_inputs_options, 3, None)
         with st.container():
             st.markdown("Output Params:")
             params_outputs = st.session_state.get('create_prompt_outputs', {})
             params_outputs_options = list(params_outputs.keys())
 
-            add_output_config_param(params_outputs_options, 1)
+            add_output_config_param(params_outputs_options, 1, None)
 
 
     with st.container():
@@ -554,7 +577,7 @@ def new_app_ui():
             elif submit_info == 'exist':
                 st.error("Submit app error, app name has existed")
             else:
-                st.error("Submit app error, please check up app params")
+                st.error(f"Submit app error, please check up app params, refer to {FAQ_URL}")
 
         operation_row.empty()
 

modules/preview_app.py

@@ -3,7 +3,7 @@
 import streamlit as st
 import modules.page as page
 from streamlit_extras.row import row
-from modules import get_comfy_client, get_inner_comfy_client, get_workspace_model
+from modules import get_comfy_client, get_workspace_model
 from modules.workspace_model import AppStatus
 
 def on_preview_workspace():