Merge pull request #216 from dashscope/dev/v2-change

dev/v2-change

Author: luk384090-cloud

.github/workflows/unit_test.yml

@@ -9,15 +9,14 @@ on:
       - 'main'
 
 jobs:
-  test:
+  current:
     if: ${{ !(github.event_name == 'pull_request' && startsWith(github.event.pull_request.title, 'docs:')) }}
 
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        python-version: [ '3.9', '3.12', '3.13', '3.14' ]
-
+        python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13' ]
 
     steps:
       - name: Checkout repository
@@ -55,10 +54,55 @@ jobs:
         run: |
           python -m pip list --format=columns
 
-      - name: Run tests with coverage
+      - name: Run current tests with coverage
         run: |
-          coverage run -m pytest tests/unit
+          coverage run -m pytest tests --ignore=tests/legacy_1x
 
       - name: Generate coverage report
         run: |
           coverage report -m
+
+  legacy:
+    if: ${{ !(github.event_name == 'pull_request' && startsWith(github.event.pull_request.title, 'docs:')) }}
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+        python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13' ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Cache pip dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - name: Update setuptools
+        run: |
+          pip install --upgrade pip
+          pip install setuptools==68.2.2 wheel==0.41.2
+
+      - name: Set PYTHONPATH
+        run: |
+          echo "PYTHONPATH=$PYTHONPATH:${{ github.workspace }}/src" >> $GITHUB_ENV
+
+      - name: Install dependencies
+        run: |
+          export PIP_DEFAULT_TIMEOUT=300
+          pip install -r requirements.txt
+          pip install -r requirements-test.txt
+
+      - name: Run archived legacy tests
+        run: |
+          python -m pytest tests/legacy_1x

.gitignore

@@ -144,5 +144,5 @@ cython_debug/
 # Local design/analysis docs — kept out of the public repo
 /md/
 
-# Local PyPI investigation tooling; the CI guard lives in tests/unit/.
+# Local PyPI investigation tooling; the CI guard lives in tests/legacy_1x/unit/.
 /scripts/

.pre-commit-config.yaml

@@ -3,36 +3,36 @@ repos:
     rev: v4.3.0
     hooks:
       - id: check-ast
-        exclude: ^tests/legacy/
+        exclude: ^tests/legacy_1x/legacy/
       - id: sort-simple-yaml
-        exclude: ^tests/legacy/
+        exclude: ^tests/legacy_1x/legacy/
       - id: check-yaml
         exclude: |
           (?x)^(
               meta.yaml
-              | tests/legacy/
+              | tests/legacy_1x/legacy/
           )$
       - id: check-xml
-        exclude: ^tests/legacy/
+        exclude: ^tests/legacy_1x/legacy/
       - id: check-toml
-        exclude: ^tests/legacy/
+        exclude: ^tests/legacy_1x/legacy/
       - id: check-docstring-first
-        exclude: ^tests/legacy/
+        exclude: ^tests/legacy_1x/legacy/
       - id: check-json
-        exclude: ^tests/legacy/
+        exclude: ^tests/legacy_1x/legacy/
       - id: fix-encoding-pragma
-        exclude: ^tests/legacy/
+        exclude: ^tests/legacy_1x/legacy/
       - id: detect-private-key
-        exclude: ^tests/legacy/
+        exclude: ^tests/legacy_1x/legacy/
       - id: trailing-whitespace
-        exclude: ^tests/legacy/
+        exclude: ^tests/legacy_1x/legacy/
   - repo: https://github.com/asottile/add-trailing-comma
     rev: v3.1.0
     hooks:
       - id: add-trailing-comma
         # examples/01_atomic_capabilities/audio is ported verbatim from the sibling repo's
         # samples/ tree, whose hooks exempt samples/.
-        exclude: ^(tests/legacy|examples/01_atomic_capabilities/audio)/
+        exclude: ^(tests/legacy_1x/legacy|examples/01_atomic_capabilities/audio)/
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.7.0
     hooks:
@@ -45,7 +45,7 @@ repos:
           pb2\.py$
           | grpc\.py$
           | ^docs
-          | ^tests/legacy/
+          | ^tests/legacy_1x/legacy/
           | ^examples/01_atomic_capabilities/audio/
           | \.html$
           | \.pyi$
@@ -67,13 +67,13 @@ repos:
     hooks:
       - id: black
         args: [ --line-length=79 ]
-        exclude: ^(tests/legacy|examples/01_atomic_capabilities/audio)/
+        exclude: ^(tests/legacy_1x/legacy|examples/01_atomic_capabilities/audio)/
   - repo: https://github.com/PyCQA/flake8
     rev: 6.1.0
     hooks:
       - id: flake8
         args: [ "--extend-ignore=E203"]
-        exclude: ^(tests/legacy|examples/01_atomic_capabilities/audio)/
+        exclude: ^(tests/legacy_1x/legacy|examples/01_atomic_capabilities/audio)/
   - repo: https://github.com/pylint-dev/pylint
     rev: v3.0.2
     hooks:
@@ -97,6 +97,7 @@ repos:
           --disable=R0913,
           --disable=E0401,
           --disable=E1101,
+          --disable=E0611,  # Runtime meta-path aliases are invisible to astroid
           --disable=C0415,
           --disable=W0603,
           --disable=R1705,
@@ -122,6 +123,7 @@ repos:
           --disable=C0114,  # Disable missing module docstring for quick dev
           --disable=C0115,  # Disable missing class docstring for quick dev
           --disable=C0116,  # Disable missing function or method docstring for quick dev
+          --disable=E0603,  # Absolute self-imports and lazy exports in reinforcement
         ]
       # Tests get their own entry (pylint 3.0.2 discovers rcfiles from the
       # invocation CWD, not per linted-file directory, so a tests/pylintrc
@@ -132,7 +134,7 @@ repos:
       - id: pylint
         name: pylint (tests)
         files: ^tests/
-        exclude: ^tests/legacy/
+        exclude: ^tests/legacy_1x/legacy/
         args: [
           --disable=W0511,
           --disable=W0718,
@@ -141,6 +143,7 @@ repos:
           --disable=R0913,
           --disable=E0401,
           --disable=E1101,
+          --disable=E0611,  # Runtime meta-path aliases are invisible to astroid
           --disable=C0415,
           --disable=W0603,
           --disable=R1705,
@@ -190,19 +193,19 @@ repos:
     hooks:
       - id: eslint
         files: \.(js|jsx)$
-        exclude: '(.*js_third_party.*|^tests/legacy/)'
+        exclude: '(.*js_third_party.*|^tests/legacy_1x/legacy/)'
         args: [ '--fix' ]
   - repo: https://github.com/thibaudcolas/pre-commit-stylelint
     rev: v14.4.0
     hooks:
       - id: stylelint
         files: \.(css)$
-        exclude: '(.*css_third_party.*|^tests/legacy/)'
+        exclude: '(.*css_third_party.*|^tests/legacy_1x/legacy/)'
         args: [ '--fix' ]
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: 'v3.0.0'
     hooks:
       - id: prettier
         additional_dependencies: [ 'prettier@3.0.0' ]
         files: \.(tsx?)$
-        exclude: ^tests/legacy/
+        exclude: ^tests/legacy_1x/legacy/

MANIFEST.in

@@ -1,4 +1,4 @@
-include dashscope/resources/qwen.tiktoken
+include dashscope/legacy_1x/tokenizers/qwen.tiktoken
 include dashscope/py.typed
 include dashscope/__init__.pyi
 include NOTICE