lockbot 2.15.2__tar.gz → 3.0.1__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (151) hide show
  1. {lockbot-2.15.2/python/lockbot.egg-info → lockbot-3.0.1}/PKG-INFO +31 -54
  2. {lockbot-2.15.2 → lockbot-3.0.1}/README.md +26 -52
  3. {lockbot-2.15.2 → lockbot-3.0.1}/pyproject.toml +3 -2
  4. lockbot-3.0.1/python/lockbot/agent_client/__init__.py +1 -0
  5. lockbot-3.0.1/python/lockbot/agent_client/handoff.py +229 -0
  6. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/agent_skill/SKILL.md +21 -0
  7. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/auth/dependencies.py +8 -1
  8. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/backup/service.py +19 -0
  9. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bot_audit/router.py +3 -2
  10. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bots/manager.py +7 -0
  11. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bots/metrics_access.py +5 -17
  12. lockbot-3.0.1/python/lockbot/backend/app/bots/metrics_signers.py +171 -0
  13. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bots/router.py +107 -8
  14. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bots/schemas.py +8 -0
  15. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/broadcast/service.py +9 -5
  16. lockbot-3.0.1/python/lockbot/backend/app/feishu/__init__.py +1 -0
  17. lockbot-3.0.1/python/lockbot/backend/app/feishu/backup.py +75 -0
  18. lockbot-3.0.1/python/lockbot/backend/app/feishu/connectors.py +228 -0
  19. lockbot-3.0.1/python/lockbot/backend/app/feishu/display_names.py +218 -0
  20. lockbot-3.0.1/python/lockbot/backend/app/feishu/models.py +44 -0
  21. lockbot-3.0.1/python/lockbot/backend/app/feishu/proxy_settings.py +33 -0
  22. lockbot-3.0.1/python/lockbot/backend/app/feishu/router.py +532 -0
  23. lockbot-3.0.1/python/lockbot/backend/app/feishu/service.py +138 -0
  24. lockbot-3.0.1/python/lockbot/backend/app/feishu/traffic.py +36 -0
  25. lockbot-3.0.1/python/lockbot/backend/app/feishu/unbound.py +150 -0
  26. lockbot-3.0.1/python/lockbot/backend/app/feishu/ws_process.py +46 -0
  27. lockbot-3.0.1/python/lockbot/backend/app/feishu/ws_proxy.py +38 -0
  28. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/main.py +23 -0
  29. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/managed_paths.py +1 -1
  30. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/op_skill/SKILL.md +63 -0
  31. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/activity.py +3 -2
  32. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/commands.py +7 -0
  33. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/discovery.py +16 -2
  34. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/errors.py +32 -0
  35. lockbot-3.0.1/python/lockbot/backend/app/resource_api/event_log.py +366 -0
  36. lockbot-3.0.1/python/lockbot/backend/app/resource_api/lease_history.py +398 -0
  37. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/operator.py +88 -2
  38. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/privacy.py +16 -3
  39. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/resources.py +4 -0
  40. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/skill.py +2 -0
  41. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/usage.py +69 -5
  42. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/views.py +5 -0
  43. lockbot-3.0.1/python/lockbot/backend/app/service_traffic.py +446 -0
  44. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/settings/router.py +73 -4
  45. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/base_bot.py +23 -2
  46. lockbot-3.0.1/python/lockbot/core/command_context.py +43 -0
  47. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/device_bot.py +9 -9
  48. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/handler.py +23 -1
  49. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/i18n/zh.py +1 -1
  50. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/io.py +22 -1
  51. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/node_bot.py +8 -8
  52. lockbot-3.0.1/python/lockbot/core/platforms/feishu.py +454 -0
  53. lockbot-3.0.1/python/lockbot/core/platforms/feishu_events.py +118 -0
  54. lockbot-3.0.1/python/lockbot/core/platforms/feishu_proxy.py +74 -0
  55. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/platforms/registry.py +1 -0
  56. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/queue_bot.py +7 -7
  57. {lockbot-2.15.2 → lockbot-3.0.1/python/lockbot.egg-info}/PKG-INFO +31 -54
  58. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot.egg-info/SOURCES.txt +21 -0
  59. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot.egg-info/requires.txt +4 -0
  60. lockbot-3.0.1/tests/test_op_history_report.py +171 -0
  61. lockbot-3.0.1/tools/deployment_preflight.py +118 -0
  62. lockbot-2.15.2/python/lockbot/backend/app/resource_api/event_log.py +0 -166
  63. lockbot-2.15.2/python/lockbot/backend/app/service_traffic.py +0 -219
  64. lockbot-2.15.2/python/lockbot/core/command_context.py +0 -5
  65. {lockbot-2.15.2 → lockbot-3.0.1}/LICENSE +0 -0
  66. {lockbot-2.15.2 → lockbot-3.0.1}/MANIFEST.in +0 -0
  67. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/__init__.py +0 -0
  68. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/__init__.py +0 -0
  69. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/__init__.py +0 -0
  70. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/admin/__init__.py +0 -0
  71. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/admin/router.py +0 -0
  72. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/audit/__init__.py +0 -0
  73. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/audit/models.py +0 -0
  74. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/audit/router.py +0 -0
  75. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/audit/service.py +0 -0
  76. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/auth/__init__.py +0 -0
  77. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/auth/models.py +0 -0
  78. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/auth/router.py +0 -0
  79. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/auth/schemas.py +0 -0
  80. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/backup/__init__.py +0 -0
  81. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/backup/router.py +0 -0
  82. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/backup/scheduler.py +0 -0
  83. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bot_audit/__init__.py +0 -0
  84. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bot_audit/models.py +0 -0
  85. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bot_audit/service.py +0 -0
  86. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bots/__init__.py +0 -0
  87. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bots/datasource.py +0 -0
  88. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bots/encryption.py +0 -0
  89. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bots/models.py +0 -0
  90. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/bots/webhook_handler.py +0 -0
  91. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/broadcast/__init__.py +0 -0
  92. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/broadcast/models.py +0 -0
  93. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/broadcast/router.py +0 -0
  94. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/config.py +0 -0
  95. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/database.py +0 -0
  96. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/deployment.py +0 -0
  97. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/logs/__init__.py +0 -0
  98. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/rate_limit.py +0 -0
  99. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/__init__.py +0 -0
  100. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/ingress.py +0 -0
  101. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/notification_queue.py +0 -0
  102. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/notifications.py +0 -0
  103. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/observability.py +0 -0
  104. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/op_skill.py +0 -0
  105. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/rules.py +0 -0
  106. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/snapshot.py +0 -0
  107. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/sources.py +0 -0
  108. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/traffic.py +0 -0
  109. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/usage_cleanup.py +0 -0
  110. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/versioning.py +0 -0
  111. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_api/view_links.py +0 -0
  112. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_auth/__init__.py +0 -0
  113. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_auth/authority.py +0 -0
  114. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_auth/credentials.py +0 -0
  115. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_auth/dependencies.py +0 -0
  116. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_auth/http_errors.py +0 -0
  117. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_auth/models.py +0 -0
  118. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_auth/pending.py +0 -0
  119. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_auth/router.py +0 -0
  120. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/resource_auth/service.py +0 -0
  121. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/settings/__init__.py +0 -0
  122. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/settings/models.py +0 -0
  123. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/sqlite_paths.py +0 -0
  124. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/state_migration.py +0 -0
  125. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/state_ownership.py +0 -0
  126. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/backend/app/static.py +0 -0
  127. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/__init__.py +0 -0
  128. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/bot_instance.py +0 -0
  129. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/config.py +0 -0
  130. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/device_usage_alert.py +0 -0
  131. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/device_usage_utils.py +0 -0
  132. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/i18n/__init__.py +0 -0
  133. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/i18n/en.py +0 -0
  134. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/message_adapter.py +0 -0
  135. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/msg_utils.py +0 -0
  136. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/platforms/__init__.py +0 -0
  137. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/platforms/infoflow.py +0 -0
  138. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/queue_device_bot.py +0 -0
  139. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/request.py +0 -0
  140. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/resource_policy.py +0 -0
  141. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/scheduler.py +0 -0
  142. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/core/utils.py +0 -0
  143. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/metrics/__init__.py +0 -0
  144. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/metrics/exporter.py +0 -0
  145. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot/metrics/gateway.py +0 -0
  146. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot.egg-info/dependency_links.txt +0 -0
  147. {lockbot-2.15.2 → lockbot-3.0.1}/python/lockbot.egg-info/top_level.txt +0 -0
  148. {lockbot-2.15.2 → lockbot-3.0.1}/setup.cfg +0 -0
  149. {lockbot-2.15.2 → lockbot-3.0.1}/tools/create_super_admin.py +0 -0
  150. {lockbot-2.15.2 → lockbot-3.0.1}/tools/gen_keys.py +0 -0
  151. {lockbot-2.15.2 → lockbot-3.0.1}/tools/reset_super_admin_password.py +0 -0
