conflict

app.py

@@ -36,7 +36,7 @@ def generate_text(messages):
 #       model_id, token=huggingface_token ,torch_dtype=dtype,device_map=device
 #  )
 
-    text_generator = pipeline("text-generation", model=model, tokenizer=tokenizer,torch_dtype=dtype,device_map=device) #pipeline has not to(device)
+    #text_generator = pipeline("text-generation", model=model, tokenizer=tokenizer,torch_dtype=dtype,device_map=device) #pipeline has not to(device)
     result = text_generator(messages, max_new_tokens=256, do_sample=True, temperature=0.7)
 
     generated_output = result[0]["generated_text"]
@@ -58,10 +58,18 @@ def call_generate_text(message, history):
     print(history)
    
     #messages = history + message
+<<<<<<< HEAD
     messages =history + [{"role":"user","content":message}]
     try:
         text = generate_text(history)
         #history.append({"role": "assistant", "content": text})
+=======
+   # messages = [{"role":"user","content":message}]
+    messages = history+[{"role":"user","content":message}]
+    try:
+        text = generate_text(messages)
+        history.append({"role": "assistant", "content": text})
+>>>>>>> 82325f6d06d848b6c1600ce2902018538b68230b
         return text
     except RuntimeError  as e:
         print(f"An unexpected error occurred: {e}")