Update app.py

app.py

@@ -10,12 +10,12 @@ import torch
 from transformers import AutoModelForCausalLM, AutoTokenizer, TextIteratorStreamer
 from peft import PeftModel, PeftConfig
 
-DESCRIPTION = "This is a conversational interface powered by the MergeLlama-7b model, a finetune of CodeLlama-7b designed to assist developers in resolving merge conflicts in their code. "
+DESCRIPTION = "# MergeLlama-7b\nThis is a conversational interface powered by the MergeLlama-7b model, a finetune of CodeLlama-7b designed to assist developers in resolving merge conflicts in their code. "
 DESCRIPTION += "It leverages the capabilities of deep learning to provide suggestions for reconciling code differences, presenting potential resolutions for highlighted changes\n"
 DESCRIPTION += "The feedback from this space will help develop future versions including more powerful 13b and 34b versions."
 
 DESCRIPTION += "\n# How to use: \n"
-DESCRIPTION += "1. Input your merge conflict in the chat in the following format:\n```\n<<<<<<<\n[change]\n=======\n[base]\n>>>>>>>\n```\n"
+DESCRIPTION += "1. Input your merge conflict in the chat in the following format:\n```\n<<<<<<<\n[Current change]\n=======\n[Incoming change]\n>>>>>>>\n```\n"
 DESCRIPTION += "The model will generate the merge resolution. Context can be added before the conflict and multiple conflicts/resolutions can be chained together for context.\n"
 DESCRIPTION += "**Additional Information:**\n"
 DESCRIPTION += "- The model behind this tool is based on the MergeLlama dataset, which can be found [here](https://huggingface.co/datasets/codys12/MergeLlama).\n"
@@ -134,10 +134,9 @@ chat_interface = gr.ChatInterface(
     ],
     stop_btn=None,
     examples=[
-        ["<<<<<<<\n  brandPrimary: (Platform.OS === 'ios') ? '#007aff' : '#3F51B5',\n  brandInfo: '#5bc0de',\n\n=======\n\n  brandPrimary: '#5067FF',\n  brandInfo: '#62B1F6',\n\n>>>>>>>"],
+        ["<<<<<<<\nlet x = max(y, 11)\n=======\nvar x = max(y, 12, z)\n>>>>>>>"],
+        ["class Calculator {  \nadd(a, b) {\n    return a + b;\n  }\n}\n=======\nclass Calculator {\n  subtract(a, b) {\n    return a - b;\n  }\n}\n>>>>>>>"]
         ["<<<<<<<\n            var visibleSets = beatmapSets.Where(s => !s.Filtered).ToList();\n            if (!visibleSets.Any())\n                return;\n\n=======\n\n            var visible = beatmapSets.Where(s => !s.Filtered).ToList();\n            if (!visible.Any())\n                return false;\n\n>>>>>>>"],
-        ["<<<<<<<\n// Related to JDK7\nimport java.nio.channels.FileChannel;\n\n=======\n\n// Branch-dependent imports\nimport java.nio.channels.SeekableByteChannel;\n\n>>>>>>>"],
-        ["<<<<<<<\n    bind(BlobDirectoryAccess.class, DefaultBlobDirectoryAccess.class);\n\n=======\n\n    bind(new TypeLiteral<UpdateStepRepositoryMetadataAccess<Path>>() {}).to(new TypeLiteral<MetadataStore>() {});\n\n>>>>>>>"],
     ],
 )