Skip to content

Commit

Permalink
Renew proto and change auto semver rule (#1653)
Browse files Browse the repository at this point in the history
1. Since our semver are broken for 2.4.0.devN due to 2.3.0b1,
the PR will change the auto-gen semver to a more specified style:

    `2.3.0b1.dev121+g0a70b58.d20230822`

2. Renew the milvus-proto with tag v2.3.0
3. Renew README.md in master branch

Signed-off-by: yangxuan <[email protected]>
  • Loading branch information
XuanYang-cn authored Aug 22, 2023
1 parent 0a70b58 commit 33f4325
Show file tree
Hide file tree
Showing 9 changed files with 98 additions and 89 deletions.
21 changes: 11 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@

[![version](https://img.shields.io/pypi/v/pymilvus.svg?color=blue)](https://pypi.org/project/pymilvus/)
[![Supported Python Versions](https://img.shields.io/pypi/pyversions/pymilvus?logo=python&logoColor=blue)](https://pypi.org/project/pymilvus/)
[![Downloads](https://pepy.tech/badge/pymilvus)](https://pepy.tech/project/pymilvus)
[![Downloads](https://pepy.tech/badge/pymilvus/month)](https://pepy.tech/project/pymilvus/month)
[![Downloads](https://pepy.tech/badge/pymilvus/week)](https://pepy.tech/project/pymilvus/week)
[![Downloads](https://static.pepy.tech/badge/pymilvus)](https://pepy.tech/project/pymilvus)
[![Downloads](https://static.pepy.tech/badge/pymilvus/month)](https://pepy.tech/project/pymilvus)
[![Downloads](https://static.pepy.tech/badge/pymilvus/week)](https://pepy.tech/project/pymilvus)

[![license](https://img.shields.io/hexpm/l/plug.svg?color=green)](https://github.com/milvus-io/pymilvus/blob/master/LICENSE)
[![Mergify Status][mergify-status]][mergify]
![Static Badge](https://img.shields.io/badge/slack-%23py--milvus-blue?style=social&logo=slack&link=https%3A%2F%2Fmilvusio.slack.com%2Farchives%2FC024XTWMT4L)

[mergify]: https://mergify.com
[mergify-status]: https://img.shields.io/endpoint.svg?url=https://api.mergify.com/v1/badges/milvus-io/pymilvus&style=flat

Python SDK for [Milvus](https://github.com/milvus-io/milvus). To contribute code to this project, please read our [contribution guidelines](https://github.com/milvus-io/milvus/blob/master/CONTRIBUTING.md) first. If you have some ideas or encounter a problem, you can find us in the Slack channel [#py-milvus](https://milvusio.slack.com/archives/C024XTWMT4L).

Expand All @@ -21,7 +25,8 @@ The following collection shows Milvus versions and recommended PyMilvus versions
| 1.1.\* | 1.1.2 |
| 2.0.\* | 2.0.2 |
| 2.1.\* | 2.1.3 |
| 2.2.\* | 2.2.13 |
| 2.2.\* | 2.2.15 |
| 2.3.\* | 2.3.0 |


## Installation
Expand All @@ -35,7 +40,7 @@ $ pip3 install pymilvus
You can install a specific version of PyMilvus by:

```shell
$ pip3 install pymilvus==2.2.13
$ pip3 install pymilvus==2.3.0
```

You can upgrade PyMilvus to the latest version by:
Expand Down Expand Up @@ -86,7 +91,7 @@ make format

## Documentation

Documentation is available online: https://milvus.io/api-reference/pymilvus/v2.2.x/About.md
Documentation is available online: https://milvus.io/api-reference/pymilvus/v2.3.x/About.md

## Developing package releases

Expand All @@ -109,7 +114,3 @@ $ python3 -m pip install --extra-index-url https://test.pypi.org/simple/ pymilvu

## License
[Apache License 2.0](LICENSE)


[mergify]: https://mergify.io
[mergify-status]: https://img.shields.io/endpoint.svg?url=https://gh.mergify.io/badges/milvus-io/pymilvus&style=plastic
42 changes: 21 additions & 21 deletions pymilvus/grpc_gen/common_pb2.py

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions pymilvus/grpc_gen/common_pb2.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ class PlaceholderType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
None: _ClassVar[PlaceholderType]
BinaryVector: _ClassVar[PlaceholderType]
FloatVector: _ClassVar[PlaceholderType]
Float16Vector: _ClassVar[PlaceholderType]
Int64: _ClassVar[PlaceholderType]
VarChar: _ClassVar[PlaceholderType]

Expand Down Expand Up @@ -367,6 +368,7 @@ Importing: SegmentState
None: PlaceholderType
BinaryVector: PlaceholderType
FloatVector: PlaceholderType
Float16Vector: PlaceholderType
Int64: PlaceholderType
VarChar: PlaceholderType
Undefined: MsgType
Expand Down
70 changes: 35 additions & 35 deletions pymilvus/grpc_gen/milvus_pb2.py

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions pymilvus/grpc_gen/milvus_pb2.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -1676,16 +1676,18 @@ class ResourceGroup(_message.Message):
def __init__(self, name: _Optional[str] = ..., capacity: _Optional[int] = ..., num_available_node: _Optional[int] = ..., num_loaded_replica: _Optional[_Mapping[str, int]] = ..., num_outgoing_node: _Optional[_Mapping[str, int]] = ..., num_incoming_node: _Optional[_Mapping[str, int]] = ...) -> None: ...

class RenameCollectionRequest(_message.Message):
__slots__ = ["base", "db_name", "oldName", "newName"]
__slots__ = ["base", "db_name", "oldName", "newName", "newDBName"]
BASE_FIELD_NUMBER: _ClassVar[int]
DB_NAME_FIELD_NUMBER: _ClassVar[int]
OLDNAME_FIELD_NUMBER: _ClassVar[int]
NEWNAME_FIELD_NUMBER: _ClassVar[int]
NEWDBNAME_FIELD_NUMBER: _ClassVar[int]
base: _common_pb2.MsgBase
db_name: str
oldName: str
newName: str
def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., db_name: _Optional[str] = ..., oldName: _Optional[str] = ..., newName: _Optional[str] = ...) -> None: ...
newDBName: str
def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., db_name: _Optional[str] = ..., oldName: _Optional[str] = ..., newName: _Optional[str] = ..., newDBName: _Optional[str] = ...) -> None: ...

class GetIndexStatisticsRequest(_message.Message):
__slots__ = ["base", "db_name", "collection_name", "index_name", "timestamp"]
Expand Down Expand Up @@ -1764,9 +1766,11 @@ class ListDatabasesRequest(_message.Message):
def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ...) -> None: ...

class ListDatabasesResponse(_message.Message):
__slots__ = ["status", "db_names"]
__slots__ = ["status", "db_names", "created_timestamp"]
STATUS_FIELD_NUMBER: _ClassVar[int]
DB_NAMES_FIELD_NUMBER: _ClassVar[int]
CREATED_TIMESTAMP_FIELD_NUMBER: _ClassVar[int]
status: _common_pb2.Status
db_names: _containers.RepeatedScalarFieldContainer[str]
def __init__(self, status: _Optional[_Union[_common_pb2.Status, _Mapping]] = ..., db_names: _Optional[_Iterable[str]] = ...) -> None: ...
created_timestamp: _containers.RepeatedScalarFieldContainer[int]
def __init__(self, status: _Optional[_Union[_common_pb2.Status, _Mapping]] = ..., db_names: _Optional[_Iterable[str]] = ..., created_timestamp: _Optional[_Iterable[int]] = ...) -> None: ...
28 changes: 14 additions & 14 deletions pymilvus/grpc_gen/schema_pb2.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions pymilvus/grpc_gen/schema_pb2.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class DataType(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
JSON: _ClassVar[DataType]
BinaryVector: _ClassVar[DataType]
FloatVector: _ClassVar[DataType]
Float16Vector: _ClassVar[DataType]

class FieldState(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
__slots__ = []
Expand All @@ -44,6 +45,7 @@ Array: DataType
JSON: DataType
BinaryVector: DataType
FloatVector: DataType
Float16Vector: DataType
FieldCreated: FieldState
FieldCreating: FieldState
FieldDropping: FieldState
Expand Down Expand Up @@ -190,14 +192,16 @@ class ScalarField(_message.Message):
def __init__(self, bool_data: _Optional[_Union[BoolArray, _Mapping]] = ..., int_data: _Optional[_Union[IntArray, _Mapping]] = ..., long_data: _Optional[_Union[LongArray, _Mapping]] = ..., float_data: _Optional[_Union[FloatArray, _Mapping]] = ..., double_data: _Optional[_Union[DoubleArray, _Mapping]] = ..., string_data: _Optional[_Union[StringArray, _Mapping]] = ..., bytes_data: _Optional[_Union[BytesArray, _Mapping]] = ..., array_data: _Optional[_Union[ArrayArray, _Mapping]] = ..., json_data: _Optional[_Union[JSONArray, _Mapping]] = ...) -> None: ...

class VectorField(_message.Message):
__slots__ = ["dim", "float_vector", "binary_vector"]
__slots__ = ["dim", "float_vector", "binary_vector", "float16_vector"]
DIM_FIELD_NUMBER: _ClassVar[int]
FLOAT_VECTOR_FIELD_NUMBER: _ClassVar[int]
BINARY_VECTOR_FIELD_NUMBER: _ClassVar[int]
FLOAT16_VECTOR_FIELD_NUMBER: _ClassVar[int]
dim: int
float_vector: FloatArray
binary_vector: bytes
def __init__(self, dim: _Optional[int] = ..., float_vector: _Optional[_Union[FloatArray, _Mapping]] = ..., binary_vector: _Optional[bytes] = ...) -> None: ...
float16_vector: bytes
def __init__(self, dim: _Optional[int] = ..., float_vector: _Optional[_Union[FloatArray, _Mapping]] = ..., binary_vector: _Optional[bytes] = ..., float16_vector: _Optional[bytes] = ...) -> None: ...

class FieldData(_message.Message):
__slots__ = ["type", "field_name", "scalars", "vectors", "field_id", "is_dynamic"]
Expand Down
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ dynamic = ["version"]
"repository" = 'https://github.com/milvus-io/pymilvus'

[tool.setuptools_scm]
'local_scheme'= 'no-local-version'
'version_scheme'= 'release-branch-semver'

[tool.black]
line-length = 100
Expand Down

0 comments on commit 33f4325

Please sign in to comment.