Merge branch 'main' into jobs-api

Author: elena-kolevska

.github/workflows/fossa.yaml

@@ -43,12 +43,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: "Run FOSSA Scan"
-        uses: fossas/fossa-action@v1.4.0 # Use a specific version if locking is preferred
+        uses: fossas/fossa-action@v1.7.0 # Use a specific version if locking is preferred
         with:
           api-key: ${{ env.FOSSA_API_KEY }}
 
       - name: "Run FOSSA Test"
-        uses: fossas/fossa-action@v1.4.0 # Use a specific version if locking is preferred
+        uses: fossas/fossa-action@v1.7.0 # Use a specific version if locking is preferred
         with:
           api-key: ${{ env.FOSSA_API_KEY }}
           run-tests: true

dapr/actor/runtime/_reminder_data.py

@@ -36,7 +36,7 @@ def __init__(
         reminder_name: str,
         state: Optional[bytes],
         due_time: timedelta,
-        period: timedelta,
+        period: Optional[timedelta] = None,
         ttl: Optional[timedelta] = None,
     ):
         """Creates new :class:`ActorReminderData` instance.
@@ -77,7 +77,7 @@ def due_time(self) -> timedelta:
         return self._due_time
 
     @property
-    def period(self) -> timedelta:
+    def period(self) -> Optional[timedelta]:
         """Gets period of Actor Reminder."""
         return self._period
 

dapr/actor/runtime/actor.py

@@ -112,7 +112,7 @@ async def register_reminder(
         name: str,
         state: bytes,
         due_time: timedelta,
-        period: timedelta,
+        period: Optional[timedelta] = None,
         ttl: Optional[timedelta] = None,
     ) -> None:
         """Registers actor reminder.

dapr/actor/runtime/mock_actor.py

@@ -86,7 +86,7 @@ async def register_reminder(
         name: str,
         state: bytes,
         due_time: timedelta,
-        period: timedelta,
+        period: Optional[timedelta] = None,
         ttl: Optional[timedelta] = None,
     ) -> None:
         """Adds actor reminder to self._state_manager._mock_reminders.

dapr/actor/runtime/state_manager.py

@@ -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
 
 

dapr/clients/grpc/_request.py

@@ -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)
@@ -127,7 +127,7 @@ def http_verb(self) -> Optional[str]:
     @http_verb.setter
     def http_verb(self, val: Optional[str]) -> None:
         """Sets HTTP method to Dapr invocation request."""
-        if val not in self.HTTP_METHODS:
+        if val is not None and val not in self.HTTP_METHODS:
             raise ValueError(f'{val} is the invalid HTTP verb.')
         self._http_verb = val
 
@@ -285,6 +285,7 @@ def __init__(
         data: Optional[Union[bytes, str]] = None,
         etag: Optional[str] = None,
         operation_type: TransactionOperationType = TransactionOperationType.upsert,
+        metadata: Optional[Dict[str, str]] = None,
     ):
         """Initializes TransactionalStateOperation item from
         :obj:`runtime_v1.TransactionalStateOperation`.
@@ -305,6 +306,7 @@ def __init__(
         self._data = data  # type: ignore
         self._etag = etag
         self._operation_type = operation_type
+        self._metadata = metadata
 
     @property
     def key(self) -> str:
@@ -326,6 +328,11 @@ def operation_type(self) -> TransactionOperationType:
         """Gets etag."""
         return self._operation_type
 
+    @property
+    def metadata(self) -> Dict[str, str]:
+        """Gets metadata."""
+        return {} if self._metadata is None else self._metadata
+
 
 class EncryptRequestIterator(DaprRequest):
     """An iterator for cryptography encrypt API requests.

dapr/clients/grpc/client.py

@@ -940,6 +940,7 @@ def execute_state_transaction(
                     key=o.key,
                     value=to_bytes(o.data) if o.data is not None else to_bytes(''),
                     etag=common_v1.Etag(value=o.etag) if o.etag is not None else None,
+                    metadata=o.metadata,
                 ),
             )
             for o in operations

daprdocs/content/en/python-sdk-docs/python-sdk-extensions/python-fastapi.md

@@ -47,7 +47,7 @@ class RawEventModel(BaseModel):
 
 class User(BaseModel):
     id: int
-    name = 'Jane Doe'
+    name: str
 
 class CloudEventModel(BaseModel):
     data: User

examples/state_store/README.md

@@ -41,13 +41,15 @@ expected_stdout_lines:
   - "== APP == Cannot save bulk due to bad etags. ErrorCode=StatusCode.ABORTED"
   - "== APP == Got value=b'value_1' eTag=1"
   - "== APP == Got items with etags: [(b'value_1_updated', '2'), (b'value_2', '2')]"
+  - "== APP == Transaction with outbox pattern executed successfully!"
+  - "== APP == Got value after outbox pattern: b'val1'"
   - "== APP == Got values after transaction delete: [b'', b'']"
   - "== APP == Got value after delete: b''"
 timeout_seconds: 5
 -->
 
 ```bash
-dapr run -- python3 state_store.py
+dapr run --resources-path components/ -- python3 state_store.py
 ```
 <!-- END_STEP -->
 
@@ -68,6 +70,10 @@ The output should be as follows:
 
 == APP == Got items with etags: [(b'value_1_updated', '2'), (b'value_2', '2')]
 
+== APP == Transaction with outbox pattern executed successfully!
+
+== APP == Got value after outbox pattern: b'val1'
+
 == APP == Got values after transaction delete: [b'', b'']
 
 == APP == Got value after delete: b''

examples/state_store/components/pubsub.yaml

@@ -0,0 +1,12 @@
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: pubsub
+spec:
+  type: pubsub.redis
+  version: v1
+  metadata:
+  - name: redisHost
+    value: localhost:6379
+  - name: redisPassword
+    value: ""