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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsh-cloud
-Version: 0.2.0
+Version: 0.2.2
 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.0 → dsh_cloud-0.2.2}/pyproject.toml

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

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

@@ -5,8 +5,12 @@ import os
 import re
 import secrets
 import shutil
+import re
+import shutil
 import subprocess
 import sys
+
+from .wizard import apply_answers, command_prefix, next_steps, prompt_answers, should_run_wizard
 from pathlib import Path
 
 
@@ -173,7 +177,7 @@ def template_roots() -> tuple[Path, Path]:
     return root / "deploy/selfhost", root / "server/config"
 
 
-def generated_env(parsed: dict, manifest: dict) -> str:
+def generated_env(parsed: dict, manifest: dict, answers: dict | None = None) -> str:
     options = parsed["options"]
     mode = str(options.get("mode", "trial"))
     trial = mode == "trial"
@@ -184,12 +188,17 @@ def generated_env(parsed: dict, manifest: dict) -> str:
     values = [
         ("COMPOSE_PROJECT_NAME", str(options.get("projectName", "dsh-selfhost"))),
         ("DOMAIN", domain), ("SITE_SCHEME", "http" if trial else "https"),
-        ("PUBLIC_BASE", public_base), ("BIND_ADDRESS", "127.0.0.1" if trial else "0.0.0.0"),
+        # 键序与 src/wizard.mjs 的那份保持一致 —— 两个安装器的 .env 逐字节相同,
+        # 由 tests/distribution 的 parity 用例钉着。
+        ("PUBLIC_BASE", public_base),
         ("DSH_SITE", TRIAL_CADDY_SITE if trial else f"https://{domain}"),
+        ("BIND_ADDRESS", "127.0.0.1" if trial else "0.0.0.0"),
         ("HTTP_PORT", "8787" if trial else "80"), ("HTTPS_PORT", "8443" if trial else "443"),
         ("DHC_DEV", "1" if trial else "0"), ("DHC_CONFIG_DIR", "./config"),
         ("PRICING_FILE", "pricing.cny.json"), ("AUTH_SECRET_FILE", "/run/secrets/auth_secret"),
         ("UPSTREAM_BASE_URL", "https://api.deepseek.com/v1"), ("UPSTREAM_API_KEY", ""),
+        # 联网搜索: 留空则 web_search 不可用。zhipu 走 open.bigmodel.cn。
+        ("SEARCH_PROVIDER", "zhipu"), ("ZHIPU_SEARCH_API_KEY", ""),
         ("ADMIN_EMAILS", str(options.get("adminEmail", ""))),
         ("MAIL_SMTP_HOST", ""), ("MAIL_SMTP_USER", ""), ("MAIL_SMTP_PASS", ""), ("MAIL_FROM", ""),
         ("GOOGLE_LOGIN_CLIENT_ID", ""), ("GOOGLE_LOGIN_CLIENT_SECRET", ""),
@@ -197,13 +206,21 @@ def generated_env(parsed: dict, manifest: dict) -> str:
         ("DHC_SERVER_IMAGE", manifest["images"]["server"]),
         ("CADDY_IMAGE", manifest["baseImages"]["caddy"]),
         ("POSTGRES_IMAGE", manifest["baseImages"]["postgres"]),
+        # 云工作台。自部署给了域名就默认开 —— 那是招牌功能, 装完没有它等于交付了
+        # 半个东西。还差一条 DNS 记录 (work.<域名> 指向本机), 装完面板会说。试用
+        # 模式必定关: localhost 与 work.localhost 是不同 host, 会话 cookie 过不去。
+        ("WORK_ENABLED", "0" if trial else "1"),
+        ("WORK_DOMAIN", "" if trial else f"work.{domain}"),
+        ("COOKIE_DOMAIN", "" if trial else f".{domain}"),
+        ("COMPOSE_PROFILES", "" if trial else "work"),
         ("SOCKET_PROXY_IMAGE", manifest["baseImages"]["socketProxy"]),
         ("WORK_IMAGE", manifest["images"]["workspace"]),
     ]
+    values = apply_answers(values, answers or {})
     return "".join(f"{key}={value}\n" for key, value in values)
 
 
