Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
a25793b
move old sdk under legacy
l0lawrence Apr 24, 2023
ad72024
gen typespec code
l0lawrence Apr 24, 2023
f81c227
naming changes from archboard
l0lawrence Apr 27, 2023
486735f
samples
l0lawrence Apr 27, 2023
1fa0d92
update patch naming
l0lawrence Apr 27, 2023
e284adf
update imports with new gen
l0lawrence Apr 27, 2023
5efd365
update samples
l0lawrence Apr 27, 2023
aebdf0c
update client naming on aio
l0lawrence Apr 27, 2023
276d51a
update receive op
l0lawrence Apr 27, 2023
81161a8
update async to close client
l0lawrence Apr 27, 2023
d419cf2
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python …
l0lawrence Apr 27, 2023
32efd54
update receive()
l0lawrence May 1, 2023
b1eeca8
update gen code
l0lawrence May 1, 2023
5634655
moving around samples
l0lawrence May 1, 2023
36976bd
updating samples
l0lawrence May 1, 2023
328a71a
update samples
l0lawrence May 1, 2023
ba088a2
update patch and samples
l0lawrence May 1, 2023
bdf3bc0
patch internalmodels
l0lawrence May 1, 2023
57c6ada
spacing
l0lawrence May 1, 2023
4100767
updating model patch
l0lawrence May 1, 2023
69a61e1
update patch models
l0lawrence May 1, 2023
594ba71
add both models back
l0lawrence May 1, 2023
abd97bc
update docstring
l0lawrence May 1, 2023
cb4d9a2
update docs
l0lawrence May 1, 2023
3429e60
updating patch for receive
l0lawrence May 2, 2023
9d7cf66
old EG models
l0lawrence May 2, 2023
199542a
add reject samples
l0lawrence May 2, 2023
8f77e83
patch
l0lawrence May 2, 2023
a31e9fa
update format
l0lawrence May 2, 2023
710f8c3
update patch
l0lawrence May 4, 2023
bdec4b8
eventgrid_client exceptions
l0lawrence May 4, 2023
5bca49d
update test imports
l0lawrence May 4, 2023
b9a4d6f
update total sample
l0lawrence May 4, 2023
b0e50c3
receive patch fix
l0lawrence May 4, 2023
135b0c7
add in more tests
l0lawrence May 4, 2023
19573e2
update test file
l0lawrence May 8, 2023
24b2535
remove locktoken model
l0lawrence May 9, 2023
9a12471
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-python …
l0lawrence May 9, 2023
dc2d26c
remove LockToken in patch
l0lawrence May 9, 2023
cec8bd0
remove event delivery delay
l0lawrence May 11, 2023
a26c1e7
eg client exceptions
l0lawrence May 11, 2023
cf80540
.8.5 generation, and deliveryCount
l0lawrence May 12, 2023
c1f1ae7
rename sample
l0lawrence May 15, 2023
8538458
update version for beta
l0lawrence May 15, 2023
4e7b141
changelog
l0lawrence May 15, 2023
7713d3b
updating for gen
l0lawrence May 15, 2023
e9eab96
regen
l0lawrence May 16, 2023
36ac074
generate via commit
l0lawrence May 16, 2023
b58773e
publish result
l0lawrence May 16, 2023
459b403
fix docstring
l0lawrence May 16, 2023
e091bb9
publish docstring
l0lawrence May 16, 2023
eb50871
return type
l0lawrence May 16, 2023
1edd9ac
publish result
l0lawrence May 16, 2023
7fb9946
return publish result -- is none
l0lawrence May 16, 2023
f1f18f5
format
l0lawrence May 16, 2023
1646322
update Publish result model
l0lawrence May 16, 2023
0da1768
deliverycount patch
l0lawrence May 16, 2023
7ef5bbe
update from main
l0lawrence May 16, 2023
07da8c7
Merge branch 'feature/eventgrid' of https://github.com/Azure/azure-sd…
l0lawrence May 16, 2023
ed4c53c
add copyright
l0lawrence May 16, 2023
da155ae
added to readme
l0lawrence May 16, 2023
11708ec
remove from readme
l0lawrence May 16, 2023
6acc4bc
force publish_result response
l0lawrence May 16, 2023
5c97aed
update patch tp unindent
l0lawrence May 16, 2023
994ab41
cspell
l0lawrence May 16, 2023
060c9ce
update mypy.ini
l0lawrence May 16, 2023
d72039c
import order
l0lawrence May 16, 2023
e16a255
mark livetest
l0lawrence May 16, 2023
df0430f
update operations init
l0lawrence May 16, 2023
830fd1d
rename async
l0lawrence May 16, 2023
30bc939
mypy
l0lawrence May 16, 2023
fb0479e
ignore mypy
l0lawrence May 16, 2023
2a050e1
pylint
l0lawrence May 16, 2023
26dfdef
pylint
l0lawrence May 16, 2023
37e7341
ignore pylint for now to avoid gen code errors
l0lawrence May 16, 2023
99bbe93
ignore samples until ARM setup
l0lawrence May 17, 2023
bcf7d34
update patches
l0lawrence May 17, 2023
4927ac1
remove publish result
l0lawrence May 17, 2023
4bde87e
remove PublishResult
l0lawrence May 17, 2023
78605f2
remove publishresult
l0lawrence May 17, 2023
b050474
comma
l0lawrence May 17, 2023
e0ff0ed
update publishResult
l0lawrence May 18, 2023
34ff7a3
Merge branch 'llaw/build_eventgrid' of https://github.com/l0lawrence/…
l0lawrence May 18, 2023
4f26e01
change to .value
l0lawrence May 18, 2023
80f0384
gen code " to '
l0lawrence May 18, 2023
58b4d7e
remove comment
l0lawrence May 18, 2023
fea7384
ran black
l0lawrence May 18, 2023
c557de0
update changelog
l0lawrence May 19, 2023
522e90c
update sample readme
l0lawrence May 19, 2023
7349da4
gen code without query name
l0lawrence May 19, 2023
204a6d6
gen code
l0lawrence May 19, 2023
adb9f45
update tsp commit
l0lawrence May 19, 2023
0fdc51f
remove publishresult
l0lawrence May 19, 2023
1442893
readme disclaimer
l0lawrence May 19, 2023
b820027
update changelog
l0lawrence May 19, 2023
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
Prev Previous commit
Next Next commit
remove locktoken model
  • Loading branch information
