Merge pull request #469 from it-at-m/deleted-communityassistants-in-db

Deleted communityassistants in db

Author: pilitz

mucgpt-assistant-service/src/api/api_models.py

@@ -494,7 +494,7 @@ class SubscriptionResponse(BaseModel):
         description="Unique identifier for the assistant (UUID v4)",
         example="123e4567-e89b-12d3-a456-426614174000",
     )
-    name: str = Field(
+    title: str = Field(
         ...,
         description="The name/title of the assistant",
         example="Technical Support Assistant",
@@ -511,7 +511,8 @@ class SubscriptionResponse(BaseModel):
         json_schema_extra={
             "example": {
                 "id": "123e4567-e89b-12d3-a456-426614174000",
-                "name": "Technical Support Assistant",
+                "title": "Technical Support Assistant",
+                "description": "An AI assistant specialized in providing technical support for software issues",
             }
         },
     )

mucgpt-assistant-service/src/api/routers/users_router.py

@@ -230,7 +230,7 @@ async def get_user_subscriptions(
         if latest_version:
             response = SubscriptionResponse(
                 id=assistant_id,
-                name=getattr(latest_version, "name", ""),
+                title=getattr(latest_version, "name", ""),
                 description=getattr(latest_version, "description", ""),
             )
             response_list.append(response)

mucgpt-assistant-service/src/database/assistant_repo.py

@@ -1,7 +1,7 @@
 from __future__ import annotations  # Enable forward references in annotations
 
 import uuid
-from datetime import datetime, timezone
+from datetime import datetime
 
 from sqlalchemy import delete, func, insert, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -428,7 +428,7 @@ async def remove_subscription(self, assistant_id: str, user_id: str) -> bool:
                     .values(
                         subscriptions_count=Assistant.subscriptions_count
                         - rows_deleted,
-                        updated_at=datetime.now(timezone.utc),
+                        updated_at=datetime.now(),
                     )
                 )
 

mucgpt-assistant-service/tests/integration/test_users_router.py

@@ -523,7 +523,7 @@ def test_subscribe_to_assistant_success(test_client):
     # Validate using SubscriptionResponse model
     subscription_response = SubscriptionResponse.model_validate(subscriptions[0])
     assert subscription_response.id == assistant_id
-    assert subscription_response.name == "Subscribe Test Assistant"
+    assert subscription_response.title == "Subscribe Test Assistant"
 
 
 @pytest.mark.integration
@@ -630,7 +630,7 @@ def test_unsubscribe_from_assistant_success(test_client):
     # Validate using SubscriptionResponse model
     subscription_response = SubscriptionResponse.model_validate(subscriptions_before[0])
     assert subscription_response.id == assistant_id
-    assert subscription_response.name == "Unsubscribe Test Assistant"
+    assert subscription_response.title == "Unsubscribe Test Assistant"
 
     # Unsubscribe from the assistant
     unsubscribe_response = test_client.delete(
@@ -721,7 +721,7 @@ def test_get_user_subscriptions_multiple(test_client):
     assert len(subscriptions) == 2
 
     # Check that we have the correct assistants with simplified structure
-    subscription_names = [sub["name"] for sub in subscriptions]
+    subscription_names = [sub["title"] for sub in subscriptions]
     assert "Subscription Assistant 1" in subscription_names
     assert "Subscription Assistant 2" not in subscription_names
     assert (
@@ -731,14 +731,14 @@ def test_get_user_subscriptions_multiple(test_client):
         # Parse with SubscriptionResponse model to ensure structure is correct
         subscription_response = SubscriptionResponse.model_validate(subscription)
         assert subscription_response.id in [assistant_ids[0], assistant_ids[2]]
-        assert subscription_response.name in [
+        assert subscription_response.title in [
             "Subscription Assistant 1",
             "Subscription Assistant 3",
         ]
 
         # Also validate that only expected fields are present
         assert "id" in subscription
-        assert "name" in subscription
+        assert "title" in subscription
         # Should NOT have complex fields like latest_version
         assert "latest_version" not in subscription
         assert "created_at" not in subscription
@@ -776,7 +776,7 @@ async def test_subscription_lifecycle(test_client, test_db_session):
     # Validate using SubscriptionResponse model
     subscription_response = SubscriptionResponse.model_validate(after_subscribe[0])
     assert subscription_response.id == assistant_id
-    assert subscription_response.name == "Lifecycle Test Assistant"
+    assert subscription_response.title == "Lifecycle Test Assistant"
 
     # Also validate that only expected fields are present
     assert "latest_version" not in after_subscribe[0]
@@ -1161,7 +1161,7 @@ async def test_hierarchical_access_subscription_vs_ownership(
     # Verify subscription was created
     subscriptions = test_client.get("/user/subscriptions", headers=headers).json()
     assert len(subscriptions) == 1
-    assert subscriptions[0]["name"] == "IT Accessible Assistant"
+    assert subscriptions[0]["title"] == "IT Accessible Assistant"
 
 
 @pytest.mark.integration

mucgpt-frontend/src/api/assistant-client.ts

@@ -1,12 +1,12 @@
 import { getConfig, handleApiRequest, postConfig, deleteConfig } from "./fetch-utils";
-import { AssistantCreateInput, AssistantCreateResponse, AssistantResponse, AssistantUpdateInput, Assistant } from "./models";
+import { AssistantCreateInput, AssistantCreateResponse, AssistantResponse, AssistantUpdateInput, Assistant, CommunityAssistant } from "./models";
 
 /**
  * Get all assistants the user is subscribed to (ID and name only).
  * @returns Array of SubscriptionResponse
  */
 
-export async function getUserSubscriptionsApi(): Promise<{ id: string; name: string; description: string }[]> {
+export async function getUserSubscriptionsApi(): Promise<CommunityAssistant[]> {
     return handleApiRequest(() => fetch("/api/user/subscriptions", getConfig()), "Failed to get user subscriptions");
 } /**
  * Unsubscribe the current user from an assistant.

mucgpt-frontend/src/api/models.ts

@@ -227,3 +227,9 @@ export interface User {
     user_roles?: string[];
     authorities?: string[];
 }
+
+export type CommunityAssistant = {
+    title: string;
+    description: string;
+    id: string;
+};

mucgpt-frontend/src/components/AssistantsettingsDrawer/AssistantsettingsDrawer.module.css

@@ -285,3 +285,17 @@
 .newChatHeaderContent:hover {
     background-color: var(--colorNeutralBackground1Hover);
 }
+
+.deletedWarning {
+    padding: var(--spacingVerticalM) var(--spacingHorizontalM);
+    background-color: var(--colorPaletteRedBackground1);
+    border: 1px solid var(--colorPaletteRedBorder1);
+    border-radius: var(--borderRadiusMedium);
+    color: var(--colorPaletteRedForeground1);
+    font-size: var(--fontSizeBase300);
+    font-weight: var(--fontWeightSemibold);
+    margin: var(--spacingVerticalM) var(--spacingHorizontalM);
+    display: flex;
+    align-items: center;
+    gap: var(--spacingHorizontalS);
+}

mucgpt-frontend/src/components/AssistantsettingsDrawer/AssistantsettingsDrawer.tsx

@@ -29,7 +29,7 @@ import { AssistantStorageService } from "../../service/assistantstorage";
 import { ASSISTANT_STORE } from "../../constants";
 import { Collapse } from "@fluentui/react-motion-components-preview";
 import { deleteCommunityAssistantApi } from "../../api/assistant-client";
-import { AssistantStrategy } from "../../pages/assistant/AssistantStrategy";
+import { AssistantStrategy, DeletedCommunityAssistantStrategy } from "../../pages/assistant/AssistantStrategy";
 
 interface Props {
     assistant: Assistant;
@@ -203,18 +203,23 @@ export const AssistantsettingsDrawer = ({
             <div className={styles.titleSection}>
                 <h3 className={styles.assistantTitle}>{assistant.title}</h3>
             </div>
+            {strategy instanceof DeletedCommunityAssistantStrategy && (
+                <div className={styles.deletedWarning}>
+                    {t("components.assistantsettingsdrawer.deleted_warning")}
+                </div>
+            )}
             <div
                 className={styles.actionsHeader}
                 role="heading"
                 aria-level={4}
-                onClick={clearChat}
+                onClick={clearChatDisabled ? undefined : clearChat}
                 aria-disabled={clearChatDisabled}
                 tabIndex={0}
-                onKeyDown={e => e.key === "Enter" && clearChat()}
+                onKeyDown={clearChatDisabled ? undefined : e => e.key === "Enter" && clearChat()}
             >
                 <div className={styles.newChatHeaderContent}>
                     <ChatAdd24Regular className={styles.actionsIcon} aria-hidden="true" />
-                    <span>New Chat</span>
+                    <span>{t("common.clear_chat")}</span>
                 </div>
             </div>
 
@@ -237,6 +242,7 @@ export const AssistantsettingsDrawer = ({
                     icon={isOwner ? <Edit24Regular /> : <ChatSettings24Regular />}
                     onClick={toggleEditDialog}
                     className={styles.actionButton}
+                    disabled={strategy instanceof DeletedCommunityAssistantStrategy}
                 >
                     {isOwner ? t("components.assistantsettingsdrawer.edit") : t("components.assistantsettingsdrawer.show_configutations")}
                 </Button>

mucgpt-frontend/src/components/CommunityAssistantDialog/CommunityAssistantDialog.tsx

@@ -2,9 +2,9 @@ import { Button, Dialog, DialogBody, DialogContent, DialogSurface, DialogTitle,
 import { Dismiss24Regular } from "@fluentui/react-icons";
 import { useTranslation } from "react-i18next";
 import { useCallback, useEffect, useState } from "react";
-import { Assistant, AssistantResponse } from "../../api";
-import { AssistantStorageService } from "../../service/assistantstorage";
-import { ASSISTANT_STORE } from "../../constants";
+import { Assistant, AssistantResponse, CommunityAssistant } from "../../api";
+import { CommunityAssistantStorageService } from "../../service/communityassistantstorage";
+import { COMMUNITY_ASSISTANT_STORE } from "../../constants";
 
 // Components
 import { AssistantSearchSection } from "./components/AssistantSearchSection";
@@ -72,7 +72,7 @@ export const CommunityAssistantsDialog = ({
     const [selectedAssistant, setSelectedAssistant] = useState<Assistant>(createMockAssistant());
     const [showAssistantDialog, setShowAssistantDialog] = useState<boolean>(false);
 
-    const communityAssistantStorageService = new AssistantStorageService(ASSISTANT_STORE);
+    const communityAssistantStorageService = new CommunityAssistantStorageService(COMMUNITY_ASSISTANT_STORE);
 
     // sort Functions
     const compareByTitle = (a: AssistantWithMetadata, b: AssistantWithMetadata): number => {
@@ -240,6 +240,12 @@ export const CommunityAssistantsDialog = ({
 
             try {
                 await subscribeToAssistantApi(assistant.id);
+                const community_config: CommunityAssistant = {
+                    id: assistant.id,
+                    title: assistant.title,
+                    description: assistant.description,
+                }
+                await communityAssistantStorageService.createAssistantConfig(community_config);
                 showSuccess(
                     t("components.community_assistants.subscribe_success_title", { title: assistant.title }),
                     t("components.community_assistants.subscribe_success_message")
@@ -274,9 +280,6 @@ export const CommunityAssistantsDialog = ({
             // Load full assistant details
             const fullAssistant = await loadAssistantDetails(assistant.id);
             setSelectedAssistant(fullAssistant);
-
-            // Update storage service
-            communityAssistantStorageService.getAssistantConfig(assistant.id);
         } catch (error) {
             // Error is handled in the hook
             console.error("Failed to load assistant details:", error);

mucgpt-frontend/src/constants.ts

@@ -42,6 +42,12 @@ export const CHAT_STORE: IndexedDBStorage = {
     db_version: 3
 };
 
+export const COMMUNITY_ASSISTANT_STORE: IndexedDBStorage = {
+    db_name: "MUCGPT-COMMUNITY-ASSISTANTS",
+    objectStore_name: "assistants",
+    db_version: 1
+};
+
 // Create Assistant examples
 export const CREATE_ASSISTANT_EXAMPLE_1 = "Englischübersetzer: Der Assistent übersetzt den eingegebenen Text ins Englische.";
 export const CREATE_ASSISTANT_EXAMPLE_2 =