dsh-cloud 0.2.2__tar.gz → 0.2.4__tar.gz

{dsh_cloud-0.2.2 → dsh_cloud-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsh-cloud
-Version: 0.2.2
+Version: 0.2.4
 Summary: Safe self-host installer and lifecycle CLI for DSH Cloud Community Edition
 Requires-Python: >=3.11
 License-Expression: LicenseRef-DSH-Cloud-Community-1.0

{dsh_cloud-0.2.2 → dsh_cloud-0.2.4}/pyproject.toml

@@ -5,7 +5,7 @@ backend-path = ["."]
 
 [project]
 name = "dsh-cloud"
-version = "0.2.2"
+version = "0.2.4"
 description = "Safe self-host installer and lifecycle CLI for DSH Cloud Community Edition"
 requires-python = ">=3.11"
 dependencies = []

{dsh_cloud-0.2.2 → dsh_cloud-0.2.4}/src/dsh_cloud_cli/cli.py

@@ -10,7 +10,8 @@ import shutil
 import subprocess
 import sys
 
-from .wizard import apply_answers, command_prefix, next_steps, prompt_answers, should_run_wizard
+from .wizard import (apply_answers, command_prefix, init_summary, next_steps,
+                     prompt_answers, should_run_wizard)
 from pathlib import Path
 
 
@@ -334,7 +335,15 @@ def execute(parsed: dict) -> dict:
         if parsed["options"].get("dryRun"):
             return {"json": value}
         initialize(parsed, manifest, value, answers)
-        return {"json": {**value, "initialized": True}}
+        # 人在终端前看的是"写到哪了、下一步敲什么"; 脚本要的才是那坨 JSON。
+        if parsed["options"].get("json") or not sys.stdout.isatty():
+            return {"json": {**value, "initialized": True}}
+        return {"text": init_summary(
+            directory=value["directory"],
+            prefix=command_prefix(resolved=shutil.which("dsh-cloud") or "", entry=sys.argv[0]),
+            mode=value["mode"],
+            work_domain=(f"work.{parsed['options'].get('domain')}"
+                         if value["mode"] == "selfhost" else ""))}
     if parsed["command"] == "start" and fresh_init and not parsed["options"].get("dryRun"):
         initialize(parsed, manifest, value, answers)
     if state.is_file():

{dsh_cloud-0.2.2 → dsh_cloud-0.2.4}/src/dsh_cloud_cli/release-manifest.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "version": "0.2.2",
+  "version": "0.2.4",
   "license": "LicenseRef-DSH-Cloud-Community-1.0",
   "stackSchema": 1,
   "databaseSchema": 1,
@@ -8,8 +8,8 @@
   "minUpgradeFrom": "0.1.0",
   "harnessRuntime": "0.1.0-rc.8",
   "images": {
-    "server": "ghcr.io/agentsdanceai/dsh-cloud-server:0.2.2",
-    "workspace": "ghcr.io/agentsdanceai/dsh-cloud-workspace:0.2.2"
+    "server": "ghcr.io/agentsdanceai/dsh-cloud-server:0.2.4",
+    "workspace": "ghcr.io/agentsdanceai/dsh-cloud-workspace:0.2.4"
   },
   "baseImages": {
     "python": "python:3.11-slim-bookworm@sha256:2e32f7d302adc1c37428355c1e646897c0c53f4fd60b6a551245fb90ee129f91",

{dsh_cloud-0.2.2 → dsh_cloud-0.2.4}/src/dsh_cloud_cli/wizard.py

@@ -46,7 +46,12 @@ def should_run_wizard(parsed: dict, *, is_tty: bool, fresh_init: bool) -> bool:
     options = parsed.get("options", {})
     if options.get("json") or options.get("dryRun") or options.get("yes"):
         return False
-    return parsed.get("command") in {"start", "init"}
+    if parsed.get("command") not in {"start", "init"}:
+        return False
+    # 试用模式一句不问: 那条命令的意义就是"一行装完看看长什么样", 而看的东西
+    # (下载、云工作台) 本来就指向官方站点, 本机根本用不到上游密钥。想在本地真
+    # 跑模型的人去改 .env。自部署才问 —— 没有 SMTP/OAuth 谁也注册不了第一个账号。
+    return str(options.get("mode", "trial")) == "selfhost"
 
 
 def apply_answers(pairs: list[tuple[str, str]], answers: dict) -> list[tuple[str, str]]:
@@ -101,9 +106,10 @@ def next_steps(*, url: str, directory: str, has_upstream_key: bool,
         "",
     ]
     if not has_upstream_key:
+        # 不再写成"注意/警告": 试用模式本来就不在本机跑模型 —— 下载与云工作台都
+        # 指向官方站点, 没有上游密钥是**正常状态**而不是出错。
         lines += [
-            "  注意    还没有配模型上游，聊天会返回 503。把 UPSTREAM_API_KEY 填进",
-            f"          {directory}/.env 后执行 dsh-cloud up 生效。",
+            f"  想在本机跑模型：把 UPSTREAM_API_KEY 填进 {directory}/.env，再执行一次上面的启动命令",
             "",
         ]
     if work_domain:
@@ -125,6 +131,34 @@ def next_steps(*, url: str, directory: str, has_upstream_key: bool,
     return "\n".join(lines)
 
 
+def init_summary(*, directory: str, prefix: str = "dsh-cloud", mode: str = "trial",
+                 work_domain: str = "") -> str:
+    """``init`` 的收尾摘要。
+
+    init 只写配置、不起容器, 所以不能用 next_steps (那张面板说的是"已就绪")。
+    它原本无论如何都吐一整坨 JSON —— 那是给脚本解析的, 而人在终端前只想知道
+    "写到哪了、下一步敲什么"。带 --json 或非 TTY 时仍然只吐 JSON。
+    """
+    lines = [
+        "",
+        "  配置已写入，容器还没起",
+        "",
+        f"  目录    {directory}",
+        f"  启动    {prefix} up --dir {directory}",
+        "",
+    ]
+    if mode == "selfhost":
+        lines += [
+            "  这是对外服务的配置：绑 0.0.0.0、占用 80/443、申请真证书，",
+            "  请在目标服务器上启动，而不是本机。",
+            "",
+        ]
+        if work_domain:
+            lines += [f"  别忘了给 {work_domain} 加一条指向该服务器的 DNS 记录（云工作台按域名路由）", ""]
+    lines += [f"  启动前可以先过一遍 {directory}/.env", ""]
+    return "\n".join(lines)
+
+
 def _ask(prompt: str) -> str:
     """Read one line; EOF (Ctrl-D, or `start < /dev/null`) means "take the default"."""
     try: