Merge branch 'main' into webupdate

.devcontainer/Dockerfile

@@ -1,4 +1,10 @@
 #-------------------------------------------------------------------------------------------------------------
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+# SPDX-License-Identifier: Apache-2.0
+# Contributions to this project, i.e., https://github.com/autogen-ai/autogen, are licensed under the Apache License, Version 2.0 (Apache-2.0).
+
+# Portions derived from  https://github.com/microsoft/autogen under the MIT License.
+# SPDX-License-Identifier: MIT
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See LICENSE file in the project root for license information.
 #-------------------------------------------------------------------------------------------------------------

.devcontainer/studio/Dockerfile

@@ -1,4 +1,10 @@
 #-------------------------------------------------------------------------------------------------------------
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+# SPDX-License-Identifier: Apache-2.0
+# Contributions to this project, i.e., https://github.com/autogen-ai/autogen, are licensed under the Apache License, Version 2.0 (Apache-2.0).
+
+# Portions derived from  https://github.com/microsoft/autogen under the MIT License.
+# SPDX-License-Identifier: MIT
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See LICENSE file in the project root for license information.
 #-------------------------------------------------------------------------------------------------------------

NOTICE.md

@@ -0,0 +1,19 @@
+## NOTICE
+
+Copyright (c) 2023-2024, Owners of https://github.com/autogen-ai
+
+This project is a fork of https://github.com/microsoft/autogen.
+
+The [original project](https://github.com/microsoft/autogen) is licensed under the MIT License as detailed in [LICENSE_original_MIT](./license_original/LICENSE_original_MIT). The fork was created from version v0.2.35 of the original project.
+
+
+This project, i.e., https://github.com/autogen-ai/autogen, is licensed under the Apache License, Version 2.0 as detailed in [LICENSE](./LICENSE)
+
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+Ongoing MIT-licensed contributions:
+This project regularly incorporates code merged from the [original repository](https://github.com/microsoft/autogen) after the initial fork. This merged code remains under the original MIT license. For specific details on merged commits, please refer to the project's commit history.
+The MIT license applies to portions of code originating from the [original repository](https://github.com/microsoft/autogen) as described above.
+
+Last updated: 08/25/2024

README.md

@@ -122,7 +122,7 @@ pip install pyautogen
 
 Minimal dependencies are installed without extra options. You can install extra options based on the feature you need.
 
-<!-- For example, use the following to install the dependencies needed by the [`blendsearch`](https://autogen-ai.github.io/FLAML/docs/Use-Cases/Tune-User-Defined-Function#blendsearch-economical-hyperparameter-optimization-with-blended-search-strategy) option.
+<!-- For example, use the following to install the dependencies needed by the [`blendsearch`](https://microsoft.github.io/FLAML/docs/Use-Cases/Tune-User-Defined-Function#blendsearch-economical-hyperparameter-optimization-with-blended-search-strategy) option.
 ```bash
 pip install "pyautogen[blendsearch]"
 ``` -->
@@ -308,27 +308,13 @@ In addition, you can find:
   </a>
 </p>
 
-<!--
-# Legal Notices
-
-Microsoft and any contributors grant you a license to the Microsoft documentation and other content
-in this repository under the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/legalcode),
-see the [LICENSE](LICENSE) file, and grant you a license to any code in the repository under the [MIT License](https://opensource.org/licenses/MIT), see the
-[LICENSE-CODE](LICENSE-CODE) file.
+## License
+This project is licensed under the [Apache License, Version 2.0 (Apache-2.0)](./LICENSE).
 
-Microsoft, Windows, Microsoft Azure, and/or other Microsoft products and services referenced in the documentation
-may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries.
-The licenses for this project do not grant you rights to use any Microsoft names, logos, or trademarks.
-Microsoft's general trademark guidelines can be found at http://go.microsoft.com/fwlink/?LinkID=254653.
+This project is a fork of https://github.com/microsoft/autogen and contains code under two licenses:
 
-Privacy information can be found at https://privacy.microsoft.com/en-us/
+- The original code from https://github.com/microsoft/autogen is licensed under the MIT License.  See the [LICENSE_original_MIT](./license_original/LICENSE_original_MIT) file for details.
 
-Microsoft and any contributors reserve all other rights, whether under their respective copyrights, patents,
-or trademarks, whether by implication, estoppel, or otherwise.
+- Modifications and additions made in this fork are licensed under the Apache License, Version 2.0. See the  [LICENSE](./LICENSE) file for the full license text.
 
-<p align="right" style="font-size: 14px; color: #555; margin-top: 20px;">
-  <a href="#readme-top" style="text-decoration: none; color: blue; font-weight: bold;">
-    ↑ Back to Top ↑
-  </a>
-</p>
--->
+We have documented these changes for clarity and to ensure transparency with our user and contributor community. For more details, please see the [NOTICE](./NOTICE.md) file.

autogen/__init__.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import logging
 
 from .agentchat import *

autogen/_pydantic.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from typing import Any, Dict, Optional, Tuple, Type, Union, get_args
 
 from pydantic import BaseModel

autogen/agentchat/__init__.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from .agent import Agent
 from .assistant_agent import AssistantAgent
 from .chat import ChatResult, initiate_chats

autogen/agentchat/agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from typing import Any, Dict, List, Optional, Protocol, Union, runtime_checkable
 
 

autogen/agentchat/assistant_agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from typing import Callable, Dict, Literal, Optional, Union
 
 from autogen.runtime_logging import log_new_agent, logging_enabled

autogen/agentchat/chat.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import asyncio
 import datetime
 import logging

autogen/agentchat/contrib/agent_builder.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import hashlib
 import importlib
 import json

autogen/agentchat/contrib/agent_eval/agent_eval.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from typing import Dict, List, Literal, Optional, Union
 
 import autogen

autogen/agentchat/contrib/agent_eval/criterion.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from __future__ import annotations
 
 import json

autogen/agentchat/contrib/agent_eval/critic_agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from typing import Optional
 
 from autogen.agentchat.conversable_agent import ConversableAgent

autogen/agentchat/contrib/agent_eval/quantifier_agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from typing import Optional
 
 from autogen.agentchat.conversable_agent import ConversableAgent

autogen/agentchat/contrib/agent_eval/subcritic_agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from typing import Optional
 
 from autogen.agentchat.conversable_agent import ConversableAgent

autogen/agentchat/contrib/agent_eval/task.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import json
 
 from pydantic import BaseModel

autogen/agentchat/contrib/agent_optimizer.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import copy
 import json
 from typing import Dict, List, Literal, Optional, Union

autogen/agentchat/contrib/capabilities/agent_capability.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from autogen.agentchat.assistant_agent import ConversableAgent
 
 

autogen/agentchat/contrib/capabilities/generate_images.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import re
 from typing import Any, Dict, List, Literal, Optional, Protocol, Tuple, Union
 

autogen/agentchat/contrib/capabilities/teachability.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import os
 import pickle
 from typing import Dict, Optional, Union

autogen/agentchat/contrib/capabilities/text_compressors.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from typing import Any, Dict, Optional, Protocol
 
 IMPORT_ERROR: Optional[Exception] = None

autogen/agentchat/contrib/capabilities/transform_messages.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import copy
 from typing import Dict, List
 

autogen/agentchat/contrib/capabilities/transforms.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import copy
 import sys
 from typing import Any, Dict, List, Optional, Protocol, Tuple, Union

autogen/agentchat/contrib/capabilities/transforms_util.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from typing import Any, Dict, Hashable, List, Optional, Tuple
 
 from autogen import token_count_utils

autogen/agentchat/contrib/capabilities/vision_capability.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import copy
 from typing import Callable, Dict, List, Optional, Union
 

autogen/agentchat/contrib/gpt_assistant_agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import copy
 import json
 import logging

autogen/agentchat/contrib/img_utils.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import base64
 import copy
 import os

autogen/agentchat/contrib/llamaindex_conversable_agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 from typing import Dict, List, Optional, Tuple, Union
 
 from autogen import OpenAIWrapper

autogen/agentchat/contrib/llava_agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import json
 import logging
 from typing import List, Optional, Tuple

autogen/agentchat/contrib/math_user_proxy_agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import os
 import re
 from time import sleep

autogen/agentchat/contrib/multimodal_conversable_agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import copy
 from typing import Dict, List, Optional, Tuple, Union
 

autogen/agentchat/contrib/qdrant_retrieve_user_proxy_agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import warnings
 from typing import Callable, Dict, List, Literal, Optional
 

autogen/agentchat/contrib/retrieve_assistant_agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import warnings
 from typing import Any, Dict, List, Optional, Tuple, Union
 

autogen/agentchat/contrib/retrieve_user_proxy_agent.py

@@ -1,3 +1,9 @@
+# Copyright (c) 2023 - 2024, Owners of https://github.com/autogen-ai
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Portions derived from  https://github.com/microsoft/autogen are under the MIT License.
+# SPDX-License-Identifier: MIT
 import hashlib
 import os
 import re