Florent Gbelidji commited on
Commit
f84da9e
·
verified ·
1 Parent(s): b3a9e87

Sync DeepSeek OCR HF job code

Browse files
Files changed (1) hide show
  1. ds_batch_ocr/cli.py +43 -2
ds_batch_ocr/cli.py CHANGED
@@ -78,6 +78,43 @@ def getenv_int(name: str, default: int) -> int:
78
  return default
79
 
80
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
81
  def main(argv: Optional[Sequence[str]] = None) -> None:
82
  configure_logging()
83
  bootstrap() # Ensure dependencies are installed and available.
@@ -126,7 +163,8 @@ def main(argv: Optional[Sequence[str]] = None) -> None:
126
  or os.environ.get("STAGE1_OUTPUT_DIR")
127
  or os.environ.get("OUTPUT_DIR", "./outputs/stage1")
128
  )
129
- doc_max_tokens = args.doc_max_tokens or getenv_int("DOC_MAX_TOKENS", 2048)
 
130
  doc_temperature = (
131
  args.doc_temperature
132
  if args.doc_temperature is not None
@@ -177,9 +215,12 @@ def main(argv: Optional[Sequence[str]] = None) -> None:
177
  "FIGURE_PROMPT",
178
  "<image>\nDescribe this image in detail",
179
  )
180
- figure_max_tokens = (
181
  args.figure_max_tokens or getenv_int("FIGURE_MAX_TOKENS", 512)
182
  )
 
 
 
183
  figure_temperature = (
184
  args.figure_temperature
185
  if args.figure_temperature is not None
 
78
  return default
79
 
80
 
81
+ def _token_margin_for_stage(stage: str, default: int = 512) -> int:
82
+ stage_key = f"{stage.upper()}_TOKEN_MARGIN"
83
+ value = os.environ.get(stage_key) or os.environ.get("PIPELINE_TOKEN_MARGIN")
84
+ if value is None:
85
+ return default
86
+ try:
87
+ parsed = int(value)
88
+ if parsed < 0:
89
+ raise ValueError
90
+ return parsed
91
+ except ValueError:
92
+ LOGGER.warning(
93
+ "Invalid token margin for %s=%s. Using default=%s",
94
+ stage_key,
95
+ value,
96
+ default,
97
+ )
98
+ return default
99
+
100
+
101
+ def safe_max_tokens(desired: int, stage: str) -> int:
102
+ max_context = getenv_int("MAX_MODEL_LEN", 4096)
103
+ margin = _token_margin_for_stage(stage)
104
+ allowed = max(1, max_context - margin)
105
+ clamped = min(desired, allowed)
106
+ if clamped < desired:
107
+ LOGGER.info(
108
+ "Clamping %s max tokens from %s to %s to respect context window (MAX_MODEL_LEN=%s, margin=%s)",
109
+ stage,
110
+ desired,
111
+ clamped,
112
+ max_context,
113
+ margin,
114
+ )
115
+ return clamped
116
+
117
+
118
  def main(argv: Optional[Sequence[str]] = None) -> None:
119
  configure_logging()
120
  bootstrap() # Ensure dependencies are installed and available.
 
163
  or os.environ.get("STAGE1_OUTPUT_DIR")
164
  or os.environ.get("OUTPUT_DIR", "./outputs/stage1")
165
  )
166
+ doc_max_tokens_requested = args.doc_max_tokens or getenv_int("DOC_MAX_TOKENS", 2048)
167
+ doc_max_tokens = safe_max_tokens(doc_max_tokens_requested, stage="extract")
168
  doc_temperature = (
169
  args.doc_temperature
170
  if args.doc_temperature is not None
 
215
  "FIGURE_PROMPT",
216
  "<image>\nDescribe this image in detail",
217
  )
218
+ figure_max_tokens_requested = (
219
  args.figure_max_tokens or getenv_int("FIGURE_MAX_TOKENS", 512)
220
  )
221
+ figure_max_tokens = safe_max_tokens(
222
+ figure_max_tokens_requested, stage="describe"
223
+ )
224
  figure_temperature = (
225
  args.figure_temperature
226
  if args.figure_temperature is not None