Add conditions to allow for python executable variants (#1062)

Author: JoshTrim

autogen/code_utils.py

@@ -10,6 +10,8 @@
 from hashlib import md5
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
+from _pytest import python
+
 from autogen import oai
 
 import docker
@@ -244,6 +246,8 @@ def get_powershell_command():
 
 
 def _cmd(lang: str) -> str:
+    if lang in ["Python", "py"]:
+        return "python"
     if lang.startswith("python") or lang in ["bash", "sh"]:
         return lang
     if lang in ["shell"]:

autogen/coding/local_commandline_code_executor.py

@@ -116,6 +116,9 @@ def execute_code_blocks(self, code_blocks: List[CodeBlock]) -> CommandLineCodeRe
             LocalCommandLineCodeExecutor.sanitize_command(lang, code)
             code = silence_pip(code, lang)
 
+            if lang in ["Python", "py"]:
+                lang = "python"
+
             if WIN32 and lang in ["sh", "shell"]:
                 lang = "ps1"
 
@@ -141,7 +144,7 @@ def execute_code_blocks(self, code_blocks: List[CodeBlock]) -> CommandLineCodeRe
                 f.write(code)
             file_names.append(written_file)
 
-            program = sys.executable if lang.startswith("python") else _cmd(lang)
+            program = sys.executable if _cmd(lang).startswith("python") else _cmd(lang)
             cmd = [program, str(written_file.absolute())]
 
             try:

test/coding/test_commandline_code_executor.py

@@ -64,23 +64,29 @@ def test_commandline_executor_execute_code(cls) -> None:
 
 
 def _test_execute_code(executor: CodeExecutor) -> None:
+
+    # Python executable variants
+    python_variants = ["python", "Python", "py"]
+
     # Test single code block.
-    code_blocks = [CodeBlock(code="import sys; print('hello world!')", language="python")]
-    code_result = executor.execute_code_blocks(code_blocks)
-    assert code_result.exit_code == 0 and "hello world!" in code_result.output and code_result.code_file is not None
+    for py_variant in python_variants:
+        code_blocks = [CodeBlock(code="import sys; print('hello world!')", language=py_variant)]
+        code_result = executor.execute_code_blocks(code_blocks)
+        assert code_result.exit_code == 0 and "hello world!" in code_result.output and code_result.code_file is not None
 
     # Test multiple code blocks.
-    code_blocks = [
-        CodeBlock(code="import sys; print('hello world!')", language="python"),
-        CodeBlock(code="a = 100 + 100; print(a)", language="python"),
-    ]
-    code_result = executor.execute_code_blocks(code_blocks)
-    assert (
-        code_result.exit_code == 0
-        and "hello world!" in code_result.output
-        and "200" in code_result.output
-        and code_result.code_file is not None
-    )
+    for py_variant in python_variants:
+        code_blocks = [
+            CodeBlock(code="import sys; print('hello world!')", language=py_variant),
+            CodeBlock(code="a = 100 + 100; print(a)", language=py_variant),
+        ]
+        code_result = executor.execute_code_blocks(code_blocks)
+        assert (
+            code_result.exit_code == 0
+            and "hello world!" in code_result.output
+            and "200" in code_result.output
+            and code_result.code_file is not None
+        )
 
     # Test bash script.
     if sys.platform not in ["win32"]:
@@ -89,15 +95,16 @@ def _test_execute_code(executor: CodeExecutor) -> None:
         assert code_result.exit_code == 0 and "hello world!" in code_result.output and code_result.code_file is not None
 
     # Test running code.
-    file_lines = ["import sys", "print('hello world!')", "a = 100 + 100", "print(a)"]
-    code_blocks = [CodeBlock(code="\n".join(file_lines), language="python")]
-    code_result = executor.execute_code_blocks(code_blocks)
-    assert (
-        code_result.exit_code == 0
-        and "hello world!" in code_result.output
-        and "200" in code_result.output
-        and code_result.code_file is not None
-    )
+    for py_variant in python_variants:
+        file_lines = ["import sys", "print('hello world!')", "a = 100 + 100", "print(a)"]
+        code_blocks = [CodeBlock(code="\n".join(file_lines), language=py_variant)]
+        code_result = executor.execute_code_blocks(code_blocks)
+        assert (
+            code_result.exit_code == 0
+            and "hello world!" in code_result.output
+            and "200" in code_result.output
+            and code_result.code_file is not None
+        )
 
     # Check saved code file.
     with open(code_result.code_file) as f: