Fix app.py merge conflicts

app.py

@@ -1,5 +1,4 @@
 import gradio as gr
-<<<<<<< HEAD
 from src.model.him_model import HIMModel
 from src.core.config import HIMConfig
 
@@ -8,95 +7,40 @@ def initialize_model():
     model = HIMModel(config)
     return model
 
-def process_input(text: str, image: str = None, audio: str = None):
+def chat(message: str, 
+         system_message: str = "You are a friendly Chatbot.",
+         max_tokens: int = 512,
+         temperature: float = 0.7,
+         top_p: float = 0.95):
+    
     input_data = {
-        'text': text,
-        'image': image,
-        'audio': audio,
-        'context': {}
+        "message": message,
+        "system_message": system_message,
+        "parameters": {
+            "max_tokens": max_tokens,
+            "temperature": temperature,
+            "top_p": top_p
+        }
     }
     
-    result = model.forward(input_data)
-    return format_output(result)
+    result = model.generate_response(input_data)
+    return result["response"]
 
 model = initialize_model()
 
 interface = gr.Interface(
-    fn=process_input,
+    fn=chat,
     inputs=[
-        gr.Textbox(label="Text Input"),
-        gr.Image(label="Image Input", optional=True),
-        gr.Audio(label="Audio Input", optional=True)
-    ],
-    outputs=[
-        gr.Textbox(label="HIM Response"),
-        gr.Plot(label="Consciousness State Visualization")
+        gr.Textbox(label="Message"),
+        gr.Textbox(label="System Message", value="You are a friendly Chatbot."),
+        gr.Slider(minimum=1, maximum=2048, value=512, label="Max Tokens"),
+        gr.Slider(minimum=0.1, maximum=1.0, value=0.7, label="Temperature"),
+        gr.Slider(minimum=0.1, maximum=1.0, value=0.95, label="Top P")
     ],
+    outputs=gr.Textbox(label="HIM Response"),
     title="Hybrid Intelligence Matrix (HIM)",
     description="Interact with the HIM system for advanced cognitive processing"
 )
-=======
-from huggingface_hub import InferenceClient
-
-"""
-For more information on `huggingface_hub` Inference API support, please check the docs: https://huggingface.co/docs/huggingface_hub/v0.22.2/en/guides/inference
-"""
-client = InferenceClient("HuggingFaceH4/zephyr-7b-beta")
-
-
-def respond(
-    message,
-    history: list[tuple[str, str]],
-    system_message,
-    max_tokens,
-    temperature,
-    top_p,
-):
-    messages = [{"role": "system", "content": system_message}]
-
-    for val in history:
-        if val[0]:
-            messages.append({"role": "user", "content": val[0]})
-        if val[1]:
-            messages.append({"role": "assistant", "content": val[1]})
-
-    messages.append({"role": "user", "content": message})
-
-    response = ""
-
-    for message in client.chat_completion(
-        messages,
-        max_tokens=max_tokens,
-        stream=True,
-        temperature=temperature,
-        top_p=top_p,
-    ):
-        token = message.choices[0].delta.content
-
-        response += token
-        yield response
-
-
-"""
-For information on how to customize the ChatInterface, peruse the gradio docs: https://www.gradio.app/docs/chatinterface
-"""
-demo = gr.ChatInterface(
-    respond,
-    additional_inputs=[
-        gr.Textbox(value="You are a friendly Chatbot.", label="System message"),
-        gr.Slider(minimum=1, maximum=2048, value=512, step=1, label="Max new tokens"),
-        gr.Slider(minimum=0.1, maximum=4.0, value=0.7, step=0.1, label="Temperature"),
-        gr.Slider(
-            minimum=0.1,
-            maximum=1.0,
-            value=0.95,
-            step=0.05,
-            label="Top-p (nucleus sampling)",
-        ),
-    ],
-)
-
 
 if __name__ == "__main__":
-    demo.launch()
->>>>>>> origin/main
+    interface.launch()