Skip to content

Commit

Permalink
Merge pull request arc53#1013 from arc53/fix/singleton-llama-cpp
Browse files Browse the repository at this point in the history
fix: use singleton in llama_cpp
  • Loading branch information
dartpain authored Jun 25, 2024
2 parents f34a75f + 5aa8871 commit 2985e3b
Showing 1 changed file with 26 additions and 23 deletions.
49 changes: 26 additions & 23 deletions application/llm/llama_cpp.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,30 @@
from application.llm.base import BaseLLM
from application.core.settings import settings
import threading

class LlamaSingleton:
_instances = {}
_lock = threading.Lock() # Add a lock for thread synchronization

@classmethod
def get_instance(cls, llm_name):
if llm_name not in cls._instances:
try:
from llama_cpp import Llama
except ImportError:
raise ImportError(
"Please install llama_cpp using pip install llama-cpp-python"
)
cls._instances[llm_name] = Llama(model_path=llm_name, n_ctx=2048)
return cls._instances[llm_name]

@classmethod
def query_model(cls, llm, prompt, **kwargs):
with cls._lock:
return llm(prompt, **kwargs)


class LlamaCpp(BaseLLM):

def __init__(
self,
api_key=None,
Expand All @@ -12,41 +33,23 @@ def __init__(
*args,
**kwargs,
):
global llama
try:
from llama_cpp import Llama
except ImportError:
raise ImportError(
"Please install llama_cpp using pip install llama-cpp-python"
)

super().__init__(*args, **kwargs)
self.api_key = api_key
self.user_api_key = user_api_key
llama = Llama(model_path=llm_name, n_ctx=2048)
self.llama = LlamaSingleton.get_instance(llm_name)

def _raw_gen(self, baseself, model, messages, stream=False, **kwargs):
context = messages[0]["content"]
user_question = messages[-1]["content"]
prompt = f"### Instruction \n {user_question} \n ### Context \n {context} \n ### Answer \n"

result = llama(prompt, max_tokens=150, echo=False)

# import sys
# print(result['choices'][0]['text'].split('### Answer \n')[-1], file=sys.stderr)

result = LlamaSingleton.query_model(self.llama, prompt, max_tokens=150, echo=False)
return result["choices"][0]["text"].split("### Answer \n")[-1]

def _raw_gen_stream(self, baseself, model, messages, stream=True, **kwargs):
context = messages[0]["content"]
user_question = messages[-1]["content"]
prompt = f"### Instruction \n {user_question} \n ### Context \n {context} \n ### Answer \n"

result = llama(prompt, max_tokens=150, echo=False, stream=stream)

# import sys
# print(list(result), file=sys.stderr)

result = LlamaSingleton.query_model(self.llama, prompt, max_tokens=150, echo=False, stream=stream)
for item in result:
for choice in item["choices"]:
yield choice["text"]
yield choice["text"]

0 comments on commit 2985e3b

Please sign in to comment.