generated from john/python-template
V3 post step 2 refinement: add temperature & top-p settings to config (and .env), add prompt fields back to job table so that the prompt settings get frozen at runtime for all sources being processed.
This commit is contained in:
@@ -126,6 +126,12 @@ class Job(SQLModel, table=True):
|
||||
date_updated: datetime = Field(default_factory=lambda: datetime.now(UTC))
|
||||
provider: str | None = None
|
||||
model: str | None = None
|
||||
prompt_name: str | None = None
|
||||
prompt_hash: str | None = None
|
||||
system_prompt: str | None = None
|
||||
user_prompt: str | None = None
|
||||
temperature: float | None = None
|
||||
top_p: float | None = None
|
||||
|
||||
document: Optional["Document"] = Relationship(back_populates="jobs", sa_relationship_kwargs={"lazy": "selectin"})
|
||||
job_sources: list["JobSource"] = Relationship(back_populates="job", sa_relationship_kwargs={"lazy": "selectin"})
|
||||
@@ -223,12 +229,6 @@ class JobSource(SQLModel, table=True):
|
||||
source_id: UUID = Field(foreign_key="source.id")
|
||||
status: JobSourceStatus = Field(default=JobSourceStatus.PENDING)
|
||||
raw_transcription: str | None = None
|
||||
prompt_name: str | None = None
|
||||
prompt_hash: str | None = None
|
||||
system_prompt: str | None = None
|
||||
user_prompt: str | None = None
|
||||
temperature: float | None = None
|
||||
top_p: float | None = None
|
||||
ai_metadata: dict[str, Any] | None = Field(default=None, sa_column=Column(JSONBCompat(), nullable=True))
|
||||
raw_api_response: dict[str, Any] | None = Field(default=None, sa_column=Column(JSONBCompat(), nullable=True))
|
||||
error_detail: str | None = None
|
||||
|
||||
@@ -22,6 +22,7 @@ from ..db.models import JobSource
|
||||
from ..db.models import JobSourceStatus
|
||||
from ..db.models import Source
|
||||
from .documents import UploadJobResult
|
||||
from .transcription import build_prompt_execution
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -62,6 +63,7 @@ async def create_upload_job(
|
||||
) -> UploadJobResult:
|
||||
"""Create upload-backed document and queued job records."""
|
||||
runtime_settings = settings or get_settings()
|
||||
prompt_execution = build_prompt_execution(settings=runtime_settings)
|
||||
document_id = uuid4()
|
||||
source_id = uuid4()
|
||||
stored_path = store_file(
|
||||
@@ -81,6 +83,7 @@ async def create_upload_job(
|
||||
stored_path=stored_path,
|
||||
file_hash=file_hash,
|
||||
file_size_bytes=file_size_bytes,
|
||||
prompt_execution=prompt_execution,
|
||||
)
|
||||
except Exception as exc:
|
||||
_best_effort_delete(stored_path)
|
||||
@@ -118,6 +121,7 @@ async def create_job_for_document(
|
||||
)
|
||||
|
||||
runtime_settings = settings or get_settings()
|
||||
prompt_execution = build_prompt_execution(settings=runtime_settings)
|
||||
sorted_uploads = sorted(uploads, key=lambda item: Path(item[0]).name.casefold())
|
||||
stored_uploads: list[PendingStoredUpload] = []
|
||||
for filename, file_bytes in sorted_uploads:
|
||||
@@ -145,6 +149,7 @@ async def create_job_for_document(
|
||||
stored_uploads=stored_uploads,
|
||||
provider=provider,
|
||||
model=model,
|
||||
prompt_execution=prompt_execution,
|
||||
)
|
||||
except Exception as exc:
|
||||
for upload in stored_uploads:
|
||||
@@ -173,6 +178,7 @@ async def _create_upload_records(
|
||||
stored_path: Path,
|
||||
file_hash: str,
|
||||
file_size_bytes: int,
|
||||
prompt_execution,
|
||||
) -> tuple[Document, Job]:
|
||||
document = Document(
|
||||
id=document_id,
|
||||
@@ -181,7 +187,15 @@ async def _create_upload_records(
|
||||
session.add(document)
|
||||
await session.flush()
|
||||
|
||||
job = Job(document_id=document.id)
|
||||
job = Job(
|
||||
document_id=document.id,
|
||||
prompt_name=prompt_execution.prompt_name,
|
||||
prompt_hash=prompt_execution.prompt_hash,
|
||||
system_prompt=prompt_execution.system_prompt,
|
||||
user_prompt=prompt_execution.user_prompt,
|
||||
temperature=prompt_execution.temperature,
|
||||
top_p=prompt_execution.top_p,
|
||||
)
|
||||
session.add(job)
|
||||
await session.flush()
|
||||
|
||||
@@ -219,6 +233,7 @@ async def _create_job_for_document_records(
|
||||
stored_uploads: Sequence[PendingStoredUpload],
|
||||
provider: str | None,
|
||||
model: str | None,
|
||||
prompt_execution,
|
||||
) -> tuple[Job, list[UUID]]:
|
||||
document = await session.get(Document, document_id)
|
||||
if document is None:
|
||||
@@ -237,6 +252,12 @@ async def _create_job_for_document_records(
|
||||
document_id=document_id,
|
||||
provider=(provider or None),
|
||||
model=(model or None),
|
||||
prompt_name=prompt_execution.prompt_name,
|
||||
prompt_hash=prompt_execution.prompt_hash,
|
||||
system_prompt=prompt_execution.system_prompt,
|
||||
user_prompt=prompt_execution.user_prompt,
|
||||
temperature=prompt_execution.temperature,
|
||||
top_p=prompt_execution.top_p,
|
||||
)
|
||||
session.add(job)
|
||||
await session.flush()
|
||||
|
||||
@@ -424,12 +424,6 @@ class TranscriptionService(ServiceBase):
|
||||
error_detail=error_detail,
|
||||
provider=provider,
|
||||
model=model,
|
||||
prompt_name=prompt_name,
|
||||
prompt_hash=prompt_hash,
|
||||
system_prompt=system_prompt,
|
||||
user_prompt=user_prompt,
|
||||
temperature=temperature,
|
||||
top_p=top_p,
|
||||
session=_session,
|
||||
)
|
||||
|
||||
@@ -447,12 +441,6 @@ class TranscriptionService(ServiceBase):
|
||||
raw_api_response: dict[str, object] | None = None,
|
||||
provider: str | None = None,
|
||||
model: str | None = None,
|
||||
prompt_name: str = DEFAULT_PROMPT_FILE,
|
||||
prompt_hash: str | None = None,
|
||||
system_prompt: str | None = None,
|
||||
user_prompt: str | None = None,
|
||||
temperature: float | None = None,
|
||||
top_p: float | None = None,
|
||||
session: AsyncSession | None = None,
|
||||
) -> JobSource:
|
||||
"""Persist transcription fields for one source within a specific job."""
|
||||
@@ -497,12 +485,6 @@ class TranscriptionService(ServiceBase):
|
||||
source_id=source_id,
|
||||
status=JobSourceStatus.TRANSCRIBED if text is not None else JobSourceStatus.FAILED,
|
||||
raw_transcription=text,
|
||||
prompt_name=prompt_name,
|
||||
prompt_hash=prompt_hash,
|
||||
system_prompt=system_prompt,
|
||||
user_prompt=user_prompt,
|
||||
temperature=temperature,
|
||||
top_p=top_p,
|
||||
ai_metadata=ai_metadata,
|
||||
raw_api_response=raw_api_response,
|
||||
error_detail=error_detail,
|
||||
@@ -510,12 +492,6 @@ class TranscriptionService(ServiceBase):
|
||||
_session.add(job_source)
|
||||
else:
|
||||
job_source.raw_transcription = text
|
||||
job_source.prompt_name = prompt_name
|
||||
job_source.prompt_hash = prompt_hash
|
||||
job_source.system_prompt = system_prompt
|
||||
job_source.user_prompt = user_prompt
|
||||
job_source.temperature = temperature
|
||||
job_source.top_p = top_p
|
||||
job_source.ai_metadata = ai_metadata
|
||||
job_source.raw_api_response = raw_api_response
|
||||
job_source.error_detail = error_detail
|
||||
@@ -591,12 +567,26 @@ async def transcribe_document_image(
|
||||
image_path: str | Path,
|
||||
*,
|
||||
prompt_name: str | None = None,
|
||||
prompt_text: str | None = None,
|
||||
temperature: float | None = None,
|
||||
top_p: float | None = None,
|
||||
settings: Settings | None = None,
|
||||
provider: TranscriptionProvider | None = None,
|
||||
) -> TranscriptionResult:
|
||||
"""Transcribe a local image using the configured prompt and provider."""
|
||||
runtime_settings = settings or get_settings()
|
||||
prompt_execution = build_prompt_execution(prompt_name=prompt_name, settings=runtime_settings)
|
||||
if prompt_text is None:
|
||||
prompt_execution = build_prompt_execution(prompt_name=prompt_name, settings=runtime_settings)
|
||||
else:
|
||||
effective_prompt_name = (prompt_name or runtime_settings.default_prompt_name or DEFAULT_PROMPT_FILE).strip()
|
||||
prompt_execution = PromptExecution(
|
||||
prompt_name=effective_prompt_name,
|
||||
prompt_hash=hashlib.sha256(prompt_text.encode("utf-8")).hexdigest(),
|
||||
system_prompt=None,
|
||||
user_prompt=prompt_text,
|
||||
temperature=temperature if temperature is not None else runtime_settings.transcription_temperature,
|
||||
top_p=top_p if top_p is not None else runtime_settings.transcription_top_p,
|
||||
)
|
||||
image_bytes, mime_type = load_image_payload(image_path)
|
||||
|
||||
adapter = provider or get_transcription_provider(settings=runtime_settings)
|
||||
|
||||
@@ -15,8 +15,8 @@ from ..errors import classify_unexpected_error
|
||||
from ..errors import format_error_detail
|
||||
from ..providers import TranscriptionResult
|
||||
from . import ServiceBundle
|
||||
from .transcription import DEFAULT_PROMPT_FILE
|
||||
from .transcription import build_prompt_execution
|
||||
from .transcription import PromptExecution
|
||||
from .transcription import transcribe_document_image
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -85,13 +85,13 @@ async def process_queued_job(
|
||||
if not sources:
|
||||
return await services.jobs.mark_job_status(job.id, JobStatus.TRANSCRIBED, session=session)
|
||||
|
||||
successful_pages: list[tuple[Source, TranscriptionResult, str, str | None, str, float | None, float | None]] = []
|
||||
failed_pages: list[tuple[Source, AppError, str, str, str | None, str, float | None, float | None]] = []
|
||||
successful_pages: list[tuple[Source, TranscriptionResult]] = []
|
||||
failed_pages: list[tuple[Source, AppError]] = []
|
||||
externally_stopped = False
|
||||
|
||||
for source in sources:
|
||||
prompt_execution = build_prompt_execution(settings=runtime_settings)
|
||||
prompt_execution = _resolve_job_prompt_execution(source_job=source_job, settings=runtime_settings)
|
||||
|
||||
for source in sources:
|
||||
if await _job_no_longer_processing(job_id=job.id, services=services, session=session):
|
||||
externally_stopped = True
|
||||
break
|
||||
@@ -101,6 +101,10 @@ async def process_queued_job(
|
||||
result = await asyncio.wait_for(
|
||||
transcribe_document_image(
|
||||
source.file_path,
|
||||
prompt_name=prompt_execution.prompt_name,
|
||||
prompt_text=prompt_execution.user_prompt,
|
||||
temperature=prompt_execution.temperature,
|
||||
top_p=prompt_execution.top_p,
|
||||
settings=runtime_settings,
|
||||
provider=services.transcriptions.provider,
|
||||
),
|
||||
@@ -127,17 +131,7 @@ async def process_queued_job(
|
||||
)
|
||||
|
||||
_validate_transcription_quality(result=result, settings=runtime_settings)
|
||||
successful_pages.append(
|
||||
(
|
||||
source,
|
||||
result,
|
||||
prompt_execution.prompt_hash,
|
||||
prompt_execution.system_prompt,
|
||||
prompt_execution.user_prompt,
|
||||
prompt_execution.temperature,
|
||||
prompt_execution.top_p,
|
||||
)
|
||||
)
|
||||
successful_pages.append((source, result))
|
||||
except TimeoutError:
|
||||
error = AppError(
|
||||
f"Provider call timed out after {runtime_settings.worker_provider_timeout_seconds:.1f}s",
|
||||
@@ -145,18 +139,7 @@ async def process_queued_job(
|
||||
suggestion="Retry the job. If this repeats, verify provider latency and request payload size.",
|
||||
retriable=True,
|
||||
)
|
||||
failed_pages.append(
|
||||
(
|
||||
source,
|
||||
error,
|
||||
prompt_execution.prompt_name,
|
||||
prompt_execution.prompt_hash,
|
||||
prompt_execution.system_prompt,
|
||||
prompt_execution.user_prompt,
|
||||
prompt_execution.temperature,
|
||||
prompt_execution.top_p,
|
||||
)
|
||||
)
|
||||
failed_pages.append((source, error))
|
||||
logger.error(
|
||||
"Source failed operation=worker.process_job job_id=%s document_id=%s source_id=%s error_id=%s category=%s",
|
||||
job.id,
|
||||
@@ -172,18 +155,7 @@ async def process_queued_job(
|
||||
case _:
|
||||
error = classify_unexpected_error(exc, operation="worker.process_job")
|
||||
|
||||
failed_pages.append(
|
||||
(
|
||||
source,
|
||||
error,
|
||||
prompt_execution.prompt_name,
|
||||
prompt_execution.prompt_hash,
|
||||
prompt_execution.system_prompt,
|
||||
prompt_execution.user_prompt,
|
||||
prompt_execution.temperature,
|
||||
prompt_execution.top_p,
|
||||
)
|
||||
)
|
||||
failed_pages.append((source, error))
|
||||
logger.error(
|
||||
"Source failed operation=worker.process_job job_id=%s document_id=%s source_id=%s error_id=%s category=%s",
|
||||
job.id,
|
||||
@@ -392,6 +364,20 @@ def _resolve_job_sources(job: Job) -> list[Source]:
|
||||
return list(sorted(sources, key=lambda item: (item.page_number, item.upload_name.casefold())))
|
||||
|
||||
|
||||
def _resolve_job_prompt_execution(*, source_job: Job, settings: Settings) -> PromptExecution:
|
||||
if source_job.user_prompt and source_job.prompt_name:
|
||||
return PromptExecution(
|
||||
prompt_name=source_job.prompt_name,
|
||||
prompt_hash=source_job.prompt_hash or "",
|
||||
system_prompt=source_job.system_prompt,
|
||||
user_prompt=source_job.user_prompt,
|
||||
temperature=source_job.temperature,
|
||||
top_p=source_job.top_p,
|
||||
)
|
||||
|
||||
return build_prompt_execution(settings=settings)
|
||||
|
||||
|
||||
async def _job_no_longer_processing(
|
||||
*,
|
||||
job_id,
|
||||
@@ -407,15 +393,15 @@ async def _finalize_batch_outcome(
|
||||
*,
|
||||
job: Job,
|
||||
services: ServiceBundle,
|
||||
successful_pages: list[tuple[Source, TranscriptionResult, str, str | None, str, float | None, float | None]],
|
||||
failed_pages: list[tuple[Source, AppError, str, str, str | None, str, float | None, float | None]],
|
||||
successful_pages: list[tuple[Source, TranscriptionResult]],
|
||||
failed_pages: list[tuple[Source, AppError]],
|
||||
status: JobStatus,
|
||||
session: AsyncSession | None = None,
|
||||
) -> Job:
|
||||
"""Transaction B: write per-source outcomes and terminal job status atomically."""
|
||||
if session is None:
|
||||
async with services.jobs._session_scope() as local_session:
|
||||
for source, result, prompt_hash, system_prompt, user_prompt, temperature, top_p in successful_pages:
|
||||
for source, result in successful_pages:
|
||||
await services.transcriptions.update_job_source_transcription(
|
||||
job_id=job.id,
|
||||
source_id=source.id,
|
||||
@@ -425,27 +411,15 @@ async def _finalize_batch_outcome(
|
||||
raw_api_response=result.raw_api_response,
|
||||
provider=result.provider,
|
||||
model=result.model,
|
||||
prompt_name=result.prompt_name,
|
||||
prompt_hash=result.prompt_hash or prompt_hash,
|
||||
system_prompt=result.system_prompt if result.system_prompt is not None else system_prompt,
|
||||
user_prompt=result.user_prompt if result.user_prompt is not None else user_prompt,
|
||||
temperature=result.temperature if result.temperature is not None else temperature,
|
||||
top_p=result.top_p if result.top_p is not None else top_p,
|
||||
session=local_session,
|
||||
)
|
||||
|
||||
for source, error, prompt_name, prompt_hash, system_prompt, user_prompt, temperature, top_p in failed_pages:
|
||||
for source, error in failed_pages:
|
||||
await services.transcriptions.update_job_source_transcription(
|
||||
job_id=job.id,
|
||||
source_id=source.id,
|
||||
text=None,
|
||||
error_detail=format_error_detail(error),
|
||||
prompt_name=prompt_name,
|
||||
prompt_hash=prompt_hash,
|
||||
system_prompt=system_prompt,
|
||||
user_prompt=user_prompt,
|
||||
temperature=temperature,
|
||||
top_p=top_p,
|
||||
session=local_session,
|
||||
)
|
||||
|
||||
@@ -453,7 +427,7 @@ async def _finalize_batch_outcome(
|
||||
await local_session.commit()
|
||||
return updated_job
|
||||
|
||||
for source, result, prompt_hash, system_prompt, user_prompt, temperature, top_p in successful_pages:
|
||||
for source, result in successful_pages:
|
||||
await services.transcriptions.update_job_source_transcription(
|
||||
job_id=job.id,
|
||||
source_id=source.id,
|
||||
@@ -463,27 +437,15 @@ async def _finalize_batch_outcome(
|
||||
raw_api_response=result.raw_api_response,
|
||||
provider=result.provider,
|
||||
model=result.model,
|
||||
prompt_name=result.prompt_name,
|
||||
prompt_hash=result.prompt_hash or prompt_hash,
|
||||
system_prompt=result.system_prompt if result.system_prompt is not None else system_prompt,
|
||||
user_prompt=result.user_prompt if result.user_prompt is not None else user_prompt,
|
||||
temperature=result.temperature if result.temperature is not None else temperature,
|
||||
top_p=result.top_p if result.top_p is not None else top_p,
|
||||
session=session,
|
||||
)
|
||||
|
||||
for source, error, prompt_name, prompt_hash, system_prompt, user_prompt, temperature, top_p in failed_pages:
|
||||
for source, error in failed_pages:
|
||||
await services.transcriptions.update_job_source_transcription(
|
||||
job_id=job.id,
|
||||
source_id=source.id,
|
||||
text=None,
|
||||
error_detail=format_error_detail(error),
|
||||
prompt_name=prompt_name,
|
||||
prompt_hash=prompt_hash,
|
||||
system_prompt=system_prompt,
|
||||
user_prompt=user_prompt,
|
||||
temperature=temperature,
|
||||
top_p=top_p,
|
||||
session=session,
|
||||
)
|
||||
|
||||
|
||||
@@ -116,8 +116,8 @@ def _latest_job_error_detail(job: Job) -> str | None:
|
||||
|
||||
def _latest_job_prompt(job: Job) -> str | None:
|
||||
for job_source in sorted(job.job_sources, key=lambda item: item.executed_at, reverse=True):
|
||||
if job_source.prompt_name:
|
||||
return job_source.prompt_name
|
||||
if job_source.job and job_source.job.prompt_name:
|
||||
return job_source.job.prompt_name
|
||||
return None
|
||||
|
||||
|
||||
|
||||
@@ -452,6 +452,6 @@ def _parse_uuid(value: str | None) -> UUID | None:
|
||||
def _latest_prompt_name(job: Job) -> str | None:
|
||||
ordered = sorted(job.job_sources, key=lambda item: item.executed_at, reverse=True)
|
||||
for job_source in ordered:
|
||||
if job_source.prompt_name:
|
||||
return job_source.prompt_name
|
||||
if job_source.job and job_source.job.prompt_name:
|
||||
return job_source.job.prompt_name
|
||||
return None
|
||||
@@ -281,7 +281,7 @@ def _render_source_job_metadata_zone(latest_job_source: JobSource | None) -> Non
|
||||
)
|
||||
metadata_row(
|
||||
"Prompt:",
|
||||
latest_job_source.prompt_name or "unknown",
|
||||
latest_job_source.job.prompt_name if latest_job_source.job and latest_job_source.job.prompt_name else "unknown",
|
||||
)
|
||||
|
||||
if latest_job_source.error_detail:
|
||||
|
||||
Reference in New Issue
Block a user