Skip to content

Commit 7f2ca8c

Browse files
authored
Merge pull request #168 from microsoftgraph/v1.0/pipelinebuild/112909
Generated models and request builders
2 parents 3f83a22 + cae4c4e commit 7f2ca8c

1,922 files changed

Lines changed: 28418 additions & 22206 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,23 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## ["1.0.0a11] - 2023-04-05
8+
## [1.0.0a12] - 2023-04-19
9+
10+
### Added
11+
12+
### Changed
13+
14+
- Changed the request builders api to include indexers as part of the path. [#2528](https://github.com/microsoft/kiota/issues/2528)
15+
16+
## [1.0.0a11] - 2023-04-05
917

1018
### Added
1119

1220
### Changed
1321

1422
- Fixed a bug where UUIDs were being passed as u_u_i_d to desrialization methods.
1523

16-
## ["1.0.0a10] - 2023-03-28
24+
## [1.0.0a10] - 2023-03-28
1725

1826
### Added
1927

@@ -24,7 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2432
- Fixed a bug where the date and guid types were improperly mapped.
2533
- Re-ordered method hierarchy to match python conventions
2634

27-
## ["1.0.0a9] - 2023-01-25
35+
## [1.0.0a9] - 2023-01-25
2836

2937
### Added
3038

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ request_adapter = GraphRequestAdapter(auth_provider)
101101
client = GraphServiceClient(request_adapter)
102102

103103
async def get_user():
104-
user = await client.users_by_id('userPrincipalName').get()
104+
user = await client.users.by_user_id('userPrincipalName').get()
105105
print(user.display_name)
106106

107107
asyncio.run(get_user())
@@ -133,11 +133,12 @@ asyncio.run(me())
133133

134134
Failed requests raise `APIError` exceptions. You can handle these exceptions using `try` `catch` statements.
135135
```py
136+
from kiota_abstractions.api_error import APIError
136137
async def get_user():
137138
try:
138-
user = await client.users_by_id('userID').get()
139+
user = await client.users.by_user_id('userID').get()
139140
print(user.user_principal_name, user.display_name, user.id)
140-
except Exception as e:
141+
except APIError as e:
141142
print(f'Error: {e.error.message}')
142143

143144
asyncio.run(get_user())

‎UPGRADING.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This package (`msgraph-sdk`) will only contain models that match the [Microsoft
3434
resp =client.get('/users/userId/messages')
3535

3636
# msgraph-sdk
37-
req = client.users_by_id('userId').messages().get()
37+
req = client.users.by_user_id('userId').messages.get()
3838
resp = asyncio.run(req)
3939
```
4040

@@ -120,7 +120,7 @@ request_config = MessagesRequestBuilder.MessagesRequestBuilderGetRequestConfigur
120120
query_parameters=query_params,
121121
)
122122

123-
messages = asyncio.run(client.users_by_id('userId').messages().get(request_configuration=request_config))
123+
messages = asyncio.run(client.users.by_user_id('userId').messages.get(request_configuration=request_config))
124124
for msg in messages.value:
125125
print(msg.subject)
126126
```
@@ -129,15 +129,15 @@ See [the examples](docs/Examples.md) on how to pass headers in your requests.
129129

130130
## Exception handling
131131

132-
Any `4xx` or `5xx` responses from the Graph API will result in an `ApiException` being thrown.
132+
Any `4xx` or `5xx` responses from the Graph API will result in an `APIError` being thrown.
133133

134134
```py
135-
135+
from kiota_abstractions.api_error import APIError
136136
try:
137137
users = asyncio.run(client.users().get())
138138

