Skip to content

Commit 123736e

Browse files
committed
dependency udpates and small adjustements handling misconfigured embedding or chatting options
1 parent c27d68d commit 123736e

3 files changed

Lines changed: 23 additions & 20 deletions

File tree

nedrexapi/llm.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,23 @@
33
from nedrexapi.config import config as _config
44
from langchain_community.llms.ollama import Ollama
55

6-
_LLM_BASE=_config["embeddings.server_base"]
7-
_LLM_model=_config[f"embeddings.model"]
8-
_LLM_path=_config[f"embeddings.path"]
6+
def get_conf_or_none(key):
7+
try:
8+
return _config.get(key)
9+
except:
10+
return None
911

10-
# _LLM_user=_config[f"embeddings.user"]
11-
# _LLM_pass=_config[f"embeddings.pass"]
12+
_LLM_BASE=get_conf_or_none("embeddings.server_base")
13+
_LLM_model=get_conf_or_none("embeddings.model")
14+
_LLM_path=get_conf_or_none("embeddings.path")
15+
16+
_LLM_chat_model=get_conf_or_none("chat.model")
17+
_LLM_chat_base=get_conf_or_none("chat.server_base")
18+
_LLM_chat_api_key=get_conf_or_none("chat.api_key")
19+
20+
headers = {"Authorization": "Bearer " + str(_LLM_chat_api_key)}
1221

13-
_LLM_chat_model=_config["chat.model"]
14-
_LLM_chat_base=_config["chat.server_base"]
15-
_LLM_chat_api_key=_config["chat.api_key"]
1622

17-
headers = {"Authorization": "Bearer " + _LLM_chat_api_key}
1823

1924

2025
def get_embedder():
@@ -24,15 +29,12 @@ def get_generator():
2429
return Ollama(base_url=_LLM_chat_base, model=_LLM_chat_model, temperature=0.0, headers=headers)
2530

2631
def get_chat():
27-
print(headers)
2832
return ChatOllama(base_url=_LLM_chat_base, model=_LLM_chat_model, temperature=0.0, client_kwargs={'headers': headers})
2933

3034
def get_embedding(query):
3135
embedder = get_embedder()
3236
return embedder.embed(query)
3337

34-
35-
3638
def generate(query):
3739
ollama_llm = get_generator()
3840
response = ollama_llm.invoke(query)

poetry.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ langchain-neo4j = "^0.8.0"
4141
langchain-ollama = "^1.0.1"
4242
aiohttp = "^3.12.14"
4343
fonttools = "^4.60.2"
44-
pypdf = "^6.7.1"
44+
pypdf = "^6.8.0"
45+
langgraph = "^1.0.10"
4546

4647
[tool.poetry.dev-dependencies]
4748
pytest = "^7.2.0"

0 commit comments

Comments
 (0)