@@ -1,7 +1,7 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: lockbot
3
- Version: 2.15.2
4
- Summary: Cluster resource management bot for IM platforms
3
+ Version: 3.0.1
4
+ Summary: Cluster resource management and queuing for Infoflow and Feishu
5
5
  Author-email: Jianbang Yang <yangjianbang112@gmail.com>
6
6
  License: MIT
7
7
  Project-URL: Homepage, https://github.com/dynamicheart/lockbot
@@ -35,6 +35,9 @@ Requires-Dist: httpx
35
35
  Requires-Dist: slowapi
36
36
  Requires-Dist: pyzipper
37
37
  Requires-Dist: bce-python-sdk
38
+ Provides-Extra: feishu
39
+ Requires-Dist: lark-oapi==1.7.5; extra == "feishu"
40
+ Requires-Dist: websockets==15.0.1; extra == "feishu"
38
41
  Provides-Extra: dev
39
42
  Requires-Dist: pytest>=7.0; extra == "dev"
40
43
  Requires-Dist: pytest-xdist<4,>=3.6; extra == "dev"
@@ -43,7 +46,7 @@ Dynamic: license-file
43
46
 
44
47
  # lockbot
45
48
 
46
- Cluster resource management bot for IM platforms (e.g., Baidu InfoFlow).
49
+ Cluster resource management and queuing for Infoflow and Feishu.
47
50
 
48
51
  Lock and unlock GPU devices, cluster nodes, and queue slots via chat commands.
49
52
  Runs as a multi-bot platform with FastAPI and a Vue.js frontend.
