llama-cpp-python 0.2.66__tar.gz → 0.2.67__tar.gz

llama_cpp_python-0.2.67/.git/FETCH_HEAD

@@ -0,0 +1 @@
+f417cce28a3f3386206dabe98e87c038d05b228d		'f417cce28a3f3386206dabe98e87c038d05b228d' of https://github.com/abetlen/llama-cpp-python

llama_cpp_python-0.2.67/.git/HEAD

@@ -0,0 +1 @@
+f417cce28a3f3386206dabe98e87c038d05b228d

{llama_cpp_python-0.2.66 → llama_cpp_python-0.2.67}/.git/config

@@ -9,7 +9,7 @@
 [gc]
 	auto = 0
 [http "https://github.com/"]
-	extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzXzF1VE5jaENjUk8yTTdveXZBUThTZWMxWnNmVktyRzMzdnBWZw==
+	extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzX1Z3cnF2cFBtMHRHQmp6b0tWNHNLd1ZOYXVFdDYyYzF3amxueQ==
 [submodule "vendor/llama.cpp"]
 	active = true
 	url = https://github.com/ggerganov/llama.cpp.git

llama_cpp_python-0.2.67/.git/logs/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 f417cce28a3f3386206dabe98e87c038d05b228d runner <runner@fv-az570-436.dbl011l0kofevkdmwtujm0njug.bx.internal.cloudapp.net> 1714461118 +0000	checkout: moving from master to refs/tags/v0.2.67

{llama_cpp_python-0.2.66 → llama_cpp_python-0.2.67}/.git/modules/vendor/llama.cpp/config

@@ -16,7 +16,7 @@
 [gc]
 	auto = 0
 [http "https://github.com/"]
-	extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzXzF1VE5jaENjUk8yTTdveXZBUThTZWMxWnNmVktyRzMzdnBWZw==
+	extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzX1Z3cnF2cFBtMHRHQmp6b0tWNHNLd1ZOYXVFdDYyYzF3amxueQ==
 [url "https://github.com/"]
 	insteadOf = git@github.com:
 	insteadOf = org-6826477@github.com:

llama_cpp_python-0.2.67/.git/modules/vendor/llama.cpp/logs/HEAD

@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 8843a98c2ba97a25e93319a104f9ddfaf83ce4c4 runner <runner@fv-az570-436.dbl011l0kofevkdmwtujm0njug.bx.internal.cloudapp.net> 1714461119 +0000	clone: from https://github.com/ggerganov/llama.cpp.git
+8843a98c2ba97a25e93319a104f9ddfaf83ce4c4 8843a98c2ba97a25e93319a104f9ddfaf83ce4c4 runner <runner@fv-az570-436.dbl011l0kofevkdmwtujm0njug.bx.internal.cloudapp.net> 1714461119 +0000	checkout: moving from master to 8843a98c2ba97a25e93319a104f9ddfaf83ce4c4

llama_cpp_python-0.2.67/.git/modules/vendor/llama.cpp/logs/refs/heads/master

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 8843a98c2ba97a25e93319a104f9ddfaf83ce4c4 runner <runner@fv-az570-436.dbl011l0kofevkdmwtujm0njug.bx.internal.cloudapp.net> 1714461119 +0000	clone: from https://github.com/ggerganov/llama.cpp.git

llama_cpp_python-0.2.67/.git/modules/vendor/llama.cpp/logs/refs/remotes/origin/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 8843a98c2ba97a25e93319a104f9ddfaf83ce4c4 runner <runner@fv-az570-436.dbl011l0kofevkdmwtujm0njug.bx.internal.cloudapp.net> 1714461119 +0000	clone: from https://github.com/ggerganov/llama.cpp.git

{llama_cpp_python-0.2.66 → llama_cpp_python-0.2.67}/.git/modules/vendor/llama.cpp/modules/kompute/config

@@ -13,7 +13,7 @@
 [gc]
 	auto = 0
 [http "https://github.com/"]
-	extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzXzF1VE5jaENjUk8yTTdveXZBUThTZWMxWnNmVktyRzMzdnBWZw==
+	extraheader = AUTHORIZATION: basic eC1hY2Nlc3MtdG9rZW46Z2hzX1Z3cnF2cFBtMHRHQmp6b0tWNHNLd1ZOYXVFdDYyYzF3amxueQ==
 [url "https://github.com/"]
 	insteadOf = git@github.com:
 	insteadOf = org-6826477@github.com:

llama_cpp_python-0.2.67/.git/modules/vendor/llama.cpp/modules/kompute/logs/HEAD

