Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions packages/api/src/microsoft_teams/api/activities/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,17 @@
)
from .event import * # noqa: F403
from .event import EventActivity
from .handoff import HandoffActivity
from .install_update import * # noqa: F403
from .install_update import InstallUpdateActivity
from .invoke import * # noqa: F403
from .invoke import InvokeActivity
from .message import * # noqa: F403
from .message import MessageActivities
from .sent_activity import SentActivity
from .trace import TraceActivity
from .typing import TypingActivity, TypingActivityInput

Activity = Annotated[
Union[
HandoffActivity,
TraceActivity,
TypingActivity,
CommandActivity,
ConversationActivity,
Expand Down Expand Up @@ -61,13 +57,11 @@
"ConversationUpdateActivity",
"ConversationChannelData",
"EventActivity",
"HandoffActivity",
"InstallUpdateActivity",
"TypingActivity",
"TypingActivityInput",
"ConversationEventType",
"InvokeActivity",
"TraceActivity",
"ActivityParams",
"SentActivity",
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,17 @@

from pydantic import Field

from .command import CommandResultActivityInput, CommandSendActivityInput
from .conversation import ConversationUpdateActivityInput
from .handoff import HandoffActivityInput
from .message import (
MessageActivityInput,
MessageDeleteActivityInput,
MessageReactionActivityInput,
MessageUpdateActivityInput,
)
from .trace import TraceActivityInput
from .typing import TypingActivityInput

ActivityParams = Annotated[
Union[
# Simple activities
ConversationUpdateActivityInput,
HandoffActivityInput,
TraceActivityInput,
TypingActivityInput,
# Message activities
MessageActivityInput,
MessageDeleteActivityInput,
MessageReactionActivityInput,
MessageUpdateActivityInput,
# Command activities
CommandSendActivityInput,
CommandResultActivityInput,
TypingActivityInput,
],
Field(discriminator="type"),
]
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@

from pydantic import Field

from .command_result import CommandResultActivity, CommandResultActivityInput, CommandResultValue
from .command_send import CommandSendActivity, CommandSendActivityInput, CommandSendValue
from .command_result import CommandResultActivity, CommandResultValue
from .command_send import CommandSendActivity, CommandSendValue

CommandActivity = Annotated[Union[CommandSendActivity, CommandResultActivity], Field(discriminator="type")]

__all__ = [
"CommandResultValue",
"CommandResultActivity",
"CommandResultActivityInput",
"CommandSendValue",
"CommandSendActivity",
"CommandSendActivityInput",
"CommandActivity",
]
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from typing import Any, Literal, Optional

from ...models import ActivityBase, ActivityInputBase, CustomBaseModel
from ...models import ActivityBase, CustomBaseModel


class CommandResultValue(CustomBaseModel):
Expand Down Expand Up @@ -45,9 +45,3 @@ class CommandResultActivity(_CommandResultBase, ActivityBase):

name: str # pyright: ignore [reportGeneralTypeIssues, reportIncompatibleVariableOverride]
"""The name of the event."""


class CommandResultActivityInput(_CommandResultBase, ActivityInputBase):
"""Input model for creating command result activities with builder methods."""

pass
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from typing import Any, Literal, Optional

from ...models import ActivityBase, ActivityInputBase, CustomBaseModel
from ...models import ActivityBase, CustomBaseModel


class CommandSendValue(CustomBaseModel):
Expand Down Expand Up @@ -41,9 +41,3 @@ class CommandSendActivity(_CommandSendBase, ActivityBase):

name: str # pyright: ignore [reportGeneralTypeIssues, reportIncompatibleVariableOverride]
"""The name of the event."""


class CommandSendActivityInput(_CommandSendBase, ActivityInputBase):
"""Input model for creating command send activities with builder methods."""

pass
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
ConversationChannelData,
ConversationEventType,
ConversationUpdateActivity,
ConversationUpdateActivityInput,
)

ConversationActivity = ConversationUpdateActivity
Expand All @@ -16,6 +15,5 @@
"ConversationEventType",
"ConversationChannelData",
"ConversationUpdateActivity",
"ConversationUpdateActivityInput",
"ConversationActivity",
]
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from typing import List, Literal, Optional

from ...models import Account, ActivityBase, ActivityInputBase, ChannelData, CustomBaseModel
from ...models import Account, ActivityBase, ChannelData, CustomBaseModel

