Локальные тесты проходят

Author: knoff

.vscode/tasks.json

@@ -32,6 +32,31 @@
       "group": "build",
       "presentation": { "reveal": "always", "panel": "dedicated" },
       "problemMatcher": []
+    },
+    {
+      "label": "Pytest (container)",
+      "type": "shell",
+      "command": "docker compose exec -e DATABASE_URL=postgresql+psycopg://xmlsvc:xmlsvc@postgres:5432/xmlsvc -e S3_ENDPOINT=http://minio:9000 -e S3_BUCKET=xmlsvc -e S3_ACCESS_KEY=minioadmin -e S3_SECRET_KEY=minioadmin app pytest -q",
+      "group": "test",
+      "presentation": { "reveal": "always", "panel": "dedicated" },
+      "problemMatcher": []
+    },
+    {
+      "label": "Pytest (host venv)",
+      "type": "shell",
+      "command": "pytest -q",
+      "options": {
+        "env": {
+          "DATABASE_URL": "postgresql+psycopg://xmlsvc:xmlsvc@localhost:15433/xmlsvc",
+          "S3_ENDPOINT": "http://localhost:19000",
+          "S3_BUCKET": "xmlsvc",
+          "S3_ACCESS_KEY": "minioadmin",
+          "S3_SECRET_KEY": "minioadmin"
+        }
+      },
+      "group": "test",
+      "presentation": { "reveal": "always", "panel": "dedicated" },
+      "problemMatcher": []
     }
   ]
 }

app/db.py

@@ -1,5 +1,5 @@
-from sqlalchemy import create_engine
 from sqlalchemy.orm import DeclarativeBase, sessionmaker
+from sqlalchemy import create_engine
 import os
 
 DATABASE_URL = os.getenv("DATABASE_URL", "postgresql+psycopg://xmlsvc:xmlsvc@localhost:15433/xmlsvc")

app/models_sqlalchemy.py

@@ -1,42 +1,51 @@
-from sqlalchemy import Column, String, Integer, JSON, LargeBinary, ForeignKey, DateTime, func
-from sqlalchemy.orm import Mapped, mapped_column, relationship
+from __future__ import annotations
+from datetime import datetime
+from typing import Optional
+
+from sqlalchemy import String, Integer, JSON, DateTime
+from sqlalchemy.orm import Mapped, mapped_column
+
 from app.db import Base
 
 class DocumentRow(Base):
     __tablename__ = "documents"
+
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     doc_uid: Mapped[str] = mapped_column(String(64), unique=True, index=True)
     cdm: Mapped[dict] = mapped_column(JSON)
-    schema_id: Mapped[str | None] = mapped_column(String(64), nullable=True)
-    schema_version: Mapped[str | None] = mapped_column(String(32), nullable=True)
-    created_at: Mapped = mapped_column(DateTime(timezone=True), server_default=func.now())
-    updated_at: Mapped = mapped_column(DateTime(timezone=True), server_default=func.now(), onupdate=func.now())
+    schema_id: Mapped[Optional[str]] = mapped_column(String(64), nullable=True)
+    schema_version: Mapped[Optional[str]] = mapped_column(String(32), nullable=True)
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True))
+    updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True))
+
 
 class FileRow(Base):
     __tablename__ = "files"
+
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     filename: Mapped[str] = mapped_column(String(255))
     sha256: Mapped[str] = mapped_column(String(64), index=True)
     size: Mapped[int] = mapped_column(Integer)
-    mime: Mapped[str | None] = mapped_column(String(128), nullable=True)
-    meta: Mapped[dict | None] = mapped_column(JSON, nullable=True)
-    created_at: Mapped = mapped_column(DateTime(timezone=True), server_default=func.now())
+    mime: Mapped[Optional[str]] = mapped_column(String(128), nullable=True)
+    meta: Mapped[Optional[dict]] = mapped_column(JSON, nullable=True)
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True))
 
 class RuleRow(Base):
     __tablename__ = "rules"
+
     id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
     rule_id: Mapped[str] = mapped_column(String(128), unique=True, index=True)
     content: Mapped[dict] = mapped_column(JSON)
-    version: Mapped[str | None] = mapped_column(String(32), nullable=True)
-    created_at: Mapped = mapped_column(DateTime(timezone=True), server_default=func.now())
+    version: Mapped[Optional[str]] = mapped_column(String(32), nullable=True)
+    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True))
 
 class Schema(Base):
     __tablename__ = "schemas"
 
-    id = Column(Integer, primary_key=True, index=True)
-    name = Column(String, nullable=False)
-    version = Column(String, nullable=True)
-    namespace = Column(String, nullable=True)
-    description = Column(String, nullable=True)
-    file_path = Column(String, nullable=False)
-    created_at = Column(DateTime, nullable=False)
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
+    name: Mapped[str] = mapped_column(String, nullable=False)
+    version: Mapped[Optional[str]] = mapped_column(String, nullable=True)
+    namespace: Mapped[Optional[str]] = mapped_column(String, nullable=True)
+    description: Mapped[Optional[str]] = mapped_column(String, nullable=True)
+    file_path: Mapped[str] = mapped_column(String, nullable=False)
+    created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False)

app/rules/example_rules.yaml

@@ -13,7 +13,7 @@
       formula: "Project.object.volumeTotal * 0.6"
     - field: "Project.object.volumeBelow0"
       formula: "Project.object.volumeTotal - Project.object.volumeAbove0"
-  validate:
+  condition:
     - rule: "abs(Project.object.volumeAbove0 + Project.object.volumeBelow0 - Project.object.volumeTotal) <= 0.01"
       message: "Сумма частей должна равняться общему строительному объему"
   severity: "warning"

app/services/rules.py

@@ -10,7 +10,7 @@ class Rule(BaseModel):
     id: str
     when: str | None = None
     generate: List[Dict[str, Any]] | None = None
-    validate: List[Dict[str, Any]] | None = None
+    condition: List[Dict[str, Any]] | None = None
     severity: str | None = None
     version: str | None = None
 

pytest.ini

@@ -0,0 +1,3 @@
+[pytest]
+testpaths = tests
+pythonpath = app

requirements.txt

@@ -11,4 +11,5 @@ alembic>=1.13.2
 psycopg[binary]>=3.1.19
 python-multipart>=0.0.9
 boto3>=1.34.0
-pytest
+httpx>=0.24
+pytest>=8.0