refactor: optimize GGUF imports

- optimize imports in GGUF conversion utilities
- rename gguf library modules
- update .gitignore and build workflow

Author: leafspark

Diff for: .github/workflows/build.yml

@@ -61,8 +61,8 @@ jobs:
       if: matrix.os == 'windows-latest'
       run: |
         $distPath = if ("${{ github.event.inputs.build_type }}" -eq "RELEASE") { "build\release\dist" } else { "build\dev\dist" }
-        New-Item -ItemType Directory -Force -Path "$distPath\src\gguf-py"
-        Copy-Item -Path "src\gguf-py\*" -Destination "$distPath\src\gguf-py" -Recurse
+        New-Item -ItemType Directory -Force -Path "$distPath\src\gguf"
+        Copy-Item -Path "src\gguf\*" -Destination "$distPath\src\gguf" -Recurse
         Copy-Item -Path "src\convert_hf_to_gguf.py" -Destination "$distPath\src"
         Copy-Item -Path "src\convert_lora_to_gguf.py" -Destination "$distPath\src"
         Copy-Item -Path "src\convert_lora_to_ggml.py" -Destination "$distPath\src"
@@ -72,8 +72,8 @@ jobs:
       if: matrix.os != 'windows-latest'
       run: |
         distPath=$(if [ "${{ github.event.inputs.build_type }}" = "RELEASE" ]; then echo "build/release/dist"; else echo "build/dev/dist"; fi)
-        mkdir -p $distPath/src/gguf-py
-        cp -R src/gguf-py/* $distPath/src/gguf-py/
+        mkdir -p $distPath/src/gguf
+        cp -R src/gguf/* $distPath/src/gguf/
         cp src/convert_hf_to_gguf.py $distPath/src/
         cp src/convert_lora_to_gguf.py $distPath/src/
         cp src/convert_lora_to_ggml.py $distPath/src/

Diff for: .gitignore

@@ -20,6 +20,9 @@ __pycache__/
 !src/
 src/*
 !src/*.py
+!src/gguf
+src/gguf/*
+!src/gguf/*.py
 
 # Allow docs folder and its .py files
 !docs/

Diff for: src/AutoGGUF.py

@@ -1,8 +1,8 @@
 import importlib
 import json
 import shutil
-import urllib.request
 import urllib.error
+import urllib.request
 from datetime import datetime
 from functools import partial, wraps
 from typing import Any, Dict, List, Tuple
@@ -24,10 +24,10 @@
 from error_handling import handle_error, show_error
 from imports_and_globals import (
     ensure_directory,
+    load_dotenv,
     open_file_safe,
     resource_path,
     show_about,
-    load_dotenv,
 )
 
 
@@ -41,21 +41,18 @@ def wrapper(self, *args, **kwargs):
 
                     # Length check
                     if len(value) > 1024:
-                        show_error(f"{field} exceeds maximum length")
+                        show_error(self.logger, f"{field} exceeds maximum length")
 
                     # Normalize path
                     normalized_path = os.path.normpath(value)
 
                     # Check for path traversal attempts
                     if ".." in normalized_path:
-                        show_error(f"Invalid path in {field}")
+                        show_error(self.logger, f"Invalid path in {field}")
 
                     # Disallow control characters and null bytes
                     if re.search(r"[\x00-\x1f\x7f]", value):
-                        show_error(f"Invalid characters in {field}")
-
-                    # Update the field with normalized path
-                    getattr(self, field).setText(normalized_path)
+                        show_error(self.logger, f"Invalid characters in {field}")
 
                 return func(self, *args, **kwargs)
 

Diff for: src/convert_hf_to_gguf.py

@@ -30,8 +30,6 @@
 if TYPE_CHECKING:
     from torch import Tensor
 
-if "NO_LOCAL_GGUF" not in os.environ:
-    sys.path.insert(1, str(Path(__file__).parent / "gguf-py"))
 import gguf
 
 logger = logging.getLogger("hf-to-gguf")

Diff for: src/convert_lora_to_ggml.py

@@ -1,19 +1,17 @@
 from __future__ import annotations
 
-import logging
 import json
+import logging
 import os
 import struct
 import sys
-from pathlib import Path
-from typing import Any, BinaryIO, Sequence
+from typing import BinaryIO
 
 import numpy as np
 import torch
 
-if "NO_LOCAL_GGUF" not in os.environ:
-    sys.path.insert(1, str(Path(__file__).parent / "gguf-py" / "gguf"))
-import gguf
+from gguf.constants import *
+from gguf.tensor_mapping import *
 
 logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger("lora-to-gguf")
@@ -51,19 +49,14 @@ def write_tensor_header(
     fout.seek((fout.tell() + 31) & -32)
 
 
-def pyinstaller_include():
-    # PyInstaller import
-    pass
-
-
 if __name__ == "__main__":
     if len(sys.argv) < 2:
         logger.info(f"Usage: python {sys.argv[0]} <path> <output_path> [arch]")
         logger.info(
             "Path must contain HuggingFace PEFT LoRA files 'adapter_config.json' and 'adapter_model.bin'"
         )
         logger.info(
-            f"Arch must be one of {list(gguf.MODEL_ARCH_NAMES.values())} (default: llama)"
+            f"Arch must be one of {list(MODEL_ARCH_NAMES.values())} (default: llama)"
         )
         sys.exit(1)
 
@@ -82,14 +75,14 @@ def pyinstaller_include():
 
     arch_name = sys.argv[3] if len(sys.argv) == 4 else "llama"
 
-    if arch_name not in gguf.MODEL_ARCH_NAMES.values():
+    if arch_name not in MODEL_ARCH_NAMES.values():
         logger.error(f"Error: unsupported architecture {arch_name}")
         sys.exit(1)
 
-    arch = list(gguf.MODEL_ARCH_NAMES.keys())[
-        list(gguf.MODEL_ARCH_NAMES.values()).index(arch_name)
+    arch = list(MODEL_ARCH_NAMES.keys())[
+        list(MODEL_ARCH_NAMES.values()).index(arch_name)
     ]
-    name_map = gguf.TensorNameMap(arch, 500)
+    name_map = TensorNameMap(arch, 500)
 
     with open(input_json, "r") as f:
         params = json.load(f)

Diff for: src/convert_lora_to_gguf.py

@@ -24,9 +24,7 @@
 if TYPE_CHECKING:
     from torch import Tensor
 
-if "NO_LOCAL_GGUF" not in os.environ:
-    sys.path.insert(1, str(Path(__file__).parent / "gguf-py"))
-import gguf
+from gguf.constants import *
 
 from convert_hf_to_gguf import LazyTorchTensor, Model