AhmadYarAI commited on
Commit
d7dc866
·
1 Parent(s): cb8dc8e

Done the configuration

Browse files
Files changed (3) hide show
  1. Dockerfile +2 -4
  2. api/invoices.py +7 -2
  3. main.py +19 -14
Dockerfile CHANGED
@@ -6,16 +6,14 @@ RUN apt-get update && apt-get install -y libpq-dev gcc && rm -rf /var/lib/apt/li
6
  RUN useradd -m -u 1000 user
7
  USER user
8
  ENV HOME=/home/user \
9
- PATH=/home/user/.local/bin:$PATH
 
10
 
11
  WORKDIR $HOME/app
12
 
13
- # 1. Copy requirements and install
14
  COPY --chown=user:user requirements.txt .
15
  RUN pip install --no-cache-dir --upgrade -r requirements.txt
16
 
17
- # 2. Copy everything (including the moved frontend folder)
18
  COPY --chown=user:user . .
19
 
20
- # 3. Run the app
21
  CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]
 
6
  RUN useradd -m -u 1000 user
7
  USER user
8
  ENV HOME=/home/user \
9
+ PATH=/home/user/.local/bin:$PATH \
10
+ PYTHONPATH=/home/user/app
11
 
12
  WORKDIR $HOME/app
13
 
 
14
  COPY --chown=user:user requirements.txt .
15
  RUN pip install --no-cache-dir --upgrade -r requirements.txt
16
 
 
17
  COPY --chown=user:user . .
18
 
 
19
  CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]
api/invoices.py CHANGED
@@ -3,8 +3,13 @@ from sqlalchemy.orm import Session
3
  from datetime import datetime
4
  from typing import Optional, List
5
  from pydantic import BaseModel
6
- from core.database import get_db
7
- from models.invoice import Invoice, InvoiceItem
 
 
 
 
 
8
 
9
  router = APIRouter(prefix="/invoices", tags=["Invoices"])
10
 
 
3
  from datetime import datetime
4
  from typing import Optional, List
5
  from pydantic import BaseModel
6
+
7
+ try:
8
+ from backend.models.invoice import Invoice
9
+ from backend.core.database import get_db
10
+ except ImportError:
11
+ from models.invoice import Invoice
12
+ from core.database import get_db
13
 
14
  router = APIRouter(prefix="/invoices", tags=["Invoices"])
15
 
main.py CHANGED
@@ -4,27 +4,32 @@ from fastapi import FastAPI
4
  from fastapi.staticfiles import StaticFiles
5
  from fastapi.responses import FileResponse
6
 
7
- # FIXED IMPORTS: Added 'backend.' prefix so Vercel can find the modules
8
- from backend.core.database import engine, Base
9
- from backend.api.invoices import router as invoice_router
 
 
 
 
 
 
10
 
11
- # Create tables in Neon
12
  Base.metadata.create_all(bind=engine)
13
 
14
- app = FastAPI(title="SmiloCAD Invoice API")
15
 
16
- # Path logic for Vercel
17
  BASE_DIR = Path(__file__).resolve().parent
 
18
 
19
- # Mount Static Files (Ensure these folders exist inside backend/frontend/)
20
- app.mount("/js", StaticFiles(directory=BASE_DIR / "frontend" / "js"), name="js")
21
- app.mount("/css", StaticFiles(directory=BASE_DIR / "frontend" / "css"), name="css")
22
- app.mount("/img", StaticFiles(directory=BASE_DIR / "frontend" / "img"), name="img")
23
 
24
- # Serve the index.html
25
  @app.get("/")
26
  async def serve_index():
27
- return FileResponse(BASE_DIR / "frontend" / "index.html")
28
 
29
- # Include the routes - the prefix '/api' is handled by vercel.json
30
- app.include_router(invoice_router)
 
4
  from fastapi.staticfiles import StaticFiles
5
  from fastapi.responses import FileResponse
6
 
7
+ # --- SMART IMPORT LOGIC ---
8
+ try:
9
+ # Works on Vercel (Root access)
10
+ from backend.core.database import engine, Base
11
+ from backend.api.invoices import router as invoice_router
12
+ except ImportError:
13
+ # Works on Hugging Face Docker / Local (Internal access)
14
+ from core.database import engine, Base
15
+ from api.invoices import router as invoice_router
16
 
17
+ # Initialize Database
18
  Base.metadata.create_all(bind=engine)
19
 
20
+ app = FastAPI(title="SmiloCAD API")
21
 
22
+ # Setup Pathing
23
  BASE_DIR = Path(__file__).resolve().parent
24
+ FRONTEND_DIR = BASE_DIR / "frontend"
25
 
26
+ # Mount Statics (for Hugging Face directly serving)
27
+ app.mount("/js", StaticFiles(directory=FRONTEND_DIR / "js"), name="js")
28
+ app.mount("/css", StaticFiles(directory=FRONTEND_DIR / "css"), name="css")
 
29
 
 
30
  @app.get("/")
31
  async def serve_index():
32
+ return FileResponse(FRONTEND_DIR / "index.html")
33
 
34
+ # Include Router with /api prefix so JS can find it on both platforms
35
+ app.include_router(invoice_router, prefix="/api")