updates to examples, fix on streaming tools

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

Author: filintod

dapr/aio/clients/grpc/client.py

@@ -2015,20 +2015,7 @@ def convert_content_part_to_pb(part):
                 elif response.HasField('complete'):
                     # Handle completion
                     complete_pb = response.complete
-
-                    usage = None
-                    if complete_pb.HasField('usage'):
-                        usage = ConversationUsage(
-                            prompt_tokens=complete_pb.usage.prompt_tokens,
-                            completion_tokens=complete_pb.usage.completion_tokens,
-                            total_tokens=complete_pb.usage.total_tokens
-                        )
-
-                    complete = ConversationStreamComplete(
-                        context_id=complete_pb.contextID if complete_pb.HasField('contextID') else None,
-                        usage=usage
-                    )
-
+                    complete = ConversationStreamComplete.from_proto(complete_pb)
                     yield ConversationStreamResponse(complete=complete)
 
         except grpc.aio.AioRpcError as err:

dapr/clients/grpc/client.py

@@ -1,4 +1,3 @@
-
 """
 Copyright 2023 The Dapr Authors
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -2050,20 +2049,7 @@ def convert_content_part_to_pb(part):
                 elif response.HasField('complete'):
                     # Handle completion
                     complete_pb = response.complete
-
-                    usage = None
-                    if complete_pb.HasField('usage'):
-                        usage = ConversationUsage(
-                            prompt_tokens=complete_pb.usage.prompt_tokens,
-                            completion_tokens=complete_pb.usage.completion_tokens,
-                            total_tokens=complete_pb.usage.total_tokens
-                        )
-
-                    complete = ConversationStreamComplete(
-                        context_id=complete_pb.contextID if complete_pb.HasField('contextID') else None,
-                        usage=usage
-                    )
-
+                    complete = ConversationStreamComplete.from_proto(complete_pb)
                     yield ConversationStreamResponse(complete=complete)
 
         except RpcError as err:

examples/conversation/components/echo.yaml

@@ -0,0 +1,12 @@
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: echo
+spec:
+  type: conversation.echo
+  version: v1
+  metadata:
+  - name: key
+    value: testkey
+  - name: timeout
+    value: 30s

tools/run_dapr_dev.py

@@ -29,7 +29,13 @@
 
 SCRIPT_DIR = Path(__file__).parent
 REPO_ROOT = SCRIPT_DIR.parent
+
+# make sure dapr repo is in the right place
 DAPR_REPO = REPO_ROOT.parent / "dapr"
+if not DAPR_REPO.exists():
+    print(f"❌ Error: Dapr repository not found at {DAPR_REPO}")
+    print("Please clone the dapr repository at ../dapr relative to python-sdk and dapr-agents")
+    sys.exit(1)
 
 
 def load_env_file():
@@ -84,6 +90,7 @@ def load_env_file():
 def get_provider_key(provider, env_vars, providers_alt_keys):
     """Get the API key for a provider."""
     provider_prefixes = providers_alt_keys.get(provider, [provider])
+    value = None
     for prefix in provider_prefixes:
         key = f"{prefix}_API_KEY"
         if key in env_vars:
@@ -256,12 +263,6 @@ def run_daprd(args):
 
     # Load environment variables from .env file
     env_vars = load_env_file()
-
-    # Set environment variables for the process
-    # Some components need the environment variables to be available at runtime
-    for key, value in env_vars.items():
-        os.environ[key] = value
-
     # Special mapping for Gemini - it expects GEMINI_API_KEY but we have GOOGLE_AI_API_KEY
     if "GOOGLE_AI_API_KEY" in env_vars:
         os.environ["GEMINI_API_KEY"] = env_vars["GOOGLE_AI_API_KEY"]
@@ -309,6 +310,7 @@ def run_daprd(args):
 
     try:
         # Run the sidecar with explicit environment inheritance
+        # Set environment variables for the process
         env = os.environ.copy()
         env.update(env_vars)
         subprocess.run(cmd, check=True, env=env)