ci: add python ws 3.3.6.0 compatibility test (#352)

* ci: change TDengine version from 3.3.6 to main

* ci: add python ws compatibility ci

* ci: remove redundant step

* style: format code

* test: fix failed test case

* refactor: eliminate warnings and format code

Author: qevolg

.github/workflows/build.yml

@@ -3,25 +3,25 @@ name: Build
 on:
   push:
     branches:
-      - 'main'
-      - '3.0'
+      - "main"
+      - "3.0"
   pull_request:
     branches:
-      - 'main'
-      - '3.0'
+      - "main"
+      - "3.0"
 
 jobs:
   test:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        
+
       - name: Get CMake
         uses: lukka/get-cmake@latest
         with:
           cmakeVersion: 3.31.6
-          
+
       - name: Build tools
         run: |
           sudo apt-get update -y
@@ -62,15 +62,15 @@ jobs:
       #----------------------------------------------
       - name: Install dependencies
         if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
-        run: | 
+        run: |
           poetry install --no-interaction --no-root
           poetry run pip install "numpy<2.0.0"
 
       #----------------------------------------------
       # install your root project, if required
       #----------------------------------------------
       - name: Install library
-        run: | 
+        run: |
           poetry install --no-interaction --with=test
           poetry run pip install "numpy<2.0.0"
 
@@ -84,15 +84,15 @@ jobs:
         id: determine-branch
         with:
           cond: ${{ github.base_ref == 'main' }}
-          if_true: '3.3.6'
-          if_false: '3.0'
+          if_true: "main"
+          if_false: "3.0"
 
       - name: Checkout tdengine
         uses: actions/checkout@v2
         with:
           repository: "taosdata/TDengine"
           path: "TDengine_v3"
-          ref:  ${{ steps.determine-branch.outputs.value }}
+          ref: ${{ steps.determine-branch.outputs.value }}
 
       - name: Build TDengine 3.0
         run: |
@@ -129,7 +129,7 @@ jobs:
           curl -L -H "Authorization: Basic cm9vdDp0YW9zZGF0YQ==" -d "show databases" localhost:6041/rest/sql
           poetry run pytest --cov-report term --cov-report html --cov-report xml --cov=taos --cov=taosrest --cov-append tests
 
-      - name: 'Upload taosd logs'
+      - name: "Upload taosd logs"
         if: failure()
         uses: actions/upload-artifact@v4
         with:
@@ -140,7 +140,7 @@ jobs:
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4
         with:
-          files: ./coverage.xml          
+          files: ./coverage.xml
           token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Build Artifacts

.github/workflows/mac.yml

@@ -3,16 +3,16 @@ name: Test on macOS
 on:
   push:
     branches:
-      - 'main'
-      - '3.0'
+      - "main"
+      - "3.0"
   pull_request:
     branches:
-      - 'main'
-      - '3.0'
+      - "main"
+      - "3.0"
   workflow_dispatch:
     inputs:
       tdengine_branch:
-        description: 'TDengine branch'
+        description: "TDengine branch"
         required: true
         type: string
 
@@ -30,8 +30,8 @@ jobs:
         id: determine-branch
         with:
           cond: ${{ github.base_ref == 'main' }}
-          if_true: '3.3.6'
-          if_false: '3.0'
+          if_true: "main"
+          if_false: "3.0"
 
       #----------------------------------------------
       # Checkout TDengine repository
@@ -127,7 +127,6 @@ jobs:
           echo "do make_install grep libtao"
           pwd
 
-
       - name: package
         if: >
           (github.event_name == 'workflow_dispatch' && steps.cache-server-manually.outputs.cache-hit != 'true') ||
@@ -212,7 +211,7 @@ jobs:
           key: macos-poetry
 
       #----------------------------------------------
-      # install & configure poetry  
+      # install & configure poetry
       #----------------------------------------------
       - name: Install Poetry
         uses: snok/install-poetry@v1
@@ -301,7 +300,7 @@ jobs:
 
       - name: Checkout Connector
         uses: actions/checkout@v4
-    
+
       - name: Cache Poetry
         id: cache-poetry
         uses: actions/cache@v4
@@ -310,7 +309,7 @@ jobs:
           key: macos-poetry
 
       #----------------------------------------------
-      # install & configure poetry  
+      # install & configure poetry
       #----------------------------------------------
       - name: Install Poetry
         uses: snok/install-poetry@v1
@@ -384,4 +383,4 @@ jobs:
 
       - name: Build Artifacts
         run: |
-          poetry build
+          poetry build

.github/workflows/taos-ws-py-compatibility.yml

@@ -0,0 +1,108 @@
+name: taos-ws-py-compatibility
+
+on:
+  push:
+    branches:
+      - main
+      - "3.0"
+    tags:
+      - taos-ws-py-v*
+  pull_request:
+    branches:
+      - main
+      - "3.0"
+
+env:
+  PYTHON_VERSION: "3.10"
+
+jobs:
+  rebuild:
+    runs-on: ubuntu-latest
+    outputs:
+      status: ${{ steps.set-output.outputs.rebuild }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Detect file changes for rebuild
+        if: "!startsWith(github.ref, 'refs/tags/taos-ws-py')"
+        id: detect-changes
+        uses: tj-actions/changed-files@v41
+        with:
+          files: |
+            .github/workflows/taos-ws-py*.yml
+            taos-ws-py/**
+
+      - name: Set rebuild status
+        id: set-output
+        run: |
+          if [[ "${GITHUB_REF}" == refs/tags/taos-ws-py* ]]; then
+            echo "rebuild=true" >> $GITHUB_OUTPUT
+          else
+            echo "rebuild=${{ steps.detect-changes.outputs.any_changed }}" >> $GITHUB_OUTPUT
+          fi
+
+  test:
+    runs-on: ubuntu-latest
+    needs: rebuild
+    if: needs.rebuild.outputs.status == 'true'
+    timeout-minutes: 30
+    strategy:
+      matrix:
+        target: [x86_64]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "${{ env.PYTHON_VERSION }}"
+          architecture: x64
+
+      - name: Get CMake
+        uses: lukka/get-cmake@latest
+        with:
+          cmakeVersion: 3.31.6
+
+      - name: Build taos-ws-py wheel
+        uses: PyO3/maturin-action@v1
+        with:
+          rust-toolchain: stable
+          target: ${{ matrix.target }}
+          working-directory: taos-ws-py
+          manylinux: auto
+          args: --release --strip
+
+      - name: Install taos-ws-py wheel
+        run: pip install taos-ws-py --no-index --force-reinstall --find-links taos-ws-py/target/wheels
+
+      - name: Get TDengine
+        run: wget https://github.com/taosdata/TDengine/releases/download/ver-3.3.6.0/TDengine-server-3.3.6.0-Linux-x64.tar.gz
+
+      - name: Install TDengine
+        run: |
+          tar -zxf TDengine-server-3.3.6.0-Linux-x64.tar.gz
+          cd TDengine-server-3.3.6.0
+          sudo ./install.sh -e no
+
+      - name: Copy taos.cfg
+        run: |
+          sudo mkdir -p /etc/taos
+          sudo cp ./.github/workflows/taos.cfg /etc/taos/taos.cfg
+
+      - name: Start TDengine
+        run: |
+          taosd &
+          taosadapter &
+
+      - name: Run tests
+        env:
+          TDENGINE_URL: localhost:6041
+          WS_CLOUD_URL: ${{ secrets.WS_CLOUD_URL }}
+          WS_CLOUD_TOKEN: ${{ secrets.WS_CLOUD_TOKEN }}
+        run: |
+          pip3 install pytest
+          pytest ./taos-ws-py/tests/

.github/workflows/taos-ws-py.yml

@@ -4,13 +4,13 @@ on:
   push:
     branches:
       - main
-      - '3.0'
+      - "3.0"
     tags:
       - taos-ws-py-v*
   pull_request:
     branches:
       - main
-      - '3.0'
+      - "3.0"
 env:
   PYTHON_VERSION: "3.10" # to build abi3 wheels
 
@@ -49,9 +49,9 @@ jobs:
       matrix:
         target: [x86_64]
     steps:
-      - name: Install gettext  
+      - name: Install gettext
         run: |
-          brew install gettext 
+          brew install gettext
 
       - uses: actions/checkout@v4
 
@@ -68,10 +68,10 @@ jobs:
           target: x86_64
           working-directory: taos-ws-py
           args: --release --strip
-      - name: Install Homebrew  
-        run: |  
-          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"  
-      - name: Set DYLD_LIBRARY_PATH  
+      - name: Install Homebrew
+        run: |
+          /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+      - name: Set DYLD_LIBRARY_PATH
         run: |
           echo "export DYLD_LIBRARY_PATH=/usr/local/opt/gettext/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
       - name: Install built wheel - x86_64
@@ -165,27 +165,22 @@ jobs:
 
       #
       #  build TDengine and run taos-ws-py tests
-      #    
+      #
 
       - name: Determine TDengine branch
         uses: haya14busa/action-cond@v1
         id: determine-branch
         with:
           cond: ${{ github.base_ref == 'main' }}
-          if_true: '3.3.6'
-          if_false: '3.0'
+          if_true: "main"
+          if_false: "3.0"
 
       - name: Checkout tdengine
         uses: actions/checkout@v2
         with:
           repository: "taosdata/TDengine"
           path: "TDengine_v3"
-          ref:  ${{ steps.determine-branch.outputs.value }}
-
-      - name: Get CMake
-        uses: lukka/get-cmake@latest
-        with:
-          cmakeVersion: 3.31.6
+          ref: ${{ steps.determine-branch.outputs.value }}
 
       - name: Build TDengine 3.0
         run: |
@@ -226,7 +221,6 @@ jobs:
           pip3 install ./
           pytest ./taos-ws-py/tests/
 
-
       - name: Upload wheels linux
         uses: actions/upload-artifact@v4
         with:

taos-ws-py/src/common.rs

@@ -18,12 +18,13 @@ pub fn to_py_datetime(dt: chrono::NaiveDateTime, py: Python) -> PyResult<PyObjec
             dt.hour() as _,
             dt.minute() as _,
             dt.second() as _,
-            dt.timestamp_subsec_micros() as _,
+            dt.and_utc().timestamp_subsec_micros() as _,
         ],
     );
 
     Ok(datetime.call(args, None)?.into_py(py))
 }
+
 // pub fn datetime_to_py(t: chrono py: Python)
 pub unsafe fn get_row_of_block_unchecked(py: Python, block: &RawBlock, index: usize) -> PyObject {
     let mut vec = Vec::new();