Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 3 additions & 13 deletions .github/workflows/validate_examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ jobs:
GOOS: linux
GOARCH: amd64
GOPROXY: https://proxy.golang.org
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/master/install/install.sh
DAPR_RUNTIME_VER: 1.15.13
DAPR_CLI_VER: 1.15.2
DAPR_CLI_REF: ${{ github.event.inputs.daprcli_commit }}
DAPR_REF: ${{ github.event.inputs.daprdapr_commit }}
CHECKOUT_REPO: ${{ github.repository }}
Expand All @@ -62,17 +63,6 @@ jobs:
with:
repository: ${{ env.CHECKOUT_REPO }}
ref: ${{ env.CHECKOUT_REF }}
- uses: azure/setup-helm@v4
- name: Determine latest Dapr Runtime version
run: |
helm repo add dapr https://dapr.github.io/helm-charts/ && helm repo update && export RUNTIME_VERSION=$(helm search repo dapr/dapr --devel --versions | awk '/dapr\/dapr/ {print $3; exit}' )
echo "DAPR_RUNTIME_VER=$RUNTIME_VERSION" >> $GITHUB_ENV
echo "Found $RUNTIME_VERSION"
- name: Determine latest Dapr Cli version
run: |
export CLI_VERSION=$(curl "https://api.github.com/repos/dapr/cli/releases?per_page=1&page=1" --header 'authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' | jq '.[0].tag_name'| tr -d '",v')
echo "DAPR_CLI_VER=$CLI_VERSION" >> $GITHUB_ENV
echo "Found $CLI_VERSION"
- name: Set up Python ${{ matrix.python_ver }}
uses: actions/setup-python@v5
with:
Expand All @@ -82,7 +72,7 @@ jobs:
python -m pip install --upgrade pip
pip install setuptools wheel twine tox
- name: Set up Dapr CLI
run: wget -q ${{ env.DAPR_INSTALL_URL }} -O - | /bin/bash -s ${{ env.DAPR_CLI_VER }}
run: wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash -s ${{ env.DAPR_CLI_VER }}
- name: Set up Go ${{ env.GOVER }}
if: env.DAPR_REF != '' || env.DAPR_CLI_REF != ''
uses: actions/setup-go@v5
Expand Down
2 changes: 1 addition & 1 deletion dapr/actor/runtime/state_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def ttl_in_seconds(self) -> Optional[int]:
return self._ttl_in_seconds

@ttl_in_seconds.setter
def ttl_in_seconds(self, new_ttl_in_seconds: int) -> None:
def ttl_in_seconds(self, new_ttl_in_seconds: Optional[int]) -> None:
self._ttl_in_seconds = new_ttl_in_seconds


