Merge pull request #893 from WolframResearch/feature/updated-docs-vec…

…tor-database Updated documentation vector database
WolframResearch · Nov 8, 2024 · 063debc · 063debc
2 parents d112ce8 + c119b7d
commit 063debc
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/Source/Chatbook/PromptGenerators/RelatedDocumentation.wl b/Source/Chatbook/PromptGenerators/RelatedDocumentation.wl
@@ -10,9 +10,17 @@ Needs[ "Wolfram`Chatbook`PromptGenerators`Common`" ];
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Configuration*)
-$documentationSnippetBaseURL = "https://www.wolframcloud.com/obj/wolframai-content/DocumentationSnippets/Text";
+$snippetType                 = "Text";
+$documentationSnippetVersion = "14-1-0-10549042";
+$baseURL                     = "https://www.wolframcloud.com/obj/wolframai-content/DocumentationSnippets";
+$documentationSnippetBaseURL = URLBuild @ { $baseURL, $documentationSnippetVersion, $snippetType };
+$resourceSnippetBaseURL      = URLBuild @ { $baseURL, "Resources", $snippetType };
 
-$snippetsCacheDirectory := $snippetsCacheDirectory = ChatbookFilesDirectory[ "DocumentationSnippets" ];
+$documentationSnippetsCacheDirectory := $documentationSnippetsCacheDirectory =
+    ChatbookFilesDirectory @ { "DocumentationSnippets", "Documentation", $documentationSnippetVersion };
+
+$resourceSnippetsCacheDirectory := $resourceSnippetsCacheDirectory =
+    ChatbookFilesDirectory @ { "DocumentationSnippets", "ResourceSystem" };
 
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
@@ -385,14 +393,22 @@ snippetCacheFile[ uri_String ] /; StringStartsQ[ uri, "https://resources.wolfram
 snippetCacheFile[ uri_String, path0_String, name_String ] := Enclose[
     Module[ { path, file },
         path = ConfirmBy[ StringTrim[ path0, "/" ] <> ".wxf", StringQ, "Path" ];
-        file = ConfirmBy[ FileNameJoin @ { $snippetsCacheDirectory, name, path }, StringQ, "File" ];
+        file = ConfirmBy[ FileNameJoin @ { snippetCacheDirectory @ name, path }, StringQ, "File" ];
         snippetCacheFile[ uri ] = file
     ],
     throwInternalFailure
 ];
 
 snippetCacheFile // endDefinition;
 
+(* ::**************************************************************************************************************:: *)
+(* ::Subsubsection::Closed:: *)
+(*snippetCacheDirectory*)
+snippetCacheDirectory // beginDefinition;
+snippetCacheDirectory[ "Documentation"  ] := $documentationSnippetsCacheDirectory;
+snippetCacheDirectory[ "ResourceSystem" ] := $resourceSnippetsCacheDirectory;
+snippetCacheDirectory // endDefinition;
+
 (* ::**************************************************************************************************************:: *)
 (* ::Subsection::Closed:: *)
 (*fetchDocumentationSnippets*)
@@ -464,7 +480,7 @@ toDocSnippetURL // endDefinition;
 toDocSnippetURL0 // beginDefinition;
 
 toDocSnippetURL0[ { "resources.wolframcloud.com", { "", repo_String, "resources", name_String } } ] :=
-    URLBuild @ { $documentationSnippetBaseURL, "Resources", repo, name <> ".wxf" };
+    URLBuild @ { $resourceSnippetBaseURL, repo, name <> ".wxf" };
 
 toDocSnippetURL0 // endDefinition;
 

diff --git a/Source/Chatbook/PromptGenerators/VectorDatabases.wl b/Source/Chatbook/PromptGenerators/VectorDatabases.wl
@@ -16,7 +16,7 @@ HoldComplete[
 (* ::Section::Closed:: *)
 (*Configuration*)
 $vectorDBNames   = { "DocumentationURIs", "WolframAlphaQueries" };
-$dbVersion       = "1.1.0";
+$dbVersion       = "1.2.0";
 $allowDownload   = True;
 $cacheEmbeddings = True;
 
@@ -54,8 +54,6 @@ $vectorDBDownloadURLs = AssociationMap[
 $pacletVectorDBDirectory := FileNameJoin @ { $thisPaclet[ "Location" ], "Assets/VectorDatabases" };
 $localVectorDBDirectory  := ChatbookFilesDirectory @ { "VectorDatabases", $dbVersion };
 
-(* TODO: need versioned URLs and paths *)
-
 (* ::**************************************************************************************************************:: *)
 (* ::Subsection::Closed:: *)
 (*Argument Patterns*)

diff --git a/Tests/RelatedDocumentation.wlt b/Tests/RelatedDocumentation.wlt
@@ -128,7 +128,7 @@ VerificationTest[
 
 VerificationTest[
     StringCount[ prompt, { "paclet:ref/Prime#", "paclet:ref/NextPrime#" } ],
-    _Integer? (GreaterEqualThan[ 8 ]),
+    _Integer? (GreaterEqualThan[ 5 ]),
     SameTest -> MatchQ,
     TestID   -> "RelatedDocumentation-Prompt-Messages-Count@@Tests/RelatedDocumentation.wlt:129,1-134,2"
 ]