user image, single result

Author: Roey7

app/data_sources/mattermost.py

@@ -1,9 +1,9 @@
 import logging
-from datetime import datetime
-from urllib.parse import urlparse
 from dataclasses import dataclass, asdict
-from typing import Dict, List, Optional
+from datetime import datetime
 from functools import lru_cache
+from typing import Dict, List, Optional
+from urllib.parse import urlparse
 
 from mattermostdriver import Driver
 
@@ -13,7 +13,6 @@
 from data_source_api.utils import parse_with_workers
 from indexing_queue import IndexingQueue
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -23,136 +22,126 @@ class MattermostChannel:
     name: str
     team_id: str
 
+
 @dataclass
 class MattermostConfig:
     url: str
     token: str
     scheme: Optional[str] = "https"
     port: Optional[int] = 443
-    
+
     def __post_init__(self):
         try:
             parsed_url = urlparse(self.url)
         except Exception as e:
             raise ValueError from e
-        
+
         self.url = parsed_url.hostname
         self.port = parsed_url.port if parsed_url.port is not None else self.port
         self.scheme = parsed_url.scheme if parsed_url.scheme != "" else self.scheme
 
-        
 
 class MattermostDataSource(BaseDataSource):
     FEED_BATCH_SIZE = 500
 
     @staticmethod
     def get_config_fields() -> List[ConfigField]:
         return [
-            ConfigField(label="Mattermost Server", name="url", placeholder="https://mattermost.server.com", input_type=HTMLInputType.TEXT),
-            ConfigField(label="Token", name="token", placeholder="paste-your-token-here", input_type=HTMLInputType.PASSWORD),
+            ConfigField(label="Mattermost Server", name="url", placeholder="https://mattermost.server.com",
+                        input_type=HTMLInputType.TEXT),
+            ConfigField(label="Access Token", name="token", placeholder="paste-your-access-token-here",
+                        input_type=HTMLInputType.PASSWORD),
         ]
 
-
     @staticmethod
     def validate_config(config: Dict) -> None:
         try:
             parsed_config = MattermostConfig(**config)
-            maattermost = Driver(options = asdict(parsed_config))
+            maattermost = Driver(options=asdict(parsed_config))
             maattermost.login()
         except Exception as e:
             raise InvalidDataSourceConfig from e
 
-    
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         mattermost_config = MattermostConfig(**self._config)
-        self._mattermost = Driver(options = asdict(mattermost_config))
-    
-    
+        self._mattermost = Driver(options=asdict(mattermost_config))
+
     def _list_channels(self) -> List[MattermostChannel]:
         channels = self._mattermost.channels.client.get(f"/users/me/channels")
         return [MattermostChannel(id=channel["id"], name=channel["name"], team_id=channel["team_id"])
                 for channel in channels]
 
-
     def _is_valid_message(self, message: Dict) -> bool:
-        return message["type"] == "" 
-    
-    
+        return message["type"] == ""
+
     def _is_valid_channel(self, channel: MattermostChannel) -> bool:
         return channel.team_id != ""
-    
-    
+
     def _list_posts_in_channel(self, channel_id: str, page: int) -> Dict:
         endpoint = f"/channels/{channel_id}/posts"
         params = {
             "since": int(self._last_index_time.timestamp()) * 1000,
             "page": page
         }
-        
+
         posts = self._mattermost.channels.client.get(endpoint, params=params)
         return posts
 
-
     def _feed_new_documents(self) -> None:
         self._mattermost.login()
         channels = self._list_channels()
-    
+
         logger.info(f'Found {len(channels)} channels')
         parse_with_workers(self._parse_channel_worker, channels)
 
-    
-    def _parse_channel_worker(self, channels: List[MattermostChannel]):        
+    def _parse_channel_worker(self, channels: List[MattermostChannel]):
         for channel in channels:
             self._feed_channel(channel)
 
-    
     def _get_mattermost_url(self):
         options = self._mattermost.options
         return f"{options['scheme']}://{options['url']}:{options['port']}"
 
-
     def _get_team_url(self, channel: MattermostChannel):
         url = self._get_mattermost_url()
         team = self._mattermost.teams.get_team(channel.team_id)
         return f"{url}/{team['name']}"
-    
-    
+
     @lru_cache(maxsize=512)
     def _get_mattermost_user(self, user_id: str):
         return self._mattermost.users.get_user(user_id)["username"]
-    
-        
+
     def _feed_channel(self, channel: MattermostChannel):
         if not self._is_valid_channel(channel):
-            return 
+            return
         logger.info(f'Feeding channel {channel.name}')
-        
+
         page = 0
         total_fed = 0
-        
+
         parsed_posts = []
-        
+
         team_url = self._get_team_url(channel)
-        
+
         while True:
             posts = self._list_posts_in_channel(channel.id, page)
 
             last_message: Optional[BasicDocument] = None
-            
+
             posts["order"].reverse()
             for id in posts["order"]:
                 post = posts["posts"][id]
-                
+
                 if not self._is_valid_message(post):
                     if last_message is not None:
                         parsed_posts.append(last_message)
                         last_message = None
                     continue
-                
+
                 author = self._get_mattermost_user(post["user_id"])
                 content = post["message"]
-                
+
                 if last_message is not None:
                     if last_message.author == author:
                         last_message.content += f"\n{content}"
@@ -163,7 +152,7 @@ def _feed_channel(self, channel: MattermostChannel):
                             total_fed += len(parsed_posts)
                             IndexingQueue.get().feed(docs=parsed_posts)
                             parsed_posts = []
-                    
+
                 author_image_url = f"{self._get_mattermost_url()}/api/v4/users/{post['user_id']}/image?_=0"
                 timestamp = datetime.fromtimestamp(post["update_at"] / 1000)
                 last_message = BasicDocument(
@@ -178,18 +167,16 @@ def _feed_channel(self, channel: MattermostChannel):
                     url=f"{team_url}/pl/{id}",
                     type=DocumentType.MESSAGE
                 )
-                
+
             if last_message is not None:
                 parsed_posts.append(last_message)
 
             if posts["prev_post_id"] == "":
                 break
             page += 1
-        
 
         IndexingQueue.get().feed(docs=parsed_posts)
         total_fed += len(parsed_posts)
 
         if len(parsed_posts) > 0:
             logger.info(f"Worker fed {total_fed} documents")
-            

app/requirements.txt

@@ -19,4 +19,5 @@ google-auth-oauthlib
 oauth2client
 mammoth
 python-pptx
-alembic
+alembic
+mattermostdriver

app/search_logic.py

@@ -155,6 +155,10 @@ def _assign_answer_sentence(candidate: Candidate, answer: str):
 def _find_answers_in_candidates(candidates: List[Candidate], query: str) -> List[Candidate]:
     contexts = [candidate.content for candidate in candidates]
     answers = qa_model(question=[query] * len(contexts), context=contexts)
+
+    if type(answers) == dict:
+        answers = [answers]
+
     for candidate, answer in zip(candidates, answers):
         _assign_answer_sentence(candidate, answer['answer'])
 

ui/package-lock.json

@@ -14,6 +14,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-icons": "^4.8.0",
+    "react-image": "^4.1.0",
     "react-modal": "^3.16.1",
     "react-scripts": "5.0.1",
     "react-select": "^5.7.0",

ui/package.json

@@ -202,7 +202,7 @@ export default class DataSourcePanel extends React.Component<DataSourcePanelProp
                                        <span>1. {'Go to your Mattermost -> top-right profile picture -> Profile'}</span>
                                        <span>2. {'Security -> Personal Access Tokens -> Create token -> Name it'}</span>
                                        <span>3. {"Copy the Access Token"}</span>
-                                       <span className="text-violet-300/[.75] text-sm"> {"* Personal Access Tokens must be on"} - <a className="inline hover:underline text-violet-400/[.75]" target="_blank" href="https://developers.mattermost.com/integrate/reference/personal-access-token/">For more info</a></span>
+                                       <span className="text-violet-300/[.75] text-sm"> {"* Personal Access Tokens must be on"} - <a className="inline hover:underline text-violet-400/[.75]" target="_blank" href="https://developers.mattermost.com/integrate/reference/personal-access-token/">Click for more info</a></span>
                                  </span>
                               )
                               }

ui/src/assets/images/user.webp

@@ -1,13 +1,14 @@
 
 import React from 'react';
+import {Img} from 'react-image'
 
 import BlueFolder from '../assets/images/blue-folder.svg';
 import GoogleDoc from '../assets/images/google-doc.svg';
 import Docx from '../assets/images/docx.svg';
 import Pptx from '../assets/images/pptx.svg';
+import DefaultUserImage from '../assets/images/user.webp';
 import { DataSourceType } from '../data-source';
 
-
 export interface TextPart {
     content: string
     bold: boolean
@@ -69,7 +70,9 @@ export const SearchResult = (props: SearchResultProps) => {
                             {props.resultDetails.location} · 
                         </span>
                         <span className="flex flex-row items-center">
-                            <img alt="author" className="inline-block ml-2 mr-2 h-4 rounded-xl" src={props.resultDetails.author_image_data ? props.resultDetails.author_image_data : props.resultDetails.author_image_url}></img>
+                            
+                            <Img alt="author" className="inline-block ml-2 mr-2 h-4 rounded-xl" 
+                                src={[props.resultDetails.author_image_url, props.resultDetails.author_image_data, DefaultUserImage]}></Img>
                             <span className='capitalize'>{props.resultDetails.author} ·</span>
                         </span>
                         <span>
@@ -151,7 +154,7 @@ function getBigIcon(props: SearchResultProps) {
     if (onTopImage !== "") {
         return (
             <div className="mt-2 mr-[10px] drop-shadow-[0_0_25px_rgba(212,179,255,0.15)]">
-                <img height={"45px"} width={"45px"} className={containingClasses} alt="file-type" src={containingImage}></img>
+                <Img height={"45px"} width={"45px"} className={containingClasses} alt="file-type" src={[containingImage, DefaultUserImage]}/>
                 <img alt="file-type" className="company-logo rounded-full p-[3px] h-[24px] w-[24px] absolute -right-[5px] -bottom-[5px] bg-white" src={onTopImage}></img>
             </div>
         )