Merge branch 'main' into anthropic-system-messages-fix

microsoft · Sep 3, 2024 · d39f414 · d39f414
2 parents 2386763 + ca1a89c
commit d39f414
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/autogen/coding/local_commandline_code_executor.py b/autogen/coding/local_commandline_code_executor.py
@@ -221,7 +221,12 @@ def _setup_functions(self) -> None:
             cmd = [py_executable, "-m", "pip", "install"] + required_packages
             try:
                 result = subprocess.run(
-                    cmd, cwd=self._work_dir, capture_output=True, text=True, timeout=float(self._timeout)
+                    cmd,
+                    cwd=self._work_dir,
+                    capture_output=True,
+                    text=True,
+                    timeout=float(self._timeout),
+                    encoding="utf-8",
                 )
             except subprocess.TimeoutExpired as e:
                 raise ValueError("Pip install timed out") from e
@@ -303,7 +308,13 @@ def _execute_code_dont_check_setup(self, code_blocks: List[CodeBlock]) -> Comman
 
             try:
                 result = subprocess.run(
-                    cmd, cwd=self._work_dir, capture_output=True, text=True, timeout=float(self._timeout), env=env
+                    cmd,
+                    cwd=self._work_dir,
+                    capture_output=True,
+                    text=True,
+                    timeout=float(self._timeout),
+                    env=env,
+                    encoding="utf-8",
                 )
             except subprocess.TimeoutExpired:
                 logs_all += "\n" + TIMEOUT_MSG

diff --git a/samples/apps/autogen-studio/autogenstudio/datamodel.py b/samples/apps/autogen-studio/autogenstudio/datamodel.py
@@ -16,7 +16,19 @@
     Enum as SqlEnum,
 )
 
-SQLModel.model_config["protected_namespaces"] = ()
+# added for python3.11 and sqlmodel 0.0.22 incompatibility
+if hasattr(SQLModel, "model_config"):
+    SQLModel.model_config["protected_namespaces"] = ()
+elif hasattr(SQLModel, "Config"):
+
+    class CustomSQLModel(SQLModel):
+        class Config:
+            protected_namespaces = ()
+
+    SQLModel = CustomSQLModel
+else:
+    print("Warning: Unable to set protected_namespaces.")
+
 # pylint: disable=protected-access