Rebase and fix conflicts and type check

Author: Tianyue-Zhao

convert_hf_to_gguf.py

@@ -7928,11 +7928,13 @@ def prepare_tensors(self):
             if len(experts) > 0:
                 raise ValueError(f"Unprocessed experts: {experts}")
 
+
 @ModelBase.register("CogVLMForCausalLM")
 class CogVLMVisionModel(MmprojModel):
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.hparams_vision['num_attention_heads'] = self.hparams['num_heads']
+        self.hparams['num_attention_heads'] = self.hparams['num_heads']
 
     def set_gguf_parameters(self):
         super().set_gguf_parameters()
@@ -7956,6 +7958,7 @@ def modify_tensors(self, data_torch: Tensor, name: str, bid: int | None) -> Iter
 
         return [(self.map_tensor_name(name), data_torch)]
 
+
 @ModelBase.register("CogVLMForCausalLM")
 class CogVLMModel(LlamaModel):
     model_arch = gguf.MODEL_ARCH.COGVLM