bot api end point change

Sunbird-AIAssistant · Oct 18, 2024 · d83a5f7 · d83a5f7
1 parent 770d9cc
commit d83a5f7
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 32 deletions.
diff --git a/capacitor.config.ts b/capacitor.config.ts
@@ -6,7 +6,12 @@ const config: CapacitorConfig = {
   loggingBehavior: "none",
   webDir: 'www',
   server: {
-    androidScheme: 'https'
+    androidScheme: 'https',
+    allowNavigation: [
+      "https://drive.google.com",
+      "https://docs.google.com",
+      "https://photos.app.goo.gl"
+    ]
   },
   plugins: {
     CapacitorSQLite: {

diff --git a/configuration/environment.prod.ts b/configuration/environment.prod.ts
@@ -11,11 +11,11 @@ export const config = {
     CONTEXT_SEARCH: 'api/aiutility/v1/context',
     CONTENT_SEARCH_API: 'content/search',
     TELEMETRY_SYNC: 'telemetry/v1/telemetry',
-    BOT_QUERY_API: 'v1/query',
+    BOT_QUERY_API: 'v1/chat',
     SEARCH_API: 'content/search',
     CONFIRM_API: 'confirm',
-    BOT_SAKHI_API_PATH: 'v1/query',
-    BOT_ACTIVITY_API_PATH: 'api/activitybot/v1/query',
+    BOT_SAKHI_API_PATH: 'v1/chat',
+    BOT_ACTIVITY_API_PATH: 'api/activitybot/v1/chat',
 
     REGISTER_DEVICE_API_PATH: 'api/registerMobileDevice',
     KEY: 'myjp-0.1',

diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html
@@ -48,18 +48,18 @@
           <div class="image-title">{{"Teacher Tara" | translate }}</div>
         </div>
       </div> -->
-      <div class="card" *ngIf="content.metaData && content.metaData.name">
+      <div class="card" *ngIf="content?.metaData && content?.metaData?.name">
         <div class="card__img" (click)="playContent($event, content)">
-          <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/Audio.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.AUDIO">
+          <img loading="lazy" [src]="(content?.metaData?.thumbnail && !content?.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/Audio.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.AUDIO">
           <!-- <img appThumbnail [appThumbnail]="'assets/images/yt.jpeg'" alt="" *ngIf="content.metaData.mimetype === mimeType.YOUTUBE"> -->
           <img appThumbnail [appThumbnail]="content?.metaData" alt="" *ngIf="content?.metaData?.mimetype === mimeType.YOUTUBE && !content.play"> 
           <!-- <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/youtube-video.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.YOUTUBE"> -->
           <!-- <img [src]="loadYoutubeImg(content.metaData.identifier)" alt="" *ngIf="content.metaData.mimetype === mimeType.YOUTUBE && !content.play"> -->
-          <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/Video.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.MP4">
-          <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/PDF.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.PDF">
-          <img src="assets/images/LINK.png" alt="" *ngIf="content?.metaData?.mimetype === mimeType?.LINK">
+          <img  loading="lazy" [src]="(content?.metaData?.thumbnail && !content?.metaData?.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/Video.png'" alt="" *ngIf="content?.metaData?.mimetype === mimeType?.MP4">
+          <img [src]="(content?.metaData?.thumbnail && !content?.metaData?.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/PDF.png'" alt="" *ngIf="content?.metaData?.mimetype === mimeType?.PDF">
+          <img loading="lazy" [src]="(content?.metaData?.thumbnail && !content?.metaData?.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/LINK.png'" alt="" *ngIf="content?.metaData?.mimetype === mimeType?.LINK">
 
-          <img [src]="(content?.metaData?.thumbnail =='' && !content.metaData.identifier.startsWith('do_')) ? 'https://ejaaduipitara.ncert.gov.in/assets/img/cards.jpg' : ''" alt="">
+          <img loading="lazy"  [src]="(content?.metaData?.thumbnail =='' && !content.metaData.identifier.startsWith('do_')) ? 'https://ejaaduipitara.ncert.gov.in/assets/img/cards.jpg' : ''" alt="">
 
           <!-- <ion-img *ngIf="content.metaData.thumbnail && !content.play" [src]="content.metaData.thumbnail" alt=""/>
             <ion-img *ngIf="!content.metaData.thumbnail && !content.play" [src]="loadYoutubeImg(content.metaData.identifier)" alt=""/> -->

diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts
@@ -212,7 +212,7 @@ export class HomePage implements OnInit, OnTabViewWillEnter, OnDestroy {
   }
 
   async mappUIContentList(content: Array<ContentMetaData>) {
-    // await this.contentService.deleteAllContents();
+    await this.contentService.deleteAllContents();
     this.showSheenAnimation = false;
     this.configContents = [];
     this.contentList = [];

diff --git a/src/app/pages/mypitara/mypitara.page.html b/src/app/pages/mypitara/mypitara.page.html
@@ -21,8 +21,8 @@
             <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/youtube-video.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.YOUTUBE">
             <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/Video.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.MP4">
             <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/PDF.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.PDF">
-            <!-- <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/LINK.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.LINK"> -->
-            <img src="assets/images/LINK.png" alt="" *ngIf="content?.metaData?.mimetype === mimeType?.LINK">
+            <img  [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/LINK.png'"  alt="" *ngIf="content?.metaData?.mimetype === mimeType?.LINK">
+            <!-- <img src="assets/images/LINK.png" alt="" *ngIf="content?.metaData?.mimetype === mimeType?.LINK"> -->
 
           </ion-card>
           <div class="card-title" *ngIf="content?.metaData?.name">{{content.metaData.name |translate}}</div>

diff --git a/src/app/pages/playlist-details/playlist-details.page.html b/src/app/pages/playlist-details/playlist-details.page.html
@@ -6,22 +6,12 @@
   <div class="cards-container" *ngFor="let content of playlists; let i = index">
     <div class="card" *ngIf="content?.metaData">
       <div class="card__img" (click)="playContent(content)">
-        <!-- <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? content?.metaData?.thumbnail : 'assets/images/Audio.png'" alt="" *ngIf="content?.metaData?.mimetype === mimeType.AUDIO">
-        <img appThumbnail [appThumbnail]="content?.metaData" alt="" *ngIf="content?.metaData?.mimetype === mimeType.YOUTUBE && !content.play">
-        <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? content?.metaData?.thumbnail : 'assets/images/Video.png'" alt="" *ngIf="content?.metaData?.mimetype === mimeType.MP4">
-        <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? content?.metaData?.thumbnail : 'assets/images/PDF.png'" alt="" *ngIf="content?.metaData?.mimetype === mimeType.PDF">
-        <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? content?.metaData?.thumbnail : 'assets/images/LINK.png'" alt="" *ngIf="content?.metaData?.mimetype === 'text/html'"> -->
-
+
         <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/Audio.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.AUDIO">
-          <!-- <img appThumbnail [appThumbnail]="'assets/images/yt.jpeg'" alt="" *ngIf="content.metaData.mimetype === mimeType.YOUTUBE"> -->
           <img appThumbnail [appThumbnail]="content?.metaData" alt="" *ngIf="content?.metaData?.mimetype === mimeType.YOUTUBE && !content.play"> 
-          <!-- <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/youtube-video.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.YOUTUBE"> -->
-          <!-- <img [src]="loadYoutubeImg(content.metaData.identifier)" alt="" *ngIf="content.metaData.mimetype === mimeType.YOUTUBE && !content.play"> -->
           <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/Video.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.MP4">
           <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/PDF.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.PDF">
-          <!-- <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/LINK.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.LINK"> -->
-          <!-- <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? content?.metaData?.thumbnail : 'assets/images/LINK.png'" alt="" *ngIf="content?.metaData?.mimetype === 'text/html'"> -->
-          <img src="assets/images/LINK.png" alt="" *ngIf="content?.metaData?.mimetype === mimeType?.LINK">
+          <img  [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/LINK.png'"  alt="" *ngIf="content?.metaData?.mimetype === mimeType?.LINK">
 
           <img [src]="(content?.metaData?.thumbnail =='' && !content.metaData.identifier.startsWith('do_')) ? 'https://ejaaduipitara.ncert.gov.in/assets/img/cards.jpg' : ''" alt="">
 

diff --git a/src/app/pages/qr-scan-result/qr-scan-result.page.html b/src/app/pages/qr-scan-result/qr-scan-result.page.html
@@ -35,7 +35,7 @@
           <img appThumbnail [appThumbnail]="content?.metaData" alt="" *ngIf="content.metaData.mimetype === mimeType.YOUTUBE && !content.play">
           <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? content?.metaData?.thumbnail :'assets/images/Video.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.MP4 || content.metaData.mimetype === mimeType.WEBM">
           <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? content?.metaData?.thumbnail :'assets/images/PDF.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.PDF">
-           
+
           <!-- <ion-img [src]="content.metaData.thumbnail" alt=""/>
           <ion-img *ngIf="!content.metaData.thumbnail" src="assets/images/defaultImg.png" alt=""/> -->
         </div>

diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
@@ -56,9 +56,8 @@
 
         <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/Video.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.MP4">
         <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/PDF.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.PDF">
-        <img src="assets/images/LINK.png" alt="" *ngIf="content?.metaData?.mimetype === mimeType?.LINK">
 
-        <!-- <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/LINK.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.LINK"> -->
+        <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/LINK.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.LINK">
         <!-- <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? content?.metaData?.thumbnail : 'assets/images/LINK.png'" alt="" *ngIf="content?.metaData?.mimetype === 'text/html'"> -->
       </div>
       <div class="card__metadata">

diff --git a/src/app/pages/view-all/view-all.page.html b/src/app/pages/view-all/view-all.page.html
@@ -8,8 +8,8 @@
         <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/youtube-video.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.YOUTUBE">
         <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/Video.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.MP4">
         <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/PDF.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.PDF">
-        <!-- <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/LINK.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.LINK"> -->
-        <img src="assets/images/LINK.png" alt="" *ngIf="content?.metaData?.mimetype === mimeType?.LINK">
+        <img  [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/LINK.png'"  alt="" *ngIf="content?.metaData?.mimetype === mimeType?.LINK">
+        <!-- <img src="assets/images/LINK.png" alt="" *ngIf="content?.metaData?.mimetype === mimeType?.LINK"> -->
 
       </div>
       <div class="card__metadata">

diff --git a/src/app/services/api/http.capacitor.adapter.ts b/src/app/services/api/http.capacitor.adapter.ts
@@ -111,6 +111,20 @@ export class HttpCapacitorAdapter implements HttpClient {
         return match ? match[1] : null;
       }
 
+
+    convertGoogleDriveUrl(driveUrl: string): string | null {
+        const regex = /\/d\/([a-zA-Z0-9_-]+)\//;
+        const match = driveUrl.match(regex);
+
+        if (match && match[1]) {
+          const fileId = match[1];
+          return `https://drive.google.com/thumbnail?id=${fileId}`;
+        }
+
+        return null;  // Return null if no match
+      }
+
+
     private invokeRequest(type: ApiHttpRequestType, url: string, parametersOrData: any,
                           headers: { [key: string]: string }): Observable<ApiResponse> {
         const observable = new Subject<ApiResponse>();
@@ -144,7 +158,8 @@ export class HttpCapacitorAdapter implements HttpClient {
                 receivedData.data.djp_contents.forEach((item : any) => {
                     // let mimetype = item?.url ?  this.checkMimieType(item?.url) : 'text/html';
                     let url =   this.isGoogleDriveLink(item?.url) ? item?.url.replace('/view', '/preview'): item?.url;
-                    let thumbnail =   item?.thumbnail != null && this.isGoogleDriveLink(item?.thumbnail) ? ""  : "";
+                    item.thumbnail =  (item?.thumbnail != null && this.isGoogleDriveLink(item?.thumbnail)) ? this.convertGoogleDriveUrl(item?.thumbnail): item?.thumbnail;
+
                     let mimetype = this.checkMimieType(url);
                 // Traverse through the items array of each provider
                 const content: SearchContentMetaData = {
@@ -162,7 +177,7 @@ export class HttpCapacitorAdapter implements HttpClient {
                     provider_name: item.provider_name,
                     name: item.name,
                     description: item.description,
-                    thumbnail: thumbnail,
+                    thumbnail: item?.thumbnail,
                     domain: item.domain,
                     unique_id: item.unique_id,
                     language: item.language,