Merge branch 'main' of https://github.com/abetlen/llama-cpp-python into main

abetlen · abetlen · commit 3561ebf536d8 · 2024-02-22T03:25:13.000-05:00
diff --git a/llama_cpp/_internals.py b/llama_cpp/_internals.py
@@ -51,6 +51,9 @@ def __init__(
             self.path_model.encode("utf-8"), self.params
         )
 
+        if self.model is None:
+            raise ValueError(f"Failed to load model from file: {path_model}")
+
     def __del__(self):
         if self.model is not None and self._llama_free_model is not None:
             self._llama_free_model(self.model)
@@ -258,6 +261,9 @@ def __init__(
             self.model.model, self.params
         )
 
+        if self.ctx is None:
+            raise ValueError("Failed to create llama_context")
+
     def __del__(self):
         if self.ctx is not None and self._llama_free is not None:
             self._llama_free(self.ctx)
diff --git a/llama_cpp/llama.py b/llama_cpp/llama.py
@@ -1885,8 +1885,9 @@ def from_pretrained(
         cls,
         repo_id: str,
         filename: Optional[str],
-        local_dir: Optional[Union[str, os.PathLike[str]]] = ".",
+        local_dir: Optional[Union[str, os.PathLike[str]]] = None,
         local_dir_use_symlinks: Union[bool, Literal["auto"]] = "auto",
+        cache_dir: Optional[Union[str, os.PathLike[str]]] = None,
         **kwargs: Any,
     ) -> "Llama":
         """Create a Llama model from a pretrained model name or path.
@@ -1945,18 +1946,29 @@ def from_pretrained(
         subfolder = str(Path(matching_file).parent)
         filename = Path(matching_file).name
 
-        local_dir = "."
-
         # download the file
         hf_hub_download(
             repo_id=repo_id,
-            local_dir=local_dir,
             filename=filename,
             subfolder=subfolder,
+            local_dir=local_dir,
             local_dir_use_symlinks=local_dir_use_symlinks,
+            cache_dir=cache_dir,
         )
 
-        model_path = os.path.join(local_dir, filename)
+        if local_dir is None:
+            model_path = hf_hub_download(
+                repo_id=repo_id,
+                filename=filename,
+                subfolder=subfolder,
+                local_dir=local_dir,
+                local_dir_use_symlinks=local_dir_use_symlinks,
+                cache_dir=cache_dir,
+                local_files_only=True,
+
+            )
+        else:
+            model_path = os.path.join(local_dir, filename)
 
         return cls(
             model_path=model_path,
diff --git a/llama_cpp/llama_grammar.py b/llama_cpp/llama_grammar.py
@@ -1498,9 +1498,21 @@ def visit(self, schema: Dict[str, Any], name: str) -> str:
             item_rule_name = self.visit(
                 schema["items"], f'{name}{"-" if name else ""}item'
             )
-            rule = (
-                f'"[" space ({item_rule_name} ("," space {item_rule_name})*)? "]" space'
-            )
+            list_item_operator = f'("," space {item_rule_name})'
+            successive_items = ""
+            min_items = schema.get("minItems", 0)
+            if min_items > 0:
+               first_item = f"({item_rule_name})"
+               successive_items = list_item_operator * (min_items - 1)
+               min_items -= 1
+            else:
+               first_item = f"({item_rule_name})?"
+            max_items = schema.get("maxItems")
+            if max_items is not None and max_items > min_items:
+                successive_items += (list_item_operator + "?") * (max_items - min_items - 1)
+            else:
+                successive_items += list_item_operator + "*"
+            rule = f'"[" space {first_item} {successive_items} "]" space'
             return self._add_rule(rule_name, rule)
 
         else:
