Merge branch 'main' into feat_update_expressions

CHANGELOG.md

@@ -1,5 +1,12 @@
 
 
+## [7.11.4](https://github.com/memori-ai/memori-react/compare/v7.11.3...v7.11.4) (2024-12-10)
+
+
+### Bug Fixes
+
+* links color in user chat bubbles ([813e557](https://github.com/memori-ai/memori-react/commit/813e5574bb32467f52f397a9ff3da1bfeb5b6b4c))
+
 ## [7.11.3](https://github.com/memori-ai/memori-react/compare/v7.11.2...v7.11.3) (2024-12-06)
 
 

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "7.11.3",
+  "version": "7.11.4",
   "name": "@memori.ai/memori-react",
   "author": "Memori Srl",
   "main": "dist/index.js",

src/components/ChatBubble/ChatBubble.css

@@ -94,6 +94,10 @@
     text-decoration: underline !important;
 }
 
+.memori-chat--bubble.memori-chat--user-bubble a {
+    color: var(--memori-primary-text);
+}
+
 @media (max-width: 600px) {
     .memori-chat--bubble p {
         font-size: 12px;

src/components/ChatBubble/ChatBubble.stories.tsx

@@ -80,6 +80,18 @@ FromUser.args = {
   },
 };
 
+export const FromUserWithLink = Template.bind({});
+FromUserWithLink.args = {
+  memori,
+  tenant,
+  message: {
+    fromUser: true,
+    text: 'Proin libero ante, dignissim sit amet turpis a, pretium condimentum dolor. [Vedi altro](https://memori.ai)',
+    initial: false,
+  },
+};
+
+
 export const Initial = Template.bind({});
 Initial.args = {
   memori,

src/components/CompletionProviderStatus/CompletionProviderStatus.css

@@ -15,4 +15,12 @@
 
 .memori--completion-provider-status--tooltip.memori-tooltip .memori-tooltip--content p+p {
     margin-top: 1em;
+}
+
+.memori--completion-provider-status--loading {
+    display: flex;
+    width: 100%;
+    height: 100%;
+    align-items: center;
+    justify-content: center;
 }

src/components/CompletionProviderStatus/CompletionProviderStatus.stories.tsx

@@ -7,7 +7,7 @@ import './CompletionProviderStatus.css';
 
 const meta: Meta = {
   title: 'Completion Provider Status',
-  component: CompletionProviderStatus,
+  component: CompletionProviderStatus as React.ComponentType<any>,
   argTypes: {},
   parameters: {
     layout: 'centered',

src/components/CompletionProviderStatus/CompletionProviderStatus.tsx

@@ -1,7 +1,8 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useCallback } from 'react';
 import Tooltip from '../ui/Tooltip';
 import Warning from '../icons/Warning';
 import { useTranslation } from 'react-i18next';
+import Spin from '../ui/Spin';
 
 type Status =
   | 'operational'
@@ -15,60 +16,46 @@ export interface Props {
   provider?: string;
 }
 
-const initProviderStatus = (
-  provider?: Props['provider'] | 'DEFAULT'
-): {
-  getStatus: () => Promise<Status>;
+interface ProviderConfig {
+  statusUrl: string;
   statusPage: string;
-} => {
-  switch (provider) {
-    case 'OpenAI':
-      return {
-        getStatus: async () => {
-          const res = await fetch(
-            'https://status.openai.com/api/v2/summary.json'
-          );
-          const data = await res.json();
-          const status = data.components.find(
-            (component: { name: string }) => component.name === 'API'
-          )?.status as Status;
-          return status ?? 'operational';
-        },
-        statusPage: 'https://status.openai.com/',
-      };
-    case 'Mistral':
-      return {
-        getStatus: async () => {
-          const res = await fetch(
-            'https://status.mistral-data.com/api/v2/summary.json'
-          );
-          const data = await res.json();
-          const status = data.components.find(
-            (component: { name: string }) => component.name === 'API'
-          )?.status as Status;
-          return status ?? 'operational';
-        },
-        statusPage: 'https://status.mistral-data.com/',
-      };
-    case 'Anthropic':
-      return {
-        getStatus: async () => {
-          const res = await fetch(
-            'https://status.anthropic.com/api/v2/summary.json'
-          );
-          const data = await res.json();
-          const status = data.components.find(
-            (component: { name: string }) => component.name === 'API'
-          )?.status as Status;
-          return status ?? 'operational';
-        },
-        statusPage: 'https://status.anthropic.com/',
-      };
-    default:
-      return {
-        getStatus: async () => 'operational',
-        statusPage: '',
-      };
+}
+
+const PROVIDER_CONFIGS: Record<string, ProviderConfig> = {
+  OpenAI: {
+    statusUrl: 'https://status.openai.com/api/v2/summary.json',
+    statusPage: 'https://status.openai.com/',
+  },
+  Mistral: {
+    statusUrl: 'https://status.mistral-data.com/api/v2/summary.json',
+    statusPage: 'https://status.mistral-data.com/',
+  },
+  Anthropic: {
+    statusUrl: 'https://status.anthropic.com/api/v2/summary.json', 
+    statusPage: 'https://status.anthropic.com/',
+  },
+};
+
+// Modified to handle fetch errors and use cross-fetch
+const fetchProviderStatus = async (statusUrl: string): Promise<Status> => {
+  try {
+    // Use cross-fetch instead of native fetch
+    const response = await fetch(statusUrl);
+
+    if (!response.ok) {
+      console.warn(`Status API returned ${response.status}`);
+      return 'operational'; // Fallback to operational on API errors
+    }
+
+    const data = await response.json();
+    const apiComponent = data.components?.find(
+      (component: { name: string }) => component.name === 'API'
+    );
+
+    return apiComponent?.status as Status ?? 'operational';
+  } catch (error) {
+    console.error('Error fetching provider status:', error);
+    return 'operational'; // Fallback to operational on network errors
   }
 };
 
@@ -78,19 +65,61 @@ const CompletionProviderStatus = ({
 }: Props) => {
   const { t } = useTranslation();
   const [status, setStatus] = useState<Status>(forceStatus ?? 'operational');
+  const [isLoading, setIsLoading] = useState(false);
+
+  const config = PROVIDER_CONFIGS[provider];
 
-  const providerStatus = initProviderStatus(provider);
+  const getStatus = useCallback(async () => {
+    if (!config) return 'operational';
+    return fetchProviderStatus(config.statusUrl);
+  }, [config]);
 
   useEffect(() => {
-    if (forceStatus) return;
+    let mounted = true;
+    const abortController = new AbortController();
 
-    providerStatus
-      .getStatus()
-      .then(status => setStatus(status))
-      .catch(console.log);
-  }, [forceStatus, providerStatus]);
+    const checkStatus = async () => {
+      if (forceStatus) return;
+
+      setIsLoading(true);
+      try {
+        const newStatus = await getStatus();
+        if (mounted) {
+          setStatus(newStatus);
+        }
+      } catch (error) {
+        console.error('Failed to check status:', error);
+        if (mounted) {
+          setStatus('operational'); // Fallback on error
+        }
+      } finally {
+        if (mounted) {
+          setIsLoading(false);
+        }
+      }
+    };
+
+    checkStatus();
+
+    return () => {
+      mounted = false;
+      abortController.abort();
+    };
+  }, [forceStatus, getStatus]);
+
+  if (isLoading) {
+    return (
+      <div className="memori--completion-provider-status--loading">
+        <Spin spinning={true} />
+      </div>
+    );
+  }
+
+  if (!status || status === 'operational') {
+    return null;
+  }
 
-  return status !== 'operational' ? (
+  return (
     <Tooltip
       className="memori--completion-provider-status--tooltip"
       align="topLeft"
@@ -101,10 +130,10 @@ const CompletionProviderStatus = ({
               provider: provider ?? t('completionProviderFallbackName'),
             })}
           </p>
-          {!!providerStatus.statusPage?.length && (
+          {config?.statusPage && (
             <p>
               <a
-                href={providerStatus.statusPage}
+                href={config.statusPage}
                 rel="noopener noreferrer"
                 target="_blank"
               >
@@ -117,7 +146,7 @@ const CompletionProviderStatus = ({
     >
       <Warning className="memori--completion-provider-status--icon" />
     </Tooltip>
-  ) : null;
+  );
 };
 
-export default CompletionProviderStatus;
+export default CompletionProviderStatus;