@@ -60,73 +63,47 @@ Runs as a multi-bot platform with FastAPI and a Vue.js frontend.
60
63
  - **Device Lock Bot** — Lock/unlock individual GPUs or devices on a cluster
61
64
  - **Node Lock Bot** — Lock/unlock entire cluster nodes
62
65
  - **Queue Bot** — Manage a queue for resource allocation with booking and preemption
66
+ - **Device Queue Bot** — Book and queue for individual cards with `QUEUE_DEVICE`
67
+ - **Agent integration** — Personal authorization, resource discovery and versioned Skills
68
+ - **Utilization** — Optional browser/Agent access to independent Prometheus data sources
63
69
  - **Platform Mode** — Web UI (Vue 3 + Element Plus) for managing multiple bots, user authentication (JWT), role-based access control, and real-time logs
64
70
  - **State Persistence** — Bot state survives restarts (JSON file)
65
71
  - **Bilingual** — English and Chinese UI and bot responses
66
72
 
67
- ## Quick Start — Platform Mode (Recommended)
73
+ ## Quick Start — Docker
68
74
 
69
- Full management platform with Web UI, multi-bot orchestration, user authentication, and admin panel.
70
-
71
- 1. Install:
72
-
73
- ```bash
74
- pip install lockbot
75
- ```
76
-
77
- 2. Set environment variables:
75
+ The published image includes the web UI and Feishu dependencies. Prepare a private environment file with `JWT_SECRET` and `ENCRYPTION_KEY` following the [deployment guide](docs/agents/deployment/AGENTS.md). For upgrades, keep the original keys and data volume.
78
76
 
79
77
  ```bash
80
- export JWT_SECRET="your-jwt-secret"
81
- export ENCRYPTION_KEY="your-fernet-key" # python -c "from cryptography.fernet import Fernet; print(Fernet.generate_key().decode())"
82
- export DEV_MODE="true" # dev mode, auto-create admin user
83
- ```
84
-
85
- 3. Start:
86
-
87
- ```bash
88
- # Backend
89
- uvicorn lockbot.backend.app.main:app --host 0.0.0.0 --port 8000 --reload
90
-
91
- # Frontend (another terminal)
92
- cd frontend && npm install && npm run dev
93
- ```
94
-
95
- 4. Open `http://localhost:8000` in your browser.
96
-
97
- ### Docker
98
-
99
- ```bash
100
- # 1. Generate ENCRYPTION_KEY and JWT_SECRET
101
- python tools/gen_keys.py
102
-
103
- # 2. Pull pre-built image (or build from source)
104
- docker pull ghcr.io/dynamicheart/lockbot:latest
105
- # docker build -f docker/Dockerfile -t lockbot .
106
-
107
- # 3. Run (replace the keys with generated values)
78
+ docker pull ghcr.io/dynamicheart/lockbot:v3.0.0
108
79
  docker run -d --name lockbot -p 8000:8000 \
109
- -e JWT_SECRET=your-secret \
110
- -e ENCRYPTION_KEY=your-fernet-key \
80
+ --env-file /private/path/lockbot.env \
111
81
  -v lockbot-data:/data \
112
- ghcr.io/dynamicheart/lockbot:latest
82
+ ghcr.io/dynamicheart/lockbot:v3.0.0
113
83
 
114
- # 4. Create super_admin (password auto-generated and printed)
84
+ # New installation only: create the initial super administrator interactively.
115
85
  docker exec -it lockbot python tools/create_super_admin.py --username admin --email admin@example.com
116
86
  ```
117
87
 
118
- > **Data persistence**: All data (SQLite DB, bot state files) stored under `/data`. Override with `DATA_DIR` env var.
88
+ Open `http://localhost:8000`. Data persists under `/data`; select the intended host port without replacing an upgrade's existing mount. Run a single process/instance per data directory.
89
+
90
+ - [Agent-assisted deployment and upgrades](docs/agents/deployment/AGENTS.md), including environment validation and a Compose template
91
+ - [Infoflow and Feishu setup](docs/agents/platforms/AGENTS.md) and [illustrated Feishu guide](docs/usage/feishu-setup.md)
92
+ - [Agent API and Skill](docs/agent-api/SKILL.md)
93
+ - [Independent telemetry deployment](docs/usage/telemetry-deployment.md) and [browser utilization](docs/usage/browser-utilization.md)
94
+
95
+ In Feishu, one enterprise application can serve multiple resource groups, with a separate resource bot per group. Direct messages are unsupported. Platform credentials and users remain separate from Infoflow; copying configuration does not share live locks or authorizations.
119
96
 
120
97
  ## Bot Configuration
121
98
 
122
99
  | Key | Description | Default |
123
100
  |---|---|---|
124
- | `BOT_TYPE` | `DEVICE`, `NODE`, or `QUEUE` | (required) |
101
+ | `BOT_TYPE` | `NODE`, `DEVICE`, `QUEUE`, or `QUEUE_DEVICE` | (required) |
125
102
  | `BOT_NAME` | Bot instance name | `demo_bot` |
126
103
  | `CLUSTER_CONFIGS` | Cluster layout (dict or list) | `{}` |
127
- | `TOKEN` | Bot signature verification token | `""` |
128
- | `AESKEY` | Message decryption AES key | `""` |
129
- | `WEBHOOK_URL` | Message webhook URL | `""` |
104
+ | `TOKEN` | Infoflow signature verification token | `""` |
105
+ | `AESKEY` | Infoflow message decryption AES key | `""` |
106
+ | `WEBHOOK_URL` | Infoflow message webhook URL | `""` |
130
107
  | `DEFAULT_DURATION` | Default lock duration (seconds) | `7200` (2h) |
131
108
  | `MAX_LOCK_DURATION` | Max lock duration (seconds) | `-1` (unlimited) |
132
109
  | `EARLY_NOTIFY` | Notify before lock expiry | `false` |
@@ -155,7 +132,7 @@ See `python/lockbot/core/config.py` for the full configuration reference.
155
132
 
156
133
  ```bash
157
134
  # Install dependencies
158
- pip install -e ".[dev]"
135
+ pip install -e ".[dev,feishu]"
159
136
  cd frontend && npm install && cd ..
160
137
 
161
138
  # Start backend (port 8002, hot-reload)
@@ -165,13 +142,13 @@ bash scripts/dev/backend.sh
165
142
  bash scripts/dev/frontend.sh
166
143
  ```
167
144
 
168
- Both servers support hot-reload — code changes take effect automatically.
145
+ Open the frontend at `http://localhost:8001`; it proxies API requests to port 8002. These hot-reload scripts are for development, not production. New development targets `main`.
169
146
 
170
147
  ### Testing
171
148
 
172
149
  ```bash
173
- # Run tests
174
- pytest
150
+ # Run tests with file-isolated parallel workers
151
+ pytest -n auto --maxprocesses=4 --dist=loadfile
175
152
 
176
153
  # Lint + format check
177
154
  ruff check python/ tests/
@@ -1,6 +1,6 @@
1
1
  # lockbot
2
2
 
3
- Cluster resource management bot for IM platforms (e.g., Baidu InfoFlow).
3
+ Cluster resource management and queuing for Infoflow and Feishu.
4
4
 
5
5
  Lock and unlock GPU devices, cluster nodes, and queue slots via chat commands.
6
6
  Runs as a multi-bot platform with FastAPI and a Vue.js frontend.
@@ -17,73 +17,47 @@ Runs as a multi-bot platform with FastAPI and a Vue.js frontend.
17
17
  - **Device Lock Bot** — Lock/unlock individual GPUs or devices on a cluster
18
18
  - **Node Lock Bot** — Lock/unlock entire cluster nodes
19
19
  - **Queue Bot** — Manage a queue for resource allocation with booking and preemption
20
+ - **Device Queue Bot** — Book and queue for individual cards with `QUEUE_DEVICE`
21
+ - **Agent integration** — Personal authorization, resource discovery and versioned Skills
22
+ - **Utilization** — Optional browser/Agent access to independent Prometheus data sources
20
23
  - **Platform Mode** — Web UI (Vue 3 + Element Plus) for managing multiple bots, user authentication (JWT), role-based access control, and real-time logs
21
24
  - **State Persistence** — Bot state survives restarts (JSON file)
22
25
  - **Bilingual** — English and Chinese UI and bot responses
23
26
 
24
- ## Quick Start — Platform Mode (Recommended)
27
+ ## Quick Start — Docker
25
28
 
26
- Full management platform with Web UI, multi-bot orchestration, user authentication, and admin panel.
27
-
28
- 1. Install:
29
-
30
- ```bash
31
- pip install lockbot
32
- ```
33
-
34
- 2. Set environment variables:
29
+ The published image includes the web UI and Feishu dependencies. Prepare a private environment file with `JWT_SECRET` and `ENCRYPTION_KEY` following the [deployment guide](docs/agents/deployment/AGENTS.md). For upgrades, keep the original keys and data volume.
35
30
 
36
31
  ```bash
37
- export JWT_SECRET="your-jwt-secret"
38
- export ENCRYPTION_KEY="your-fernet-key" # python -c "from cryptography.fernet import Fernet; print(Fernet.generate_key().decode())"
39
- export DEV_MODE="true" # dev mode, auto-create admin user
40
- ```
41
-
42
- 3. Start:
43
-
44
- ```bash
45
- # Backend
46
- uvicorn lockbot.backend.app.main:app --host 0.0.0.0 --port 8000 --reload
47
-
48
- # Frontend (another terminal)
49
- cd frontend && npm install && npm run dev
50
- ```
51
-
52
- 4. Open `http://localhost:8000` in your browser.
53
-
54
- ### Docker
55
-
56
- ```bash
57
- # 1. Generate ENCRYPTION_KEY and JWT_SECRET
58
- python tools/gen_keys.py
59
-
60
- # 2. Pull pre-built image (or build from source)
61
- docker pull ghcr.io/dynamicheart/lockbot:latest
62
- # docker build -f docker/Dockerfile -t lockbot .
63
-
64
- # 3. Run (replace the keys with generated values)
32
+ docker pull ghcr.io/dynamicheart/lockbot:v3.0.0
65
33
  docker run -d --name lockbot -p 8000:8000 \
66
- -e JWT_SECRET=your-secret \
67
- -e ENCRYPTION_KEY=your-fernet-key \
34
+ --env-file /private/path/lockbot.env \
68
35
  -v lockbot-data:/data \
69
- ghcr.io/dynamicheart/lockbot:latest
36
+ ghcr.io/dynamicheart/lockbot:v3.0.0
70
37
 
71
- # 4. Create super_admin (password auto-generated and printed)
38
+ # New installation only: create the initial super administrator interactively.
72
39
  docker exec -it lockbot python tools/create_super_admin.py --username admin --email admin@example.com
73
40
  ```
