Merge branch 'main' into staging/deploy

Author: scott-cohere

poetry.lock

@@ -53,6 +53,7 @@ python-docx = "^1.1.2"
 python-calamine = "^0.2.3"
 structlog = "^24.4.0"
 pyyaml = "^6.0.1"
+nltk = "^3.9.1"
 
 [tool.poetry.group.compass]
 optional = false

pyproject.toml

@@ -62,27 +62,27 @@ async def get_users(
         db_user = user_crud.get_user_by_user_name(session, display_name)
         if not db_user:
             return ListUserResponse(
-                totalResults=0,
-                startIndex=start_index,
-                itemsPerPage=count,
-                Resources=[],
+                total_results=0,
+                start_index=start_index,
+                items_per_page=count,
+                resources=[],
             )
         return ListUserResponse(
-            totalResults=1,
-            startIndex=start_index,
-            itemsPerPage=count,
-            Resources=[User.from_db_user(db_user)],
+            total_results=1,
+            start_index=start_index,
+            items_per_page=count,
+            resources=[User.from_db_user(db_user)],
         )
 
     db_users = user_crud.get_external_users(
         session, offset=start_index - 1, limit=count
     )
     users = [User.from_db_user(db_user) for db_user in db_users]
     return ListUserResponse(
-        totalResults=len(users),
-        startIndex=start_index,
-        itemsPerPage=count,
-        Resources=users,
+        total_results=len(users),
+        start_index=start_index,
+        items_per_page=count,
+        resources=users,
     )
 
 
@@ -105,8 +105,8 @@ async def create_user(user: CreateUser, session: DBSessionDep):
     if not db_user:
         db_user = DBUser()
 
-    db_user.user_name = user.userName
-    db_user.fullname = f"{user.name.givenName} {user.name.familyName}"
+    db_user.user_name = user.user_name
+    db_user.fullname = f"{user.name.given_name} {user.name.family_name}"
     db_user.email = _get_email_from_scim_user(user)
     db_user.active = user.active
     db_user.external_id = user.externalId
@@ -128,8 +128,8 @@ async def update_user(
         logger.error(event="[SCIM] user not found", user_id=user_id)
         raise SCIMException(status_code=404, detail="User not found")
 
-    db_user.user_name = user.userName
-    db_user.fullname = f"{user.name.givenName} {user.name.familyName}"
+    db_user.user_name = user.user_name
+    db_user.fullname = f"{user.name.given_name} {user.name.family_name}"
     db_user.active = user.active
     email_update = _get_email_from_scim_user(user)
     db_user.email = email_update
@@ -176,25 +176,25 @@ async def get_groups(
         db_group = group_crud.get_group_by_name(session, display_name)
         if not db_group:
             return ListGroupResponse(
-                totalResults=0,
-                startIndex=start_index,
-                itemsPerPage=count,
-                Resources=[],
+                total_results=0,
+                start_index=start_index,
+                items_per_page=count,
+                resources=[],
             )
         return ListGroupResponse(
-            totalResults=1,
-            startIndex=start_index,
-            itemsPerPage=count,
-            Resources=[Group.from_db_group(db_group)],
+            total_results=1,
+            start_index=start_index,
+            items_per_page=count,
+            resources=[Group.from_db_group(db_group)],
         )
 
     db_groups = group_crud.get_groups(session, offset=start_index - 1, limit=count)
     groups = [Group.from_db_group(db_group) for db_group in db_groups]
     return ListGroupResponse(
-        totalResults=len(groups),
-        startIndex=start_index,
-        itemsPerPage=count,
-        Resources=groups,
+        total_results=len(groups),
+        start_index=start_index,
+        items_per_page=count,
+        resources=groups,
     )
 
 
@@ -213,11 +213,11 @@ async def get_group(
 
 @router.post("/Groups", status_code=201)
 async def create_group(group: CreateGroup, session: DBSessionDep):
-    db_group = group_crud.get_group_by_name(session, group.displayName)
+    db_group = group_crud.get_group_by_name(session, group.display_name)
     if not db_group:
         db_group = DBGroup()
 
-    db_group.display_name = group.displayName
+    db_group.display_name = group.display_name
 
     db_group = group_crud.create_group(session, db_group)
     return Group.from_db_group(db_group)

src/backend/routers/scim.py

@@ -1,45 +1,54 @@
 from typing import ClassVar, Dict, List, Optional, Union
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict, Field
+from pydantic.alias_generators import to_camel
 
 from backend.database_models import Group as DBGroup
 from backend.database_models import User as DBUser
 
 
-class Meta(BaseModel):
-    resourceType: str
+class BaseSchema(BaseModel):
+    model_config = ConfigDict(
+        alias_generator=to_camel,
+        populate_by_name=True,
+        from_attributes=True,
+    )
+
+
+class Meta(BaseSchema):
+    resource_type: str
     created: str
-    lastModified: str
+    last_modified: str
 
 
-class Name(BaseModel):
-    givenName: str
-    familyName: str
+class Name(BaseSchema):
+    given_name: str
+    family_name: str
 
 
-class BaseUser(BaseModel):
-    userName: Optional[str]
+class BaseUser(BaseSchema):
+    user_name: Optional[str]
     active: Optional[bool]
 
     schemas: list[str]
 
 
-class GroupMember(BaseModel):
+class GroupMember(BaseSchema):
     value: str
     display: str
 
 
-class BaseGroup(BaseModel):
+class BaseGroup(BaseSchema):
     schemas: list[str]
     members: list[GroupMember]
-    displayName: str
+    display_name: str
 
 
 class CreateGroup(BaseGroup):
     pass
 
 
-class Email(BaseModel):
+class Email(BaseSchema):
     primary: bool
     value: Optional[str] = None
     type: str
@@ -56,37 +65,37 @@ class UpdateUser(BaseUser):
     name: Name
 
 
-class Operation(BaseModel):
+class Operation(BaseSchema):
     op: str
     value: dict[str, bool]
 
 
-class GroupOperation(BaseModel):
+class GroupOperation(BaseSchema):
     op: str
     path: Optional[str] = None
     value: Union[Dict[str, str], list[Dict[str, str]]]
 
 
-class PatchUser(BaseModel):
+class PatchUser(BaseSchema):
     schemas: list[str]
     Operations: list[Operation]
 
 
-class PatchGroup(BaseModel):
+class PatchGroup(BaseSchema):
     schemas: list[str]
     Operations: list[GroupOperation]
 
 
 class Group(BaseGroup):
     id: str
-    displayName: str
+    display_name: str
     meta: Meta
 
     @staticmethod
     def from_db_group(db_group: DBGroup) -> "Group":
         return Group(
             id=db_group.id,
-            displayName=db_group.display_name,
+            display_name=db_group.display_name,
             members=[
                 GroupMember(value=ua.user_id, display=ua.display)
                 for ua in db_group.user_associations
@@ -102,16 +111,16 @@ def from_db_group(db_group: DBGroup) -> "Group":
 
 class User(BaseUser):
     id: str
-    externalId: str
+    external_id: str
     meta: Meta
 
     @staticmethod
     def from_db_user(db_user: DBUser) -> "User":
         return User(
             id=db_user.id,
-            userName=db_user.user_name,
+            user_name=db_user.user_name,
             active=db_user.active,
-            externalId=db_user.external_id,
+            external_id=db_user.external_id,
             meta=Meta(
                 resourceType="User",
                 created=db_user.created_at.isoformat(),
@@ -121,18 +130,18 @@ def from_db_user(db_user: DBUser) -> "User":
         )
 
 
-class BaseListResponse(BaseModel):
+class BaseListResponse(BaseSchema):
     schemas: ClassVar[list[str]] = [
         "urn:ietf:params:scim:api:messages:2.0:ListResponse"
     ]
-    totalResults: int
-    startIndex: int
-    itemsPerPage: int
+    total_results: int
+    start_index: int
+    items_per_page: int
 
 
 class ListUserResponse(BaseListResponse):
-    Resources: list[User]
+    resources: list[User] = Field(alias='Resources')
 
 
 class ListGroupResponse(BaseListResponse):
-    Resources: list[Group]
+    resources: list[Group] = Field(alias='Resources')

src/backend/schemas/scim.py

@@ -40,7 +40,7 @@
     "@types/mdast": "^4.0.3",
     "@types/react": "^18.2.18",
     "autoprefixer": "^10.4.7",
-    "axios": "^1.6.7",
+    "axios": "^1.7.4",
     "classnames": "^2.5.1",
     "cross-fetch": "^3.1.8",
     "csstype": "^3.0.10",
@@ -122,4 +122,4 @@
     "storybook": "^8.2.6",
     "vitest": "^2.0.5"
   }
-}
+}

src/interfaces/assistants_web/package-lock.json

@@ -11,7 +11,7 @@ import { useConversation } from '@/hooks/conversation';
 import { useListTools } from '@/hooks/tools';
 import { useCitationsStore, useConversationStore, useParamsStore } from '@/stores';
 import { OutputFiles } from '@/stores/slices/citationsSlice';
-import { createStartEndKey, mapHistoryToMessages } from '@/utils';
+import { createStartEndKey, fixCitationsLeadingMarkdown, mapHistoryToMessages } from '@/utils';
 import { parsePythonInterpreterToolFields } from '@/utils/tools';
 
 const Chat: React.FC<{ agentId?: string; conversationId?: string }> = ({
@@ -85,7 +85,7 @@ const Chat: React.FC<{ agentId?: string; conversationId?: string }> = ({
           }
         }
       });
-      message.citations?.forEach((citation) => {
+      fixCitationsLeadingMarkdown(message.citations, message.text)?.forEach((citation) => {
         const startEndKey = createStartEndKey(citation.start ?? 0, citation.end ?? 0);
         const documents = citation.document_ids?.map((id) => documentsMap[id]) ?? [];
         addCitation(message.generation_id ?? '', startEndKey, documents);

src/interfaces/assistants_web/package.json

@@ -0,0 +1,20 @@
+import { AgentPublic } from '@/cohere-client';
+import { CoralLogo, Text } from '@/components/Shared';
+import { useBrandedColors } from '@/hooks/brandedColors';
+import { cn } from '@/utils';
+
+export const AgentLogo = ({ agent }: { agent: AgentPublic }) => {
+  const isBaseAgent = !agent.id;
+  const { bg, contrastText, contrastFill } = useBrandedColors(agent.id);
+
+  return (
+    <div className={cn('flex size-5 flex-shrink-0 items-center justify-center rounded', bg)}>
+      {isBaseAgent && <CoralLogo className={cn(contrastFill, 'size-3')} />}
+      {!isBaseAgent && (
+        <Text className={cn('uppercase', contrastText)} styleAs="p-sm">
+          {agent.name[0]}
+        </Text>
+      )}
+    </div>
+  );
+};