Expand Down
2 changes: 1 addition & 1 deletion dapr/clients/grpc/_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def __init__(
super(InvokeMethodRequest, self).__init__(())

self._content_type = content_type
self._http_verb = None
self._http_verb: Optional[str] = None
self._http_querystring: Dict[str, str] = {}

self.set_data(data)
Expand Down
2 changes: 1 addition & 1 deletion dapr/version/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
limitations under the License.
"""

__version__ = '1.15.0'
__version__ = '1.15.1'
2 changes: 1 addition & 1 deletion examples/demo_actor/demo_actor/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dapr-ext-fastapi>=1.15.0
dapr-ext-fastapi>=1.15.1
2 changes: 1 addition & 1 deletion examples/demo_workflow/demo_workflow/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dapr-ext-workflow>=1.15.0
dapr-ext-workflow>=1.15.1
2 changes: 1 addition & 1 deletion examples/error_handling/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Example - Error handling

This guide demonstrates handling `DaprGrpcError` errors when using the Dapr python-SDK. It's important to note that not all Dapr gRPC status errors are currently captured and transformed into a `DaprGrpcError` by the SDK. Efforts are ongoing to enhance this aspect, and contributions are welcome. For detailed information on error handling in Dapr, refer to the [official documentation](https://docs.dapr.io/reference/errors).
This guide demonstrates handling `DaprGrpcError` errors when using the Dapr python-SDK. It's important to note that not all Dapr gRPC status errors are currently captured and transformed into a `DaprGrpcError` by the SDK. Efforts are ongoing to enhance this aspect, and contributions are welcome.

The example involves creating a DaprClient and invoking the save_state method.
It uses the default configuration from Dapr init in [self-hosted mode](https://github.com/dapr/cli#install-dapr-on-your-local-machine-self-hosted).
Expand Down
4 changes: 2 additions & 2 deletions examples/invoke-simple/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dapr-ext-grpc >= 1.15.0
dapr >= 1.15.0
dapr-ext-grpc >= 1.15.1
dapr >= 1.15.1
4 changes: 2 additions & 2 deletions examples/w3c-tracing/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dapr-ext-grpc >= 1.15.0
dapr >= 1.15.0
dapr-ext-grpc >= 1.15.1
dapr >= 1.15.1
opentelemetry-sdk
opentelemetry-instrumentation-grpc
opentelemetry-exporter-zipkin
4 changes: 2 additions & 2 deletions examples/workflow/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
dapr-ext-workflow>=1.15.0
dapr>=1.15.0
dapr-ext-workflow>=1.15.1
dapr>=1.15.1
2 changes: 1 addition & 1 deletion ext/dapr-ext-fastapi/dapr/ext/fastapi/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
limitations under the License.
"""

__version__ = '1.15.0'
__version__ = '1.15.1'
4 changes: 2 additions & 2 deletions ext/dapr-ext-fastapi/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ python_requires = >=3.9
packages = find_namespace:
include_package_data = True
install_requires =
dapr >= 1.15.0
dapr >= 1.15.1
uvicorn >= 0.11.6
fastapi >= 0.60.1

[options.packages.find]
include =
dapr.*

exclude =
exclude =
tests
2 changes: 1 addition & 1 deletion ext/dapr-ext-grpc/dapr/ext/grpc/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
limitations under the License.
"""

__version__ = '1.15.0'
__version__ = '1.15.1'
6 changes: 3 additions & 3 deletions ext/dapr-ext-grpc/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ python_requires = >=3.9
packages = find_namespace:
include_package_data = True
install_requires =
dapr >= 1.15.0
cloudevents >= 1.0.0
dapr >= 1.15.1
cloudevents >= 1.0.0, < 2.0.0

[options.packages.find]
include =
dapr.*

exclude =
exclude =
tests
2 changes: 1 addition & 1 deletion ext/dapr-ext-workflow/dapr/ext/workflow/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
limitations under the License.
"""

__version__ = '1.15.0'
__version__ = '1.15.1'
4 changes: 2 additions & 2 deletions ext/dapr-ext-workflow/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ python_requires = >=3.9
packages = find_namespace:
include_package_data = True
install_requires =
dapr >= 1.15.0
dapr >= 1.15.1
durabletask-dapr >= 0.2.0a7

[options.packages.find]
include =
dapr.*

exclude =
exclude =
tests
1 change: 0 additions & 1 deletion ext/dapr-ext-workflow/tests/test_workflow_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ def schedule_new_orchestration(
return mock_schedule_result

def get_orchestration_state(self, instance_id, fetch_payloads):
global wf_status
if wf_status == 'not-found':
raise SimulatedRpcError(code='UNKNOWN', details='no such instance exists')
elif wf_status == 'found':
Expand Down
2 changes: 1 addition & 1 deletion ext/flask_dapr/flask_dapr/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
limitations under the License.
"""

__version__ = '1.15.0'
__version__ = '1.15.1'
2 changes: 1 addition & 1 deletion ext/flask_dapr/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ include_package_data = true
zip_safe = false
install_requires =
Flask >= 1.1
dapr >= 1.15.0
dapr >= 1.15.1
Loading