Update README.md
Browse files
README.md
CHANGED
|
@@ -1,3 +1,219 @@
|
|
| 1 |
-
---
|
| 2 |
-
license: apache-2.0
|
| 3 |
-
---
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
---
|
| 2 |
+
license: apache-2.0
|
| 3 |
+
---
|
| 4 |
+
Here's a professional and engaging model card for your KiteResolve-20B model:
|
| 5 |
+
|
| 6 |
+
```markdown
|
| 7 |
+
---
|
| 8 |
+
license: mit
|
| 9 |
+
base_model: openai/gpt-oss-20b
|
| 10 |
+
tags:
|
| 11 |
+
- merge-conflicts
|
| 12 |
+
- git-automation
|
| 13 |
+
- developer-tools
|
| 14 |
+
- code-generation
|
| 15 |
+
- version-control
|
| 16 |
+
- devops
|
| 17 |
+
language:
|
| 18 |
+
- en
|
| 19 |
+
pipeline_tag: text-generation
|
| 20 |
+
library_name: transformers
|
| 21 |
+
datasets:
|
| 22 |
+
- SoarAILabs/merge-conflict-dataset
|
| 23 |
+
metrics:
|
| 24 |
+
- bleu
|
| 25 |
+
- rouge
|
| 26 |
+
- exact_match
|
| 27 |
+
model-index:
|
| 28 |
+
- name: KiteResolve-20B
|
| 29 |
+
results:
|
| 30 |
+
- task:
|
| 31 |
+
type: text-generation
|
| 32 |
+
name: Merge Conflict Resolution
|
| 33 |
+
metrics:
|
| 34 |
+
- type: exact_match
|
| 35 |
+
value: 20.0
|
| 36 |
+
name: Exact Match
|
| 37 |
+
- type: bleu
|
| 38 |
+
value: 54.83
|
| 39 |
+
name: BLEU Score
|
| 40 |
+
- type: rouge-l
|
| 41 |
+
value: 67.10
|
| 42 |
+
name: ROUGE-L
|
| 43 |
+
---
|
| 44 |
+
|
| 45 |
+
# 🪁 KiteResolve-20B: AI-Powered Merge Conflict Resolution
|
| 46 |
+
|
| 47 |
+
*Developed by [Soar AI Labs](https://huggingface.co/SoarAILabs)*
|
| 48 |
+
|
| 49 |
+
<div align="center">
|
| 50 |
+
<img src="https://img.shields.io/badge/License-MIT-blue.svg" alt="License">
|
| 51 |
+
<img src="https://img.shields.io/badge/Model-20B%20Parameters-red.svg" alt="Parameters">
|
| 52 |
+
<img src="https://img.shields.io/badge/Task-Code%20Generation-green.svg" alt="Task">
|
| 53 |
+
<img src="https://img.shields.io/badge/BLEU-54.83-orange.svg" alt="BLEU Score">
|
| 54 |
+
</div>
|
| 55 |
+
|
| 56 |
+
## 🚀 Model Description
|
| 57 |
+
|
| 58 |
+
**KiteResolve-20B** is a fine-tuned version of GPT-OSS-20B specifically engineered for **automated Git merge conflict resolution**. This model transforms the tedious process of manually resolving merge conflicts into an intelligent, automated workflow that understands code semantics across multiple programming languages.
|
| 59 |
+
|
| 60 |
+
### ✨ Key Features
|
| 61 |
+
|
| 62 |
+
- 🎯 **20% Exact Match Accuracy** on real-world merge conflicts
|
| 63 |
+
- 📈 **43.64% BLEU Score Improvement** over base model
|
| 64 |
+
- 🌐 **Multi-Language Support**: Java, JavaScript, Python, C#, TypeScript, and more
|
| 65 |
+
- ⚡ **Fast Inference**: Optimized for CLI and webhook integrations
|
| 66 |
+
- 🔧 **Production Ready**: Designed for enterprise Git workflows
|
| 67 |
+
|
| 68 |
+
## 📊 Performance Metrics
|
| 69 |
+
|
| 70 |
+
| Metric | Score | Improvement |
|
| 71 |
+
|--------|-------|-------------|
|
| 72 |
+
| **Exact Match** | 20.0% | ↗️ 20.0% |
|
| 73 |
+
| **BLEU Score** | 54.83% | ↗️ +43.64% |
|
| 74 |
+
| **ROUGE-L** | 67.10% | ↗️ +33.65% |
|
| 75 |
+
|
| 76 |
+
*Evaluated on 20 held-out samples from real-world merge conflicts*
|
| 77 |
+
|
| 78 |
+
## 🛠️ Usage
|
| 79 |
+
|
| 80 |
+
### Quick Start
|
| 81 |
+
|
| 82 |
+
```
|
| 83 |
+
from transformers import AutoModelForCausalLM, AutoTokenizer
|
| 84 |
+
from unsloth.chat_templates import get_chat_template
|
| 85 |
+
|
| 86 |
+
# Load the model
|
| 87 |
+
model = AutoModelForCausalLM.from_pretrained("SoarAILabs/KiteResolve-20B")
|
| 88 |
+
tokenizer = AutoTokenizer.from_pretrained("SoarAILabs/KiteResolve-20B")
|
| 89 |
+
tokenizer = get_chat_template(tokenizer, chat_template="gpt-oss")
|
| 90 |
+
|
| 91 |
+
# Resolve a merge conflict
|
| 92 |
+
conflict = """
|
| 93 |
+
<<<<<<< ours
|
| 94 |
+
function calculateTotal(items) {
|
| 95 |
+
return items.reduce((sum, item) => sum + item.price, 0);
|
| 96 |
+
}
|
| 97 |
+
=======
|
| 98 |
+
function calculateTotal(items) {
|
| 99 |
+
return items.map(item => item.price).reduce((a, b) => a + b, 0);
|
| 100 |
+
}
|
| 101 |
+
>>>>>>> theirs
|
| 102 |
+
"""
|
| 103 |
+
|
| 104 |
+
messages = [{"role": "user", "content": f"Resolve this merge conflict:\n```{conflict}```
|
| 105 |
+
prompt = tokenizer.apply_chat_template(messages, tokenize=False, add_generation_prompt=True)
|
| 106 |
+
|
| 107 |
+
inputs = tokenizer([prompt], return_tensors="pt")
|
| 108 |
+
outputs = model.generate(**inputs, max_new_tokens=200, do_sample=False)
|
| 109 |
+
resolution = tokenizer.decode(outputs[inputs['input_ids'].shape:], skip_special_tokens=True)[1]
|
| 110 |
+
|
| 111 |
+
print(resolution)
|
| 112 |
+
```
|
| 113 |
+
|
| 114 |
+
### Integration Examples
|
| 115 |
+
|
| 116 |
+
#### GitHub Webhook Integration
|
| 117 |
+
```
|
| 118 |
+
# Perfect for automated PR conflict resolution
|
| 119 |
+
@app.route('/webhook', methods=['POST'])
|
| 120 |
+
def handle_merge_conflict():
|
| 121 |
+
conflict_data = request.json
|
| 122 |
+
resolution = model.resolve_conflict(conflict_data['conflict'])
|
| 123 |
+
create_resolution_commit(resolution)
|
| 124 |
+
return {"status": "resolved"}
|
| 125 |
+
```
|
| 126 |
+
|
| 127 |
+
## 🎯 Intended Use Cases
|
| 128 |
+
|
| 129 |
+
### Primary Applications
|
| 130 |
+
- **Automated CI/CD Pipelines**: Resolve conflicts in merge requests automatically
|
| 131 |
+
- **Developer Productivity Tools**: Speed up code integration workflows
|
| 132 |
+
- **Git Workflow Automation**: Reduce manual intervention in version control
|
| 133 |
+
- **Code Review Assistance**: Pre-resolve conflicts before human review
|
| 134 |
+
|
| 135 |
+
### Supported Scenarios
|
| 136 |
+
- ✅ Simple syntactic conflicts (variable names, imports)
|
| 137 |
+
- ✅ Formatting and whitespace conflicts
|
| 138 |
+
- ✅ Method signature changes
|
| 139 |
+
- ✅ Configuration file updates
|
| 140 |
+
- ⚠️ Complex semantic conflicts may require human review
|
| 141 |
+
|
| 142 |
+
## 🏗️ Training Details
|
| 143 |
+
|
| 144 |
+
### Base Model
|
| 145 |
+
- **Architecture**: GPT-OSS-20B (20 billion parameters)
|
| 146 |
+
- **Fine-tuning Method**: Full parameter fine-tuning with LoRA adapters
|
| 147 |
+
- **Training Framework**: Unsloth for efficient training
|
| 148 |
+
|
| 149 |
+
### Training Data
|
| 150 |
+
- **Dataset Size**: 956 curated merge conflict examples
|
| 151 |
+
- **Data Sources**: Real-world GitHub repositories
|
| 152 |
+
- **Languages**: Java, JavaScript, Python, C#, TypeScript, Go, Rust
|
| 153 |
+
- **Conflict Types**: Syntactic, semantic, and formatting conflicts
|
| 154 |
+
|
| 155 |
+
### Training Configuration
|
| 156 |
+
- **Batch Size**: Optimized for merge conflict patterns
|
| 157 |
+
- **Learning Rate**: Fine-tuned for code generation
|
| 158 |
+
- **Epochs**: Trained until convergence on validation set
|
| 159 |
+
- **Hardware**: NVIDIA A100 GPUs
|
| 160 |
+
|
| 161 |
+
|
| 162 |
+
## 🔍 Evaluation
|
| 163 |
+
|
| 164 |
+
### Test Methodology
|
| 165 |
+
- **Evaluation Set**: 20 held-out real-world merge conflicts
|
| 166 |
+
- **Metrics**: Exact Match, BLEU, ROUGE-L, Character Similarity
|
| 167 |
+
- **Comparison**: Benchmarked against GPT-OSS-20B base model
|
| 168 |
+
- **Validation**: Human expert review of generated resolutions
|
| 169 |
+
|
| 170 |
+
### Sample Results
|
| 171 |
+
```
|
| 172 |
+
Sample Conflict Type: JavaScript import statements
|
| 173 |
+
Expected: import { helper } from './utils';
|
| 174 |
+
Generated: import { helper } from './utils';
|
| 175 |
+
Result: ✅ Exact Match
|
| 176 |
+
```
|
| 177 |
+
|
| 178 |
+
## 🏢 About Soar AI Labs
|
| 179 |
+
|
| 180 |
+
**Soar AI Labs** develops cutting-edge AI solutions for software development workflows. Our mission is to eliminate friction in the development process through intelligent automation.
|
| 181 |
+
|
| 182 |
+
### Our Products
|
| 183 |
+
- 🪁 **KiteResolve**: AI-powered merge conflict resolution
|
| 184 |
+
- 🔧 **Developer Tools**: CLI utilities and IDE integrations
|
| 185 |
+
- 🚀 **Future**: More AI-powered DevOps solutions coming soon
|
| 186 |
+
|
| 187 |
+
## 📚 Citation
|
| 188 |
+
|
| 189 |
+
```
|
| 190 |
+
@misc{kiteResolve2025,
|
| 191 |
+
title={KiteResolve-20B: Fine-tuned GPT-OSS for Automated Merge Conflict Resolution},
|
| 192 |
+
author={Soar AI Labs},
|
| 193 |
+
year={2025},
|
| 194 |
+
publisher={Hugging Face},
|
| 195 |
+
url={https://huggingface.co/SoarAILabs/KiteResolve-20B}
|
| 196 |
+
}
|
| 197 |
+
```
|
| 198 |
+
|
| 199 |
+
## 📄 License
|
| 200 |
+
|
| 201 |
+
This model is released under the MIT License. See the [LICENSE](LICENSE) file for details.
|
| 202 |
+
|
| 203 |
+
## 🤝 Contributing
|
| 204 |
+
|
| 205 |
+
Interested in improving KiteResolve? We welcome contributions!
|
| 206 |
+
|
| 207 |
+
- 🐛 **Report Issues**: Found a conflict type we don't handle well?
|
| 208 |
+
- 💡 **Feature Requests**: Ideas for new capabilities?
|
| 209 |
+
- 🔧 **Pull Requests**: Code improvements and extensions
|
| 210 |
+
|
| 211 |
+
Visit our [GitHub Organization](https://github.com/SoarAILabs) to get involved.
|
| 212 |
+
|
| 213 |
+
---
|
| 214 |
+
|
| 215 |
+
<div align="center">
|
| 216 |
+
<strong>Built with ❤️ by Soar AI Labs</strong><br>
|
| 217 |
+
<em>Elevating developer productivity through AI</em>
|
| 218 |
+
</div>
|
| 219 |
+
```
|