139-
except ApiException as e {
140-
return f"Exception occurred: {repr(e)}"
139+
except APIError as e {
140+
return f"Exception occurred: {e.error.message}"
141141
}
142142
```
143143
## Dependency changes

‎msgraph/_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION: str = '1.0.0a11'
1+
VERSION: str = '1.0.0a12'

‎msgraph/generated/admin/edge/internet_explorer_mode/internet_explorer_mode_request_builder.py‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from ....models import internet_explorer_mode
1414
from ....models.o_data_errors import o_data_error
1515
from .site_lists import site_lists_request_builder
16-
from .site_lists.item import browser_site_list_item_request_builder
1716

1817
class InternetExplorerModeRequestBuilder():
1918
"""
@@ -103,21 +102,6 @@ async def patch(self,body: Optional[internet_explorer_mode.InternetExplorerMode]
103102

104103
return await self.request_adapter.send_async(request_info, internet_explorer_mode.InternetExplorerMode, error_mapping)
105104

106-
def site_lists_by_id(self,id: str) -> browser_site_list_item_request_builder.BrowserSiteListItemRequestBuilder:
107-
"""
108-
Provides operations to manage the siteLists property of the microsoft.graph.internetExplorerMode entity.
109-
Args:
110-
id: Unique identifier of the item
111-
Returns: browser_site_list_item_request_builder.BrowserSiteListItemRequestBuilder
112-
"""
113-
if id is None:
114-
raise Exception("id cannot be undefined")
115-
from .site_lists.item import browser_site_list_item_request_builder
116-
117-
url_tpl_params = get_path_parameters(self.path_parameters)
118-
url_tpl_params["browserSiteList%2Did"] = id
119-
return browser_site_list_item_request_builder.BrowserSiteListItemRequestBuilder(self.request_adapter, url_tpl_params)
120-
121105
def to_delete_request_information(self,request_configuration: Optional[InternetExplorerModeRequestBuilderDeleteRequestConfiguration] = None) -> RequestInformation:
122106
"""
123107
Delete navigation property internetExplorerMode for admin

‎msgraph/generated/admin/edge/internet_explorer_mode/site_lists/item/browser_site_list_item_request_builder.py‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
from ......models.o_data_errors import o_data_error
1515
from .publish import publish_request_builder
1616
from .shared_cookies import shared_cookies_request_builder
17-
from .shared_cookies.item import browser_shared_cookie_item_request_builder
1817
from .sites import sites_request_builder
19-
from .sites.item import browser_site_item_request_builder
2018

2119
class BrowserSiteListItemRequestBuilder():
2220
"""
@@ -106,36 +104,6 @@ async def patch(self,body: Optional[browser_site_list.BrowserSiteList] = None, r
106104

107105
return await self.request_adapter.send_async(request_info, browser_site_list.BrowserSiteList, error_mapping)
108106

109-
def shared_cookies_by_id(self,id: str) -> browser_shared_cookie_item_request_builder.BrowserSharedCookieItemRequestBuilder:
110-
"""
111-
Provides operations to manage the sharedCookies property of the microsoft.graph.browserSiteList entity.
112-
Args:
113-
id: Unique identifier of the item
114-
Returns: browser_shared_cookie_item_request_builder.BrowserSharedCookieItemRequestBuilder
115-
"""
116-
if id is None:
117-
raise Exception("id cannot be undefined")
118-
from .shared_cookies.item import browser_shared_cookie_item_request_builder
119-
120-
url_tpl_params = get_path_parameters(self.path_parameters)
121-
url_tpl_params["browserSharedCookie%2Did"] = id
122-
return browser_shared_cookie_item_request_builder.BrowserSharedCookieItemRequestBuilder(self.request_adapter, url_tpl_params)
123-
124-
def sites_by_id(self,id: str) -> browser_site_item_request_builder.BrowserSiteItemRequestBuilder:
125-
"""
126-
Provides operations to manage the sites property of the microsoft.graph.browserSiteList entity.
127-
Args:
128-
id: Unique identifier of the item
129-
Returns: browser_site_item_request_builder.BrowserSiteItemRequestBuilder
130-
"""
131-
if id is None:
132-
raise Exception("id cannot be undefined")
133-
from .sites.item import browser_site_item_request_builder
134-
135-
url_tpl_params = get_path_parameters(self.path_parameters)
136-
url_tpl_params["browserSite%2Did"] = id
137-
return browser_site_item_request_builder.BrowserSiteItemRequestBuilder(self.request_adapter, url_tpl_params)
138-
139107
def to_delete_request_information(self,request_configuration: Optional[BrowserSiteListItemRequestBuilderDeleteRequestConfiguration] = None) -> RequestInformation:
140108
"""
141109
Delete navigation property siteLists for admin

‎msgraph/generated/admin/edge/internet_explorer_mode/site_lists/item/shared_cookies/shared_cookies_request_builder.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from .......models import browser_shared_cookie, browser_shared_cookie_collection_response
1414
from .......models.o_data_errors import o_data_error
1515
from .count import count_request_builder
16+
from .item import browser_shared_cookie_item_request_builder
1617

1718
class SharedCookiesRequestBuilder():
1819
"""
@@ -36,6 +37,21 @@ def __init__(self,request_adapter: RequestAdapter, path_parameters: Optional[Uni
3637
self.path_parameters = url_tpl_params
3738
self.request_adapter = request_adapter
3839

40+
def by_browser_shared_cookie_id(self,browser_shared_cookie_id: str) -> browser_shared_cookie_item_request_builder.BrowserSharedCookieItemRequestBuilder:
41+
"""
42+
Provides operations to manage the sharedCookies property of the microsoft.graph.browserSiteList entity.
43+
Args:
44+
browser_shared_cookie_id: Unique identifier of the item
45+
Returns: browser_shared_cookie_item_request_builder.BrowserSharedCookieItemRequestBuilder
46+
"""
47+
if browser_shared_cookie_id is None:
48+
raise Exception("browser_shared_cookie_id cannot be undefined")
49+
from .item import browser_shared_cookie_item_request_builder
50+
51+
url_tpl_params = get_path_parameters(self.path_parameters)
52+
url_tpl_params["browserSharedCookie%2Did"] = browser_shared_cookie_id
53+
return browser_shared_cookie_item_request_builder.BrowserSharedCookieItemRequestBuilder(self.request_adapter, url_tpl_params)
54+
3955
async def get(self,request_configuration: Optional[SharedCookiesRequestBuilderGetRequestConfiguration] = None) -> Optional[browser_shared_cookie_collection_response.BrowserSharedCookieCollectionResponse]:
4056
"""
4157
Get a list of the browserSharedCookie objects and their properties.

‎msgraph/generated/admin/edge/internet_explorer_mode/site_lists/item/sites/sites_request_builder.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from .......models import browser_site, browser_site_collection_response
1414
from .......models.o_data_errors import o_data_error
1515
from .count import count_request_builder
16+
from .item import browser_site_item_request_builder
1617

1718
class SitesRequestBuilder():
1819
"""
@@ -36,6 +37,21 @@ def __init__(self,request_adapter: RequestAdapter, path_parameters: Optional[Uni
3637
self.path_parameters = url_tpl_params
3738
self.request_adapter = request_adapter
3839

40+
def by_browser_site_id(self,browser_site_id: str) -> browser_site_item_request_builder.BrowserSiteItemRequestBuilder:
41+
"""
42+
Provides operations to manage the sites property of the microsoft.graph.browserSiteList entity.
43+
Args:
44+
browser_site_id: Unique identifier of the item
45+
Returns: browser_site_item_request_builder.BrowserSiteItemRequestBuilder
46+
"""
47+
if browser_site_id is None:
48+
raise Exception("browser_site_id cannot be undefined")
49+
from .item import browser_site_item_request_builder
50+
51+
url_tpl_params = get_path_parameters(self.path_parameters)
52+
url_tpl_params["browserSite%2Did"] = browser_site_id
53+
return browser_site_item_request_builder.BrowserSiteItemRequestBuilder(self.request_adapter, url_tpl_params)
54+
3955
async def get(self,request_configuration: Optional[SitesRequestBuilderGetRequestConfiguration] = None) -> Optional[browser_site_collection_response.BrowserSiteCollectionResponse]:
4056
"""
4157
Get a list of the browserSite objects and their properties.

‎msgraph/generated/admin/edge/internet_explorer_mode/site_lists/site_lists_request_builder.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from .....models import browser_site_list, browser_site_list_collection_response
1414
from .....models.o_data_errors import o_data_error
1515
from .count import count_request_builder
16+
from .item import browser_site_list_item_request_builder
1617

1718
class SiteListsRequestBuilder():
1819
"""
@@ -36,6 +37,21 @@ def __init__(self,request_adapter: RequestAdapter, path_parameters: Optional[Uni
3637
self.path_parameters = url_tpl_params
3738
self.request_adapter = request_adapter
3839

40+
def by_browser_site_list_id(self,browser_site_list_id: str) -> browser_site_list_item_request_builder.BrowserSiteListItemRequestBuilder:
41+
"""
42+
Provides operations to manage the siteLists property of the microsoft.graph.internetExplorerMode entity.
43+
Args:
44+
browser_site_list_id: Unique identifier of the item
45+
Returns: browser_site_list_item_request_builder.BrowserSiteListItemRequestBuilder
46+
"""
47+
if browser_site_list_id is None:
48+
raise Exception("browser_site_list_id cannot be undefined")
49+
from .item import browser_site_list_item_request_builder
50+
51+
url_tpl_params = get_path_parameters(self.path_parameters)
52+
url_tpl_params["browserSiteList%2Did"] = browser_site_list_id
53+
return browser_site_list_item_request_builder.BrowserSiteListItemRequestBuilder(self.request_adapter, url_tpl_params)
54+
3955
async def get(self,request_configuration: Optional[SiteListsRequestBuilderGetRequestConfiguration] = None) -> Optional[browser_site_list_collection_response.BrowserSiteListCollectionResponse]:
4056
"""
4157
Get a list of the browserSiteList objects and their properties.

‎msgraph/generated/admin/service_announcement/health_overviews/health_overviews_request_builder.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from ....models import service_health, service_health_collection_response
1414
from ....models.o_data_errors import o_data_error
1515
from .count import count_request_builder
16+
from .item import service_health_item_request_builder
1617

1718
class HealthOverviewsRequestBuilder():
1819
"""
@@ -36,6 +37,21 @@ def __init__(self,request_adapter: RequestAdapter, path_parameters: Optional[Uni
3637
self.path_parameters = url_tpl_params
3738
self.request_adapter = request_adapter
3839

40+
def by_service_health_id(self,service_health_id: str) -> service_health_item_request_builder.ServiceHealthItemRequestBuilder:
41+
"""
42+
Provides operations to manage the healthOverviews property of the microsoft.graph.serviceAnnouncement entity.
43+
Args:
44+
service_health_id: Unique identifier of the item
45+
Returns: service_health_item_request_builder.ServiceHealthItemRequestBuilder
46+
"""
47+
if service_health_id is None:
48+
raise Exception("service_health_id cannot be undefined")
49+
from .item import service_health_item_request_builder
50+
51+
url_tpl_params = get_path_parameters(self.path_parameters)
52+
url_tpl_params["serviceHealth%2Did"] = service_health_id
53+
return service_health_item_request_builder.ServiceHealthItemRequestBuilder(self.request_adapter, url_tpl_params)
54+
3955
async def get(self,request_configuration: Optional[HealthOverviewsRequestBuilderGetRequestConfiguration] = None) -> Optional[service_health_collection_response.ServiceHealthCollectionResponse]:
4056
"""
4157
Retrieve the serviceHealth resources from the **healthOverviews** navigation property. This operation provides the health report of all subscribed services for a tenant.

0 commit comments

Comments
 (0)