mirror of
https://github.com/lllin000/PaperForge.git
synced 2026-07-22 06:50:53 +00:00
fix: deploy scripts and .env to 99_System/PaperForge/ instead of vault root
This commit is contained in:
parent
fd7ccb53fc
commit
7517ead1a6
2 changed files with 13 additions and 10 deletions
|
|
@ -2587,7 +2587,9 @@ def main() -> int:
|
|||
parser.add_argument('--skip-ingest', action='store_true')
|
||||
parser.add_argument('worker', choices=['selection-sync', 'index-refresh', 'ocr', 'deep-reading', 'update', 'wizard', 'all'])
|
||||
args = parser.parse_args()
|
||||
# Load .env from vault root first, then from PaperForge directory
|
||||
load_simple_env(args.vault / '.env')
|
||||
load_simple_env(args.vault / '99_System' / 'PaperForge' / '.env')
|
||||
if args.worker == 'selection-sync':
|
||||
return run_selection_sync(args.vault)
|
||||
if args.worker == 'index-refresh':
|
||||
|
|
|
|||
|
|
@ -880,21 +880,21 @@ class DeployStep(StepScreen):
|
|||
dirs = [
|
||||
pf_path / "exports",
|
||||
pf_path / "ocr",
|
||||
pf_path / "worker/scripts",
|
||||
vault / resources_dir / "LiteratureControl" / "library-records",
|
||||
vault / "pipeline/worker/scripts",
|
||||
vault / skill_dir / "literature-qa/scripts",
|
||||
vault / skill_dir / "literature-qa/chart-reading",
|
||||
]
|
||||
for d in dirs:
|
||||
d.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
# 3. 复制脚本
|
||||
# 3. 复制脚本(到 PaperForge 目录下)
|
||||
import shutil
|
||||
repo_root = vault # 假设从 github-release 运行
|
||||
|
||||
# Copy pipeline worker
|
||||
# Copy pipeline worker to PaperForge/worker/scripts/
|
||||
worker_src = repo_root / "pipeline/worker/scripts/literature_pipeline.py"
|
||||
worker_dst = vault / "pipeline/worker/scripts/literature_pipeline.py"
|
||||
worker_dst = pf_path / "worker/scripts/literature_pipeline.py"
|
||||
if worker_src.exists():
|
||||
shutil.copy2(worker_src, worker_dst)
|
||||
|
||||
|
|
@ -911,7 +911,7 @@ class DeployStep(StepScreen):
|
|||
for f in chart_src.glob("*.md"):
|
||||
shutil.copy2(f, chart_dst / f.name)
|
||||
|
||||
# 4. 创建 .env(使用用户输入的 API Key)
|
||||
# 4. 创建 .env(放到 PaperForge 目录下)
|
||||
from textual.widgets import Input
|
||||
api_key = self.query_one("#input-api-key", Input).value.strip()
|
||||
api_url = self.query_one("#input-api-url", Input).value.strip() or "https://api.paddleocr.com/ocr"
|
||||
|
|
@ -920,7 +920,8 @@ class DeployStep(StepScreen):
|
|||
self.set_status("请填写 PaddleOCR API Key", False)
|
||||
return False
|
||||
|
||||
env_path = vault / ".env"
|
||||
# 把 .env 放在 PaperForge 目录下
|
||||
env_path = pf_path / ".env"
|
||||
env_content = f"""# PaperForge 配置文件
|
||||
# PaddleOCR API Token(从 https://paddleocr.baidu.com 获取)
|
||||
PADDLEOCR_API_TOKEN={api_key}
|
||||
|
|
@ -994,12 +995,12 @@ class DoneStep(StepScreen):
|
|||
|
||||
**1. 同步 Zotero 文献**
|
||||
```bash
|
||||
python pipeline/worker/scripts/literature_pipeline.py --vault . selection-sync
|
||||
python 99_System/PaperForge/worker/scripts/literature_pipeline.py --vault . selection-sync
|
||||
```
|
||||
|
||||
**2. 生成正式笔记**
|
||||
```bash
|
||||
python pipeline/worker/scripts/literature_pipeline.py --vault . index-refresh
|
||||
python 99_System/PaperForge/worker/scripts/literature_pipeline.py --vault . index-refresh
|
||||
```
|
||||
|
||||
**3. 标记精读文献**
|
||||
|
|
@ -1009,7 +1010,7 @@ python pipeline/worker/scripts/literature_pipeline.py --vault . index-refresh
|
|||
|
||||
**4. 运行 OCR**
|
||||
```bash
|
||||
python pipeline/worker/scripts/literature_pipeline.py --vault . ocr
|
||||
python 99_System/PaperForge/worker/scripts/literature_pipeline.py --vault . ocr
|
||||
```
|
||||
|
||||
**5. 执行精读**
|
||||
|
|
@ -1038,7 +1039,7 @@ python pipeline/worker/scripts/literature_pipeline.py --vault . ocr
|
|||
|
||||
**Python 脚本命令(备用):**
|
||||
```bash
|
||||
python pipeline/worker/scripts/literature_pipeline.py --vault . <command>
|
||||
python 99_System/PaperForge/worker/scripts/literature_pipeline.py --vault . <command>
|
||||
```
|
||||
| 命令 | 作用 |
|
||||
|------|------|
|
||||
|
|
|
|||
Loading…
Reference in a new issue