fix(python): revert all sdk changes on python for now

Signed-off-by: Samantha Coyle <sam@diagrid.io>

Author: sicoyle

conversation/python/sdk/README.md

@@ -70,25 +70,25 @@ For more LLM options, see the [supported Conversation components](https://docs.d
     name: Run multi app run template
     expected_stdout_lines:
       - '== APP - conversation-sdk == Input sent: What is dapr?'
-      - '== APP - conversation-sdk == Output response:'
+      - '== APP - conversation-sdk == Output response: What is dapr?'
     expected_stderr_lines:
     output_match_mode: substring
     match_order: none
     background: true
-    sleep: 30
-    timeout_seconds: 60
+    sleep: 15
+    timeout_seconds: 30
     -->
-
+    
     ```bash
     source conversation/.venv/bin/activate
-    dapr run -f .
+    dapr run -f .    
     ```
-
+    
     Expected output:
-
+    
     ```text
     == APP - conversation-sdk == Input sent: What is dapr?
-    == APP - conversation-sdk == Output response: Dapr is an open-source, cross-platform microservices framework...
+    == APP - conversation-sdk == Output response: What is dapr?
     ```
 
     <!-- END_STEP -->
@@ -112,15 +112,15 @@ For more LLM options, see the [supported Conversation components](https://docs.d
     name: Run multi app run template
     expected_stdout_lines:
       - "== APP - conversation-tool-calling == Input sent: calculate square root of 15"
-      - "== APP - conversation-tool-calling == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls'"
+      - "== 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 San Francisco in celsius"
-      - "== APP - conversation-tool-calling == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls'"
+      - "== APP - conversation-tool-calling == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls', index=0, message=ConversationResultAlpha2Message(content='get weather in San Francisco 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
     background: true
-    sleep: 30
-    timeout_seconds: 60
+    sleep: 15
+    timeout_seconds: 30
     -->
 
     ```bash
@@ -132,9 +132,9 @@ For more LLM options, see the [supported Conversation components](https://docs.d
 
     ```text
     == 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='call_...', function=ConversationToolCallsOfFunction(name='calculate', arguments='{"expression": "sqrt(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 San Francisco in celsius
-    == APP - conversation-tool-calling == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls', index=0, message=ConversationResultAlpha2Message(content='get weather in San Francisco in celsius', tool_calls=[ConversationToolCalls(id='call_...', function=ConversationToolCallsOfFunction(name='get_weather', arguments='{"location": "San Francisco", "unit": "celsius"}'))]))
+    == APP - conversation-tool-calling == Output response: ConversationResultAlpha2Choices(finish_reason='tool_calls', index=0, message=ConversationResultAlpha2Message(content='get weather in San Francisco in celsius', tool_calls=[ConversationToolCalls(id='0', function=ConversationToolCallsOfFunction(name='get_weather', arguments='location,unit'))]))   
     ```
 
     <!-- END_STEP -->

conversation/python/sdk/conversation/app.py

@@ -10,53 +10,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ------------------------------------------------------------
-import sys
 from dapr.clients import DaprClient
 from dapr.clients.grpc.conversation import ConversationInputAlpha2, ConversationMessage, ConversationMessageContent, ConversationMessageOfUser
 
-try:
-    with DaprClient() as d:
-        text_input = "What is dapr?"
-        provider_component = "ollama"
+with DaprClient() as d:
+    text_input = "What is dapr?"
+    provider_component = "echo"
 
-        inputs = [
-            ConversationInputAlpha2(messages=[ConversationMessage(of_user=ConversationMessageOfUser(content=[ConversationMessageContent(text=text_input)]))],
-                                    scrub_pii=True),
-        ]
+    inputs = [
+        ConversationInputAlpha2(messages=[ConversationMessage(of_user=ConversationMessageOfUser(content=[ConversationMessageContent(text=text_input)]))],
+                                scrub_pii=True),
+    ]
 
-        print(f'Input sent: {text_input}', flush=True)
+    print(f'Input sent: {text_input}')
 
-        response = d.converse_alpha2(name=provider_component, inputs=inputs, temperature=0.7)
-        
-        if response and hasattr(response, 'outputs') and response.outputs:
-            for output in response.outputs:
-                if hasattr(output, 'model') and output.model:
-                    print(f'Model: {output.model}', flush=True)
-                
-                if hasattr(output, 'usage') and output.usage:
-                    usage = output.usage
-                    prompt_tokens = getattr(usage, 'prompt_tokens', None) or getattr(usage, 'promptTokens', None)
-                    completion_tokens = getattr(usage, 'completion_tokens', None) or getattr(usage, 'completionTokens', None)
-                    total_tokens = getattr(usage, 'total_tokens', None) or getattr(usage, 'totalTokens', None)
-                    print(f'Usage: prompt_tokens={prompt_tokens} completion_tokens={completion_tokens} total_tokens={total_tokens}', flush=True)
-                
-                if output and hasattr(output, 'choices') and output.choices and len(output.choices) > 0:
-                    choice = output.choices[0]
-                    if choice and hasattr(choice, 'message') and choice.message:
-                        message = choice.message
-                        content = getattr(message, 'content', None)
-                        if content:
-                            print(f'Output response: {content}', flush=True)
-                        else:
-                            print(f'Output response: {message}', flush=True)
-                    else:
-                        print(f'Output response: {choice}', flush=True)
-                else:
-                    print('No choices in output', flush=True)
-                    print(f'Output response: {output}', flush=True)
-        else:
-            print('No outputs found in response', flush=True)
-            print(f'Response data: {response}', flush=True)
-except Exception as e:
-    print(f'Error: {e}', file=sys.stderr, flush=True)
-    sys.exit(1)
+    response = d.converse_alpha2(name=provider_component, inputs=inputs, temperature=0.7, context_id='chat-123')
+
+    for output in response.outputs:
+        print(f'Output response: {output.choices[0].message.content}')

conversation/python/sdk/conversation/tool_calling.py

@@ -14,7 +14,7 @@
 from dapr.clients.grpc import conversation
 
 with DaprClient() as d:
-    provider_component = "ollama"
+    provider_component = "echo"
 
     # ------------------------------------------------------------
     # Creating Tool Function definition using lower level API and hand-crafted JSON schema