Update app.py

app.py

@@ -622,6 +622,9 @@ with gr.Blocks(theme='ParityError/Interstellar') as demo:
                     # 생성 버튼
                     create_btn = gr.Button("🧬 히어로 생성!", variant="primary", scale=2)
 
+
+
+
                 with gr.TabItem("🧬 히어로 DNA 설계"):
                     gr.Markdown("""
                     ### 🧪 히어로 DNA 고급 설정
@@ -683,10 +686,6 @@ with gr.Blocks(theme='ParityError/Interstellar') as demo:
                                 label="고리형 구조 비율",
                                 visible=True
                             )
-
-
-                            design_btn = gr.Button("🧬 DNA 설계 생성!", variant="primary", scale=2)
-
                     
                     # 아미노산 구성 설정 추가
                     with gr.Accordion(label='🧬 DNA 구성 설정', open=False):
@@ -740,6 +739,10 @@ with gr.Blocks(theme='ParityError/Interstellar') as demo:
                                 label='노이즈 타입',
                                 value='normal'
                             )
+                    
+                    design_btn = gr.Button("🧬 DNA 설계 생성!", variant="primary", scale=2)                
+
+
 
                 with gr.TabItem("🧪 히어로 유전자 강화"):
                     gr.Markdown("""
@@ -776,11 +779,8 @@ with gr.Blocks(theme='ParityError/Interstellar') as demo:
                     preview_viewer = gr.HTML()
                     rewrite_pdb = gr.File(label='히어로 DNA 파일')
                     preview_btn = gr.Button("🔍 미리보기", variant="secondary")
+                    enhance_btn = gr.Button("⚡ 강화된 히어로 생성!", variant="primary", scale=2)
 
-
-                        enhance_btn = gr.Button("⚡ 강화된 히어로 생성!", variant="primary", scale=2)
-
-                    
                 with gr.TabItem("👑 히어로 가문"):
                     gr.Markdown("""
                     ### 🏰 위대한 히어로 가문의 유산
@@ -798,12 +798,12 @@ with gr.Blocks(theme='ParityError/Interstellar') as demo:
                     pssm = gr.File(label='분석된 가문 특성')
                     pssm_view = gr.Plot(label='가문 특성 분석 결과')
                     pssm_gen_btn = gr.Button("✨ 가문 특성 분석", variant="secondary")
+                    inherit_btn = gr.Button("👑 가문의 힘 계승!", variant="primary", scale=2)             
+
 
-                    inherit_btn = gr.Button("👑 가문의 힘 계승!", variant="primary", scale=2)
 
 
 
-        
         with gr.Column():
             gr.Markdown("## 🦸‍♂️ 히어로 프로필")
             
@@ -823,7 +823,7 @@ with gr.Blocks(theme='ParityError/Interstellar') as demo:
             gr.Markdown("#### 🔬 DNA 구조")
             output_viewer = gr.HTML()
 
-# 이벤트 연결 부분에 다음 코드 추가
+    # 이벤트 연결
     seq_opt.change(
         fn=toggle_seq_input,
         inputs=[seq_opt],
@@ -838,33 +838,68 @@ with gr.Blocks(theme='ParityError/Interstellar') as demo:
         queue=False
     )
 
-
-
-# 이벤트 연결
     preview_btn.click(get_motif_preview,[pdb_id_code, contigs],[preview_viewer, rewrite_pdb])
     pssm_gen_btn.click(get_pssm,[fasta_msa,input_pssm],[pssm_view, pssm])
 
-# 각 탭의 생성 버튼 연결
-    design_btn.click(
+    # 각 탭의 생성 버튼 연결
+    create_btn.click(
         combined_generation,
-        inputs=[...],  # DNA 설계에 필요한 입력값들
-        outputs=[...]  # 필요한 출력값들
+        inputs=[
+            hero_name, strength, flexibility, speed, defense, hero_size, special_ability,
+            sequence, seq_len, helix_bias, strand_bias, loop_bias, 
+            secondary_structure, aa_bias, aa_bias_potential, 
+            num_steps, noise, hydrophobic_target_score, hydrophobic_potential,
+            contigs, pssm, seq_mask, str_mask, rewrite_pdb
+        ],
+        outputs=[
+            hero_stats, 
+            hero_description, 
+            output_seq,
+            output_pdb,
+            output_viewer,
+            plddt_plot
+        ]
     )
 
-    enhance_btn.click(
+    design_btn.click(
         combined_generation,
-        inputs=[...],  # 유전자 강화에 필요한 입력값들
-        outputs=[...]  # 필요한 출력값들
+        inputs=[
+            hero_name, strength, flexibility, speed, defense, hero_size, special_ability,
+            sequence, seq_len, helix_bias, strand_bias, loop_bias, 
+            secondary_structure, aa_bias, aa_bias_potential, 
+            num_steps, noise, hydrophobic_target_score, hydrophobic_potential,
+            contigs, pssm, seq_mask, str_mask, rewrite_pdb
+        ],
+        outputs=[
+            hero_stats, 
+            hero_description, 
+            output_seq,
+            output_pdb,
+            output_viewer,
+            plddt_plot
+        ]
     )
 
-    inherit_btn.click(
+    enhance_btn.click(
         combined_generation,
-        inputs=[...],  # 가문 계승에 필요한 입력값들
-        outputs=[...]  # 필요한 출력값들
+        inputs=[
+            hero_name, strength, flexibility, speed, defense, hero_size, special_ability,
+            sequence, seq_len, helix_bias, strand_bias, loop_bias, 
+            secondary_structure, aa_bias, aa_bias_potential, 
+            num_steps, noise, hydrophobic_target_score, hydrophobic_potential,
+            contigs, pssm, seq_mask, str_mask, rewrite_pdb
+        ],
+        outputs=[
+            hero_stats, 
+            hero_description, 
+            output_seq,
+            output_pdb,
+            output_viewer,
+            plddt_plot
+        ]
     )
 
-    # generate_hero와 protein_diffusion_model을 combined_generation으로 통합
-    create_btn.click(
+    inherit_btn.click(
         combined_generation,
         inputs=[
             hero_name, strength, flexibility, speed, defense, hero_size, special_ability,
@@ -884,4 +919,4 @@ with gr.Blocks(theme='ParityError/Interstellar') as demo:
     )
 
 demo.queue()
-demo.launch(debug=True)
+demo.launch(debug=True)