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

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

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

{openbayes_cli-0.7.0 → openbayes_cli-0.8.0}/bayes/commands/data.py

@@ -3,7 +3,7 @@ from typing import Optional
 
 import typer
 
-from bayes.model.file.settings import BayesEnvConfig
+from bayes.model.file.settings import BayesEnvConfig, BayesSettings
 from bayes.usercases import auth_usecase, dataset_list_usecase, dataset_usecase, open_usecase, minio_storage_usecase
 
 app = typer.Typer()
@@ -34,7 +34,7 @@ def create(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -78,7 +78,7 @@ def new_version(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -137,7 +137,7 @@ def upload(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -192,7 +192,7 @@ def ls(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -227,7 +227,7 @@ def versions(ctx: typer.Context, id: str):
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -261,7 +261,7 @@ def open(ctx: typer.Context, id: str):
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""

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

@@ -7,7 +7,7 @@ import typer
 
 from bayes.model.file.openbayes_gear import OpenBayesGearSettings, FILE_NAME as GEAR_FILE_NAME
 from bayes.model.file.openbayes_yaml import OpenBayesYamlSettings, FILE_NAME, DEFAULT_JOB_RESOURCE, DEFAULT_JOB_RUNTIME
-from bayes.model.file.settings import BayesEnvConfig
+from bayes.model.file.settings import BayesEnvConfig, BayesSettings
 from bayes.model.party import ModeEnum
 from bayes.usercases import auth_usecase, gear_usecase, open_usecase, resource_usecase, runtime_usecase, \
     gear_logs_usecase, gear_download_usecese, gear_run_usecase, minio_storage_usecase
@@ -41,8 +41,9 @@ def init(ctx: typer.Context,
     if not login:
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
-    # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+
+    # 重新获得最新的配置
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -100,7 +101,7 @@ def ls(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -157,7 +158,7 @@ def run(
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -273,7 +274,7 @@ def status(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -338,7 +339,7 @@ def restart(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -416,7 +417,7 @@ def stop(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -472,7 +473,7 @@ def bindings(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -516,7 +517,7 @@ def download(ctx: typer.Context,
         raise typer.Exit(code=1)
     
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -586,7 +587,8 @@ def env(ctx: typer.Context):
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    # 重新获得最新的配置
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -624,7 +626,8 @@ def logs(id: str, ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    # 重新获得最新的配置
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -694,7 +697,8 @@ def open(ctx: typer.Context, id_or_name: Optional[str] = typer.Argument(None, he
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    # 重新获得最新的配置
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -752,8 +756,9 @@ def resource(ctx: typer.Context):
     if not login:
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
-    # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+
+    # 重新获得最新的配置
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""

{openbayes_cli-0.7.0 → openbayes_cli-0.8.0}/bayes/commands/hpc.py

@@ -7,7 +7,7 @@ import typer
 
 from bayes.model.file.openbayes_gear import OpenBayesGearSettings, FILE_NAME as GEAR_FILE_NAME
 from bayes.model.file.openbayes_yaml import OpenBayesYamlSettings, FILE_NAME, DEFAULT_JOB_RESOURCE, DEFAULT_JOB_RUNTIME
-from bayes.model.file.settings import BayesEnvConfig
+from bayes.model.file.settings import BayesEnvConfig, BayesSettings
 from bayes.model.party import ModeEnum
 from bayes.usercases import auth_usecase, gear_usecase, open_usecase, resource_usecase, runtime_usecase, \
     gear_logs_usecase, gear_download_usecese, gear_run_usecase, minio_storage_usecase
@@ -41,7 +41,7 @@ def init(ctx: typer.Context, id_or_name: str,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -102,7 +102,7 @@ def ls(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -159,7 +159,7 @@ def run(
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -277,7 +277,7 @@ def status(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -342,7 +342,7 @@ def restart(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -420,7 +420,7 @@ def stop(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -477,7 +477,7 @@ def bindings(ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -521,7 +521,7 @@ def download(ctx: typer.Context,
         raise typer.Exit(code=1)
 
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -591,7 +591,7 @@ def env(ctx: typer.Context):
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -629,7 +629,7 @@ def logs(id: str, ctx: typer.Context,
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -699,7 +699,7 @@ def open(ctx: typer.Context, id_or_name: Optional[str] = typer.Argument(None, he
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""
@@ -758,7 +758,7 @@ def resource(ctx: typer.Context):
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
     # 检查现在是处于 组织/用户 状态
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     party_name = ""

{openbayes_cli-0.7.0 → openbayes_cli-0.8.0}/bayes/commands/org.py

@@ -2,7 +2,7 @@ from typing import Optional
 
 import typer
 
-from bayes.model.file.settings import BayesEnvConfig
+from bayes.model.file.settings import BayesEnvConfig, BayesSettings
 from bayes.usercases import org_usecase
 from bayes.usercases import auth_usecase
 
@@ -30,7 +30,7 @@ def switch(name: str, ctx: typer.Context):
         raise typer.Exit(code=1)
 
     # 检查用户是否尝试切换回用户模式（组织名称是否与用户名相同，忽略大小写）
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
     switch_back_to_user = str.lower(name) == str.lower(default_env.username)
 
@@ -94,7 +94,7 @@ def ls(ctx: typer.Context):
         print("尚未授权，请先登录")
         raise typer.Exit(code=1)
 
-    bayes_settings = ctx.obj
+    bayes_settings = BayesSettings()
     default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
 
     user_orgs_data = org_usecase.list_user_orgs(default_env.username)

{openbayes_cli-0.7.0 → openbayes_cli-0.8.0}/bayes/model/file/settings.py

@@ -118,9 +118,16 @@ class BayesSettings(BaseModel):
     def login(self, username, token):
         default_env = self.default_env
         if default_env:
+            # print(f"正在更新登录信息: username={username}, token={token[:10]}...")
             default_env.username = username
             default_env.token = token
             self.save_to_yaml()
+            # print(f"登录信息已保存到配置文件: {self.config_path}")
+            
+            # 重新加载配置，确保获取最新的配置
+            self.load_from_yaml()
+            default_env = self.default_env
+            # print(f"登录后重新加载配置: username={default_env.username}, token={default_env.token[:10]}...")
         else:
             raise ValueError("No default environment found")
 

{openbayes_cli-0.7.0 → openbayes_cli-0.8.0}/bayes/root.py

@@ -81,6 +81,7 @@ def login_with_token(bayes_settings, default_env, username):
 
         print(f"{result.username} 已成功登入 {default_env.name}")
     except Error as e:
+        print(f"登录失败: {e}")
         print("请重新输入密码或者新的令牌登陆")
         raise typer.Exit(code=1)
 

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

@@ -28,7 +28,8 @@ def get_default_credential_userinfo():
 
 
 def check_login():
-    default_env: Optional[BayesEnvConfig] = BayesSettings().default_env
+    bayes_settings = BayesSettings()
+    default_env: Optional[BayesEnvConfig] = bayes_settings.default_env
     gql_client = BayesGQLClient(default_env.graphQL, None)
     
     # 检查是否已登录
@@ -39,24 +40,24 @@ def check_login():
     token = os.getenv("OPENBAYES_TOKEN")
     org = os.getenv("OPENBAYES_ORG")
     user = os.getenv("OPENBAYES_USER")
+
+    # print(f"从环境变量获取信息: token:{token}, org:{org}, user:{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)
-        
+        bayes_settings.login(login_model.username, token)
         # 更新 orgName
         if org and user:
-            if org == user:
-                default_env.orgName = ""
-            else:
-                default_env.orgName = org
+            if org != user:
+                bayes_settings.switch_org(org)
+
         return True
     except Error as e:
-        print("登陆失败，请重新使用密码或者新的令牌登录")
+        print(f"登陆失败: {e}")
+        print("请重新使用密码或者新的令牌登录")
         raise typer.Exit(code=1)
 
 

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

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