deploy.yml: sync compose+Caddyfile from git, reload caddy after up

backend/app/core/config.py

@@ -2,13 +2,9 @@ from pydantic_settings import BaseSettings, SettingsConfigDict
 
 
 class Settings(BaseSettings):
-    model_config = SettingsConfigDict(
+    model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf-8", extra="ignore")
-        env_file=".env", env_file_encoding="utf-8", extra="ignore"
-    )
 
-    database_url: str = (
+    database_url: str = "postgresql+psycopg://gendesign:gendesign@localhost:5432/gendesign"
-        "postgresql+psycopg://gendesign:gendesign@localhost:5432/gendesign"
-    )
     redis_url: str = "redis://localhost:6379/0"
     cors_origins: list[str] = ["http://localhost:3000"]
     sentry_dsn: str | None = None

backend/app/core/db.py

@@ -6,9 +6,7 @@ from sqlalchemy.orm import DeclarativeBase, Session, sessionmaker
 from app.core.config import settings
 
 engine = create_engine(settings.database_url, pool_pre_ping=True, future=True)
-SessionLocal = sessionmaker(
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine, expire_on_commit=False)
-    autocommit=False, autoflush=False, bind=engine, expire_on_commit=False
-)
 
 
 class Base(DeclarativeBase):

backend/app/schemas/concept.py

@@ -12,9 +12,7 @@ class ConceptInput(BaseModel):
     housing_class: Literal["econom", "comfort", "business"] = "comfort"
     target_floors: int = Field(9, ge=1, le=30)
     development_type: Literal["spot", "mid_rise", "high_rise"] = "mid_rise"
-    land_cost_rub: float | None = Field(
+    land_cost_rub: float | None = Field(None, description="Optional land cost for financial model")
-        None, description="Optional land cost for financial model"
-    )
 
 
 class TEAP(BaseModel):

backend/app/services/generative/geometry.py

@@ -21,9 +21,7 @@ def generate_stub(payload: ConceptInput) -> list[ConceptVariant]:
         density=0.0,
         parking_spaces=0,
     )
-    empty_financial = FinancialModel(
+    empty_financial = FinancialModel(revenue_rub=0.0, cost_rub=0.0, gross_margin_rub=0.0, irr=0.0)
-        revenue_rub=0.0, cost_rub=0.0, gross_margin_rub=0.0, irr=0.0
-    )
     strategies: list[ConceptVariant] = []
     for strategy in ("max_area", "max_insolation", "balanced"):
         strategies.append(

backend/app/workers/celery_app.py

@@ -7,7 +7,5 @@ from celery import Celery
 
 from app.core.config import settings
 
-celery_app = Celery(
+celery_app = Celery("gendesign", broker=settings.redis_url, backend=settings.redis_url)
-    "gendesign", broker=settings.redis_url, backend=settings.redis_url
-)
 celery_app.conf.timezone = "Europe/Moscow"

frontend/src/app/concept/page.tsx

@@ -8,12 +8,10 @@ export default function ConceptPage() {
       <Link href="/">← Home</Link>
       <h1>Concept (Generative Design)</h1>
       <p>
-        TODO Stage 1a: polygon import (GeoJSON / Leaflet draw) + parameter form +
+        TODO Stage 1a: polygon import (GeoJSON / Leaflet draw) + parameter form
-        result tabs.
+        + result tabs.
-      </p>
-      <p>
-        TODO Stage 1b: render 3 variants on the map with colored buildings.
       </p>
+      <p>TODO Stage 1b: render 3 variants on the map with colored buildings.</p>
       <p>
         TODO Stage 1c: TEAP table, financial form, PDF/Excel/DXF download
         buttons.

frontend/src/app/site-finder/page.tsx

@@ -8,7 +8,10 @@ export default function SiteFinderPage() {
       <Link href="/">← Home</Link>
       <h1>Site Finder</h1>
       <p>TODO Stage 2a: load 1000+ Sverdlovsk parcels into PostGIS.</p>
-      <p>TODO Stage 2b: map (Mapbox) with color-graded parcels + filters + table + card.</p>
+      <p>
+        TODO Stage 2b: map (Mapbox) with color-graded parcels + filters + table
+        + card.
+      </p>
       <p>TODO Stage 2c: «Compute concept» button calling Generative module.</p>
     </main>
   );

frontend/src/lib/api.ts

@@ -4,7 +4,7 @@ export const API_BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 export async function apiFetch<T>(
   path: string,
-  init?: RequestInit
+  init?: RequestInit,
 ): Promise<T> {
   const response = await fetch(`${API_BASE_URL}${path}`, {
     ...init,
@@ -14,9 +14,7 @@ export async function apiFetch<T>(
     },
   });
   if (!response.ok) {
-    throw new Error(
+    throw new Error(`API error ${response.status}: ${await response.text()}`);
-      `API error ${response.status}: ${await response.text()}`
-    );
   }
   return response.json() as Promise<T>;
 }

memory/memory-gendesign.jsonl

@@ -31,4 +31,4 @@
 {"type":"relation","from":"PlanA_AnalyticsFirst_Apr25","to":"WorkSplit_Generative_Stage1","relationType":"needs_revision"}
 {"type":"relation","from":"PlanA_AnalyticsFirst_Apr25","to":"SalesTracking_Strategy_Apr25","relationType":"depends_on"}
 {"type":"relation","from":"PlanA_AnalyticsFirst_Apr25","to":"DataSources_Pricing_Apr25","relationType":"depends_on"}
-{"type":"relation","from":"PlanA_AnalyticsFirst_Apr25","to":"Project_GenDesign","relationType":"reshapes"}
+{"type":"relation","from":"PlanA_AnalyticsFirst_Apr25","to":"Project_GenDesign","relationType":"reshapes"}

sshkey.txt

@@ -21,7 +21,7 @@ mYsNNJf%6hpN
 
 `gendesign' 12345 ssh gendesign
 
-for github 
+for github
 Generating public/private ed25519 key pair.
 Your identification has been saved in /home/gendesign/.ssh/github_deploy
 Your public key has been saved in /home/gendesign/.ssh/github_deploy.pub