From 55b0c1e7bbc9bacbc72fd493fc6560b01e3eafdd Mon Sep 17 00:00:00 2001
From: "me@rodrigorodriguez.com" <me@rodrigorodriguez.com>
Date: Thu, 26 Sep 2024 12:36:08 -0300
Subject: [PATCH] fix(core.gbapp): Themes missing in PROD.

---
 packages/core.gbapp/services/GBDeployer.ts    |  2 +-
 packages/llm.gblib/services/ChatServices.ts   | 31 +++++++++----------
 templates/edu.gbai/edu.gbdata/enrollments.csv |  1 +
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts
index f3645a76a..63927c4c4 100644
--- a/packages/core.gbapp/services/GBDeployer.ts
+++ b/packages/core.gbapp/services/GBDeployer.ts
@@ -712,7 +712,7 @@ export class GBDeployer implements IGBDeployer {
 
       case '.gbtheme':
         // Updates server listeners to serve theme files in .gbtheme.
-        const filePath = path.join(GBConfigService.get('STORAGE_LIBRARY'), 'default.gbai', 'default.gbtheme');
+        const filePath = path.join(process.env.PWD, 'templates','default.gbai', 'default.gbtheme');
         GBServer.globals.server.use('/' + urlJoin('themes', packageName), express.static( filePath));
         GBLogEx.verbose(min, `Theme (.gbtheme) assets accessible at: /themes/${packageName}.`);
 
diff --git a/packages/llm.gblib/services/ChatServices.ts b/packages/llm.gblib/services/ChatServices.ts
index b15485af2..319606264 100644
--- a/packages/llm.gblib/services/ChatServices.ts
+++ b/packages/llm.gblib/services/ChatServices.ts
@@ -51,7 +51,7 @@ import { SqlDatabaseChain } from 'langchain/chains/sql_db';
 import { SqlDatabase } from 'langchain/sql_db';
 import { DataSource } from 'typeorm';
 import { GBMinInstance } from 'botlib';
-import fs from 'fs/promises'; 
+import fs from 'fs/promises';
 import { jsonSchemaToZod } from 'json-schema-to-zod';
 import { BufferWindowMemory } from 'langchain/memory';
 import path from 'path';
@@ -74,7 +74,7 @@ import {
 import { GBUtil } from '../../../src/util.js';
 import { z } from 'zod';
 import zodToJsonSchema from 'zod-to-json-schema';
-export interface CustomOutputParserFields {}
+export interface CustomOutputParserFields { }
 export type ExpectedOutput = any;
 
 function isChatGeneration(llmOutput: ChatGeneration | Generation): llmOutput is ChatGeneration {
@@ -133,12 +133,10 @@ export class GBLLMOutputParser extends BaseLLMOutputParser<ExpectedOutput> {
 
     let res;
     try {
-      GBLogEx.info(this.min, result);
-      result = result.replace(/\u000A/g, '\n');
-      result = result.replace(/\\n/g, '\n');
-      result = result.replace(/\`\`\`/g, '');
+        GBLogEx.info(this.min, result);
       res = JSON.parse(result);
-    } catch {
+    } catch (e) {
+      GBLogEx.verbose(this.min, `LLM JSON error: ${GBUtil.toYAML(e)}.`);
       return result;
     }
 
@@ -189,7 +187,7 @@ export class ChatServices {
       const gbaiName = GBUtil.getGBAIPath(min.botId, null);
       const localName = path.join('work', gbaiName, 'cache', `img${GBAdminService.getRndReadableIdentifier()}.png`);
       const url = urlJoin(GBServer.globals.publicAddress, min.botId, 'cache', path.basename(localName));
-  await fs.writeFile(localName, buffer, { encoding: null });
+      await fs.writeFile(localName, buffer, { encoding: null });
       return { localName: localName, url: url, data: buffer };
     }
   }
@@ -223,16 +221,14 @@ export class ChatServices {
         page = await ChatServices.findPageForText(metadata.source, doc.pageContent);
       }
 
-      output = `${output}\n\n\n\nUse also the following context which is coming from Source Document: ${filename} at page: ${
-        page ? page : 'entire document'
-      } 
+      output = `${output}\n\n\n\nUse also the following context which is coming from Source Document: ${filename} at page: ${page ? page : 'entire document'
+        } 
       (you will fill the JSON sources collection field later), 
       Ignore this block if it is an index or part of table of contents. 
       And memorize this block among document
        information and return when you 
-       are refering this part of content:\n\n\n\n ${
-        doc.pageContent
-      } \n\n\n\n.`; 
+       are refering this part of content:\n\n\n\n ${doc.pageContent
+        } \n\n\n\n.`;
     }
     return output;
   }
@@ -414,7 +410,7 @@ export class ChatServices {
     Folowing answer:`)
     ] as any);
 
-        
+
     const jsonInformation = `
     CRITICAL INSTRUCTION: You MUST ALWAYS return ONLY a valid JSON object matching this exact structure, with no additional text before or after:
 
@@ -447,9 +443,10 @@ export class ChatServices {
       - Ensure that no TOC with page numbering, indexing or summary information is included in your response.
       - Double check that your response contains ONLY the JSON object before returning
       - You sometimes return a formatted JSON surrounded by quotes like MD, DONT RETURN LIKE THIS, just valid JSON!
+      - Do not use ENTER to format JSON, but keep ENTER char inside text tag.
   
-      Failure to follow these requirements exactly will result in an error.`; 
-  
+      Failure to follow these requirements exactly will result in an error.`;
+
 
     const combineDocumentsPrompt = ChatPromptTemplate.fromMessages([
       AIMessagePromptTemplate.fromTemplate(
diff --git a/templates/edu.gbai/edu.gbdata/enrollments.csv b/templates/edu.gbai/edu.gbdata/enrollments.csv
index a7a69cf14..5edeb69c2 100644
--- a/templates/edu.gbai/edu.gbdata/enrollments.csv
+++ b/templates/edu.gbai/edu.gbdata/enrollments.csv
@@ -1 +1,2 @@
 Id,Name,Birthday,Email,Personalid,Address
+lwkerderv,John Godf,12/12/2001,johng@fool.com.tg,12381239923,"Boulevard Street, 329"
\ No newline at end of file