Skip to content

Commit c2c6419

Browse files
committed
alias
1 parent 2be999c commit c2c6419

File tree

15 files changed

+65
-37
lines changed

15 files changed

+65
-37
lines changed

packages/api/src/microsoft/teams/api/clients/base_client.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ def __init__(self, options: Optional[Union[Client, ClientOptions]] = None) -> No
1717
Args:
1818
options: Optional Client or ClientOptions instance. If not provided, a default Client will be created.
1919
"""
20-
self._http = Client(options or ClientOptions())
20+
if options is None:
21+
self._http = Client(ClientOptions())
22+
elif isinstance(options, Client):
23+
self._http = options
24+
else:
25+
self._http = Client(options)
2126

2227
@property
2328
def http(self) -> Client:

packages/api/src/microsoft/teams/api/clients/bot/client.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,15 @@ def __init__(self, options: Optional[Union[Client, ClientOptions]] = None) -> No
2424
super().__init__(options)
2525
self.token = BotTokenClient(self.http)
2626
self.sign_in = BotSignInClient(self.http)
27+
28+
@property
29+
def http(self) -> Client:
30+
"""Get the HTTP client instance."""
31+
return self._http
32+
33+
@http.setter
34+
def http(self, value: Client) -> None:
35+
"""Set the HTTP client instance and propagate to sub-clients."""
36+
self._http = value
37+
self.token.http = value
38+
self.sign_in.http = value

packages/api/src/microsoft/teams/api/clients/bot/params.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
from typing import Optional
77

8-
from pydantic import AliasGenerator, BaseModel, ConfigDict
8+
from pydantic import BaseModel, ConfigDict
99
from pydantic.alias_generators import to_camel
1010

1111

1212
class GetBotSignInUrlParams(BaseModel):
1313
"""Parameters for getting a bot sign-in URL."""
1414

1515
model_config = ConfigDict(
16-
alias_generator=AliasGenerator(serialization_alias=to_camel),
16+
alias_generator=to_camel,
1717
extra="allow",
1818
)
1919

@@ -39,7 +39,7 @@ class GetBotSignInResourceParams(BaseModel):
3939
"""Parameters for getting a bot sign-in resource."""
4040

4141
model_config = ConfigDict(
42-
alias_generator=AliasGenerator(serialization_alias=to_camel),
42+
alias_generator=to_camel,
4343
extra="allow",
4444
)
4545

packages/api/src/microsoft/teams/api/clients/conversation/client.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,18 @@ def __init__(self, service_url: str, options: Optional[Union[Client, ClientOptio
7474
self._activities = ConversationActivityClient(service_url, self.http)
7575
self._members = ConversationMemberClient(service_url, self.http)
7676

77+
@property
78+
def http(self) -> Client:
79+
"""Get the HTTP client instance."""
80+
return self._http
81+
82+
@http.setter
83+
def http(self, value: Client) -> None:
84+
"""Set the HTTP client instance and propagate to sub-clients."""
85+
self._http = value
86+
self._activities.http = value
87+
self._members.http = value
88+
7789
def activities(self, conversation_id: str) -> ActivityOperations:
7890
"""Get activity operations for a conversation.
7991

packages/api/src/microsoft/teams/api/clients/user/client.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,14 @@ def __init__(self, options: Optional[Union[Client, ClientOptions]] = None) -> No
2424
super().__init__(options)
2525

2626
self.token = UserTokenClient(self.http)
27+
28+
@property
29+
def http(self) -> Client:
30+
"""Get the HTTP client instance."""
31+
return self._http
32+
33+
@http.setter
34+
def http(self, value: Client) -> None:
35+
"""Set the HTTP client instance and propagate to sub-clients."""
36+
self._http = value
37+
self.token.http = value

packages/api/src/microsoft/teams/api/clients/user/token_client.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ async def sign_out(self, params: SignOutUserParams) -> None:
9393
await self.http.delete(
9494
"https://token.botframework.com/api/usertoken/SignOut",
9595
params=query_params,
96-
json={"data": params.model_dump()},
9796
)
9897

9998
async def exchange(self, params: ExchangeUserTokenParams) -> TokenResponse:

packages/api/src/microsoft/teams/api/models/account.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from typing import Any, Dict, Literal, Optional
77

8-
from pydantic import AliasGenerator, BaseModel, ConfigDict
8+
from pydantic import BaseModel, ConfigDict
99
from pydantic.alias_generators import to_camel
1010

1111
AccountRole = Literal["user", "bot"]
@@ -17,9 +17,7 @@ class Account(BaseModel):
1717
"""
1818

1919
model_config = ConfigDict(
20-
alias_generator=AliasGenerator(
21-
serialization_alias=to_camel,
22-
),
20+
alias_generator=to_camel,
2321
extra="allow",
2422
)
2523

packages/api/src/microsoft/teams/api/models/activity.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from typing import Any, Dict, Optional
77

8-
from pydantic import AliasGenerator, BaseModel, ConfigDict
8+
from pydantic import BaseModel, ConfigDict
99
from pydantic.alias_generators import to_camel
1010

1111

@@ -14,9 +14,7 @@ class Activity(BaseModel):
1414
"""Represents a Teams activity."""
1515

1616
model_config = ConfigDict(
17-
alias_generator=AliasGenerator(
18-
serialization_alias=to_camel,
19-
),
17+
alias_generator=to_camel,
2018
extra="allow",
2119
)
2220

packages/api/src/microsoft/teams/api/models/conversation/conversation.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from typing import List, Literal, Optional
77

8-
from pydantic import AliasGenerator, BaseModel, ConfigDict
8+
from pydantic import BaseModel, ConfigDict
99
from pydantic.alias_generators import to_camel
1010

1111
from ..account import Account
@@ -17,9 +17,7 @@ class Conversation(BaseModel):
1717
"""Represents a Teams conversation."""
1818

1919
model_config = ConfigDict(
20-
alias_generator=AliasGenerator(
21-
serialization_alias=to_camel,
22-
),
20+
alias_generator=to_camel,
2321
extra="allow",
2422
)
2523

packages/api/src/microsoft/teams/api/models/conversation/resource.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@
33
Licensed under the MIT License.
44
"""
55

6-
from pydantic import AliasGenerator, BaseModel, ConfigDict
6+
from pydantic import BaseModel, ConfigDict
77
from pydantic.alias_generators import to_camel
88

99

1010
class ConversationResource(BaseModel):
1111
"""A response containing a resource."""
1212

1313
model_config = ConfigDict(
14-
alias_generator=AliasGenerator(
15-
serialization_alias=to_camel,
16-
),
14+
alias_generator=to_camel,
1715
extra="allow",
1816
)
1917

0 commit comments

Comments
 (0)