Merge branch 'main' into rysweet-refactor-4670-rename-Abstractions-to…

…-Contracts
microsoft · Dec 13, 2024 · ff49e70 · ff49e70
2 parents c75ec80 + 7d4bf9b
commit ff49e70
Show file tree

Hide file tree

Showing 13 changed files with 1,132 additions and 295 deletions.
diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Agent.cs b/dotnet/src/Microsoft.AutoGen/Agents/Agent.cs
@@ -13,7 +13,7 @@
 
 namespace Microsoft.AutoGen.Agents;
 
-public abstract class Agent : IDisposable, IHandle
+public abstract class Agent : IHandle
 {
     public static readonly ActivitySource s_source = new("AutoGen.Agent");
     public AgentId AgentId => _runtime.AgentId;
@@ -22,8 +22,6 @@ public abstract class Agent : IDisposable, IHandle
 
     private readonly Channel<object> _mailbox = Channel.CreateUnbounded<object>();
     private readonly IAgentRuntime _runtime;
-    public string Route { get; set; } = "base";
-
     protected internal ILogger<Agent> _logger;
     public IAgentRuntime Context => _runtime;
     protected readonly EventTypes EventTypes;
@@ -343,9 +341,4 @@ public async ValueTask PublishEventAsync(string topic, IMessage evt, Cancellatio
     {
         await PublishEventAsync(evt.ToCloudEvent(topic), cancellationToken).ConfigureAwait(false);
     }
-
-    public void Dispose()
-    {
-        throw new NotImplementedException();
-    }
 }
diff --git a/dotnet/src/Microsoft.AutoGen/Agents/AgentRuntime.cs b/dotnet/src/Microsoft.AutoGen/Agents/AgentRuntime.cs
@@ -14,7 +14,7 @@ internal sealed class AgentRuntime(AgentId agentId, IAgentWorker worker, ILogger
     private readonly IAgentWorker worker = worker;
 
     public AgentId AgentId { get; } = agentId;
-    public ILogger<Agent> Logger { get; } = logger;
+    private ILogger<Agent> Logger { get; } = logger;
     public Agent? AgentInstance { get; set; }
     private DistributedContextPropagator DistributedContextPropagator { get; } = distributedContextPropagator;
     public (string?, string?) GetTraceIdAndState(IDictionary<string, string> metadata)

diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/ConsoleAgent/IHandleConsole.cs b/dotnet/src/Microsoft.AutoGen/Agents/Agents/IOAgent/ConsoleAgent/IHandleConsole.cs
@@ -8,7 +8,6 @@ namespace Microsoft.AutoGen.Agents;
 
 public interface IHandleConsole : IHandle<Output>, IHandle<Input>
 {
-    string Route { get; }
     AgentId AgentId { get; }
     ValueTask PublishMessageAsync<T>(T message, string? source = null, CancellationToken token = default) where T : IMessage;
 

diff --git a/dotnet/src/Microsoft.AutoGen/Agents/Services/HostBuilderExtensions.cs b/dotnet/src/Microsoft.AutoGen/Agents/Services/HostBuilderExtensions.cs
@@ -19,6 +19,7 @@ public static class HostBuilderExtensions
 
     public static IHostApplicationBuilder AddAgent<
         [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TAgent>(this IHostApplicationBuilder builder, string typeName) where TAgent : Agent
+        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] TAgent>(this IHostApplicationBuilder builder, string typeName) where TAgent : Agent
     {
         builder.Services.AddKeyedSingleton("AgentTypes", (sp, key) => Tuple.Create(typeName, typeof(TAgent)));
 

diff --git a/python/packages/autogen-ext/pyproject.toml b/python/packages/autogen-ext/pyproject.toml
@@ -32,6 +32,7 @@ web-surfer = [
     "autogen-agentchat==0.4.0.dev11",
     "playwright>=1.48.0",
     "pillow>=11.0.0",
+    "markitdown>=0.0.1a2",
 ]
 magentic-one = [
     "autogen-agentchat==0.4.0.dev11",
@@ -77,7 +78,11 @@ testpaths = ["tests"]
 include = "../../shared_tasks.toml"
 
 [tool.poe.tasks]
-test = "pytest -n auto"
+test.sequence = [
+    "playwright install",
+    "pytest -n auto",
+]
+test.default_item_type = "cmd"
 mypy = "mypy --config-file ../../pyproject.toml --exclude src/autogen_ext/runtimes/grpc/protos --exclude tests/protos src tests"
 
 [tool.mypy]

diff --git a/python/packages/autogen-ext/src/autogen_ext/agents/web_surfer/__init__.py b/python/packages/autogen-ext/src/autogen_ext/agents/web_surfer/__init__.py
@@ -1,3 +1,4 @@
 from ._multimodal_web_surfer import MultimodalWebSurfer
+from .playwright_controller import PlaywrightController
 
-__all__ = ["MultimodalWebSurfer"]
+__all__ = ["MultimodalWebSurfer", "PlaywrightController"]
diff --git a/python/packages/autogen-ext/src/autogen_ext/agents/web_surfer/_multimodal_web_surfer.py b/python/packages/autogen-ext/src/autogen_ext/agents/web_surfer/_multimodal_web_surfer.py