ConversationEventType = Literal[
"channelCreated",
Expand Down Expand Up @@ -53,9 +53,3 @@ class ConversationUpdateActivity(_ConversationUpdateBase, ActivityBase):

channel_data: ConversationChannelData # pyright: ignore [reportGeneralTypeIssues, reportIncompatibleVariableOverride]
"""Channel data with event type information."""


class ConversationUpdateActivityInput(_ConversationUpdateBase, ActivityInputBase):
"""Input model for creating conversation update activities with builder methods."""

pass
22 changes: 0 additions & 22 deletions packages/api/src/microsoft_teams/api/activities/handoff.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@
from pydantic import Field

from .message import MessageActivity, MessageActivityInput
from .message_delete import MessageDeleteActivity, MessageDeleteActivityInput, MessageDeleteChannelData
from .message_delete import MessageDeleteActivity, MessageDeleteChannelData
from .message_reaction import MessageReactionActivity, MessageReactionActivityInput
from .message_update import (
MessageEventType,
MessageUpdateActivity,
MessageUpdateActivityInput,
MessageUpdateChannelData,
)

Expand All @@ -32,12 +31,10 @@
"MessageActivity",
"MessageActivityInput",
"MessageDeleteActivity",
"MessageDeleteActivityInput",
"MessageDeleteChannelData",
"MessageReactionActivity",
"MessageReactionActivityInput",
"MessageUpdateActivity",
"MessageUpdateActivityInput",
"MessageUpdateChannelData",
"MessageEventType",
]
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from typing import Literal, Optional

from ...models import ActivityBase, ActivityInputBase, ChannelData
from ...models import ActivityBase, ChannelData
from ...models.custom_base_model import CustomBaseModel


Expand All @@ -30,7 +30,3 @@ class MessageDeleteActivity(_MessageDeleteBase, ActivityBase):

channel_data: MessageDeleteChannelData # pyright: ignore [reportGeneralTypeIssues]
"""Channel-specific data for message delete events."""


class MessageDeleteActivityInput(_MessageDeleteBase, ActivityInputBase):
"""Input model for creating message delete activities with builder methods."""
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"""

from datetime import datetime
from typing import Any, Literal, Optional, Self
from typing import Any, Literal, Optional

from ...models import ActivityBase, ActivityInputBase, ChannelData
from ...models import ActivityBase, ChannelData
from ...models.custom_base_model import CustomBaseModel

MessageEventType = Literal["undeleteMessage", "editMessage"]
Expand Down Expand Up @@ -54,59 +54,3 @@ class MessageUpdateActivity(_MessageUpdateBase, ActivityBase):

channel_data: MessageUpdateChannelData # pyright: ignore [reportGeneralTypeIssues]
"""Channel-specific data for message update events."""


class MessageUpdateActivityInput(_MessageUpdateBase, ActivityInputBase):
"""Input model for creating message update activities with builder methods."""

def with_text(self, text: str) -> Self:
"""
Set the text content of the message.

Args:
text: The text content to set

Returns:
Self for method chaining
"""
self.text = text
return self

def with_speak(self, speak: str) -> Self:
"""
Set the text to speak.

Args:
speak: The text to speak

Returns:
Self for method chaining
"""
self.speak = speak
return self

def with_summary(self, summary: str) -> Self:
"""
Set the summary text.

Args:
summary: The summary text to set

Returns:
Self for method chaining
"""
self.summary = summary
return self

def with_expiration(self, expiration: datetime) -> Self:
"""
Set the expiration time for the activity.

Args:
expiration: The expiration datetime to set

Returns:
Self for method chaining
"""
self.expiration = expiration
return self
52 changes: 0 additions & 52 deletions packages/api/src/microsoft_teams/api/activities/trace.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
ExecuteActionInvokeActivity,
FileConsentInvokeActivity,
HandoffActionInvokeActivity,
HandoffActivity,
InstalledActivity,
InvokeActivity,
MeetingEndEventActivity,
Expand Down Expand Up @@ -49,7 +48,6 @@
TabFetchInvokeActivity,
TabInvokeResponse,
TabSubmitInvokeActivity,
TraceActivity,
TypingActivity,
UninstalledActivity,
)
Expand Down Expand Up @@ -550,20 +548,6 @@ class ActivityConfig:
selector=lambda activity: isinstance(activity, TypingActivity),
output_model=None,
),
"trace": ActivityConfig(
name="trace",
method_name="on_trace",
input_model=TraceActivity,
selector=lambda activity: isinstance(activity, TraceActivity),
output_model=None,
),
"handoff": ActivityConfig(
name="handoff",
method_name="on_handoff",
input_model=HandoffActivity,
selector=lambda activity: isinstance(activity, HandoffActivity),
output_model=None,
),
# Generic Activity Handler (catch-all)
"activity": ActivityConfig(
name="activity",
Expand Down
Loading
Loading