Skip to content

Commit 83b514f

Browse files
berndverstberndverst
authored
Merge branch 'main' into andystaples/allow-override-stubs-in-worker
2 parents e548700 + c54c386 commit 83b514f

File tree

14 files changed

+345
-29
lines changed

14 files changed

+345
-29
lines changed

‎.github/workflows/durabletask-azuremanaged-dev.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Durable Task Scheduler SDK (durabletask-azuremanaged) Dev Release
2+
3+
on:
4+
workflow_run:
5+
workflows: ["Durable Task Scheduler SDK (durabletask-azuremanaged)"]
6+
types:
7+
- completed
8+
branches:
9+
- main
10+
11+
jobs:
12+
publish-dev:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout code
16+
uses: actions/checkout@v4
17+
18+
- name: Extract version from tag
19+
run: echo "VERSION=${GITHUB_REF#refs/tags/azuremanaged-v}" >> $GITHUB_ENV # Extract version from the tag
20+
21+
- name: Set up Python
22+
uses: actions/setup-python@v5
23+
with:
24+
python-version: "3.14" # Adjust Python version as needed
25+
26+
- name: Install dependencies
27+
run: |
28+
python -m pip install --upgrade pip
29+
pip install build twine
30+
31+
- name: Append dev to version in pyproject.toml
32+
working-directory: durabletask-azuremanaged
33+
run: |
34+
sed -i 's/^version = "\(.*\)"/version = "\1.dev${{ github.run_number }}"/' pyproject.toml
35+
36+
- name: Build package from directory durabletask-azuremanaged
37+
working-directory: durabletask-azuremanaged
38+
run: |
39+
python -m build
40+
41+
- name: Check package
42+
working-directory: durabletask-azuremanaged
43+
run: |
44+
twine check dist/*
45+
46+
- name: Publish package to PyPI
47+
env:
48+
TWINE_USERNAME: __token__
49+
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN_AZUREMANAGED }} # Store your PyPI API token in GitHub Secrets
50+
working-directory: durabletask-azuremanaged
51+
run: |
52+
twine upload dist/*

‎.github/workflows/durabletask-azuremanaged-experimental.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Durable Task Scheduler SDK (durabletask-azuremanaged) Experimental Release
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- main
7+
- release/*
8+
9+
jobs:
10+
publish-experimental:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v4
15+
16+
- name: Extract version from tag
17+
run: echo "VERSION=${GITHUB_REF#refs/tags/azuremanaged-v}" >> $GITHUB_ENV # Extract version from the tag
18+
19+
- name: Set up Python
20+
uses: actions/setup-python@v5
21+
with:
22+
python-version: "3.14" # Adjust Python version as needed
23+
24+
- name: Install dependencies
25+
run: |
26+
python -m pip install --upgrade pip
27+
pip install build twine
28+
29+
- name: Change the version in pyproject.toml to 0.0.0dev{github.run_number}
30+
working-directory: durabletask-azuremanaged
31+
run: |
32+
sed -i 's/^version = ".*"/version = "0.0.0.dev${{ github.run_number }}"/' pyproject.toml
33+
sed -i 's/"durabletask>=.*"/"durabletask>=0.0.0dev1"/' pyproject.toml
34+
35+
- name: Build package from directory durabletask-azuremanaged
36+
working-directory: durabletask-azuremanaged
37+
run: |
38+
python -m build
39+
40+
- name: Check package
41+
working-directory: durabletask-azuremanaged
42+
run: |
43+
twine check dist/*
44+
45+
- name: Publish package to PyPI
46+
env:
47+
TWINE_USERNAME: __token__
48+
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN_AZUREMANAGED }} # Store your PyPI API token in GitHub Secrets
49+
working-directory: durabletask-azuremanaged
50+
run: |
51+
twine upload dist/*

‎.github/workflows/durabletask-azuremanaged.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
run: |
8787
pytest -m "dts" --verbose
8888
89-
publish:
89+
publish-release:
9090
if: startsWith(github.ref, 'refs/tags/azuremanaged-v') # Only run if a matching tag is pushed
9191
needs: run-docker-tests
9292
runs-on: ubuntu-latest

‎.github/workflows/durabletask-dev.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Durable Task SDK (durabletask) Dev Release
2+
3+
on:
4+
workflow_run:
5+
workflows: ["Durable Task SDK (durabletask)"]
6+
types:
7+
- completed
8+
branches:
9+
- main
10+
11+
jobs:
12+
publish-dev:
13+
# needs: run-tests
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Checkout code
17+
uses: actions/checkout@v4
18+
19+
- name: Extract version from tag
20+
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV # Extract version from the tag
21+
22+
- name: Set up Python
23+
uses: actions/setup-python@v5
24+
with:
25+
python-version: "3.14" # Adjust Python version as needed
26+
27+
- name: Install dependencies
28+
run: |
29+
python -m pip install --upgrade pip
30+
pip install build twine
31+
32+
- name: Append dev to version in pyproject.toml
33+
run: |
34+
sed -i 's/^version = "\(.*\)"/version = "\1.dev${{ github.run_number }}"/' pyproject.toml
35+
36+
- name: Build package from root directory
37+
run: |
38+
python -m build
39+
40+
- name: Check package
41+
run: |
42+
twine check dist/*
43+
44+
- name: Publish package to PyPI
45+
env:
46+
TWINE_USERNAME: __token__
47+
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} # Store your PyPI API token in GitHub Secrets
48+
run: |
49+
twine upload dist/*

‎.github/workflows/durabletask-experiment.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Durable Task SDK (durabletask) Experimental Release
2+
3+
on:
4+
push:
5+
branches-ignore:
6+
- main
7+
- release/*
8+
9+
jobs:
10+
publish-experimental:
11+
# needs: run-tests
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@v4
16+
17+
- name: Extract version from tag
18+
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV # Extract version from the tag
19+
20+
- name: Set up Python
21+
uses: actions/setup-python@v5
22+
with:
23+
python-version: "3.14" # Adjust Python version as needed
24+
25+
- name: Install dependencies
26+
run: |
27+
python -m pip install --upgrade pip
28+
pip install build twine
29+
30+
- name: Change the version in pyproject.toml to 0.0.0dev{github.run_number}
31+
run: |
32+
sed -i 's/^version = ".*"/version = "0.0.0.dev${{ github.run_number }}"/' pyproject.toml
33+
34+
- name: Build package from root directory
35+
run: |
36+
python -m build
37+
38+
- name: Check package
39+
run: |
40+
twine check dist/*
41+
42+
- name: Publish package to PyPI
43+
env:
44+
TWINE_USERNAME: __token__
45+
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} # Store your PyPI API token in GitHub Secrets
46+
run: |
47+
twine upload dist/*

‎.github/workflows/durabletask.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Durable Task SDK (durabletask)
22

33
on:
44
push:
5-
branches:
5+
branches:
66
- "main"
77
tags:
88
- "v*" # Only run for tags starting with "v"
@@ -71,7 +71,7 @@ jobs:
7171
durabletask-go --port 4001 &
7272
pytest -m "e2e and not dts" --verbose
7373
74-
publish:
74+
publish-release:
7575
if: startsWith(github.ref, 'refs/tags/v') # Only run if a matching tag is pushed
7676
needs: run-tests
7777
runs-on: ubuntu-latest
@@ -105,4 +105,4 @@ jobs:
105105
TWINE_USERNAME: __token__
106106
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }} # Store your PyPI API token in GitHub Secrets
107107
run: |
108-
twine upload dist/*
108+
twine upload dist/*

‎durabletask/entities/entity_instance_id.py‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
from typing import Optional
2-
3-
41
class EntityInstanceId:
52
def __init__(self, entity: str, key: str):
63
self.entity = entity
@@ -20,7 +17,7 @@ def __lt__(self, other):
2017
return str(self) < str(other)
2118

2219
@staticmethod
23-
def parse(entity_id: str) -> Optional["EntityInstanceId"]:
20+
def parse(entity_id: str) -> "EntityInstanceId":
2421
"""Parse a string representation of an entity ID into an EntityInstanceId object.
2522
2623
Parameters
@@ -30,8 +27,13 @@ def parse(entity_id: str) -> Optional["EntityInstanceId"]:
3027
3128
Returns
3229
-------
33-
Optional[EntityInstanceId]
34-
The parsed EntityInstanceId object, or None if the input is None.
30+
EntityInstanceId
31+
The parsed EntityInstanceId object.
32+
33+
Raises
34+
------
35+
ValueError
36+
If the input string is not in the correct format.
3537
"""
3638
try:
3739
_, entity, key = entity_id.split("@", 2)

‎durabletask/entities/entity_metadata.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ def __init__(self,
4444

4545
@staticmethod
4646
def from_entity_response(entity_response: pb.GetEntityResponse, includes_state: bool):
47-
entity_id = EntityInstanceId.parse(entity_response.entity.instanceId)
48-
if not entity_id:
47+
try:
48+
entity_id = EntityInstanceId.parse(entity_response.entity.instanceId)
49+
except ValueError:
4950
raise ValueError("Invalid entity instance ID in entity response.")
5051
entity_state = None
5152
if includes_state:

‎durabletask/internal/helpers.py‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,14 @@ def new_schedule_task_action(id: int, name: str, encoded_input: Optional[str],
196196
))
197197

198198

199-
def new_call_entity_action(id: int, parent_instance_id: str, entity_id: EntityInstanceId, operation: str, encoded_input: Optional[str]):
199+
def new_call_entity_action(id: int,
200+
parent_instance_id: str,
201+
entity_id: EntityInstanceId,
202+
operation: str,
203+
encoded_input: Optional[str],
204+
request_id: str) -> pb.OrchestratorAction:
200205
return pb.OrchestratorAction(id=id, sendEntityMessage=pb.SendEntityMessageAction(entityOperationCalled=pb.EntityOperationCalledEvent(
201-
requestId=f"{parent_instance_id}:{id}",
206+
requestId=request_id,
202207
operation=operation,
203208
scheduledTime=None,
204209
input=get_string_value(encoded_input),
@@ -208,9 +213,13 @@ def new_call_entity_action(id: int, parent_instance_id: str, entity_id: EntityIn
208213
)))
209214

210215

211-
def new_signal_entity_action(id: int, entity_id: EntityInstanceId, operation: str, encoded_input: Optional[str]):
216+
def new_signal_entity_action(id: int,
217+
entity_id: EntityInstanceId,
218+
operation: str,
219+
encoded_input: Optional[str],
220+
request_id: str) -> pb.OrchestratorAction:
212221
return pb.OrchestratorAction(id=id, sendEntityMessage=pb.SendEntityMessageAction(entityOperationSignaled=pb.EntityOperationSignaledEvent(
213-
requestId=f"{entity_id}:{id}",
222+
requestId=request_id,
214223
operation=operation,
215224
scheduledTime=None,
216225
input=get_string_value(encoded_input),

‎durabletask/py.typed‎

Whitespace-only changes.

0 commit comments

Comments
 (0)