Merge branch 'master' into 9162-resources-toggleBoxInconsistency

Author: emmanuelbaa

.gitignore

@@ -57,3 +57,6 @@ planet.yml
 
 # Dev environment
 environment.dev.ts
+
+# Gemini CLI configuration
+gemini-extension.json

chatapi/src/index.ts

@@ -48,7 +48,11 @@ wss.on('connection', (ws) => {
         }));
       }
     } catch (error: any) {
-      ws.send(`${error.message}: Cannot connect to the streaming endpoint`);
+      if (error.message === 'missing' || error.statusCode === 404 || error.error === 'not_found') {
+        ws.send(JSON.stringify({ 'error': 'Not Found', 'message': 'Conversation not found' }));
+      } else {
+        ws.send(JSON.stringify({ 'error': 'Internal Server Error', 'message': error.message }));
+      }
     }
   });
 
@@ -66,7 +70,7 @@ app.post('/', async (req: any, res: any) => {
 
   try {
     if (!save) {
-      const response = await chatNoSave(data.content, data.aiProvider, data.context, data.assistant, false);
+      const response = await chatNoSave(data.content, data.aiProvider, data.assistant, data.context);
       return res.status(200).json({
         'status': 'Success',
         'chat': response
@@ -80,6 +84,9 @@ app.post('/', async (req: any, res: any) => {
       });
     }
   } catch (error: any) {
+    if (error.message === 'missing' || error.statusCode === 404 || error.error === 'not_found') {
+      return res.status(404).json({ 'error': 'Not Found', 'message': 'Conversation not found' });
+    }
     return res.status(500).json({ 'error': 'Internal Server Error', 'message': error.message });
   }
 });

chatapi/src/services/chat.service.ts

@@ -69,20 +69,14 @@ export async function chatNoSave(
   content: any,
   aiProvider: AIProvider,
   assistant: boolean,
-  context?: any,
-  stream?: boolean,
-  callback?: (response: string) => void
+  context?: any
 ): Promise<string | undefined> {
   const messages: ChatMessage[] = [];
 
   messages.push({ 'role': 'user', content });
 
   try {
-    const completionText = await aiChat(messages, aiProvider, assistant, context, stream, callback);
-    messages.push({
-      'role': 'assistant', 'content': completionText
-    });
-
+    const completionText = await aiChat(messages, aiProvider, assistant, context);
     return completionText;
   } catch (error: any) {
     handleChatError(error);

chatapi/src/utils/db.utils.ts

@@ -8,21 +8,14 @@ import { ChatMessage } from '../models/chat.model';
  * @returns Array of chat conversations
  */
 async function getChatDocument(id: string) {
-  try {
-    const res = await chatDB.get(id) as DbDoc;
-    return {
-      'conversations': res.conversations,
-      'title': res.title,
-      'createdDate': res.createdDate,
-      'aiProvider': res.aiProvider
-    };
-    // Should return user, team data as well particularly for the "/conversations" endpoint
-  } catch (error) {
-    return {
-      'conversations': [],
-      'title': ''
-    };
-  }
+  const res = await chatDB.get(id) as DbDoc;
+  return {
+    'conversations': res.conversations,
+    'title': res.title,
+    'createdDate': res.createdDate,
+    'aiProvider': res.aiProvider
+  };
+  // Should return user, team data as well particularly for the "/conversations" endpoint
 }
 
 export async function retrieveChatHistory(dbData: any, messages: ChatMessage[]) {

docker/planet/scripts/crosscompile_planet.sh

@@ -40,6 +40,6 @@ envsubst '$DEFAULT_LANGUAGE' < /etc/nginx/templates/default.conf.template > /etc
 
 spawn-fcgi -s /run/fcgi.sock -U nginx -G nginx /usr/bin/fcgiwrap
 
-nginx -g "daemon off;"
-
 mkdir -p /usr/share/nginx/html/fs
+
+nginx -g "daemon off;"

docker/planet/scripts/docker-entrypoint.sh

@@ -3,24 +3,6 @@
 # An example hook script to verify what is about to be pushed.  Called by "git
 # push" after it has checked the remote status, but before anything has been
 # pushed.  If this script exits with a non-zero status nothing will be pushed.
-#
-# This hook is called with the following parameters:
-#
-# $1 -- Name of the remote to which the push is being done
-# $2 -- URL to which the push is being done
-#
-# If pushing without using a named remote those arguments will be equal.
-#
-# Information about the commits which are being pushed is supplied as lines to
-# the standard input in the form:
-#
-#   <local ref> <local sha1> <remote ref> <remote sha1>
-#
-# This sample shows how to prevent push of commits where the log message starts
-# with "WIP" (work in progress).
-
-remote="$1"
-url="$2"
 
 pass=true
 RED='\033[1;31m'

git-hooks/pre-push

@@ -1,10 +1,10 @@
 {
   "name": "planet",
   "license": "AGPL-3.0",
-  "version": "0.20.64",
+  "version": "0.20.75",
   "myplanet": {
-    "latest": "v0.36.37",
-    "min": "v0.35.37"
+    "latest": "v0.37.2",
+    "min": "v0.30.2"
   },
   "scripts": {
     "ng": "ng",

package.json

@@ -25,7 +25,7 @@ import { CouchService } from '../shared/couchdb.service';
 import { PlanetMessageService } from '../shared/planet-message.service';
 import { DialogsPromptComponent } from '../shared/dialogs/dialogs-prompt.component';
 import { CoursesService } from './courses.service';
-import { dedupeShelfReduce, findByIdInArray, calculateMdAdjustedLimit } from '../shared/utils';
+import { dedupeShelfReduce, findByIdInArray, calculateMdAdjustedLimit, itemsShown } from '../shared/utils';
 import { StateService } from '../shared/state.service';
 import { DialogsLoadingService } from '../shared/dialogs/dialogs-loading.service';
 import { TagsService } from '../shared/forms/tags.service';
@@ -307,8 +307,7 @@ export class CoursesComponent implements OnInit, OnChanges, AfterViewInit, OnDes
 
   /** Whether the number of selected elements matches the total number of rows. */
   isAllSelected() {
-    const itemsShown = Math.min(this.paginator.length - (this.paginator.pageIndex * this.paginator.pageSize), this.paginator.pageSize);
-    return this.selection.selected.length === itemsShown;
+    return this.selection.selected.length === itemsShown(this.paginator);
   }
 
   /** Selects all rows if they are not all selected; otherwise clear selection. */

src/app/courses/courses.component.ts

@@ -77,7 +77,7 @@ <h3 i18n *ngIf="showParentList">{{ planetType === 'community' ? 'Nation' : 'Cent
       </ng-container>
     </div>
     <div *ngIf="pin"><span i18n>myPlanet Server pin:</span> <b class="pinClass">{{ ' ' + pin + ' ' }}</b>
-      <button mat-raised-button i18n (click)="resetPin()">Reset Pin</button>
+      <button mat-raised-button i18n (click)="confirmResetPin()">Reset Pin</button>
     </div>
   </ng-container>
   <div>