This is an automated email from the ASF dual-hosted git repository.
jin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph-ai.git
The following commit(s) were added to refs/heads/main by this push:
new df998ac fix(llm): handle the profile regenerate error (#98)
df998ac is described below
commit df998ac046b81a8938ac404a2eb33083cd4ff143
Author: Hongjun Li <[email protected]>
AuthorDate: Sun Oct 20 22:48:38 2024 +0800
fix(llm): handle the profile regenerate error (#98)
# Problem analysis
This PR solves the problem that the function of regenerating the
configuration file fails. The core problem is that the default configuration
file will be overwritten by the existing configuration file according to the
original program logic after it is read into memory
# Problem Solving
Therefore, the goal of this solution is to initialize the configuration
class instance independently during the call of `config.generate`, skip the
part of reading the existing configuration file, and enter the branch of
whether to use the default configuration to cover the current configuration file
# Test (passed)
use `python3 -m hugegraph_llm.config.generate --update`
---
hugegraph-llm/src/hugegraph_llm/config/__init__.py | 2 +-
hugegraph-llm/src/hugegraph_llm/config/config.py | 18 +++++++++++++-----
hugegraph-llm/src/hugegraph_llm/config/generate.py | 5 +++--
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/hugegraph-llm/src/hugegraph_llm/config/__init__.py
b/hugegraph-llm/src/hugegraph_llm/config/__init__.py
index e077fee..87b6d2e 100644
--- a/hugegraph-llm/src/hugegraph_llm/config/__init__.py
+++ b/hugegraph-llm/src/hugegraph_llm/config/__init__.py
@@ -24,7 +24,7 @@ from .config import Config, PromptConfig
settings = Config()
settings.from_env()
prompt = PromptConfig()
-
+prompt.ensure_yaml_file_exists()
package_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
resource_path = os.path.join(package_path, "resources")
diff --git a/hugegraph-llm/src/hugegraph_llm/config/config.py
b/hugegraph-llm/src/hugegraph_llm/config/config.py
index 8d691f7..c6e06e7 100644
--- a/hugegraph-llm/src/hugegraph_llm/config/config.py
+++ b/hugegraph-llm/src/hugegraph_llm/config/config.py
@@ -45,6 +45,7 @@ def read_dotenv() -> dict[str, Optional[str]]:
@dataclass
class Config(ConfigData):
+
def from_env(self):
if os.path.exists(env_path):
env_config = read_dotenv()
@@ -58,7 +59,7 @@ class Config(ConfigData):
def generate_env(self):
if os.path.exists(env_path):
- log.info("%s already exists, do you want to update it? (y/n)",
env_path)
+ log.info("%s already exists, do you want to override with the
default configuration? (y/n)", env_path)
update = input()
if update.lower() != "y":
return
@@ -89,9 +90,6 @@ class Config(ConfigData):
class PromptConfig(PromptData):
- def __init__(self):
- self.ensure_yaml_file_exists()
-
def ensure_yaml_file_exists(self):
if os.path.exists(yaml_file_path):
log.info("Loading prompt file '%s' successfully.", F_NAME)
@@ -101,7 +99,7 @@ class PromptConfig(PromptData):
for key, value in data.items():
setattr(self, key, value)
else:
- self.save_to_yaml()
+ self.generate_yaml_file()
log.info("Prompt file '%s' doesn't exist, create it.",
yaml_file_path)
@@ -134,6 +132,16 @@ answer_prompt: |
with open(yaml_file_path, "w", encoding="utf-8") as file:
file.write(yaml_content)
+ def generate_yaml_file(self):
+ if os.path.exists(yaml_file_path):
+ log.info("%s already exists, do you want to override with the
default configuration? (y/n)", yaml_file_path)
+ update = input()
+ if update.lower() != "y":
+ return
+ self.save_to_yaml()
+ else:
+ self.save_to_yaml()
+ log.info("Prompt file '%s' doesn't exist, create it.",
yaml_file_path)
def update_yaml_file(self):
self.save_to_yaml()
diff --git a/hugegraph-llm/src/hugegraph_llm/config/generate.py
b/hugegraph-llm/src/hugegraph_llm/config/generate.py
index fb8943b..0961b39 100644
--- a/hugegraph-llm/src/hugegraph_llm/config/generate.py
+++ b/hugegraph-llm/src/hugegraph_llm/config/generate.py
@@ -18,11 +18,12 @@
import argparse
-from hugegraph_llm.config import settings
+from hugegraph_llm.config import Config, PromptConfig
if __name__ == "__main__":
parser = argparse.ArgumentParser(description="Generate hugegraph-llm
config file")
parser.add_argument("-U", "--update", action="store_true", help="Update
the config file")
args = parser.parse_args()
if args.update:
- settings.generate_env()
+ Config().generate_env()
+ PromptConfig().generate_yaml_file()
