Merge branch 'master' into addCertforREST

Author: abd-770

.github/mergify.yml

@@ -4,14 +4,14 @@ pull_request_rules:
       - or:
         - base=master
         - base~=2\.\d
-      - "status-success=Run Python Tests (3.8, windows-2022)"
-      - "status-success=Run Python Tests (3.12, windows-2022)"
-      - "status-success=Run Python Tests (3.8, ubuntu-22.04)"
-      - "status-success=Run Python Tests (3.12, ubuntu-22.04)"
-      - "status-success=Run Check Proto (3.8)"
-      - "status-success=Code lint check (3.8)"
-      - "status-success=Run Check Proto (3.12)"
-      - "status-success=Code lint check (3.12)"
+      # Require that Python tests succeed on Windows (any Python version, any Windows build)
+      - "status-success~=Run Python Tests \\(\\d+\\.\\d+, windows-\\S+\\)"
+      # Require that Python tests succeed on Ubuntu (any Python version, any Ubuntu build)
+      - "status-success~=Run Python Tests \\(\\d+\\.\\d+, ubuntu-\\S+\\)"
+      # Require that proto checks pass for any Python version
+      - "status-success~=Run Check Proto \\(\\d+\\.\\d+\\)"
+      # Require that code lint checks pass for any Python version
+      - "status-success~=Code lint check \\(\\d+\\.\\d+\\)"
     actions:
       label:
         add:

.github/workflows/check_milvus_proto.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: [3.8, 3.12]
+        python-version: [3.8, 3.13]
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/code_checker.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: [3.8, 3.12]
+        python-version: [3.8, 3.13]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/publish_dev_package.yml

@@ -20,10 +20,10 @@ jobs:
       run: |
           git fetch --prune --unshallow
           git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-    - name: Set up Python 3.12
+    - name: Set up Python 3.13
       uses: actions/setup-python@v5
       with:
-        python-version: 3.12
+        python-version: 3.13
     - name: Install pypa/build
       run: >-
         python -m

.github/workflows/publish_on_release.yml

@@ -19,10 +19,10 @@ jobs:
       run: |
           git fetch --prune --unshallow
           git fetch --depth=1 origin +refs/tags/*:refs/tags/*
-    - name: Set up Python 3.12
+    - name: Set up Python 3.13
       uses: actions/setup-python@v5
       with:
-        python-version: 3.12
+        python-version: 3.13
     - name: Install pypa/build
       run: >-
         python -m

.github/workflows/pull_request.yml

@@ -10,7 +10,7 @@ jobs:
     name: Run Python Tests
     strategy:
       matrix:
-        python-version: [3.8, 3.12]
+        python-version: [3.8, 3.13]
         os: [ubuntu-22.04, windows-2022]
     runs-on: ${{ matrix.os }}
 

.gitignore

@@ -29,7 +29,7 @@ TODO
 # GitHub
 .coverage
 htmlcov/
-debug/
+**/debug/
 .codecov.yml
 coverage.xml
 

examples/hybrid_search.py

@@ -49,7 +49,6 @@
 milvus_client.load_collection(collection_name)
 
 field_names = ["embeddings", "embeddings2"]
-field_names = ["embeddings"]
 
 req_list = []
 nq = 1

examples/hybrid_search/hybrid_search.py

@@ -80,7 +80,7 @@
     req_list.append(req)
 
 print(fmt.format("rank by WightedRanker"))
-hybrid_res = hello_milvus.hybrid_search(req_list, WeightedRanker(*weights), default_limit, output_fields=["random"])
+hybrid_res = hello_milvus.hybrid_search(req_list, WeightedRanker(*weights, norm_score=True), default_limit, output_fields=["random"])
 for hits in hybrid_res:
     for hit in hits:
         print(f" hybrid search hit: {hit}")

examples/simple_async.py

@@ -122,4 +122,4 @@ async def other_async_task(collection_name):
 
 results = loop.run_until_complete(other_async_task(collection_name))
 for r in results:
-    print(r)
+    print(r)

pymilvus/bulk_writer/bulk_import.py

@@ -140,6 +140,10 @@ def bulk_import(
         "secretKey": secret_key,
     }
 
+    options = kwargs.pop("options", {})
+    if isinstance(options, dict):
+        params["options"] = options
+
     resp = _post_request(url=request_url, api_key=api_key, params=params, verify=verify, cert=cert, **kwargs)
     _handle_response(request_url, resp.json())
     return resp
@@ -218,4 +222,4 @@ def list_import_jobs(
 
     resp = _post_request(url=request_url, api_key=api_key, params=params, verify=verify, cert=cert, **kwargs)
     _handle_response(request_url, resp.json())
-    return resp
+    return resp

pymilvus/client/abstract.py

@@ -1,5 +1,5 @@
 import abc
-from typing import Any, Dict, List, Optional, Sequence, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple, Union
 
 import ujson
 
@@ -351,19 +351,6 @@ def _pack(self, raw: Any):
         )
 
 
-class SequenceIterator:
-    def __init__(self, seq: Sequence[Any]):
-        self._seq = seq
-        self._idx = 0
-
-    def __next__(self) -> Any:
-        if self._idx < len(self._seq):
-            res = self._seq[self._idx]
-            self._idx += 1
-            return res
-        raise StopIteration
-
-
 class BaseRanker:
     def __int__(self):
         return
@@ -394,16 +381,22 @@ def dict(self):
 
 
 class WeightedRanker(BaseRanker):
-    def __init__(self, *nums):
+    def __init__(self, *nums, norm_score: bool = True):
         self._strategy = RANKER_TYPE_WEIGHTED
         weights = []
         for num in nums:
+            # isinstance(True, int) is True, thus we need to check bool first
+            if isinstance(num, bool) or not isinstance(num, (int, float)):
+                error_msg = f"Weight must be a number, got {type(num)}"
+                raise TypeError(error_msg)
             weights.append(num)
         self._weights = weights
+        self._norm_score = norm_score
 
     def dict(self):
         params = {
             "weights": self._weights,
+            "norm_score": self._norm_score,
         }
         return {
             "strategy": self._strategy,
@@ -660,9 +653,6 @@ def get_fields_by_range(
                 continue
         return field2data
 
-    def __iter__(self) -> SequenceIterator:
-        return SequenceIterator(self)
-
     def __str__(self) -> str:
         """Only print at most 10 query results"""
         reminder = f" ... and {len(self) - 10} results remaining" if len(self) > 10 else ""
@@ -743,9 +733,6 @@ def __init__(
 
         super().__init__(hits)
 
-    def __iter__(self) -> SequenceIterator:
-        return SequenceIterator(self)
-
     def __str__(self) -> str:
         """Only print at most 10 query results"""
         reminder = f" ... and {len(self) - 10} entities remaining" if len(self) > 10 else ""