fix(fetch): 修复钉钉来源身份与取件失败监控
build / build (push) Successful in 1m17s

This commit is contained in:
姚章浩
2026-10-27 14:36:24 +08:00
parent 1b09f7d35b
commit 74aef1e373
8 changed files with 211 additions and 9 deletions
+48 -1
View File
@@ -371,8 +371,55 @@ def dingtalk_local_export(manifest):
return str(candidate), fresh
def dingtalk_live_raw_key(manifest):
"""Resolve in the configured source; names locate folders, never file identity."""
from live_catalog_refresh import dingtalk_root_key
from source_catalog_import import node_id as catalog_node_id, safe_relative_path
from dws_dingtalk_scan import normalise
match = re.fullmatch(r"spaces/([A-Za-z0-9_-]+)\?space=([A-Za-z0-9_-]+)", manifest['source_root'])
if not match:
raise FetchError('DingTalk source root is invalid', retryable=False, code='source_identity')
root_id, space_id = match.groups()
try:
source_key = 'dingtalk-' + dingtalk_root_key(manifest['connection_id'], space_id)
parts = safe_relative_path(manifest['relative_path']).split('/')
except (OSError, ValueError, RuntimeError):
raise FetchError('DingTalk source identity cannot be resolved', retryable=False, code='source_identity')
folder = ''
for index in range(len(parts)):
drive = space_id.isdigit()
args = ['drive', '+list', '--space-id', space_id] if drive else ['wiki', '+node-list', '--workspace', space_id]
args += ['--page-all', '--limit', '50', '--max-items', '10000', '--page-limit', '200']
if folder:
args += ['--folder', folder]
payload, verdict = dws_run(args, timeout=180)
if not verdict['ok']:
raise _dws_error(verdict)
data = payload.get('data', {}) if isinstance(payload, dict) else {}
entries = data.get('files' if drive else 'nodes')
if not isinstance(entries, list) or data.get('hasMore') is not False or data.get('autoPageComplete') is not True:
raise FetchError('DingTalk directory response is incomplete', retryable=True, code='source_lookup_incomplete')
matches = []
for entry in entries:
raw, node, is_folder = normalise(entry, folder or root_id)
if index == len(parts) - 1:
if not is_folder and catalog_node_id(source_key, raw) == manifest['node_id']:
matches.append(raw)
elif is_folder and node['name'] == parts[index]:
matches.append(raw)
if len(matches) != 1:
# A missing/ambiguous path is not evidence that the source file was deleted.
raise FetchError('DingTalk node identity unresolved; refresh 来源目录 before retrying',
retryable=False, code='source_node_unresolved')
folder = matches[0]
return folder, 'file'
def dingtalk_raw_keys(manifest):
"""Recover the dentry uuid behind a node id via the scanner inventory."""
"""Use current source coordinates; retain inventory support for old manifests."""
if manifest.get('source_root'):
return dingtalk_live_raw_key(manifest)
state_path = pathlib.Path("/sources/dingtalk/data/dingtalk-internal/inventory-state.json")
state = json.loads(state_path.read_text(encoding="utf-8"))
roots = state.get("roots") or {}