fix bug

microsoft · Jul 2, 2024 · e9340ab · e9340ab
1 parent 68b2887
commit e9340ab
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 29 deletions.
diff --git a/python/packages/ai/teams/ai/ai.py b/python/packages/ai/teams/ai/ai.py
@@ -19,7 +19,7 @@
 from ..utils.citations import format_citations_response, get_used_citations
 from .actions import ActionEntry, ActionHandler, ActionTurnContext, ActionTypes
 from .ai_options import AIOptions
-from .citations.citations import Appearance, ClientCitation
+from .citations.citations import Appearance, ClientCitation, AIEntity
 from .moderators.moderator import Moderator
 from .planners.plan import Plan, PredictedDoCommand, PredictedSayCommand
 from .planners.planner import Planner
@@ -308,25 +308,18 @@ async def _on_say_command(
 
         if is_teams_channel:
             channel_data["feedbackLoopEnabled"] = self._options.enable_feedback_loop
-
+      
         await context.send_activity(
             Activity(
                 type=ActivityTypes.message,
                 text=content_text,
                 channel_data=channel_data,
                 entities=[
-                    {
-                        "type": "https://schema.org/Message",
-                        "@type": "Message",
-                        "@context": "https://schema.org",
-                        "@id": "",
-                        "additionalType": ["AIGeneratedContent"],
-                        **(
-                            {"citation": [citation.__dict__ for citation in referenced_citations]}
-                            if referenced_citations
-                            else {}
-                        ),
-                    }
+                    AIEntity(
+                        citation = [citation for citation in referenced_citations] if referenced_citations else [],
+                        additional_type = ["AIGeneratedContent"]
+                    ),
+
                 ],
             )
         )

diff --git a/python/packages/ai/teams/ai/citations/__init__.py b/python/packages/ai/teams/ai/citations/__init__.py
@@ -3,6 +3,6 @@
 Licensed under the MIT License.
 """
 
-from .citations import Appearance, ClientCitation, Pattern, SensitivityUsageInfo
+from .citations import Appearance, ClientCitation, Pattern, SensitivityUsageInfo, AIEntity
 
-__all__ = ["ClientCitation", "Appearance", "SensitivityUsageInfo", "Pattern"]
+__all__ = ["ClientCitation", "Appearance", "SensitivityUsageInfo", "Pattern", "AIEntity"]
diff --git a/python/packages/ai/teams/ai/citations/citations.py b/python/packages/ai/teams/ai/citations/citations.py
@@ -7,9 +7,27 @@
 
 from dataclasses import dataclass, field
 from typing import Optional
-
+from botbuilder.schema import Entity
 from msrest.serialization import Model
 
+@dataclass
+class AIEntity(Entity):
+
+    _attribute_map = {
+        "type": { "key": "type", "type": "str" },
+        "type_": { "key": "@type", "type": "str" },
+        "context_": { "key": "@context", "type": "str" },
+        "id_": { "key": "@id", "type": "str" },
+        "additional_type": { "key": "additionalType", "type": "[str]"},
+        "citation": { "key": "citation", "type": "[ClientCitation]"},
+    }
+
+    additional_type: Optional[list[str]]
+    citation: Optional[list[ClientCitation]]
+    type: str = "https://schema.org/Message"
+    type_: str = "Message"
+    context_: str = "https://schema.org"
+    id_: str = ""
 
 @dataclass
 class ClientCitation(Model):
@@ -24,11 +42,13 @@ class ClientCitation(Model):
 
     _attribute_map = {
         "type_": {"key": "@type", "type": "str"},
+        "position": {"key": "position", "type": "str"},
+        "appearance": {"key": "appearance", "type": "Appearance"},
     }
 
-    type_: str = field(default="Claim", metadata={"alias": "@type"}, init=False, repr=False)
     position: str
     appearance: Appearance
+    type_: str = field(default="Claim", metadata={"alias": "@type"}, init=False, repr=False)
 
 
 @dataclass
@@ -50,21 +70,25 @@ class Appearance(Model):
 
     _attribute_map = {
         "type_": {"key": "@type", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "abstract": {"key": "abstract", "type": "str"},
         "usage_info": {"key": "usageInfo", "type": "SensitivityUsageInfo"},
+        "keywords": {"key": "keywords", "type": "[str]"},
+        "text": {"key": "text", "type": "str"},
+        "url": {"key": "url", "type": "str"},
         "encoding_format": {"key": "encodingFormat", "type": "str"},
+        "image": {"key": "image", "type": "str"},
     }
 
     name: str
     abstract: str
-    usage_info: Optional[SensitivityUsageInfo] = field(
-        default=None, metadata={"alias": "usageInfo"}, init=False, repr=False
-    )
-    keywords: Optional[list[str]] = None
+    keywords: Optional[list[str]] = field(default=None)
+    text: Optional[str] = field(default=None)
+    url: Optional[str] = field(default=None)
+    image: Optional[str] = field(default=None)
+    encoding_format: Optional[str] = field(default=None)
+    usage_info: Optional[SensitivityUsageInfo] = field(default=None)
     type_: str = field(default="DigitalDocument", metadata={"alias": "@type"})
-    text: Optional[str] = ""
-    url: str = ""
-    encoding_format: Optional[str] = "text/html"
-    image: Optional[str] = ""
 
 
 @dataclass
@@ -80,12 +104,17 @@ class SensitivityUsageInfo(Model):
 
     _attribute_map = {
         "type_": {"key": "@type", "type": "str"},
+        "name": {"key": "name", "type": "str"},
+        "description": {"key": "description", "type": "str"},
+        "position": {"key": "position", "type": "int"},
+        "pattern": {"key": "pattern", "type": "Pattern"},
+
     }
 
     name: str
-    description: Optional[str]
-    position: Optional[int]
-    pattern: Optional[Pattern]
+    description: Optional[str] = field(default=None)
+    position: Optional[int] = field(default=None)
+    pattern: Optional[Pattern] = field(default=None)
     type_: str = field(default="https://schema.org/Message", metadata={"alias": "@type"})
 
 
@@ -103,6 +132,7 @@ class Pattern(Model):
     _attribute_map = {
         "type_": {"key": "@type", "type": "str"},
         "in_defined_term_set": {"key": "inDefinedTermSet", "type": "str"},
+        "name": {"key": "name", "type": "str"},
         "term_code": {"key": "termCode", "type": "str"},
     }