updates, merge from release-1.16, fix tests, separate app IDs

Signed-off-by: Filinto Duran <[email protected]>

Author: filintod

conversation/python/sdk/README.md

@@ -69,8 +69,8 @@ For more LLM options, see the [supported Conversation components](https://docs.d
     <!-- STEP
     name: Run multi app run template
     expected_stdout_lines:
-      - '== APP - conversation == Input sent: What is dapr?'
-      - '== APP - conversation == Output response: What is dapr?'
+      - '== APP - conversation-sdk == Input sent: What is dapr?'
+      - '== APP - conversation-sdk == Output response: What is dapr?'
     expected_stderr_lines:
     output_match_mode: substring
     match_order: none
@@ -87,8 +87,8 @@ For more LLM options, see the [supported Conversation components](https://docs.d
     Expected output:
 
     ```text
-    == APP - conversation == Input sent: What is dapr?
-    == APP - conversation == Output response: What is dapr?
+    == APP - conversation-sdk == Input sent: What is dapr?
+    == APP - conversation-sdk == Output response: What is dapr?
     ```
 
     <!-- END_STEP -->
@@ -111,10 +111,10 @@ For more LLM options, see the [supported Conversation components](https://docs.d
     <!-- STEP
     name: Run multi app run template
     expected_stdout_lines:
-      - "== APP - conversation == Input sent: calculate square root of 15"
-      - "== APP - conversation == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls', index=0, message=ConversationResultAlpha2Message(content='calculate square root of 15', tool_calls=[ConversationToolCalls(id='0', function=ConversationToolCallsOfFunction(name='calculate', arguments='expression'))]))"
-      - "== APP - conversation == Input sent: get weather in London in celsius"
-      - "== APP - conversation == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls', index=0, message=ConversationResultAlpha2Message(content='get weather in London in celsius', tool_calls=[ConversationToolCalls(id='0', function=ConversationToolCallsOfFunction(name='get_weather', arguments='location,unit'))]))"
+      - "== APP - conversation-tool-calling == Input sent: calculate square root of 15"
+      - "== APP - conversation-tool-calling == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls', index=0, message=ConversationResultAlpha2Message(content='calculate square root of 15', tool_calls=[ConversationToolCalls(id='0', function=ConversationToolCallsOfFunction(name='calculate', arguments='expression'))]))"
+      - "== APP - conversation-tool-calling == Input sent: get weather in London in celsius"
+      - "== APP - conversation-tool-calling == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls', index=0, message=ConversationResultAlpha2Message(content='get weather in London in celsius', tool_calls=[ConversationToolCalls(id='0', function=ConversationToolCallsOfFunction(name='get_weather', arguments='location,unit'))]))"
     expected_stderr_lines:
     output_match_mode: substring
     match_order: none
@@ -131,10 +131,10 @@ For more LLM options, see the [supported Conversation components](https://docs.d
    Expected output:
 
     ```text
-    == APP - conversation == Input sent: calculate square root of 15
-    == APP - conversation == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls', index=0, message=ConversationResultAlpha2Message(content='calculate square root of 15', tool_calls=[ConversationToolCalls(id='0', function=ConversationToolCallsOfFunction(name='calculate', arguments='expression'))]))
-    == APP - conversation == Input sent: get weather in London in celsius
-    == APP - conversation == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls', index=0, message=ConversationResultAlpha2Message(content='get weather in London in celsius', tool_calls=[ConversationToolCalls(id='0', function=ConversationToolCallsOfFunction(name='get_weather', arguments='location,unit'))]))   
+    == APP - conversation-tool-calling == Input sent: calculate square root of 15
+    == APP - conversation-tool-calling == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls', index=0, message=ConversationResultAlpha2Message(content='calculate square root of 15', tool_calls=[ConversationToolCalls(id='0', function=ConversationToolCallsOfFunction(name='calculate', arguments='expression'))]))
+    == APP - conversation-tool-calling == Input sent: get weather in London in celsius
+    == APP - conversation-tool-calling == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls', index=0, message=ConversationResultAlpha2Message(content='get weather in London in celsius', tool_calls=[ConversationToolCalls(id='0', function=ConversationToolCallsOfFunction(name='get_weather', arguments='location,unit'))]))   
     ```
 
     <!-- END_STEP -->
@@ -147,7 +147,7 @@ For more LLM options, see the [supported Conversation components](https://docs.d
     -->
 
     ```bash
-    dapr stop -f .
+    dapr stop -f dapr-tool-calling.yaml   
     ```
 
     <!-- END_STEP -->

conversation/python/sdk/conversation/requirements.txt

@@ -1,3 +1,4 @@
 #dapr>=1.16.0-rc1
 
--e ../../../../../python-sdk
+# TODO: temporary until we get an rc or release
+dapr-dev @ git+https://github.com/dapr/python-sdk@main

conversation/python/sdk/dapr-tool-calling.yaml

@@ -2,6 +2,6 @@ version: 1
 common:
   resourcesPath: ../../components/
 apps:
-  - appID: conversation
+  - appID: conversation-tool-calling
     appDirPath: ./conversation/
     command: ["python3", "tool_calling.py"]

conversation/python/sdk/dapr.yaml

@@ -2,6 +2,6 @@ version: 1
 common:
   resourcesPath: ../../components/
 apps:
-  - appID: conversation
+  - appID: conversation-sdk
     appDirPath: ./conversation/
     command: ["python3", "app.py"]