8000 Merge branch 'main' into teamsOverload · ericmicrofocus/botbuilder-python@9f286e6 · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 9f286e6

Browse files
axelsrzaxelsrz
authored
Merge branch 'main' into teamsOverload
2 parents 63fd173 + 80438ef commit 9f286e6

File tree

2 files changed

+47
-5
lines changed

2 files changed

+47
-5
lines changed

‎libraries/botbuilder-schema/botbuilder/schema/teams/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
from ._models_py3 import TeamsMeetingInfo
6262
from ._models_py3 import TeamsMeetingParticipant
6363
from ._models_py3 import MeetingParticipantInfo
64+
from ._models_py3 import CacheInfo
6465

6566
__all__ = [
6667
"AppBasedLinkQuery",
@@ -123,4 +124,5 @@
123124
"TeamsMeetingInfo",
124125
"TeamsMeetingParticipant",
125126
"MeetingParticipantInfo",
127+
"CacheInfo",
126128
]

‎libraries/botbuilder-schema/botbuilder/schema/teams/_models_py3.py

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,28 @@ def __init__(self, *, id: str = None, name: str = None, **kwargs) -> None:
7171
self.name = name
7272

7373

74+
class CacheInfo(Model):
75+
"""A cache info object which notifies Teams how long an object should be cached for.
76+
77+
:param cache_type: Type of Cache Info
78+
:type cache_type: str
79+
:param cache_duration: Duration of the Cached Info.
80+
:type cache_duration: int
81+
"""
82+
83+
_attribute_map = {
84+
"cache_type": {"key": "cacheType", "type": "str"},
85+
"cache_duration": {"key": "cacheDuration", "type": "int"},
86+
}
87+
88+
def __init__(
89+
self, *, cache_type: str = None, cache_duration: int = None, **kwargs
90+
) -> None:
91+
super(CacheInfo, self).__init__(**kwargs)
92+
self.cache_type = cache_type
93+
self.cache_duration = cache_duration
94+
95+
7496
class ConversationList(Model):
7597
"""List of channels under a team.
7698
@@ -699,6 +721,8 @@ class MessagingExtensionActionResponse(Model):
699721
:param compose_extension:
700722
:type compose_extension:
701723
~botframework.connector.teams.models.MessagingExtensionResult
724+
:param cache_info: CacheInfo for this MessagingExtensionActionResponse.
725+
:type cache_info: ~botframework.connector.teams.models.CacheInfo
702726
"""
703727

704728
_attribute_map = {
@@ -707,12 +731,21 @@ class MessagingExtensionActionResponse(Model):
707731
"key": "composeExtension",
708732
"type": "MessagingExtensionResult",
709733
},
734+
"cache_info": {"key": "cacheInfo", "type": "CacheInfo"},
710735
}
711736

712-
def __init__(self, *, task=None, compose_extension=None, **kwargs) -> None:
737+
def __init__(
738+
self,
739+
*,
740+
task=None,
741+
compose_extension=None,
742+
cache_info: CacheInfo = None,
743+
**kwargs
744+
) -> None:
713745
super(MessagingExtensionActionResponse, self).__init__(**kwargs)
714746
self.task = task
715747
self.compose_extension = compose_extension
748+
self.cache_info = cache_info
716749

717750

718751
class MessagingExtensionAttachment(Attachment):
@@ -849,20 +882,23 @@ class MessagingExtensionResponse(Model):
849882
"""Messaging extension response.
850883
851884
:param compose_extension:
852-
:type compose_extension:
853-
~botframework.connector.teams.models.MessagingExtensionResult
885+
:type compose_extension: ~botframework.connector.teams.models.MessagingExtensionResult
886+
:param cache_info: CacheInfo for this MessagingExtensionResponse.
887+
:type cache_info: ~botframework.connector.teams.models.CacheInfo
854888
"""
855889

856890
_attribute_map = {
857891
"compose_extension": {
858892
"key": "composeExtension",
859893
"type": "MessagingExtensionResult",
860894
},
895+
"cache_info": {"key": "cacheInfo", "type": CacheInfo},
861896
}
862897

863-
def __init__(self, *, compose_extension=None, **kwargs) -> None:
898+
def __init__(self, *, compose_extension=None, cache_info=None, **kwargs) -> None:
864899
super(MessagingExtensionResponse, self).__init__(**kwargs)
865900
self.compose_extension = compose_extension
901+
self.cache_info = cache_info
866902

867903

868904
class MessagingExtensionResult(Model):
@@ -1671,15 +1707,19 @@ class TaskModuleResponse(Model):
16711707
16721708
:param task: The JSON for the Adaptive card to appear in the task module.
16731709
:type task: ~botframework.connector.teams.models.TaskModuleResponseBase
1710+
:param cache_info: CacheInfo for this TaskModuleResponse.
1711+
:type cache_info: ~botframework.connector.teams.models.CacheInfo
16741712
"""
16751713

16761714
_attribute_map = {
16771715
"task": {"key": "task", "type": "TaskModuleResponseBase"},
1716+
"cache_info": {"key": "cacheInfo", "type": "CacheInfo"},
16781717
}
16791718

1680-
def __init__(self, *, task=None, **kwargs) -> None:
1719+
def __init__(self, *, task=None, cache_info=None, **kwargs) -> None:
16811720
super(TaskModuleResponse, self).__init__(**kwargs)
16821721
self.task = task
1722+
self.cache_info = cache_info
16831723

16841724

16851725
class TaskModuleTaskInfo(Model):

0 commit comments

Comments
 (0)
0