l0lawrence committed May 9, 2023
commit 24b2535cbfe0acbb0599698fe3bc3cab0b31c74c
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ def receive_cloud_events(
for detail_item in received_result.get("value"):
deserialized_cloud_event = CloudEvent.from_dict(detail_item.get("event"))
detail_item["event"] = deserialized_cloud_event
detail_items.append(ReceiveDetails(event=detail_item.get("event"), broker_properties=detail_item.get("brokerProperties")))
detail_items.append(
ReceiveDetails(event=detail_item.get("event"), broker_properties=detail_item.get("brokerProperties"))
)
receive_result_deserialized["value"] = detail_items
return receive_result_deserialized

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,9 @@ async def receive_cloud_events(
for detail_item in receive_result.value:
deserialized_cloud_event = CloudEvent.from_dict(detail_item.event)
detail_item.event = deserialized_cloud_event
detail_items.append(ReceiveDetails(event=detail_item.get("event"), broker_properties=detail_item.get("brokerProperties")))
detail_items.append(
ReceiveDetails(event=detail_item.get("event"), broker_properties=detail_item.get("brokerProperties"))
)
receive_result_deserialized["value"] = detail_items
return receive_result_deserialized

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from ._models import AcknowledgeOptions
from ._models import AcknowledgeResult
from ._models import FailedLockToken
from ._models import LockToken
from ._models import RejectOptions
from ._models import RejectResult
from ._models import ReleaseOptions
Expand All @@ -22,7 +21,6 @@
"AcknowledgeOptions",
"AcknowledgeResult",
"FailedLockToken",
"LockToken",
"RejectOptions",
"RejectResult",
"ReleaseOptions",
Expand Down
41 changes: 5 additions & 36 deletions sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ class BrokerProperties(_model_base.Model):
All required parameters must be populated in order to send to Azure.

:ivar lock_token: The token used to lock the event. Required.
:vartype lock_token: ~azure.eventgrid.models.LockToken
:vartype lock_token: str
:ivar delivery_attempt_count: The attempt count for deliverying the event. Required.
:vartype delivery_attempt_count: int
"""

lock_token: "_models.LockToken" = rest_field(name="lockToken")
lock_token: str = rest_field(name="lockToken")
"""The token used to lock the event. Required."""
delivery_attempt_count: int = rest_field(name="deliveryAttemptCount")
"""The attempt count for deliverying the event. Required."""
Expand Down Expand Up @@ -168,7 +168,7 @@ class FailedLockToken(_model_base.Model):
All required parameters must be populated in order to send to Azure.

:ivar lock_token: LockToken value. Required.
:vartype lock_token: ~azure.eventgrid.models.LockToken
:vartype lock_token: str
:ivar error_code: Error code related to the token. Example of such error codes are BadToken:
which indicates the Token is not formatted correctly, TokenLost: which indicates that token is
not found, and InternalServerError: For any internal server errors. Required.
Expand All @@ -177,7 +177,7 @@ class FailedLockToken(_model_base.Model):
:vartype error_description: str
"""

lock_token: "_models.LockToken" = rest_field(name="lockToken")
lock_token: str = rest_field(name="lockToken")
"""LockToken value. Required."""
error_code: str = rest_field(name="errorCode")
"""Error code related to the token. Example of such error codes are BadToken: which indicates the
Expand All @@ -190,7 +190,7 @@ class FailedLockToken(_model_base.Model):
def __init__(
self,
*,
lock_token: "_models.LockToken",
lock_token: str,
error_code: str,
error_description: str,
):
Expand All @@ -207,37 +207,6 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useles
super().__init__(*args, **kwargs)


class LockToken(_model_base.Model):
"""LockToken information.

All required parameters must be populated in order to send to Azure.

:ivar lock_token: The token used to lock the event. Required.
:vartype lock_token: str
"""

lock_token: str = rest_field(name="lockToken")
"""The token used to lock the event. Required."""

@overload
def __init__(
self,
*,
lock_token: str,
):
...

@overload
def __init__(self, mapping: Mapping[str, Any]):
"""
:param mapping: raw JSON to initialize the model.
:type mapping: Mapping[str, Any]
"""

def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation
super().__init__(*args, **kwargs)


class ReceiveDetails(_model_base.Model):
"""Receive operation details per Cloud Event.

Expand Down
15 changes: 13 additions & 2 deletions sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/_patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@
"""
from typing import List, overload, Mapping, Any
from ._models import LockToken
from ._models import ReceiveDetails as InternalReceiveDetails, ReceiveResult as InternalReceiveResult, BrokerProperties as InternalBrokerProperties
from ._models import (
ReceiveDetails as InternalReceiveDetails,
ReceiveResult as InternalReceiveResult,
BrokerProperties as InternalBrokerProperties,
)
from azure.core.messaging import CloudEvent


class ReceiveDetails(InternalReceiveDetails):
"""Receive operation details per Cloud Event.

Expand Down Expand Up @@ -41,6 +46,7 @@ def __init__(self, mapping: Mapping[str, Any]):
def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation
super().__init__(*args, **kwargs)


class ReceiveResult(InternalReceiveResult):
"""Details of the Receive operation response.

Expand Down Expand Up @@ -68,6 +74,7 @@ def __init__(self, mapping: Mapping[str, Any]):
def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useless-super-delegation
super().__init__(*args, **kwargs)


class BrokerProperties(InternalBrokerProperties):
"""Properties of the Event Broker operation.

Expand Down Expand Up @@ -99,7 +106,11 @@ def __init__(self, *args: Any, **kwargs: Any) -> None: # pylint: disable=useles
super().__init__(*args, **kwargs)


__all__: List[str] = ["ReceiveDetails", "ReceiveResult", "BrokerProperties"] # Add all objects you want publicly available to users at this package level
__all__: List[str] = [
"ReceiveDetails",
"ReceiveResult",
"BrokerProperties",
] # Add all objects you want publicly available to users at this package level


def patch_sdk():
Expand Down