@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 d1e3b0953cf66acc94b2e29693e221427b2c1f3f runner <runner@fv-az570-436.dbl011l0kofevkdmwtujm0njug.bx.internal.cloudapp.net> 1714461119 +0000	clone: from https://github.com/nomic-ai/kompute.git
+d1e3b0953cf66acc94b2e29693e221427b2c1f3f 4565194ed7c32d1d2efa32ceab4d3c6cae006306 runner <runner@fv-az570-436.dbl011l0kofevkdmwtujm0njug.bx.internal.cloudapp.net> 1714461120 +0000	checkout: moving from master to 4565194ed7c32d1d2efa32ceab4d3c6cae006306

llama_cpp_python-0.2.67/.git/modules/vendor/llama.cpp/modules/kompute/logs/refs/heads/master

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 d1e3b0953cf66acc94b2e29693e221427b2c1f3f runner <runner@fv-az570-436.dbl011l0kofevkdmwtujm0njug.bx.internal.cloudapp.net> 1714461119 +0000	clone: from https://github.com/nomic-ai/kompute.git

llama_cpp_python-0.2.67/.git/modules/vendor/llama.cpp/modules/kompute/logs/refs/remotes/origin/HEAD

@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 d1e3b0953cf66acc94b2e29693e221427b2c1f3f runner <runner@fv-az570-436.dbl011l0kofevkdmwtujm0njug.bx.internal.cloudapp.net> 1714461119 +0000	clone: from https://github.com/nomic-ai/kompute.git

llama_cpp_python-0.2.67/.git/refs/tags/v0.2.67

@@ -0,0 +1 @@
+f417cce28a3f3386206dabe98e87c038d05b228d

llama_cpp_python-0.2.67/.git/shallow

@@ -0,0 +1 @@
+f417cce28a3f3386206dabe98e87c038d05b228d

{llama_cpp_python-0.2.66 → llama_cpp_python-0.2.67}/.github/workflows/build-and-release.yaml

