Merge branch 'main' into statestore-examples

Author: elena-kolevska

dapr/actor/runtime/state_manager.py

@@ -85,7 +85,7 @@ async def try_add_state(self, state_name: str, value: T) -> bool:
         existed = await self._actor.runtime_ctx.state_provider.contains_state(
             self._type_name, self._actor.id.id, state_name
         )
-        if not existed:
+        if existed:
             return False
 
         state_change_tracker[state_name] = StateMetadata(value, StateChangeKind.add)

examples/invoke-http/README.md

@@ -0,0 +1,75 @@
+# Example - Invoke a service
+
+This example utilizes a receiver and a caller for the `invoke_method` functionality.
+
+> **Note:** Make sure to use the latest proto bindings
+
+## Pre-requisites
+
+- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started)
+- [Install Python 3.8+](https://www.python.org/downloads/)
+
+### Install requirements
+
+You can install dapr SDK package using pip command:
+
+<!-- STEP 
+name: Install requirements
+-->
+
+```sh
+pip3 install dapr Flask
+```
+
+<!-- END_STEP -->
+
+## Run the example
+
+To run this example, the following code can be utilized:
+
+Start the receiver:
+<!-- STEP
+name: Run invoke http example
+expected_stdout_lines:
+  - '== APP == Order received : {"id": 1, "message": "hello world"}'
+  - '== APP == Order error : {"id": 2, "message": "hello world"}'
+background: true
+sleep: 5
+-->
+
+```bash
+dapr run --app-id=invoke-receiver --app-port=8088 --app-protocol http -- python3 invoke-receiver.py
+```
+<!-- END_STEP -->
+
+Start the caller:
+<!-- STEP
+name: Run invoke http example
+expected_stdout_lines:
+  - '== APP == text/html'
+  - '== APP == {"success": true}'
+  - '== APP == 200'
+  - '== APP == error occurred'
+  - '== APP == MY_CODE'
+background: true
+sleep: 5 
+-->
+
+```bash
+dapr run --app-id=invoke-caller -- python3 invoke-caller.py
+```
+<!-- END_STEP -->
+
+## Cleanup
+
+<!-- STEP
+expected_stdout_lines: 
+  - '✅  app stopped successfully: invoke-receiver'
+name: Shutdown dapr
+-->
+
+```bash
+dapr stop --app-id invoke-receiver
+```
+
+<!-- END_STEP -->

examples/invoke-http/invoke-caller.py

@@ -6,18 +6,29 @@
 with DaprClient() as d:
     req_data = {'id': 1, 'message': 'hello world'}
 
-    while True:
-        # Create a typed message with content type and body
-        resp = d.invoke_method(
+    # First message: success
+    # Create a typed message with content type and body
+    resp1 = d.invoke_method(
+        'invoke-receiver',
+        'my-method',
+        http_verb='POST',
+        data=json.dumps(req_data),
+    )
+
+    # Print the response
+    print(resp1.content_type, flush=True)
+    print(resp1.text(), flush=True)
+    print(str(resp1.status_code), flush=True)
+
+    # Second message: error
+    req_data = {'id': 2, 'message': 'hello world'}
+    try:
+        resp2 = d.invoke_method(
             'invoke-receiver',
-            'my-method',
+            'my-method-err',
             http_verb='POST',
             data=json.dumps(req_data),
         )
-
-        # Print the response
-        print(resp.content_type, flush=True)
-        print(resp.text(), flush=True)
-        print(str(resp.status_code), flush=True)
-
-        time.sleep(2)
+    except Exception as e:
+        print(e._message, flush=True)
+        print(e._error_code, flush=True)

examples/invoke-http/invoke-receiver.py

@@ -12,4 +12,13 @@ def getOrder():
     return json.dumps({'success': True}), 200, {'ContentType': 'application/json'}
 
 
+@app.route('/my-method-err', methods=['POST'])
+def getOrderErr():
+    data = request.json
+    print('Order error : ' + json.dumps(data), flush=True)
+    resp = {'message': 'error occurred', 'errorCode': 'MY_CODE'}
+    return json.dumps(resp), 503, {'ContentType': 'application/json'}
+
+
+print('Starting Flask app on port 8088...', flush=True)
 app.run(port=8088)

tests/actor/test_state_manager.py

@@ -46,7 +46,7 @@ def setUp(self):
 
     @mock.patch(
         'tests.actor.fake_client.FakeDaprActorClient.get_state',
-        new=_async_mock(return_value=base64.b64encode(b'"value1"')),
+        new=_async_mock(),
     )
     @mock.patch(
         'tests.actor.fake_client.FakeDaprActorClient.save_state_transactionally', new=_async_mock()
@@ -67,6 +67,20 @@ def test_add_state(self):
         added = _run(state_manager.try_add_state('state1', 'value1'))
         self.assertFalse(added)
 
+    @mock.patch(
+        'tests.actor.fake_client.FakeDaprActorClient.get_state',
+        new=_async_mock(return_value=base64.b64encode(b'"value1"')),
+    )
+    @mock.patch(
+        'tests.actor.fake_client.FakeDaprActorClient.save_state_transactionally', new=_async_mock()
+    )
+    def test_add_state_with_existing_state(self):
+        state_manager = ActorStateManager(self._fake_actor)
+
+        # Add first 'state1'
+        added = _run(state_manager.try_add_state('state1', 'value1'))
+        self.assertFalse(added)
+
     @mock.patch('tests.actor.fake_client.FakeDaprActorClient.get_state', new=_async_mock())
     def test_get_state_for_no_state(self):
         state_manager = ActorStateManager(self._fake_actor)