openbayes-cli 0.5.0__tar.gz → 0.7.0__tar.gz

{openbayes_cli-0.5.0 → openbayes_cli-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openbayes-cli
-Version: 0.5.0
+Version: 0.7.0
 Summary: A Python CLI for OpenBayes
 License: OpenBayes Public Source License
 Keywords: openbayes,cli,machine learning

{openbayes_cli-0.5.0 → openbayes_cli-0.7.0}/bayes/commands/gear.py

@@ -17,7 +17,8 @@ app = typer.Typer()
 
 
 @app.command()
-def init(ctx: typer.Context, id_or_name: str,
+def init(ctx: typer.Context, 
+         id_or_name: str = typer.Argument(None, envvar="OPENBAYES_JOB_PROJECT", help="容器 ID 或名称"),
          message: str = typer.Option(None, "-m", "--message", help="容器描述"),
          open: bool = typer.Option(False, "-o", "--open", help="成功初始化容器后，在浏览器打开")):
     """

{openbayes_cli-0.5.0 → openbayes_cli-0.7.0}/bayes/usercases/auth_usecase.py

@@ -1,3 +1,4 @@
+import os
 from typing import Optional
 
 import typer
@@ -14,23 +15,49 @@ def get_default_credential_userinfo():
 
     if not default_env.token:
         print("用户还未登陆")
-        return
+        return None
+
     try:
         login_model = user_client.login_with_token(gql_client, default_env.token)
+        # 登陆成功，获得用户信息，去修改文件
+        BayesSettings().login(login_model.username, login_model.token)
+        return login_model
     except Error as e:
         print("登陆失败，请重新使用密码或者新的令牌登录")
         raise typer.Exit(code=1)
-    # 登陆成功，获得用户信息，去修改文件
-    BayesSettings().login(login_model.username, login_model.token)
-    return login_model
 
 
 def check_login():
     default_env: Optional[BayesEnvConfig] = BayesSettings().default_env
+    gql_client = BayesGQLClient(default_env.graphQL, None)
+    
+    # 检查是否已登录
     if default_env.name and default_env.token:
         return True
-    else:
+    
+    # 从环境变量获取信息
+    token = os.getenv("OPENBAYES_TOKEN")
+    org = os.getenv("OPENBAYES_ORG")
+    user = os.getenv("OPENBAYES_USER")
+    
+    if not token:
         return False
+    
+    try:
+        login_model = user_client.login_with_token(gql_client, token)
+        # 登陆成功，获得用户信息，去修改文件
+        BayesSettings().login(login_model.username, login_model.token)
+        
+        # 更新 orgName
+        if org and user:
+            if org == user:
+                default_env.orgName = ""
+            else:
+                default_env.orgName = org
+        return True
+    except Error as e:
+        print("登陆失败，请重新使用密码或者新的令牌登录")
+        raise typer.Exit(code=1)
 
 
 def is_working_on_org():

{openbayes_cli-0.5.0 → openbayes_cli-0.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openbayes-cli"
-version = "0.5.0"
+version = "0.7.0"
 description = "A Python CLI for OpenBayes"
 authors = ["OpenBayes <dev@openbayes.com>"]
 readme = "README.md"