@@ -39,9 +39,10 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: wheels
           path: ./wheelhouse/*.whl
 
-  build_arm64_wheels:
+  build_wheels_arm64:
     name: Build arm64 wheels
     runs-on: ubuntu-latest
     steps:
@@ -67,6 +68,7 @@ jobs:
       - name: Upload wheels as artifacts
         uses: actions/upload-artifact@v4
         with:
+          name: wheels_arm64
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -89,18 +91,25 @@ jobs:
           python -m build --sdist
       - uses: actions/upload-artifact@v4
         with:
+          name: sdist
           path: ./dist/*.tar.gz
 
   release:
     name: Release
-    needs: [build_wheels, build_arm64_wheels, build_sdist]
+    needs: [build_wheels, build_wheels_arm64, build_sdist]
     runs-on: ubuntu-latest
 
     steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: release
+
       - uses: actions/download-artifact@v3
         with:
-          name: artifact
+          name: release
           path: dist
+
       - uses: softprops/action-gh-release@v2
         with:
           files: dist/*

{llama_cpp_python-0.2.66 → llama_cpp_python-0.2.67}/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.67]
+
+- fix: Ensure image renders before text in chat formats regardless of message content order by @abetlen in 3489ef09d3775f4a87fb7114f619e8ba9cb6b656
+- fix(ci): Fix bug in use of upload-artifact failing to merge multiple artifacts into a single release by @abetlen in d03f15bb73a1d520970357b702a9e7d4cc2a7a62
+
 ## [0.2.66]
 
 - feat: Update llama.cpp to ggerganov/llama.cpp@8843a98c2ba97a25e93319a104f9ddfaf83ce4c4

{llama_cpp_python-0.2.66 → llama_cpp_python-0.2.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama_cpp_python
-Version: 0.2.66
+Version: 0.2.67
 Summary: Python bindings for the llama.cpp library
 Author-Email: Andrei Betlen <abetlen@gmail.com>
 License: MIT

{llama_cpp_python-0.2.66 → llama_cpp_python-0.2.67}/llama_cpp/__init__.py

@@ -1,4 +1,4 @@
 from .llama_cpp import *
 from .llama import *
 
-__version__ = "0.2.66"
+__version__ = "0.2.67"

{llama_cpp_python-0.2.66 → llama_cpp_python-0.2.67}/llama_cpp/llama_chat_format.py

@@ -2175,12 +2175,11 @@ class Llava15ChatHandler:
         "{% if message.role == 'user' %}"
         "{% if message.content is string %}"
         "\nUSER: {{ message.content }}"
-        "{% elif message.content is iterable %}"
+        "{% endif %}"
+        "{% if message.content is iterable %}"
         "\nUSER: "
+
         "{% for content in message.content %}"
-        "{% if content.type == 'text' %}"
-        "{{ content.text }}"
-        "{% endif %}"
         "{% if content.type == 'image_url' and content.image_url is string %}"
         "{{ content.image_url }}"
         "{% endif %}"
@@ -2188,6 +2187,13 @@ class Llava15ChatHandler:
         "{{ content.image_url.url }}"
         "{% endif %}"
         "{% endfor %}"
+
+        "{% for content in message.content %}"
+        "{% if content.type == 'text' %}"
+        "{{ content.text }}"
+        "{% endif %}"
+        "{% endfor %}"
+
         "{% endif %}"
         "{% endif %}"
         "{% if message.role == 'assistant' and message.content is not none %}"
@@ -2575,14 +2581,22 @@ class ObsidianChatHandler(Llava15ChatHandler):
         "{{ message.content }}"
         "{% endif %}"
         "{% if message.content is iterable %}"
+
+        "{% for content in message.content %}"
+        "{% if content.type == 'image_url' and content.image_url is string %}"
+        "{{ content.image_url }}"
+        "{% endif %}"
+        "{% if content.type == 'image_url' and content.image_url is mapping %}"
+        "{{ content.image_url.url }}"
+        "{% endif %}"
+        "{% endfor %}"
+
         "{% for content in message.content %}"
         "{% if content.type == 'text' %}"
         "{{ content.text }}"
         "{% endif %}"
-        "{% if content.type == 'image_url' %}"
-        "{{ content.image_url }}"
-        "{% endif %}"
         "{% endfor %}"
+
         "{% endif %}"
         "###\n"
         "{% endif %}"
@@ -2606,9 +2620,9 @@ class MoondreamChatHandler(Llava15ChatHandler):
         "{% for message in messages %}"
         "{% if message.role == 'user' %}"
         "{% if message.content is iterable %}"
-        "{% for content in message.content %}"
 
         # <image>
+        "{% for content in message.content %}"
         "{% if content.type == 'image_url' %}"
         "{% if content.image_url is string %}"
         "{{ content.image_url }}\n\n"
@@ -2617,12 +2631,15 @@ class MoondreamChatHandler(Llava15ChatHandler):
         "{{ content.image_url.url }}\n\n"
         "{% endif %}"
         "{% endif %}"
+        "{% endfor %}"
 
         # Question:
+        "{% for content in message.content %}"
         "{% if content.type == 'text' %}"
         "Question: {{ content.text }}\n\n"
         "{% endif %}"
         "{% endfor %}"
+
         "{% endif %}"
 
         # Question:
@@ -2657,9 +2674,9 @@ class Llava16ChatHandler(Llava15ChatHandler):
         "{% endif %}"
         "{% if message.role == 'user' %}"
         "{% if message.content is iterable %}"
-        "{% for content in message.content %}"
 
         # <image>
+        "{% for content in message.content %}"
         "{% if content.type == 'image_url' %}"
         "{% if content.image_url is string %}"
         "{{ content.image_url }}\n"
@@ -2668,12 +2685,15 @@ class Llava16ChatHandler(Llava15ChatHandler):
         "{{ content.image_url.url }}\n"
         "{% endif %}"
         "{% endif %}"
+        "{% endfor %}"
 
         # Question:
+        "{% for content in message.content %}"
         "{% if content.type == 'text' %}"
         "{{ content.text }}"
         "{% endif %}"
         "{% endfor %}"
+
         "{% endif %}"
         
         # Question:
@@ -2719,14 +2739,22 @@ class NanoLlavaChatHandler(Llava15ChatHandler):
         "{{ message.content }}"
         "{% endif %}"
         "{% if message.content is iterable %}"
+
+        "{% for content in message.content %}"
+        "{% if content.type == 'image_url' and content.image_url is string %}"
+        "{{ content.image_url }}"
+        "{% endif %}"
+        "{% if content.type == 'image_url' and content.image_url is mapping %}"
+        "{{ content.image_url.url }}"
+        "{% endif %}"
+        "{% endfor %}"
+
         "{% for content in message.content %}"
         "{% if content.type == 'text' %}"
         "{{ content.text }}"
         "{% endif %}"
-        "{% if content.type == 'image_url' %}"
-        "{{ content.image_url }}"
-        "{% endif %}"
         "{% endfor %}"
+
         "{% endif %}"
         "<|im_end|>"
         "{% endif %}"

llama_cpp_python-0.2.66/.git/FETCH_HEAD

@@ -1 +0,0 @@
-26c7876ba0b31bd0e9f7bfc8f341b8b5b3d81fa7		'26c7876ba0b31bd0e9f7bfc8f341b8b5b3d81fa7' of https://github.com/abetlen/llama-cpp-python

llama_cpp_python-0.2.66/.git/HEAD

@@ -1 +0,0 @@
-26c7876ba0b31bd0e9f7bfc8f341b8b5b3d81fa7

llama_cpp_python-0.2.66/.git/logs/HEAD

@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 26c7876ba0b31bd0e9f7bfc8f341b8b5b3d81fa7 runner <runner@fv-az1542-362.uwdtf5zkgycefedjt5dtsy0pzd.bx.internal.cloudapp.net> 1714456184 +0000	checkout: moving from master to refs/tags/v0.2.66

llama_cpp_python-0.2.66/.git/modules/vendor/llama.cpp/logs/HEAD

@@ -1,2 +0,0 @@
-0000000000000000000000000000000000000000 8843a98c2ba97a25e93319a104f9ddfaf83ce4c4 runner <runner@fv-az1542-362.uwdtf5zkgycefedjt5dtsy0pzd.bx.internal.cloudapp.net> 1714456185 +0000	clone: from https://github.com/ggerganov/llama.cpp.git
-8843a98c2ba97a25e93319a104f9ddfaf83ce4c4 8843a98c2ba97a25e93319a104f9ddfaf83ce4c4 runner <runner@fv-az1542-362.uwdtf5zkgycefedjt5dtsy0pzd.bx.internal.cloudapp.net> 1714456185 +0000	checkout: moving from master to 8843a98c2ba97a25e93319a104f9ddfaf83ce4c4

llama_cpp_python-0.2.66/.git/modules/vendor/llama.cpp/logs/refs/heads/master

@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 8843a98c2ba97a25e93319a104f9ddfaf83ce4c4 runner <runner@fv-az1542-362.uwdtf5zkgycefedjt5dtsy0pzd.bx.internal.cloudapp.net> 1714456185 +0000	clone: from https://github.com/ggerganov/llama.cpp.git

llama_cpp_python-0.2.66/.git/modules/vendor/llama.cpp/logs/refs/remotes/origin/HEAD

@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 8843a98c2ba97a25e93319a104f9ddfaf83ce4c4 runner <runner@fv-az1542-362.uwdtf5zkgycefedjt5dtsy0pzd.bx.internal.cloudapp.net> 1714456185 +0000	clone: from https://github.com/ggerganov/llama.cpp.git

llama_cpp_python-0.2.66/.git/modules/vendor/llama.cpp/modules/kompute/logs/HEAD

@@ -1,2 +0,0 @@
-0000000000000000000000000000000000000000 d1e3b0953cf66acc94b2e29693e221427b2c1f3f runner <runner@fv-az1542-362.uwdtf5zkgycefedjt5dtsy0pzd.bx.internal.cloudapp.net> 1714456185 +0000	clone: from https://github.com/nomic-ai/kompute.git
-d1e3b0953cf66acc94b2e29693e221427b2c1f3f 4565194ed7c32d1d2efa32ceab4d3c6cae006306 runner <runner@fv-az1542-362.uwdtf5zkgycefedjt5dtsy0pzd.bx.internal.cloudapp.net> 1714456186 +0000	checkout: moving from master to 4565194ed7c32d1d2efa32ceab4d3c6cae006306

llama_cpp_python-0.2.66/.git/modules/vendor/llama.cpp/modules/kompute/logs/refs/heads/master

@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 d1e3b0953cf66acc94b2e29693e221427b2c1f3f runner <runner@fv-az1542-362.uwdtf5zkgycefedjt5dtsy0pzd.bx.internal.cloudapp.net> 1714456185 +0000	clone: from https://github.com/nomic-ai/kompute.git

llama_cpp_python-0.2.66/.git/modules/vendor/llama.cpp/modules/kompute/logs/refs/remotes/origin/HEAD

@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 d1e3b0953cf66acc94b2e29693e221427b2c1f3f runner <runner@fv-az1542-362.uwdtf5zkgycefedjt5dtsy0pzd.bx.internal.cloudapp.net> 1714456185 +0000	clone: from https://github.com/nomic-ai/kompute.git

llama_cpp_python-0.2.66/.git/refs/tags/v0.2.66

@@ -1 +0,0 @@
-26c7876ba0b31bd0e9f7bfc8f341b8b5b3d81fa7

llama_cpp_python-0.2.66/.git/shallow

@@ -1 +0,0 @@
-26c7876ba0b31bd0e9f7bfc8f341b8b5b3d81fa7