Restructure project for multi-mode deployment: add uv.lock, openenv-core dependency, server entry point, flat app structure

Dockerfile

@@ -1,22 +1,21 @@
 FROM python:3.10-slim
 
+RUN apt-get update && apt-get install -y --no-install-recommends git && rm -rf /var/lib/apt/lists/*
+
 WORKDIR /app
 
-# Install dependencies first for better Docker layer caching
-COPY requirements.txt .
-RUN pip install --no-cache-dir -r requirements.txt
+# Install dependencies first for caching
+COPY requirements.txt pyproject.toml ./
+COPY server/ server/
+COPY __init__.py ./
+RUN pip install --no-cache-dir .
 
-# Copy application code
+# Copy remaining files
 COPY . .
 
-# Set Python path so the package is importable
-ENV PYTHONPATH="/app"
-
 EXPOSE 7860
 
-# Health check
 HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
     CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:7860/health')" || exit 1
 
-# Run the FastAPI server
-CMD ["uvicorn", "invoice_extraction_env.server.app:app", "--host", "0.0.0.0", "--port", "7860"]
+CMD ["uvicorn", "server.app:app", "--host", "0.0.0.0", "--port", "7860"]

__init__.py

@@ -0,0 +1,3 @@
+"""Invoice Extraction Environment — OpenEnv environment for document data extraction."""
+
+__version__ = "0.1.0"

invoice_extraction_env/__init__.py

@@ -1,17 +0,0 @@
-"""
-Invoice Extraction Environment — An OpenEnv environment for structured
-data extraction from unstructured invoice and receipt documents.
-
-Example:
-    >>> import requests
-    >>> r = requests.post("http://localhost:7860/reset", json={"task_name": "simple_invoice"})
-    >>> obs = r.json()
-"""
-
-from .models import InvoiceAction, InvoiceObservation, InvoiceState
-
-__all__ = [
-    "InvoiceAction",
-    "InvoiceObservation",
-    "InvoiceState",
-]

openenv.yaml

@@ -2,5 +2,5 @@ spec_version: 1
 name: invoice_extraction_env
 type: space
 runtime: fastapi
-app: invoice_extraction_env.server.app:app
+app: server.app:app
 port: 7860

pyproject.toml

@@ -8,6 +8,7 @@ version = "0.1.0"
 description = "Invoice Extraction Environment for OpenEnv — extract structured data from unstructured invoices"
 requires-python = ">=3.10"
 dependencies = [
+    "openenv-core>=0.2.0",
     "fastapi>=0.115.0",
     "pydantic>=2.0.0",
     "uvicorn[standard]>=0.24.0",
@@ -15,11 +16,13 @@ dependencies = [
     "requests>=2.31.0",
 ]
 
+[project.scripts]
+server = "server.app:start"
+
 [project.optional-dependencies]
 dev = [
     "pytest>=8.0.0",
-    "pytest-cov>=4.0.0",
 ]
 
 [tool.setuptools]
-packages = ["invoice_extraction_env", "invoice_extraction_env.server"]
+packages = ["server"]

requirements.txt

@@ -1,3 +1,4 @@
+openenv-core>=0.2.0
 fastapi>=0.115.0
 pydantic>=2.0.0
 uvicorn[standard]>=0.24.0

{invoice_extraction_env/server → server}/app.py

@@ -13,7 +13,7 @@ from fastapi import FastAPI, WebSocket, WebSocketDisconnect
 from fastapi.responses import JSONResponse
 from pydantic import BaseModel
 
-from ..models import InvoiceAction, InvoiceObservation, InvoiceState
+from .models import InvoiceAction, InvoiceObservation, InvoiceState
 from .environment import InvoiceExtractionEnvironment
 
 logger = logging.getLogger(__name__)
@@ -212,3 +212,9 @@ def create_invoice_app() -> FastAPI:
 
 # Create the app instance
 app = create_invoice_app()
+
+
+def start():
+    """Entry point for `uv run server` / `[project.scripts]`."""
+    import uvicorn
+    uvicorn.run("server.app:app", host="0.0.0.0", port=7860)

{invoice_extraction_env/server → server}/environment.py

@@ -10,7 +10,7 @@ import json
 from typing import Any, Optional
 from uuid import uuid4
 
-from ..models import InvoiceAction, InvoiceObservation, InvoiceState
+from .models import InvoiceAction, InvoiceObservation, InvoiceState
 from .documents import get_document, TASK_REQUIRED_FIELDS
 from .graders import grade_extraction
 
@@ -266,7 +266,6 @@ class InvoiceExtractionEnvironment:
         )
 
         if not done and score < 0.95:
-            # Give hints about which fields need improvement
             weak_fields = [
                 name for name, data in feedback.items()
                 if not data.get("matched", False)
@@ -309,9 +308,9 @@ class InvoiceExtractionEnvironment:
         lines = ["Detailed feedback on last extraction:\n"]
         for field, data in self._last_feedback.items():
             score = data.get("score", 0.0)
-            matched = "✓" if data.get("matched", False) else "✗"
+            matched = "Y" if data.get("matched", False) else "N"
             field_type = data.get("expected_type", "unknown")
-            lines.append(f"  {matched} {field} ({field_type}): {score:.2f}")
+            lines.append(f"  [{matched}] {field} ({field_type}): {score:.2f}")
 
         lines.append(f"\nOverall best score: {self._state.best_score:.2f}")
         lines.append(f"Attempts remaining: {self._state.max_attempts - self._state.attempts_used}")