fix: parse config after selecting

run-llama · Mar 14, 2024 · 4c2c45e · 4c2c45e
1 parent e114067
commit 4c2c45e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/helpers/index.ts b/helpers/index.ts
@@ -119,9 +119,7 @@ const installCommunityProject = async ({
   root,
   communityProjectConfig,
 }: Pick<InstallTemplateArgs, "root" | "communityProjectConfig">) => {
-  const { owner, repo, branch, filePath } = JSON.parse(
-    communityProjectConfig!,
-  ) as CommunityProjectConfig;
+  const { owner, repo, branch, filePath } = communityProjectConfig!;
   console.log("\nInstalling community project:", filePath || repo);
   await downloadAndExtractRepo(root, {
     username: owner,

diff --git a/helpers/repo.ts b/helpers/repo.ts
@@ -68,7 +68,7 @@ export async function getProjectOptions(
     title: string;
   }[]
 > {
-  // return community path for projects and submodules
+  // TODO: consider using octokit (https://github.com/octokit) if more changes are needed in the future
   const getCommunityProjectConfig = async (
     item: any,
   ): Promise<CommunityProjectConfig | null> => {
@@ -96,7 +96,6 @@ export async function getProjectOptions(
       const { default_branch } = await getRepoInfo(owner, repo);
 
       // return the path with default owner, repo, and main branch (path is empty for submodules)
-      // return `${ownerRepo}/${repoInfo.default_branch}`;
       return {
         owner,
         repo,

diff --git a/helpers/types.ts b/helpers/types.ts
@@ -50,7 +50,7 @@ export interface InstallTemplateArgs {
   llamaCloudKey?: string;
   model: string;
   embeddingModel: string;
-  communityProjectConfig?: string;
+  communityProjectConfig?: CommunityProjectConfig;
   llamapack?: string;
   vectorDb?: TemplateVectorDB;
   externalPort?: number;

diff --git a/questions.ts b/questions.ts
@@ -316,8 +316,9 @@ export const askQuestions = async (
       },
       handlers,
     );
-    program.communityProjectConfig = communityProjectConfig;
-    preferences.communityProjectConfig = communityProjectConfig;
+    const projectConfig = JSON.parse(communityProjectConfig);
+    program.communityProjectConfig = projectConfig;
+    preferences.communityProjectConfig = projectConfig;
     return; // early return - no further questions needed for community projects
   }