Skip to content

Commit

Permalink
Refactor code formatting in lightrag_api_openai_compatible_demo.py
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkthinking committed Oct 26, 2024
1 parent 981be9e commit 883d6b7
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 11 deletions.
4 changes: 1 addition & 3 deletions lightrag/lightrag.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,7 @@ class LightRAG:

# LLM
llm_model_func: callable = gpt_4o_mini_complete # hf_model_complete#
llm_model_name: str = (
"meta-llama/Llama-3.2-1B-Instruct" #'meta-llama/Llama-3.2-1B'#'google/gemma-2-2b-it'
)
llm_model_name: str = "meta-llama/Llama-3.2-1B-Instruct" #'meta-llama/Llama-3.2-1B'#'google/gemma-2-2b-it'
llm_model_max_token_size: int = 32768
llm_model_max_async: int = 16

Expand Down
4 changes: 3 additions & 1 deletion lightrag/llm.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,9 @@ async def hf_model_if_cache(
output = hf_model.generate(
**input_ids, max_new_tokens=512, num_return_sequences=1, early_stopping=True
)
response_text = hf_tokenizer.decode(output[0][len(inputs["input_ids"][0]):], skip_special_tokens=True)
response_text = hf_tokenizer.decode(
output[0][len(inputs["input_ids"][0]) :], skip_special_tokens=True
)
if hashing_kv is not None:
await hashing_kv.upsert({args_hash: {"return": response_text, "model": model}})
return response_text
Expand Down
31 changes: 24 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import setuptools
from pathlib import Path


# Reading the long description from README.md
def read_long_description():
try:
return Path("README.md").read_text(encoding="utf-8")
except FileNotFoundError:
return "A description of LightRAG is currently unavailable."


# Retrieving metadata from __init__.py
def retrieve_metadata():
vars2find = ["__author__", "__version__", "__url__"]
Expand All @@ -17,28 +19,39 @@ def retrieve_metadata():
for line in f.readlines():
for v in vars2find:
if line.startswith(v):
line = line.replace(" ", "").replace('"', "").replace("'", "").strip()
line = (
line.replace(" ", "")
.replace('"', "")
.replace("'", "")
.strip()
)
vars2readme[v] = line.split("=")[1]
except FileNotFoundError:
raise FileNotFoundError("Metadata file './lightrag/__init__.py' not found.")

# Checking if all required variables are found
missing_vars = [v for v in vars2find if v not in vars2readme]
if missing_vars:
raise ValueError(f"Missing required metadata variables in __init__.py: {missing_vars}")

raise ValueError(
f"Missing required metadata variables in __init__.py: {missing_vars}"
)

return vars2readme


# Reading dependencies from requirements.txt
def read_requirements():
deps = []
try:
with open("./requirements.txt") as f:
deps = [line.strip() for line in f if line.strip()]
except FileNotFoundError:
print("Warning: 'requirements.txt' not found. No dependencies will be installed.")
print(
"Warning: 'requirements.txt' not found. No dependencies will be installed."
)
return deps


metadata = retrieve_metadata()
long_description = read_long_description()
requirements = read_requirements()
Expand All @@ -51,7 +64,9 @@ def read_requirements():
description="LightRAG: Simple and Fast Retrieval-Augmented Generation",
long_description=long_description,
long_description_content_type="text/markdown",
packages=setuptools.find_packages(exclude=("tests*", "docs*")), # Automatically find packages
packages=setuptools.find_packages(
exclude=("tests*", "docs*")
), # Automatically find packages
classifiers=[
"Development Status :: 4 - Beta",
"Programming Language :: Python :: 3",
Expand All @@ -66,6 +81,8 @@ def read_requirements():
project_urls={ # Additional project metadata
"Documentation": metadata.get("__url__", ""),
"Source": metadata.get("__url__", ""),
"Tracker": f"{metadata.get('__url__', '')}/issues" if metadata.get("__url__") else ""
"Tracker": f"{metadata.get('__url__', '')}/issues"
if metadata.get("__url__")
else "",
},
)

0 comments on commit 883d6b7

Please sign in to comment.