Merge pull request #305 from chdb-io/py313

Author: auxten

.github/workflows/build_linux_arm64_wheels-gh.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-24.04 ]
-        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
+        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ]
         # python-version: [ "3.7" ]
     env:
       RUNNER_OS: ${{ matrix.os }}

.github/workflows/build_linux_x86_wheels.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-22.04 ]
-        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
+        python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ]
         # python-version: [ "3.7" ]
     env:
       RUNNER_OS: ${{ matrix.os }}

.github/workflows/build_macos_x86_wheels.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ macos-13 ]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12" ]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
     env:
       RUNNER_OS: ${{ matrix.os }}
       PYTHON_VERSION: ${{ matrix.python-version }}

chdb/build_mac_arm64.sh

@@ -51,7 +51,7 @@ if [ "${dest}" != "darwin-x86_64" ]; then
 fi
 
 
-for PY_VER in 3.9.13 3.10.11 3.11.3 3.12.0; do
+for PY_VER in 3.9.13 3.10.11 3.11.3 3.12.9 3.13.2; do
     if [ ! -f ${PROJ_DIR}/python_pkg/python-${PY_VER}-macos11.pkg ]; then
         wget https://www.python.org/ftp/python/${PY_VER}/python-${PY_VER}-macos11.pkg -O ${PROJ_DIR}/python_pkg/python-${PY_VER}-macos11.pkg
     fi

src/TableFunctions/TableFunctionPython.cpp

@@ -40,23 +40,39 @@ py::object findQueryableObj(const std::string & var_name)
 
     while (!current_frame.is_none())
     {
-        auto local_dict = py::reinterpret_borrow<py::dict>(current_frame.attr("f_locals"));
-        auto global_dict = py::reinterpret_borrow<py::dict>(current_frame.attr("f_globals"));
+        // Get f_locals and f_globals
+        py::object locals_obj = current_frame.attr("f_locals");
+        py::object globals_obj = current_frame.attr("f_globals");
 
-        for (const auto & dict : {local_dict, global_dict})
+        // For each namespace (locals and globals)
+        for (const auto & namespace_obj : {locals_obj, globals_obj})
         {
-            if (dict.contains(var_name))
+            // Use Python's __contains__ method to check if the key exists
+            // This works with both regular dicts and FrameLocalsProxy (Python 3.13+)
+            if (py::bool_(namespace_obj.attr("__contains__")(var_name)))
             {
-                py::object obj = dict[var_name.data()];
-                if (isInheritsFromPyReader(obj) || isPandasDf(obj) || isPyarrowTable(obj) || hasGetItem(obj))
-                    return obj;
+                py::object obj;
+                try
+                {
+                    // Get the object using Python's indexing syntax
+                    obj = namespace_obj[py::cast(var_name)];
+                    if (isInheritsFromPyReader(obj) || isPandasDf(obj) || isPyarrowTable(obj) || hasGetItem(obj))
+                    {
+                        return obj;
+                    }
+                }
+                catch (const py::error_already_set &)
+                {
+                    continue; // If getting the value fails, continue to the next namespace
+                }
             }
         }
 
+        // Move to the parent frame
         current_frame = current_frame.attr("f_back");
     }
 
-    // not found
+    // Object not found
     return py::none();
 }