74
41
 
75
- > **Data persistence**: All data (SQLite DB, bot state files) stored under `/data`. Override with `DATA_DIR` env var.
42
+ Open `http://localhost:8000`. Data persists under `/data`; select the intended host port without replacing an upgrade's existing mount. Run a single process/instance per data directory.
43
+
44
+ - [Agent-assisted deployment and upgrades](docs/agents/deployment/AGENTS.md), including environment validation and a Compose template
45
+ - [Infoflow and Feishu setup](docs/agents/platforms/AGENTS.md) and [illustrated Feishu guide](docs/usage/feishu-setup.md)
46
+ - [Agent API and Skill](docs/agent-api/SKILL.md)
47
+ - [Independent telemetry deployment](docs/usage/telemetry-deployment.md) and [browser utilization](docs/usage/browser-utilization.md)
48
+
49
+ In Feishu, one enterprise application can serve multiple resource groups, with a separate resource bot per group. Direct messages are unsupported. Platform credentials and users remain separate from Infoflow; copying configuration does not share live locks or authorizations.
76
50
 
77
51
  ## Bot Configuration
78
52
 
79
53
  | Key | Description | Default |
80
54
  |---|---|---|
81
- | `BOT_TYPE` | `DEVICE`, `NODE`, or `QUEUE` | (required) |
55
+ | `BOT_TYPE` | `NODE`, `DEVICE`, `QUEUE`, or `QUEUE_DEVICE` | (required) |
82
56
  | `BOT_NAME` | Bot instance name | `demo_bot` |
83
57
  | `CLUSTER_CONFIGS` | Cluster layout (dict or list) | `{}` |
84
- | `TOKEN` | Bot signature verification token | `""` |
85
- | `AESKEY` | Message decryption AES key | `""` |
86
- | `WEBHOOK_URL` | Message webhook URL | `""` |
58
+ | `TOKEN` | Infoflow signature verification token | `""` |
59
+ | `AESKEY` | Infoflow message decryption AES key | `""` |
60
+ | `WEBHOOK_URL` | Infoflow message webhook URL | `""` |
87
61
  | `DEFAULT_DURATION` | Default lock duration (seconds) | `7200` (2h) |
88
62
  | `MAX_LOCK_DURATION` | Max lock duration (seconds) | `-1` (unlimited) |
89
63
  | `EARLY_NOTIFY` | Notify before lock expiry | `false` |
@@ -112,7 +86,7 @@ See `python/lockbot/core/config.py` for the full configuration reference.
112
86
 
113
87
  ```bash
114
88
  # Install dependencies
115
- pip install -e ".[dev]"
89
+ pip install -e ".[dev,feishu]"
116
90
  cd frontend && npm install && cd ..
117
91
 
118
92
  # Start backend (port 8002, hot-reload)
@@ -122,13 +96,13 @@ bash scripts/dev/backend.sh
122
96
  bash scripts/dev/frontend.sh
123
97
  ```
124
98
 
125
- Both servers support hot-reload — code changes take effect automatically.
99
+ Open the frontend at `http://localhost:8001`; it proxies API requests to port 8002. These hot-reload scripts are for development, not production. New development targets `main`.
126
100
 
127
101
  ### Testing
128
102
 