-def initialize(parsed: dict, manifest: dict, deployment_plan: dict | None = None) -> Path:
+def initialize(parsed: dict, manifest: dict, deployment_plan: dict | None = None, answers: dict | None = None) -> Path:
     deployment_plan = deployment_plan or plan(parsed, manifest)
     target = target_of(parsed)
     if target.exists():
@@ -226,7 +243,7 @@ def initialize(parsed: dict, manifest: dict, deployment_plan: dict | None = None
     shutil.copytree(config, target / "config")
     secret = os.environ.get("DSH_CLOUD_TEST_RANDOM_HEX", secrets.token_hex(32))
     atomic_write(target / "secrets/auth_secret", f"{secret}\n", 0o600)
-    atomic_write(target / ".env", generated_env(parsed, manifest), 0o600)
+    atomic_write(target / ".env", generated_env(parsed, manifest, answers), 0o600)
     atomic_write(target / ".gitignore", ".env\nsecrets/\n.dsh-cloud/lock\n")
     state = {
         "schemaVersion": 1, "version": manifest["version"], "stackSchema": manifest["stackSchema"],
@@ -307,14 +324,19 @@ def execute(parsed: dict) -> dict:
     if parsed.get("special") == "version":
         return {"text": manifest["version"] + "\n"}
     value = plan(parsed, manifest)
+    state = Path(value["directory"]) / ".dsh-cloud/state.json"
+    fresh_init = not state.is_file()
+    # 只有全新部署才问; 已初始化的目录再问一遍等于诱导用户覆盖自己的配置。
+    answers: dict = {}
+    if should_run_wizard(parsed, is_tty=sys.stdin.isatty() and sys.stdout.isatty(), fresh_init=fresh_init):
+        answers = prompt_answers(version=manifest["version"], mode=str(parsed["options"].get("mode", "trial")))
     if parsed["command"] == "init":
         if parsed["options"].get("dryRun"):
             return {"json": value}
-        initialize(parsed, manifest, value)
+        initialize(parsed, manifest, value, answers)
         return {"json": {**value, "initialized": True}}
-    state = Path(value["directory"]) / ".dsh-cloud/state.json"
-    if parsed["command"] == "start" and not state.is_file() and not parsed["options"].get("dryRun"):
-        initialize(parsed, manifest, value)
+    if parsed["command"] == "start" and fresh_init and not parsed["options"].get("dryRun"):
+        initialize(parsed, manifest, value, answers)
     if state.is_file():
         restore_deployment(value, state, parsed)
     if parsed["options"].get("dryRun"):
@@ -347,7 +369,20 @@ def execute(parsed: dict) -> dict:
         if result.stderr.strip():
             response["composeError"] = result.stderr.strip()
         return {"json": response}
-    return {"text": value["url"] + "\n" if parsed["command"] in {"start", "up"} else ""}
+    if parsed["command"] not in {"start", "up"}:
+        return {"text": ""}
+    # 人在终端前就给完整指引; 管道/CI 里保持裸 URL, 免得打断既有脚本的解析。
+    if not sys.stdout.isatty():
+        return {"text": value["url"] + "\n"}
+    env_text = (Path(value["directory"]) / ".env").read_text(encoding="utf-8")
+    has_key = bool(re.search(r"^UPSTREAM_API_KEY=.+$", env_text, re.MULTILINE))
+    prefix = command_prefix(resolved=shutil.which("dsh-cloud") or "", entry=sys.argv[0])
+    return {"text": next_steps(url=value["url"], directory=value["directory"],
+                               has_upstream_key=has_key, project_name=value["projectName"],
+                               prefix=prefix,
+                               work_domain=(f"work.{parsed['options'].get('domain')}"
+                                            if value["mode"] == "selfhost" else ""),
+                               dev_mail=value["mode"] != "selfhost")}
 
 
 def main(argv: list[str] | None = None) -> int:

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

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "version": "0.2.0",
+  "version": "0.2.2",
   "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.0",
-    "workspace": "ghcr.io/agentsdanceai/dsh-cloud-workspace:0.2.0"
+    "server": "ghcr.io/agentsdanceai/dsh-cloud-server:0.2.2",
+    "workspace": "ghcr.io/agentsdanceai/dsh-cloud-workspace:0.2.2"
   },
   "baseImages": {
     "python": "python:3.11-slim-bookworm@sha256:2e32f7d302adc1c37428355c1e646897c0c53f4fd60b6a551245fb90ee129f91",