Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Axsuarez/properties in conversation account #296

Merged
merged 9 commits into from
Aug 13, 2019
Merged

Axsuarez/properties in conversation account #296

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9c78829
Blob Storage read done, missing write and delete
axelsrz Aug 12, 2019
bd90129
Blob storage implemented
axelsrz Aug 12, 2019
53e4597
BlobStorage tested
axelsrz Aug 12, 2019
8036a51
Merge branch 'master' into axsuarez/blob-storage
axelsrz Aug 12, 2019
751d663
renamed blob tests
axelsrz Aug 12, 2019
838918e
Merge branch 'axsuarez/blob-storage' of https://github.com/Microsoft/…
axelsrz Aug 12, 2019
5a92572
Merge branch 'master' of https://github.com/Microsoft/botbuilder-pyth…
axelsrz Aug 13, 2019
2b15611
Properties in ConversationAccount
axelsrz Aug 13, 2019
010f794
black fix
axelsrz Aug 13, 2019
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
5 changes: 5 additions & 0 deletions libraries/botbuilder-schema/botbuilder/schema/_models_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,8 @@ class ConversationAccount(Model):
:type role: str or ~botframework.connector.models.RoleTypes
:param tenant_id: This conversation's tenant ID
:type tenant_id: str
:param properties: This conversation's properties
:type properties: object
"""

_attribute_map = {
Expand All @@ -773,6 +775,7 @@ class ConversationAccount(Model):
"aad_object_id": {"key": "aadObjectId", "type": "str"},
"role": {"key": "role", "type": "str"},
"tenant_id": {"key": "tenantID", "type": "str"},
"properties": {"key": "properties", "type": "object"}
}

def __init__(
Expand All @@ -785,6 +788,7 @@ def __init__(
aad_object_id: str = None,
role=None,
tenant_id=None,
properties=None,
**kwargs
) -> None:
super(ConversationAccount, self).__init__(**kwargs)
Expand All @@ -795,6 +799,7 @@ def __init__(
self.aad_object_id = aad_object_id
self.role = role
self.tenant_id = tenant_id
self.properties = properties


class ConversationMembers(Model):
Expand Down