129
103
  ```bash
130
- # Run tests
131
- pytest
104
+ # Run tests with file-isolated parallel workers
105
+ pytest -n auto --maxprocesses=4 --dist=loadfile
132
106
 
133
107
  # Lint + format check
134
108
  ruff check python/ tests/
@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "lockbot"
7
- version = "2.15.2"
8
- description = "Cluster resource management bot for IM platforms"
7
+ version = "3.0.1"
8
+ description = "Cluster resource management and queuing for Infoflow and Feishu"
9
9
  readme = "README.md"
10
10
  license = {text = "MIT"}
11
11
  requires-python = ">=3.10"
@@ -46,6 +46,7 @@ dependencies = [
46
46
  ]
47
47
 
48
48
  [project.optional-dependencies]
49
+ feishu = ["lark-oapi==1.7.5", "websockets==15.0.1"]
49
50
  dev = [
50
51
  "pytest>=7.0",
51
52
  "pytest-xdist>=3.6,<4",
@@ -0,0 +1 @@
1
+ """Optional stdlib-only client reference helpers; no HTTP or command execution."""
@@ -0,0 +1,229 @@
1
+ """Build final payloads from trusted orchestration policy, not child-Agent prose.
2
+
3
+ The caller must authenticate context/manifest on the approved origin and retain the
4
+ original envelope outside the child's writable state. These helpers do no I/O.
5
+ """
6
+
7
+ from datetime import datetime, timezone
8
+ from urllib.parse import urlsplit
9
+
10
+ SERVICE_ID = "lockbot.resource-api"
11
+ MODES = {"command_only", "public_category", "private_details"}
12
+
13
+
14
+ class GateError(ValueError):
15
+ """Do not send, guess another credential or replay a previous command."""
16
+
17
+
18
+ def _text(value, maximum=512):
19
+ if (
20
+ not isinstance(value, str)
21
+ or not 1 <= len(value) <= maximum
22
+ or not value.strip()
23
+ or any(ord(c) < 32 or ord(c) == 127 for c in value)
24
+ ):
25
+ raise GateError("Expected bounded plain text")
26
+ return value
27
+
28
+
29
+ def _origin(value):
30
+ _text(value, 2048)
31
+ try:
32
+ parsed = urlsplit(value)
33
+ if (
34
+ parsed.scheme not in {"http", "https"}
35
+ or not parsed.hostname
36
+ or parsed.username is not None
37
+ or parsed.password is not None
38
+ or parsed.path not in {"", "/"}
39
+ or parsed.query
40
+ or parsed.fragment
41
+ or "\\" in value
42
+ or any(char.isspace() for char in value)
43
+ or parsed.port == 0
44
+ ):
45
+ raise GateError("Expected the verified service origin")
46
+ except ValueError as error:
47
+ raise GateError("Invalid service origin") from error
48
+ return value.rstrip("/")
49
+
50
+
51
+ def scope_from_authenticated_context(origin, context, credential_ref):
52
+ """Record an already authenticated identity; this function cannot verify TLS/key use."""
53
+ if not isinstance(context, dict):
54
+ raise GateError("Missing authenticated context")
55
+ server, bot, actor = context.get("server", {}), context.get("bot", {}), context.get("actor", {})
56
+ if (
57
+ not isinstance(server, dict)
58
+ or server.get("service_id") != SERVICE_ID
59
+ or server.get("api_version") != "1"
60
+ or context.get("credential_scope") != "one_user_one_bot"
61
+ or context.get("agent_access_enabled") is not True
62
+ or not isinstance(bot, dict)
63
+ or type(bot.get("id")) is not int
64
+ or bot["id"] <= 0
65
+ or not isinstance(actor, dict)
66
+ ):
67
+ raise GateError("Unsupported or disabled authenticated scope")
68
+ reference = _text(credential_ref)
69
+ if reference.startswith(("lbr_", "lbk_", "Bearer ")):
70
+ raise GateError("Pass a private-store reference, never a bearer key")
71
+ return {
72
+ "origin": _origin(origin),
73
+ "service_id": SERVICE_ID,
74
+ "instance_id": _text(server.get("instance_id"), 128),
75
+ "bot_uuid": _text(bot.get("uuid"), 128),
76
+ "bot_id": bot["id"],
77
+ "actor": {
78
+ "platform": _text(actor.get("platform"), 64),
79
+ "external_user_id": _text(actor.get("external_user_id")),
80
+ },
81
+ "credential_ref": reference,
82
+ }
83
+
84
+
85
+ def _policy(value):
86
+ if (
87
+ not isinstance(value, dict)
88
+ or set(value) != {"version", "mode"}
89
+ or type(value.get("version")) is not int
90
+ or value["version"] != 1
91
+ or not isinstance(value.get("mode"), str)
92
+ or value["mode"] not in MODES
93
+ ):
94
+ raise GateError("Unsupported privacy policy")
95
+ return dict(value)
96
+
97
+
98
+ def make_handoff(origin, authenticated_context, credential_ref, policy=None):
99
+ """Create a JSON-serializable envelope; keep an immutable trusted copy in the parent."""
100
+ return {
101
+ "schema_version": 1,
102
+ "scope": scope_from_authenticated_context(origin, authenticated_context, credential_ref),
103
+ "privacy_policy": _policy(policy if policy is not None else {"version": 1, "mode": "command_only"}),
104
+ }
105
+
106
+
107
+ def _envelope(value):
108
+ if (
109
+ not isinstance(value, dict)
110
+ or set(value) != {"schema_version", "scope", "privacy_policy"}
111
+ or type(value.get("schema_version")) is not int
112
+ or value["schema_version"] != 1
113
+ or not isinstance(value.get("scope"), dict)
114
+ ):
115
+ raise GateError("Unsupported handoff envelope")
116
+ _policy(value["privacy_policy"])
117
+ return value
118
+
119
+
120
+ def _matched_scope(trusted_handoff, origin, context, credential_ref):
121
+ trusted = _envelope(trusted_handoff)
122
+ current = scope_from_authenticated_context(origin, context, credential_ref)
123
+ if trusted["scope"] != current:
124
+ raise GateError("Credential/service/bot/actor scope changed")
125
+ return current
126
+
127
+
128
+ def final_command_payload(trusted_handoff, child_handoff, *, origin, authenticated_context, credential_ref, candidate):
129
+ """Return a fresh allowlisted body; never mutate inputs, send or retry a command.
130
+
131
+ The original parent policy is authoritative. A child cannot replace it by
132
+ editing its serialized envelope. Command authorization remains the caller's job.
133
+ """
134
+ trusted = _envelope(trusted_handoff)
135
+ if _envelope(child_handoff) != trusted:
136
+ raise GateError("Child changed the trusted handoff policy or scope")
137
+ _matched_scope(trusted, origin, authenticated_context, credential_ref)
138
+ if not isinstance(candidate, dict):
139
+ raise GateError("Missing command candidate")
140
+ result = {"command": _text(candidate.get("command"))}
141
+ privacy = authenticated_context.get("usage_privacy")
142
+ if not isinstance(privacy, dict):
143
+ return result
144
+ mode = trusted["privacy_policy"]["mode"]
145
+ if mode == "public_category":
146
+ categories = privacy.get("public_task_categories")
147
+ if not isinstance(categories, dict) or not categories:
148
+ return result
149
+ category = candidate.get("task_category")
150
+ if category is not None:
151
+ if not isinstance(category, str) or category not in categories:
152
+ raise GateError("Choose a public category ID from authenticated context")
153
+ result["task_category"] = category
154
+ elif mode == "private_details":
155
+ fields = privacy.get("private_fields")
156
+ if (
157
+ privacy.get("legacy_purpose_visibility") != "private"
158
+ or not isinstance(fields, list)
159
+ or "purpose" not in fields
160
+ or "agent_label" not in fields
161
+ ):
162
+ return result
163
+ for field, maximum in (("purpose", 512), ("agent_label", 64)):
164
+ if candidate.get(field) is not None:
165
+ result[field] = _text(candidate[field], maximum)
166
+ return result
167
+
168
+
169
+ def _instant(value):
170
+ try:
171
+ instant = datetime.fromisoformat(_text(value, 64).replace("Z", "+00:00"))
172
+ if instant.tzinfo is None:
173
+ raise ValueError("Timezone required")
174
+ return instant.astimezone(timezone.utc)
175
+ except (ValueError, TypeError) as error:
176
+ raise GateError("Expected an absolute lease timestamp") from error
177
+
178
+
179
+ def lease_matches(trusted_handoff, *, origin, authenticated_context, credential_ref, resource_id, saved, holder, now):
180
+ """Compare this task's saved evidence with a fresh resource holder; no release I/O.
181
+
182
+ Current APIs expose start_time; holding_id is additionally checked when present
183
+ in saved evidence. No public Agent label is used as an ownership boundary.
184
+ """
185
+ scope = _matched_scope(trusted_handoff, origin, authenticated_context, credential_ref)
186
+ if not isinstance(saved, dict) or not isinstance(holder, dict):
187
+ return False
188
+ actor = scope["actor"]
189
+ if (
190
+ saved.get("resource_id") != _text(resource_id)
191
+ or saved.get("actor") != actor
192
+ or holder.get("platform") != actor["platform"]
193
+ or holder.get("external_user_id") != actor["external_user_id"]
194
+ or _instant(saved.get("start_time")) != _instant(holder.get("start_time"))
195
+ or _instant(holder.get("expires_at")) <= _instant(now)
196
+ ):
197
+ return False
198
+ return saved.get("holding_id") is None or saved["holding_id"] == holder.get("holding_id")
199
+
200
+
201
+ def feedback_url(trusted_handoff, *, manifest_origin, verified_manifest):
202
+ """Return only the verified manifest's feedback entry; never submit or upload anything."""
203
+ scope = _envelope(trusted_handoff)["scope"]
204
+ if (
205
+ _origin(manifest_origin) != scope.get("origin")
206
+ or not isinstance(verified_manifest, dict)
207
+ or verified_manifest.get("service_id") != scope.get("service_id")
208
+ or verified_manifest.get("instance_id") != scope.get("instance_id")
209
+ ):
210
+ raise GateError("Feedback manifest does not match the verified service")
211
+ url = _text(verified_manifest.get("issues_url"), 2048)
212
+ try:
213
+ parsed = urlsplit(url)
214
+ port = parsed.port
215
+ except ValueError as error:
216
+ raise GateError("Invalid feedback entry") from error
217
+ if (
218
+ parsed.scheme != "https"
219
+ or not parsed.hostname
220
+ or parsed.username is not None
221
+ or parsed.password is not None
222
+ or parsed.query
223
+ or parsed.fragment
224
+ or "\\" in url
225
+ or any(char.isspace() for char in url)
226
+ or port == 0
227
+ ):
228
+ raise GateError("Invalid feedback entry")
229
+ return url
@@ -261,6 +261,9 @@ its bot ID once as a legacy fallback. Never scan IDs or fall back to another pla
261
261
  who enrolled it. You cannot choose or spoof the identity — it is fixed at enrollment.
262
262
  - **Enrollment is chat-only.** A human runs `bind <code>` in the bot's IM group to confirm a
263
263
  pending credential. `bind` / `unbind` / `bindings` are refused over HTTP by design.
264
+ On Feishu, mention the enterprise bot in the explicitly configured resource group;
265
+ direct messages do not enroll a resource credential. Preserve the exact `actor.platform`
266
+ from context in connection memory; matching display names across platforms are not the same identity.
264
267
  - One verified user has one active key per bot; their own agents share it. Other users and bots have separate keys. Do not repeatedly enroll to get a key per agent.
265
268
  - Agent access is enabled by default for new bots; an explicit disabled setting is retained. The owner can change it and save the configuration. Disabling access pauses it; a valid key can work again after re-enabling. `unbind` permanently revokes the key.
266
269
  - A credential lives until revoked (unless this deployment configures an expiry). It is revoked by: chat `unbind`, an owner revoke, bot delete,
@@ -588,6 +591,16 @@ Keep checks running throughout long tasks, not only at acquisition. Honour the a
588
591
 
589
592
  ## Declare work without publishing private task details
590
593
 
594
+ For delegated/background work, carry a versioned privacy policy with the verified service,
595
+ instance, bot UUID, resource actor and credential reference. Keep the parent's trusted policy
596
+ outside the child's writable state; check the final encoded payload against it rather than
597
+ trusting a child summary. Default to command-only, allow public categories only under an
598
+ explicit policy, and send private fields only when that policy and current server capability
599
+ both permit them. A changed scope/policy means stop, never try another key or replay a command.
600
+ An optional stdlib [handoff/payload-gate reference](https://github.com/dynamicheart/lockbot/blob/main/docs/usage/agent-handoff.md)
601
+ provides executable checks and an offline example; clients may implement equivalent checks
602
+ without installing a Python SDK. Lease evidence uses real actor/start time, never Agent labels.
603
+
591
604
  Check `/api/agent/context.usage_privacy` before sending notes. On servers advertising this
592
605
  policy, `task_category` is the only public task description. Choose exactly one ID from
593
606
  `public_task_categories`, for example `operator_testing`, `communication_testing`,
@@ -635,6 +648,14 @@ and other users' public categories. Never attribute a task by machine name alone
635
648
  verified actor and resource ID. `usage: null` is not proof that nobody registered a task.
636
649
  A declaration does not prove ownership or change the queue order. It disappears when the
637
650
  lease, TTL or authorization is no longer valid. DELETE your declaration to remove it.
651
+ For task-scoped cleanup, first verify this task's actor/resource/lease and read its own
652
+ current declaration. When context declares `usage_privacy.conditional_cleanup`, save the
653
+ private `revision` value and send it unchanged as the `If-Match` header on DELETE.
654
+ The server rejects changed/expired declarations or changed leases with 412. Stop and
655
+ re-read; never retry without the precondition or delete a replacement task's declaration.
656
+ This deletes metadata only: it does not free or renew resources. A revision is not an
657
+ ownership proof or credential and is hidden from other users. Old servers without this
658
+ capability require coordination; do not assume their unconditional delete is race-safe.
638
659
  Refresh an expiring declaration without repeating `lock`, which extends resource time.
639
660
  If a mutation returns `may_have_executed`, read state before retrying.
640
661
 
@@ -10,7 +10,7 @@ Depends(get_current_user), so no other changes are needed.
10
10
  from datetime import datetime, timedelta, timezone
11
11
 
12
12
  import jwt
13
- from fastapi import Depends, HTTPException, status
13
+ from fastapi import Depends, HTTPException, Request, status
14
14
  from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
15
15
  from sqlalchemy import select
16
16
  from sqlalchemy.orm import Session
@@ -35,6 +35,7 @@ def create_access_token(user_id: int, token_version: int = 0, must_change_passwo
35
35
 
36
36
 
37
37
  def get_current_user(
38
+ request: Request,
38
39
  credentials: HTTPAuthorizationCredentials | None = Depends(_security),
39
40
  db: Session = Depends(get_db),
40
41
  ) -> User:
@@ -56,6 +57,12 @@ def get_current_user(
56
57
  if user.effective_token_version != token_version:
57
58
  raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Token expired, please login again")
58
59
 
60
+ request.state.traffic_management = {
61
+ "id": "user:" + str(user.id),
62
+ "kind": "management",
63
+ "user": user.username,
64
+ "platform": "",
65
+ }
59
66
  return user
60
67
 
61
68
 
@@ -329,6 +329,10 @@ def _read_backup_bots(zf) -> list[dict]:
329
329
  result = []
330
330
  for r in rows:
331
331
  d = dict(r)
332
+ if (d.get("platform") or "").lower() == "feishu":
333
+ from lockbot.backend.app.feishu.backup import read_application_metadata
334
+
335
+ d["_feishu_application"] = read_application_metadata(conn, d["id"])
332
336
  if "uuid" not in d:
333
337
  d["uuid"] = None
334
338
  result.append(d)
@@ -517,6 +521,15 @@ def restore_apply(
517
521
  current_user_id: int,
518
522
  db,
519
523
  ) -> dict:
524
+ """Keep route restoration and its commit serialized against application removal."""
525
+ from lockbot.backend.app.feishu.connectors import connectors
526
+
527
+ with connectors.application_guard():
528
+ db.rollback()
529
+ return _restore_apply(file_bytes, password, source_secret_key, selected_uuids, current_user_id, db)
530
+
531
+
532
+ def _restore_apply(file_bytes, password, source_secret_key, selected_uuids, current_user_id, db):
520
533
  """
521
534
  Actually restore selected bots from a backup zip.
522
535
 
@@ -743,6 +756,9 @@ def restore_apply(
743
756
  existing.token = token_enc
744
757
  existing.status = "recovery_required"
745
758
  existing.pid = None
759
+ from lockbot.backend.app.feishu.backup import restore_route
760
+
761
+ restore_route(db, existing, bb, source_secret_key)
746
762
  # Commit the new config, then install the archived state atomically. If
747
763
  # the state cannot be installed after the config commit (or the commit
748
764
  # result is unknown), the row and its saved state may be inconsistent — a
@@ -794,6 +810,9 @@ def restore_apply(
794
810
  db.add(bot_obj)
795
811
  try:
796
812
  db.flush() # get bot_obj.id
813
+ from lockbot.backend.app.feishu.backup import restore_route
814
+
815
+ restore_route(db, bot_obj, bb, source_secret_key)
797
816
  db.commit()
798
817
  except IntegrityError:
799
818
  db.rollback()