Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize codes and support connect with token #49

Merged
merged 1 commit into from
Aug 23, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions milvus_cli/Cli.py
Original file line number Diff line number Diff line change
@@ -7,19 +7,6 @@
from Alias import MilvusAlias
from Partition import MilvusPartition
from pymilvus import __version__
from Types import ParameterException


def getPackageVersion():
import pkg_resources # part of setuptools

try:
version = pkg_resources.require("milvus_cli")[0].version
except Exception as e:
raise ParameterException(
"Could not get version under single executable file mode."
)
return version


class MilvusCli(object):
9 changes: 3 additions & 6 deletions milvus_cli/Connection.py
Original file line number Diff line number Diff line change
@@ -6,15 +6,12 @@ class MilvusConnection(object):
uri = "127.0.0.1:19530"
alias = "default"

def connect(self, uri=None, username=None, password=None):
def connect(self, uri=None, token=None):
self.uri = uri
trimUsername = None if username is None else username.strip()
trimPwd = None if password is None else password.strip()
trimToken = None if token is None else token.strip()

try:
res = connections.connect(
alias=self.alias, uri=self.uri, user=trimUsername, password=trimPwd
)
res = connections.connect(alias=self.alias, uri=self.uri, token=trimToken)
return res
except Exception as e:
raise ConnectException(f"Connect to Milvus error!{str(e)}")
22 changes: 7 additions & 15 deletions milvus_cli/scripts/connection_cli.py
Original file line number Diff line number Diff line change
@@ -14,32 +14,24 @@
type=str,
)
@click.option(
"-u",
"--username",
"username",
help="[Optional] - Username , default is `None`.",
default=None,
type=str,
)
@click.option(
"-pwd",
"--password",
"password",
help="[Optional] - Password , default is `None`.",
"-t",
"--token",
"token",
help="[Optional] - token: username:password or zilliz cloud api key`.",
default=None,
type=str,
)
@click.pass_obj
def connect(obj, uri, username, password):
def connect(obj, uri, token):
"""
Connect to Milvus.
Example:
milvus_cli > connect -h 127.0.0.1 -p 19530 -a default
milvus_cli > connect -uri localhost:19530
"""
try:
obj.connection.connect(uri, username, password)
obj.connection.connect(uri, token)
except Exception as e:
click.echo(message=e, err=True)
else:
3 changes: 1 addition & 2 deletions milvus_cli/scripts/helper_cli.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from Cli import getPackageVersion
from init_cli import cli
from Types import ConnectException, ParameterException
from utils import WELCOME_MSG, EXIT_MSG, Completer
from utils import WELCOME_MSG, EXIT_MSG, Completer, getPackageVersion
import sys
import os
import click
2 changes: 2 additions & 0 deletions milvus_cli/scripts/old_milvus_cli.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Deprecated file, use milvus_cli.py instead.

from tabulate import tabulate
import sys
import os
635 changes: 1 addition & 634 deletions milvus_cli/utils.py

Large diffs are not rendered by default.