From 9682c95da8b97035c43a2a74ad8a54fc2f2f4fd7 Mon Sep 17 00:00:00 2001
From: Marcus Schiesser <mail@marcusschiesser.de>
Date: Wed, 27 Dec 2023 13:58:47 +0700
Subject: [PATCH] fix: incorrect generation message
---
packages/create-llama/questions.ts | 46 ++++++++++++------------
packages/create-llama/templates/index.ts | 30 ++++++++--------
2 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/packages/create-llama/questions.ts b/packages/create-llama/questions.ts
index a1517dc33..d37096011 100644
--- a/packages/create-llama/questions.ts
+++ b/packages/create-llama/questions.ts
@@ -235,32 +235,32 @@ export const askQuestions = async (
}
}
- if (
- program.engine !== "simple" &&
- !program.vectorDb &&
- program.framework !== "fastapi"
- ) {
+ if (program.engine !== "simple" && !program.vectorDb) {
if (ciInfo.isCI) {
program.vectorDb = getPrefOrDefault("vectorDb");
} else {
- const { vectorDb } = await prompts(
- {
- type: "select",
- name: "vectorDb",
- message: "Would you like to use a vector database?",
- choices: [
- {
- title: "No, just store the data in the file system",
- value: "none",
- },
- { title: "MongoDB", value: "mongo" },
- ],
- initial: 0,
- },
- handlers,
- );
- program.vectorDb = vectorDb;
- preferences.vectorDb = vectorDb;
+ if (program.framework === "fastapi") {
+ program.vectorDb = "none";
+ } else {
+ const { vectorDb } = await prompts(
+ {
+ type: "select",
+ name: "vectorDb",
+ message: "Would you like to use a vector database?",
+ choices: [
+ {
+ title: "No, just store the data in the file system",
+ value: "none",
+ },
+ { title: "MongoDB", value: "mongo" },
+ ],
+ initial: 0,
+ },
+ handlers,
+ );
+ program.vectorDb = vectorDb;
+ preferences.vectorDb = vectorDb;
+ }
}
}
diff --git a/packages/create-llama/templates/index.ts b/packages/create-llama/templates/index.ts
index 13f499077..4924e1ccc 100644
--- a/packages/create-llama/templates/index.ts
+++ b/packages/create-llama/templates/index.ts
@@ -64,7 +64,7 @@ const copyTestData = async (
openAiKey?: string,
vectorDb?: TemplateVectorDB,
) => {
- if (engine === "context" || framework === "fastapi") {
+ if (engine === "context") {
const srcPath = path.join(__dirname, "components", "data");
const destPath = path.join(root, "data");
console.log(`\nCopying test data to ${cyan(destPath)}\n`);
@@ -75,29 +75,29 @@ const copyTestData = async (
}
if (packageManager && engine === "context") {
+ const runGenerate = `${cyan(
+ framework === "fastapi"
+ ? "python app/engine/generate.py"
+ : `${packageManager} run generate`,
+ )}`;
const hasOpenAiKey = openAiKey || process.env["OPENAI_API_KEY"];
const hasVectorDb = vectorDb && vectorDb !== "none";
- const shouldRunGenerateAfterInstall = hasOpenAiKey && vectorDb === "none";
+ const shouldRunGenerateAfterInstall =
+ hasOpenAiKey && framework !== "fastapi" && vectorDb === "none";
if (shouldRunGenerateAfterInstall) {
- console.log(
- `\nRunning ${cyan(
- `${packageManager} run generate`,
- )} to generate the context data.\n`,
- );
+ console.log(`\nRunning ${runGenerate} to generate the context data.\n`);
await callPackageManager(packageManager, true, ["run", "generate"]);
- return console.log();
+ console.log();
+ return;
}
const settings = [];
if (!hasOpenAiKey) settings.push("your OpenAI key");
if (hasVectorDb) settings.push("your Vector DB environment variables");
- const generateMessage = `run ${cyan(
- `${packageManager} run generate`,
- )} to generate the context data.\n`;
- const message = settings.length
- ? `After setting ${settings.join(" and ")}, ${generateMessage}`
- : generateMessage;
- console.log(`\n${message}\n`);
+ const settingsMessage =
+ settings.length > 0 ? `After setting ${settings.join(" and ")}, ` : "";
+ const generateMessage = `run ${runGenerate} to generate the context data.`;
+ console.log(`\n${settingsMessage}${generateMessage}\n\n`);
}
};
--
GitLab